[GeoNetwork-commit] SF.net SVN: geonetwork:[7897] trunk/installer

[<fxp...@us...>]

Revision: 7897
          http://geonetwork.svn.sourceforge.net/geonetwork/?rev=7897&view=rev
Author:   fxprunayre
Date:     2011-06-24 07:48:25 +0000 (Fri, 24 Jun 2011)

Log Message:
-----------
Update installer config to include web-client. Remove config for building an installer with JRE.

Modified Paths:
--------------
    trunk/installer/build.xml
    trunk/installer/installer-config.xml

Modified: trunk/installer/build.xml
===================================================================
--- trunk/installer/build.xml	2011-06-24 07:42:32 UTC (rev 7896)
+++ trunk/installer/build.xml	2011-06-24 07:48:25 UTC (rev 7897)
@@ -94,18 +94,6 @@
 			<replacefilter token="@javaVersion@" property="javaVersion"/>
 		</replace>
 
-	    <!-- Windows with JRE installer build -->
-	    <copy 	file="../installer/installer-config-win-jre.xml" 
-	    		tofile="${propsdir}/installer-config-win-jre.xml" 
-	    		filtering="on" overwrite="yes"/>
-
-		<replace 	file="${propsdir}/installer-config-win-jre.xml"
-			propertyFile="../web/src/main/webapp/WEB-INF/server.prop">
-			<replacefilter token="@version@" property="version"/>
-			<replacefilter token="@subVersion@" property="subVersion"/>
-			<replacefilter token="@javaVersion@" property="javaVersion"/>
-		</replace>
-
 		<!-- help file -->
 	    <copy 	file="../docs/readme.html" 
 	    		tofile="${propsdir}/readme.html" 
@@ -193,34 +181,4 @@
 		
 	</target>
 
-	<!-- =================================================================================== -->
-
-	<target name="wininstall-jre">
-		<!-- create a Windows installer using launch4j -->
-
-		<property file="../web/src/main/webapp/WEB-INF/server.prop"/>
-
-		<izpack	input="${propsdir}/installer-config-win-jre.xml" 
-			output="../geonetwork-${release}/geonetwork-install-win-jre-${release}-${subVersion}.jar" 
-					installerType="standard" 
-					basedir="${basedir}"/> 
-
-		<checksum file="../geonetwork-${release}/geonetwork-install-win-jre-${release}-${subVersion}.jar" forceOverwrite="yes"/>
-		
-		<echo message="Building Windows installer with JRE on ${osys} using launch4j"/>
-
-		<launch4j configFile="${basedir}/launch4j/launch4jConfig-jre.xml"
-			jar="../geonetwork-${release}/geonetwork-install-win-jre-${release}-${subVersion}.jar"
-			outfile="../geonetwork-${release}/geonetwork-install-with-jre-${release}-${subVersion}.exe"
-			txtFileVersion="${version}-${subVersion}-${date}" 
-			txtProductVersion="${version}-${subVersion}" 
-			fileVersion="${version}.0" 
-			productVersion="${version}.0"/>
-
-	<checksum file="../geonetwork-${release}/geonetwork-install-with-jre-${release}-${subVersion}.exe" forceOverwrite="yes"/>
-		
-	</target>
-
-	<!-- =================================================================================== -->
-
 </project>

Modified: trunk/installer/installer-config.xml
===================================================================
--- trunk/installer/installer-config.xml	2011-06-24 07:42:32 UTC (rev 7896)
+++ trunk/installer/installer-config.xml	2011-06-24 07:48:25 UTC (rev 7897)
@@ -78,20 +78,8 @@
 		<pack id="core" name="Core" required="yes" preselected="yes">
 			<description/>
 			
-			<fileset dir="../release/bin"   targetdir="$INSTALL_PATH/bin">
-				<exclude name="jre/**"/>
-			</fileset>
+			<fileset dir="../release/bin"   targetdir="$INSTALL_PATH/bin"/>
 			
-			<fileset dir="../gast"  targetdir="$INSTALL_PATH/gast">			
-				<exclude name="logs/gast.log*"/>
-				<exclude name="src/**"/>
-				<exclude name="target/**"/>
-				<exclude name="pom.xml"/>
-			</fileset>
-
-			<singlefile target="$INSTALL_PATH/gast/gast.jar" 
-				src="../gast/target/gast.jar" override="true"/>
-			
 			<fileset dir="../release/jetty" targetdir="$INSTALL_PATH/jetty">
 				<exclude name="logs/*.log"/>
 				<exclude name="logs/archive/*.log"/>
@@ -103,15 +91,47 @@
 			<fileset dir="../web/target/geonetwork"  targetdir="$INSTALL_PATH/web/geonetwork" />			
 
 			<fileset dir="../release/data"   targetdir="$INSTALL_PATH/data" />
-
-			<singlefile target="$INSTALL_PATH/web/geoserver.war" 
-				src="../geoserver/target/geoserver.war" override="true"/>
 			
 			<executable targetfile="$INSTALL_PATH/bin/start-geonetwork.sh" />
 			<executable targetfile="$INSTALL_PATH/bin/stop-geonetwork.sh" />
 			<executable targetfile="$INSTALL_PATH/bin/gast.sh" />
 		</pack>
 
+
+    <pack id="widget" name="GeoNetwork User Interface (experimental)" required="no" preselected="yes">
+      <description>GeoNetwork web-client interface</description>
+      <fileset dir="../web-client/src/main/resources" targetdir="$INSTALL_PATH/web/geonetwork/apps">
+	<exclude name="js/OpenLayers/doc/**"/>
+	<exclude name="js/OpenLayers/doc_config/**"/>
+	<exclude name="js/OpenLayers/apidoc_config/**"/>
+	<exclude name="js/OpenLayers/examples/**"/>
+	<exclude name="js/OpenLayers/tests/**"/>
+      </fileset>
+    </pack>
+    
+
+    <pack id="geoserver" name="GeoServer" required="no" preselected="yes">
+      <description/>
+      
+      <fileset dir="../geoserver/target/geoserver" targetdir="$INSTALL_PATH/web/geoserver"/>
+      <!-- Unzipping when container start takes a long time on windows. 
+        <singlefile target="$INSTALL_PATH/web/geoserver.war" src="../geoserver/target/geoserver.war"
+        override="true"/>
+      -->
+    </pack>
+
+    <pack id="gast" name="GAST" required="no" preselected="no">
+      <description/>
+      
+      <fileset dir="../gast" targetdir="$INSTALL_PATH/gast">
+        <exclude name="logs/gast.log*"/>
+        <exclude name="src/**"/>
+        <exclude name="target/**"/>
+        <exclude name="pom.xml"/>
+      </fileset>
+      
+      <singlefile target="$INSTALL_PATH/gast/gast.jar" src="../gast/target/gast.jar" override="true"/>
+    </pack>
 	</packs>
 
 	<!-- =================================================================================== -->


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