[GeoNetwork-commit] SF.net SVN: geonetwork:[5609] sandbox/3.0.x/geonetwork_legacy/installer

[<jos...@us...>]

Revision: 5609
          http://geonetwork.svn.sourceforge.net/geonetwork/?rev=5609&view=rev
Author:   josegar74
Date:     2009-12-11 11:34:15 +0000 (Fri, 11 Dec 2009)

Log Message:
-----------
Updated installer version and use deployed folders for gaap and ebRim (easier for the user to configure database and other parameters, war it's deployed to a temporal directory)

Modified Paths:
--------------
    sandbox/3.0.x/geonetwork_legacy/installer/build.xml
    sandbox/3.0.x/geonetwork_legacy/installer/installer-config.xml

Modified: sandbox/3.0.x/geonetwork_legacy/installer/build.xml
===================================================================
--- sandbox/3.0.x/geonetwork_legacy/installer/build.xml	2009-12-11 10:40:13 UTC (rev 5608)
+++ sandbox/3.0.x/geonetwork_legacy/installer/build.xml	2009-12-11 11:34:15 UTC (rev 5609)
@@ -24,7 +24,7 @@
 		
 	<!-- =================================================================================== -->
 
-	<property name="version" value="2.4.0" />
+	<property name="version" value="3.0.0" />
 	<property name="subVersion" value="0" />
 	<property name="javaVersion" value="1.5.0" /> <!-- Minimum version required -->
 	<property name="jre_url" value="http://java.sun.com/javase/downloads" />
@@ -125,18 +125,26 @@
 	<!-- Copy the ebRIM war file from the local Maven repository into a temporary directory -->
 
 	<target name="ebrim_war">
-		<copy 	file="${user.home}/.m2/repository/org/geonetwork/geonetwork-web-ebrim/3.0.0/geonetwork-web-ebrim-3.0.0.war"
+		<!--copy 	file="${user.home}/.m2/repository/org/geonetwork/geonetwork-web-ebrim/3.0.0/geonetwork-web-ebrim-3.0.0.war"
 			    		tofile="${propsdir}/geonetwork-web-ebrim-3.0.0.war"
-			    		filtering="off" overwrite="yes"/>
+			    		filtering="off" overwrite="yes"/-->
+
+        <delete dir="../web/geonetwork-web-ebrim"/>
+        <unzip  src="${user.home}/.m2/repository/org/geonetwork/geonetwork-web-ebrim/3.0.0/geonetwork-web-ebrim-3.0.0.war"
+                dest="../web/geonetwork-web-ebrim" />
 	</target>
 
     <!-- =================================================================================== -->
 	<!-- Copy the GAAP war file from the local Maven repository into a temporary directory -->
 
 	<target name="gaap_war">
-		<copy 	file="${user.home}/.m2/repository/org/geonetwork/geonetwork-gaap-web/3.0.0/geonetwork-gaap-web-3.0.0.war"
+		<!--copy 	file="${user.home}/.m2/repository/org/geonetwork/geonetwork-gaap-web/3.0.0/geonetwork-gaap-web-3.0.0.war"
 			    		tofile="${propsdir}/geonetwork-gaap-web-3.0.0.war"
-			    		filtering="off" overwrite="yes"/>
+			    		filtering="off" overwrite="yes"/-->
+
+        <delete dir="../web/geonetwork-gaap-web"/>
+        <unzip  src="${user.home}/.m2/repository/org/geonetwork/geonetwork-gaap-web/3.0.0/geonetwork-gaap-web-3.0.0.war"
+            dest="../web/geonetwork-gaap-web" />
 	</target>
 
 

Modified: sandbox/3.0.x/geonetwork_legacy/installer/installer-config.xml
===================================================================
--- sandbox/3.0.x/geonetwork_legacy/installer/installer-config.xml	2009-12-11 10:40:13 UTC (rev 5608)
+++ sandbox/3.0.x/geonetwork_legacy/installer/installer-config.xml	2009-12-11 11:34:15 UTC (rev 5609)
@@ -111,6 +111,8 @@
 				<exclude name="intermap/logs/*"/>
 				<exclude name="intermap/WEB-INF/mapServers.xml_with_geoserver"/>
 				<exclude name="geoserver/**"/>
+                <exclude name="geonetwork-web-ebrim/**"/>
+                <exclude name="geonetwork-gaap-web/**"/>
 			</fileset>
 
 			<fileset dir="../data"   targetdir="$INSTALL_PATH/data">
@@ -143,14 +145,16 @@
 				through an ebXML registry. This package provides the ebRIM CSW ISO interface.
 			</description>
 
-			<singlefile src="../.props/geonetwork-web-ebrim-3.0.0.war" target="$INSTALL_PATH/web/geonetwork-web-ebrim-3.0.0.war" override="true"></singlefile>
+            <fileset dir="../web/geonetwork-web-ebrim"   targetdir="$INSTALL_PATH/web/geonetwork-web-ebrim">
+            </fileset>
 		</pack>
 
         <pack name="Authentication and authorization services" required="yes" preselected="yes">
 			<description>This package provides authentication and authorization services to GeoNetwork opensource components.
 			</description>
 
-			<singlefile src="../.props/geonetwork-gaap-web-3.0.0.war" target="$INSTALL_PATH/web/geonetwork-gaap-web-3.0.0.war" override="true"></singlefile>
+            <fileset dir="../web/geonetwork-gaap-web"   targetdir="$INSTALL_PATH/web/geonetwork-gaap-web">
+            </fileset>
 		</pack>
         
 		<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->


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