[Giews-commit] SF.net SVN: giews: [4605] trunk/fenix-installer

[<jg...@us...>]

Revision: 4605
          http://giews.svn.sourceforge.net/giews/?rev=4605&view=rev
Author:   jgeromo
Date:     2008-07-15 02:25:36 -0700 (Tue, 15 Jul 2008)

Log Message:
-----------
preparing installer for RC3
set C:\GIEWS_Workstation as the default installation path; space in installation path causes problem in starting fenix-web
sets Tomcat service's JvmMx=1024

Modified Paths:
--------------
    trunk/fenix-installer/build.properties
    trunk/fenix-installer/build.xml
    trunk/fenix-installer/src/resources/izpack/conf/fenix-izpack-windows.xml
    trunk/fenix-installer/src/resources/scripts/service-GIEWSWorkstation.bat

Modified: trunk/fenix-installer/build.properties
===================================================================
--- trunk/fenix-installer/build.properties	2008-07-15 09:21:31 UTC (rev 4604)
+++ trunk/fenix-installer/build.properties	2008-07-15 09:25:36 UTC (rev 4605)
@@ -1,15 +1,15 @@
 
 #full-exe-name = customization-exe-name + app-version
 customization-exe-name=workstation-installer
-app-version=3.0-RC2
-fenix-web-file=fenix-web-0.0.7.war
-#fenix-web-location=\\ldvapp07\Tomcat-FENIXDEV\webapps\fenix-web-0.0.7
-fenix-web-location=D:/workspaces/fenix/fenix-installer/src/resources/fenix-web_geoserver/fenix-web-0.0.7
-fenix-birt-file=fenix-birt-0.0.7.war
-fenix-services-file=fenix-services-0.0.7.war
+app-version=3.0-RC3
+fenix-web-file=fenix-web-0.0.8.war
+#fenix-web-location=\\ldvapp07\Tomcat-FENIXDEV\webapps\fenix-web-0.0.8
+fenix-web-location=C:/workspaces/fenixweb/fenix-installer/src/resources/fenix-web_geoserver/fenix-web-0.0.8
+fenix-birt-file=fenix-birt-0.0.8.war
+fenix-services-file=fenix-services-0.0.8.war
 geoserver-file=geoserverDemo.war
 #geoserver-location=\\ldvapp07\Tomcat-FENIXDEV\webapps\geoserverDev
-geoserver-location=D:/workspaces/fenix/fenix-installer/src/resources/fenix-web_geoserver/geoserverDev
+geoserver-location=C:/workspaces/fenixweb/fenix-installer/src/resources/fenix-web_geoserver/geoserverDev
 host-url=http://localhost:$HTTP_PORT_NO
 
 #izpack/conf/fenix-izpack-windows.xml /installation/info/@appname

Modified: trunk/fenix-installer/build.xml
===================================================================
--- trunk/fenix-installer/build.xml	2008-07-15 09:21:31 UTC (rev 4604)
+++ trunk/fenix-installer/build.xml	2008-07-15 09:25:36 UTC (rev 4605)
@@ -191,6 +191,7 @@
 				<include name="shortcutSpec.xml" />
 				<include name="userInputSpec.xml" />
 				<include name="fenix-izpack-windows.xml" />
+				<include name="targetdir.txt" />
 			</fileset>
 		</copy>
 		<copy todir="../build/resources/jakarta-tomcat/conf">

Modified: trunk/fenix-installer/src/resources/izpack/conf/fenix-izpack-windows.xml
===================================================================
--- trunk/fenix-installer/src/resources/izpack/conf/fenix-izpack-windows.xml	2008-07-15 09:21:31 UTC (rev 4604)
+++ trunk/fenix-installer/src/resources/izpack/conf/fenix-izpack-windows.xml	2008-07-15 09:25:36 UTC (rev 4605)
@@ -42,6 +42,7 @@
 			src="../build/resources/izpack/conf/shortcutSpec.xml" />
 		<res id="userInputSpec.xml"
 			src="../build/resources/izpack/conf/userInputSpec.xml" />
+        <res id="TargetPanel.dir" src="../build/resources/izpack/conf/targetdir.txt" />
 	</resources>
 	<panels>
 		<panel classname="HelloPanel" />

Modified: trunk/fenix-installer/src/resources/scripts/service-GIEWSWorkstation.bat
===================================================================
--- trunk/fenix-installer/src/resources/scripts/service-GIEWSWorkstation.bat	2008-07-15 09:21:31 UTC (rev 4604)
+++ trunk/fenix-installer/src/resources/scripts/service-GIEWSWorkstation.bat	2008-07-15 09:25:36 UTC (rev 4605)
@@ -90,7 +90,7 @@
 set PR_JVM=auto
 :foundJvm
 echo Using JVM:              %PR_JVM%
-"%EXECUTABLE%" //IS//%SERVICE_NAME% --StartClass org.apache.catalina.startup.Bootstrap --StopClass org.apache.catalina.startup.Bootstrap --StartParams start --StopParams stop
+"%EXECUTABLE%" //IS//%SERVICE_NAME% --JvmMx=1024 --StartClass org.apache.catalina.startup.Bootstrap --StopClass org.apache.catalina.startup.Bootstrap --StartParams start --StopParams stop
 if not errorlevel 1 goto installed
 echo Failed installing '%SERVICE_NAME%' service
 goto end
@@ -108,7 +108,7 @@
 set PR_LOGPATH=%CATALINA_BASE%\logs
 set PR_STDOUTPUT=auto
 set PR_STDERROR=auto
-"%EXECUTABLE%" //US//%SERVICE_NAME% ++JvmOptions "-Djava.io.tmpdir=%CATALINA_BASE%\temp" --JvmMs 128 --JvmMx 256
+"%EXECUTABLE%" //US//%SERVICE_NAME% ++JvmOptions "-Djava.io.tmpdir=%CATALINA_BASE%\temp" --JvmMs 128 --JvmMx 1024
 echo The service '%SERVICE_NAME%' has been installed.
 
 :end


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.