SF.net SVN: geonetwork:[1411] sandbox/BlueNetMEST

View: New views

1 Messages — Rating Filter: Alert me

SF.net SVN: geonetwork:[1411] sandbox/BlueNetMEST

by bluenetdevteam :: Rate this Message:

Reply to Author | View Threaded | Show Only this Message

Revision: 1411
http://geonetwork.svn.sourceforge.net/geonetwork/?rev=1411&view=rev
Author: bluenetdevteam
Date: 2008-07-18 02:42:20 +0000 (Fri, 18 Jul 2008)

Log Message:
-----------
Use Stephen Davies build for installer and remove generated jars from svn -
thanks Stephen!

Modified Paths:
--------------
sandbox/BlueNetMEST/build.xml
sandbox/BlueNetMEST/installer/build.xml
sandbox/BlueNetMEST/installer/installer-config.xml

Removed Paths:
-------------
sandbox/BlueNetMEST/csw/lib/csw-client.jar
sandbox/BlueNetMEST/csw/lib/csw-common.jar
sandbox/BlueNetMEST/gast/gast.jar
sandbox/BlueNetMEST/web/geonetwork/WEB-INF/lib/GZIPFilter.jar
sandbox/BlueNetMEST/web/geonetwork/WEB-INF/lib/geonetwork.jar
sandbox/BlueNetMEST/web/geonetwork/WEB-INF/lib/jeeves.jar
sandbox/BlueNetMEST/web/geonetwork/WEB-INF/lib/oaipmh-lib.jar
sandbox/BlueNetMEST/web/intermap/WEB-INF/lib/GZIPFilter.jar
sandbox/BlueNetMEST/web/intermap/WEB-INF/lib/intermap.jar
sandbox/BlueNetMEST/web/intermap/WEB-INF/lib/jeeves.jar

Modified: sandbox/BlueNetMEST/build.xml
===================================================================
--- sandbox/BlueNetMEST/build.xml 2008-07-17 08:19:02 UTC (rev 1410)
+++ sandbox/BlueNetMEST/build.xml 2008-07-18 02:42:20 UTC (rev 1411)
@@ -70,8 +70,8 @@

<target name="jeeves" depends="init">
<ant dir="jeeves" target="all"/>
- <copy todir="${lib.gn}" file="${dist.lib}/jeeves.jar"/>
- <copy todir="${lib.im}" file="${dist.lib}/jeeves.jar"/>
+ <copy todir = "${lib.gn}" file="${dist.lib}/jeeves.jar"/>
+ <copy todir = "${lib.im}" file="${dist.lib}/jeeves.jar"/>
</target>


@@ -79,8 +79,6 @@

<target name="gzipfilter" depends="init">
<ant dir="GZIPFilter" target="all"/>
- <copy todir="${lib.gn}" file="${dist.lib}/GZIPFilter.jar"/>
- <copy todir="${lib.im}" file="${dist.lib}/GZIPFilter.jar"/>
</target>


@@ -266,7 +264,7 @@



- <target name="all" depends="war,javadoc" description="Create all generated content"/>
+ <target name="all" depends="installer,javadoc" description="Create all generated content"/>



Modified: sandbox/BlueNetMEST/installer/build.xml
===================================================================
--- sandbox/BlueNetMEST/installer/build.xml 2008-07-17 08:19:02 UTC (rev 1410)
+++ sandbox/BlueNetMEST/installer/build.xml 2008-07-18 02:42:20 UTC (rev 1411)
@@ -1,14 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>


-<project name="geonetwork" default="installer" basedir=".">
+<project name="geonetwork" default="installer" basedir="..">



@@ -16,10 +21,10 @@
<os family="mac"/>
</condition>
<condition property="osys" value="win">
- <os family="windows"/>
+ <os family="windows"/>
</condition>
<condition property="osys" value="unix">
- <os family="unix"/>
+ <os family="unix"/>
</condition>


@@ -29,28 +34,28 @@
<property name="javaVersion" value="1.5.0" /> 
<property name="jre_url" value="http://java.sun.com/javase/downloads/index_jdk5.jsp" />
<property name="OS" value="Compiled on ${os.name} (${osys})" />
- <property name="propsdir" value="../.props" />
+ <property name="dist" value="dist" />
+ <property name="propsdir" value="${dist}/.props" />


-
+
<taskdef name="izpack"
- classpath="lib/standalone-compiler.jar"
+ classpath="installer/lib/standalone-compiler.jar"
classname="com.izforge.izpack.ant.IzPackTask"/>

<taskdef name="launch4j"
classname="net.sf.launch4j.ant.Launch4jTask"
- classpath="launch4j/${osys}/launch4j.jar:launch4j/${osys}/lib/xstream.jar"/>
+ classpath="installer/launch4j/${osys}/launch4j.jar:launch4j/${osys}/lib/xstream.jar"/>



<target name="setProperties">

- <delete dir ="${propsdir}" />
<mkdir dir ="${propsdir}" />


<propertyfile
- file="../web/geonetwork/WEB-INF/server.prop"
+ file="${dist}/web/geonetwork/WEB-INF/server.prop"
comment="GeoNetwork opensource properties. These are also used by both gast and geonetwork at runtime">


@@ -69,37 +74,37 @@



- 
- <copy file="../installer/installer-config.xml"
- tofile="${propsdir}/installer-config.xml"
- filtering="on" overwrite="yes"/>
+ 
+ <copy file="installer/installer-config.xml"
+ tofile="${propsdir}/installer-config.xml"
+ filtering="on" overwrite="yes"/>

<replace file="${propsdir}/installer-config.xml"
- propertyFile="../web/geonetwork/WEB-INF/server.prop">
+ propertyFile="${dist}/web/geonetwork/WEB-INF/server.prop">
<replacefilter token="@version@" property="version"/>
<replacefilter token="@subVersion@" property="subVersion"/>
<replacefilter token="@javaVersion@" property="javaVersion"/>
</replace>


- <copy file="../installer/installer-config-win-jre.xml"
+ <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/geonetwork/WEB-INF/server.prop">
+ propertyFile="${dist}/web/geonetwork/WEB-INF/server.prop">
<replacefilter token="@version@" property="version"/>
<replacefilter token="@subVersion@" property="subVersion"/>
<replacefilter token="@javaVersion@" property="javaVersion"/>
</replace>


- <copy file="../docs/readme.html"
+ <copy file="docs/readme.html"
tofile="${propsdir}/readme.html"
filtering="on" overwrite="yes"/>

<replace file="${propsdir}/readme.html"
- propertyFile="../web/geonetwork/WEB-INF/server.prop">
+ propertyFile="${dist}/web/geonetwork/WEB-INF/server.prop">
<replacefilter token="@version@" property="version"/>
<replacefilter token="@subVersion@" property="subVersion"/>
<replacefilter token="@day@" property="day"/>
@@ -113,23 +118,18 @@

<target name="installer" depends="setProperties">

- <property file="../web/geonetwork/WEB-INF/server.prop"/>
+ <property file="${dist}/web/geonetwork/WEB-INF/server.prop"/>

- <ant dir=".." target="all" />
+ <mkdir dir="${dist}/geonetwork-${release}"/>

- 
-
- <delete dir="../geonetwork-${release}"/>
- <mkdir dir="../geonetwork-${release}"/>
-
<echo message="Building platform independent installer on ${osys} using IzPack"/>

- <izpack input="${propsdir}/installer-config.xml"
- output="../geonetwork-${release}/geonetwork-install-${release}-${subVersion}.jar"
- installerType="standard"
- basedir="${basedir}"/>
+ <izpack
+ input="${propsdir}/installer-config.xml"
+ output="${dist}/geonetwork-${release}/geonetwork-install-${release}-${subVersion}.jar"
+ installerType="standard" basedir="${basedir}"/>

- <ant dir="." target="wininstall" />
+ 

</target>

@@ -178,4 +178,9 @@



+ <target name="clean" description="Cleanup installer directories">
+ <delete dir="${dist}/geonetwork-${release}"/>
+ <delete dir="${propsdir}"/>
+ </target>
+
</project>

Modified: sandbox/BlueNetMEST/installer/installer-config.xml
===================================================================
--- sandbox/BlueNetMEST/installer/installer-config.xml 2008-07-17 08:19:02 UTC (rev 1410)
+++ sandbox/BlueNetMEST/installer/installer-config.xml 2008-07-18 02:42:20 UTC (rev 1411)
@@ -40,12 +40,12 @@


<resources>
- <res id="HTMLLicencePanel.licence" src="../docs/license.html"/>
- <res id="HTMLInfoPanel.info" src="../.props/readme.html"/>
- <res id="Installer.image" src="installer.png"/>
- <res id="shortcutSpec.xml" src="windows-shortcuts.xml"/>
- <res id="Unix_shortcutSpec.xml" src="unix-shortcuts.xml"/>
- <res id="Win_shortcutSpec.xml" src="windows-shortcuts.xml"/>
+ <res id="HTMLLicencePanel.licence" src="docs/license.html"/>
+ <res id="HTMLInfoPanel.info" src="dist/.props/readme.html"/>
+ <res id="Installer.image" src="installer/installer.png"/>
+ <res id="shortcutSpec.xml" src="installer/windows-shortcuts.xml"/>
+ <res id="Unix_shortcutSpec.xml" src="installer/unix-shortcuts.xml"/>
+ <res id="Win_shortcutSpec.xml" src="installer/windows-shortcuts.xml"/>
</resources>


@@ -73,7 +73,7 @@
(based on GeoNetwork version 2.2.0 final).
</description>

- <fileset dir="../docs" targetdir="$INSTALL_PATH/docs">
+ <fileset dir="docs" targetdir="$INSTALL_PATH/docs">
<exclude name="build/**"/>
<exclude name="build.xml"/>
<exclude name="build-docbook.xml"/>
@@ -81,25 +81,33 @@
<exclude name="html/**"/>
</fileset>

- <fileset dir="../docs/html" targetdir="$INSTALL_PATH/docs"/>
+ <fileset dir="docs/html" targetdir="$INSTALL_PATH/docs"/>

- <singlefile src="../.props/readme.html" target="$INSTALL_PATH/docs/readme.html" override="true"/>
+ <singlefile src="dist/.props/readme.html" target="$INSTALL_PATH/docs/readme.html" override="true"/>

- <fileset dir="../bin" targetdir="$INSTALL_PATH/bin">
+ <fileset dir="bin" targetdir="$INSTALL_PATH/bin">
<exclude name="jre/**"/>
<exclude name="jetty.xml_with_geoserver"/>
</fileset>

- <fileset dir="../gast" targetdir="$INSTALL_PATH/gast">
+ <fileset dir="gast" targetdir="$INSTALL_PATH/gast">
<exclude name="log/gast.log*"/>
</fileset>

- <fileset dir="../jetty" targetdir="$INSTALL_PATH/jetty">
+ <fileset dir="dist/lib" targetdir="$INSTALL_PATH/gast">
+ <exclude name="csw-client.jar"/>
+ <exclude name="csw-common.jar"/>
+ <exclude name="geonetwork.jar"/>
+ <exclude name="intermap.jar"/>
+ <exclude name="oaipmh-lib.jar"/>
+ </fileset>
+
+ <fileset dir="jetty" targetdir="$INSTALL_PATH/jetty">
<exclude name="log/*.log"/>
<exclude name="log/archive/*.log"/>
</fileset>

- <fileset dir="../web" targetdir="$INSTALL_PATH/web">
+ <fileset dir="dist/web" targetdir="$INSTALL_PATH/web">
<exclude name="geonetwork/images/logos/*"/>
<exclude name="geonetwork/WEB-INF/db/account.prop"/>
<exclude name="geonetwork/WEB-INF/db/data/*"/>
@@ -112,11 +120,11 @@
<exclude name="geoserver/**"/>
</fileset>

- <fileset dir="../schematrons" targetdir="$INSTALL_PATH/schematrons">
+ <fileset dir="schematrons" targetdir="$INSTALL_PATH/schematrons">
<exclude name="saxon*"/>
</fileset>

- <fileset dir="../gcmdfinder" targetdir="$INSTALL_PATH/gcmdfinder"/>
+ <fileset dir="gcmdfinder" targetdir="$INSTALL_PATH/gcmdfinder"/>

<parsable targetfile="$INSTALL_PATH/docs/readme.html" type="plain"/>

@@ -144,16 +152,16 @@
instructions and download.
</description>

- <fileset dir="../web/geoserver" targetdir="$INSTALL_PATH/web/geoserver">
+ <fileset dir="dist/web/geoserver" targetdir="$INSTALL_PATH/web/geoserver">
<exclude name="data/catalog.xml_jpg"/>
<exclude name="data/coverages/BlueMarble_world/world-topo-bathy-200407-3x8640x4320.jpg"/>
<exclude name="data/coverages/BlueMarble_world/world-topo-bathy-200407-3x8640x4320.wld"/>
<exclude name="data/coverages/BlueMarble_world/info.xml_jpg"/>
</fileset>
<singlefile target="$INSTALL_PATH/web/intermap/WEB-INF/mapServers.xml"
- src="../web/intermap/WEB-INF/mapServers.xml_with_geoserver" override="true"/>
+ src="dist/web/intermap/WEB-INF/mapServers.xml_with_geoserver" override="true"/>
<singlefile target="$INSTALL_PATH/bin/jetty.xml"
- src="../bin/jetty.xml_with_geoserver" override="true"/>
+ src="bin/jetty.xml_with_geoserver" override="true"/>
</pack>


@@ -163,7 +171,14 @@
This is a separate test application that can be used to test the CSW 2.0.1 services.
</description>

- <fileset dir="../csw" targetdir="$INSTALL_PATH/csw"/>
+ <fileset dir="csw" targetdir="$INSTALL_PATH/csw"/>
+
+ <fileset dir="dist/lib" targetdir="$INSTALL_PATH/csw">
+ <exclude name="gast.jar"/>
+ <exclude name="geonetwork.jar"/>
+ <exclude name="intermap.jar"/>
+ <exclude name="oaipmh-lib.jar"/>
+ </fileset>
</pack>



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

-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
GeoNetwork-commit mailing list
GeoNetwork-commit@...
https://lists.sourceforge.net/lists/listinfo/geonetwork-commit