From a71f9f51a609f745197a1b5bf72023924aad2510 Mon Sep 17 00:00:00 2001
From: brinn <brinn>
Date: Sat, 6 Aug 2011 17:15:55 +0000
Subject: [PATCH] format: convert to Unix line endings
SVN: 22393
---
datastore_server/build/build.xml | 864 +++++++++++++++----------------
1 file changed, 432 insertions(+), 432 deletions(-)
diff --git a/datastore_server/build/build.xml b/datastore_server/build/build.xml
index 77cfa2aa08f..784f88a1396 100644
--- a/datastore_server/build/build.xml
+++ b/datastore_server/build/build.xml
@@ -1,408 +1,408 @@
-<project name="datastore_server" default="dist" basedir="..">
- <import file="../../build_resources/ant/build-common.xml" />
- <project-classpath name="ecp" classes="${classes}" />
-
- <property name="dss.original.dist" value="../datastore_server/dist" />
- <property name="dss" value="datastore_server" />
- <property name="dist.datastore_server" value="${dist}/${dss}" />
- <property name="dist.datastore_server.lib" value="${dist.datastore_server}/lib" />
- <property name="dss-jar.file" value="${dist.datastore_server.lib}/datastore_server.jar" />
- <property name="dist.file.prefix" value="${dist}/datastore_server" />
- <property name="dist.lib" value="${dist}/lib"/>
- <property name="plugin-jar.file" value="${dist}/datastore_server-plugin.jar" />
-
- <property name="dss_client" value="dss_client" />
- <property name="dist.dss_client" value="${dist}/dss_client" />
- <property name="dist.dss_client.lib" value="${dist.dss_client}/lib" />
- <property name="dss-client-jar.file" value="${dist.dss_client.lib}/dss_client.jar" />
- <property name="dist.client.file.prefix" value="${dist}/dss_client" />
-
- <property name="dss_upload_gui" value="dss_upload_gui" />
- <property name="dist.dss_upload_gui" value="${dist}/${dss_upload_gui}" />
- <property name="dist.dss_upload_gui.lib" value="${dist.dss_upload_gui}/lib" />
- <property name="dss-upload-gui-jar.file" value="${dist.dss_upload_gui.lib}/dss_upload_gui.jar" />
- <property name="dist.upload-gui.file.prefix" value="${dist}/${dss_upload_gui}" />
-
- <property name="nativesrc" value="${lib}/unix/native" />
- <property name="nativeroot" value="${targets}/ant" />
- <property name="native" value="${nativeroot}/native" />
-
- <target name="clean">
- <delete dir="${dist}" />
- </target>
-
- <target name="compile" depends="build-common.compile, clean" />
-
- <target name="run-tests">
- <antcall target="build-common.run-tests">
- <param name="test.suite" value="tests.xml" />
- </antcall>
- </target>
-
- <target name="dss-jar" depends="compile">
- <mkdir dir="${dist.datastore_server.lib}" />
- <delete dir="tmp/test"/><!-- remove this directory in order to get a clean clean-flag -->
- <build-info revision="revision.number" version="version.number" clean="clean.flag" />
- <echo file="${build.info.file}">${version.number}:${revision.number}:${clean.flag}</echo>
- <copy todir="${native}">
- <fileset dir="${nativesrc}">
- <include name="**/unix.so" />
- </fileset>
- </copy>
- <jar destfile="${dist}/dss-sql.jar">
- <fileset dir="../datastore_server/source">
- <include name="**/*.sql" />
- </fileset>
- </jar>
- <recursive-jar destfile="${dss-jar.file}">
- <fileset dir="${classes}">
- <include name="**/*.class" />
- <include name="**/*.xsd" />
- <include name="${build.info.filename}" />
- </fileset>
- <zipfileset prefix="datastore_server/" src="${dist}/dss-sql.jar">
- <include name="**/*.sql" />
- </zipfileset>
- <fileset dir="${nativeroot}">
- <include name="**/unix.so" />
- </fileset>
- <manifest>
- <attribute name="Version" value="${version.number}" />
- <attribute name="Build-Number"
- value="${version.number} (r${revision.number},${clean.flag})" />
- </manifest>
- </recursive-jar>
- <delete file="${dist}/dss-sql.jar"/>
- <jar update="true" destfile="${dss-jar.file}">
- <fileset dir="../datastore_server/${sources}">
- <include name="**/*.xml" />
- <include name="**/*.xsd" />
- </fileset>
- <fileset dir="${sources}">
- <include name="**/*.xml" />
- <include name="**/*.xsd" />
- </fileset>
- <fileset dir="../${ant.project.name}/${classes}" includes="ch/systemsx/cisd/openbis/dss/BuildAndEnvironmentInfo.class"/>
- <zipfileset src="${lib}/gwt2.0/gwt-user.jar"
- includes="com/google/gwt/user/client/rpc/IsSerializable.class, com/google/gwt/user/client/rpc/SerializableException.class" />
- </jar>
- </target>
-
- <target name="make-plugin-dist">
- <move file="${plugin-jar.file}" tofile="${dist.lib}/datastore_server_plugin${variant}.jar" />
- <property name="dist.file"
- value="${dist}/datastore_server_plugin${variant}-${version.number}-r${revision.number}.zip" />
- <zip basedir="${dist}" destfile="${dist.file}" excludes="*.zip *.jar"/>
- <delete dir="${dist.lib}"/>
- </target>
-
- <target name="dist">
- <antcall target="make-dist">
- <param name="variant" value="" />
- </antcall>
- </target>
-
- <!-- This target has been separated to allow DSS extensions to modify jar files in the distribution
- -->
- <target name="prepare-dist-libs" depends="dss-jar, dist-client, dist-upload-gui">
- <copy file="${dss-jar.file}" todir="${dist.datastore_server.lib}" />
- <copy todir="${dist.datastore_server.lib}" flatten="true">
- <fileset dir="${lib}/jetty7/lib">
- <include name="common/*.jar" />
- <include name="server/*.jar" />
- </fileset>
- </copy>
- <copy todir="${dist.datastore_server.lib}">
- <fileset dir="${lib}/cisd-image_readers">
- <include name="*.jar" />
- </fileset>
- </copy>
- <copy file="${lib}/cisd-base/cisd-base.jar" todir="${dist.datastore_server.lib}" />
- <copy file="${lib}/cisd-args4j/cisd-args4j.jar" todir="${dist.datastore_server.lib}" />
- <copy file="${lib}/cifex/cifex.jar" todir="${dist.datastore_server.lib}" />
- <copy file="${lib}/activation/activation.jar" todir="${dist.datastore_server.lib}" />
- <copy file="${lib}/mail/mail.jar" todir="${dist.datastore_server.lib}" />
- <copy file="${lib}/log4j/log4j.jar" todir="${dist.datastore_server.lib}" />
- <copy file="${lib}/fast-md5/fast-md5.jar" todir="${dist.datastore_server.lib}" />
- <copy file="${lib}/commons-codec/commons-codec.jar" todir="${dist.datastore_server.lib}" />
- <copy file="${lib}/commons-io/commons-io.jar" todir="${dist.datastore_server.lib}" />
- <copy file="${lib}/commons-lang/commons-lang.jar" todir="${dist.datastore_server.lib}" />
- <copy file="${lib}/commons-dbcp/commons-dbcp.jar" todir="${dist.datastore_server.lib}" />
- <copy file="${lib}/commons-pool/commons-pool.jar" todir="${dist.datastore_server.lib}" />
- <copy file="${lib}/postgresql/postgresql.jar" todir="${dist.datastore_server.lib}" />
- <copy file="${lib}/commons-logging/commons-logging.jar" todir="${dist.datastore_server.lib}" />
- <copy file="${lib}/commons-httpclient/commons-httpclient.jar" todir="${dist.datastore_server.lib}" />
- <copy file="${lib}/eodsql/eodsql.jar" todir="${dist.datastore_server.lib}" />
- <copy file="${lib}/imagej/ij.jar" todir="${dist.datastore_server.lib}" />
- <copy file="${lib}/bioformats/bioformats.jar" todir="${dist.datastore_server.lib}" />
- <copy file="${lib}/jai/jai_core.jar" todir="${dist.datastore_server.lib}" />
- <copy file="${lib}/jai/jai_codec.jar" todir="${dist.datastore_server.lib}" />
- <copy file="${lib}/jaxb/jaxb-api.jar" todir="${dist.datastore_server.lib}" />
- <copy file="${lib}/jaxb/jaxb-impl.jar" todir="${dist.datastore_server.lib}" />
- <copy file="${lib}/jaxb/jsr173_1.0_api.jar" todir="${dist.datastore_server.lib}" />
- <copy file="${lib}/spring/spring.jar" todir="${dist.datastore_server.lib}" />
- <copy file="${lib}/slf4j/log4j12/slf4j-log4j12.jar" todir="${dist.datastore_server.lib}" />
- <copy file="${lib}/slf4j/slf4j.jar" todir="${dist.datastore_server.lib}" />
- <copy file="${lib}/fast-md5/fast-md5.jar" todir="${dist.datastore_server.lib}" />
- <copy file="${lib}/csv/csv.jar" todir="${dist.datastore_server.lib}" />
- <copy file="${lib}/jfreechart/jcommon-1.0.16.jar" todir="${dist.datastore_server.lib}" />
- <copy file="${lib}/jfreechart/jfreechart-1.0.13.jar" todir="${dist.datastore_server.lib}" />
- <copy file="${lib}/jython/jython.jar" todir="${dist.datastore_server.lib}" />
- <copy file="${lib}/mina/mina-core.jar" todir="${dist.datastore_server.lib}" />
- <copy file="${lib}/ftpserver/ftpserver-core.jar" todir="${dist.datastore_server.lib}" />
- <copy todir="${dist.datastore_server.lib}/jython-lib" >
- <fileset dir="${lib}/jython/jython-lib" />
- </copy>
- <copy file="${lib}/truezip/truezip.jar" todir="${dist.datastore_server.lib}" />
- <copy todir="${dist.datastore_server.lib}/${dss_upload_gui}" >
- <fileset dir="${dist.dss_upload_gui.lib}" />
- </copy>
+<project name="datastore_server" default="dist" basedir="..">
+ <import file="../../build_resources/ant/build-common.xml" />
+ <project-classpath name="ecp" classes="${classes}" />
+
+ <property name="dss.original.dist" value="../datastore_server/dist" />
+ <property name="dss" value="datastore_server" />
+ <property name="dist.datastore_server" value="${dist}/${dss}" />
+ <property name="dist.datastore_server.lib" value="${dist.datastore_server}/lib" />
+ <property name="dss-jar.file" value="${dist.datastore_server.lib}/datastore_server.jar" />
+ <property name="dist.file.prefix" value="${dist}/datastore_server" />
+ <property name="dist.lib" value="${dist}/lib"/>
+ <property name="plugin-jar.file" value="${dist}/datastore_server-plugin.jar" />
+
+ <property name="dss_client" value="dss_client" />
+ <property name="dist.dss_client" value="${dist}/dss_client" />
+ <property name="dist.dss_client.lib" value="${dist.dss_client}/lib" />
+ <property name="dss-client-jar.file" value="${dist.dss_client.lib}/dss_client.jar" />
+ <property name="dist.client.file.prefix" value="${dist}/dss_client" />
+
+ <property name="dss_upload_gui" value="dss_upload_gui" />
+ <property name="dist.dss_upload_gui" value="${dist}/${dss_upload_gui}" />
+ <property name="dist.dss_upload_gui.lib" value="${dist.dss_upload_gui}/lib" />
+ <property name="dss-upload-gui-jar.file" value="${dist.dss_upload_gui.lib}/dss_upload_gui.jar" />
+ <property name="dist.upload-gui.file.prefix" value="${dist}/${dss_upload_gui}" />
+
+ <property name="nativesrc" value="${lib}/unix/native" />
+ <property name="nativeroot" value="${targets}/ant" />
+ <property name="native" value="${nativeroot}/native" />
+
+ <target name="clean">
+ <delete dir="${dist}" />
+ </target>
+
+ <target name="compile" depends="build-common.compile, clean" />
+
+ <target name="run-tests">
+ <antcall target="build-common.run-tests">
+ <param name="test.suite" value="tests.xml" />
+ </antcall>
+ </target>
+
+ <target name="dss-jar" depends="compile">
+ <mkdir dir="${dist.datastore_server.lib}" />
+ <delete dir="tmp/test"/><!-- remove this directory in order to get a clean clean-flag -->
+ <build-info revision="revision.number" version="version.number" clean="clean.flag" />
+ <echo file="${build.info.file}">${version.number}:${revision.number}:${clean.flag}</echo>
+ <copy todir="${native}">
+ <fileset dir="${nativesrc}">
+ <include name="**/unix.so" />
+ </fileset>
+ </copy>
+ <jar destfile="${dist}/dss-sql.jar">
+ <fileset dir="../datastore_server/source">
+ <include name="**/*.sql" />
+ </fileset>
+ </jar>
+ <recursive-jar destfile="${dss-jar.file}">
+ <fileset dir="${classes}">
+ <include name="**/*.class" />
+ <include name="**/*.xsd" />
+ <include name="${build.info.filename}" />
+ </fileset>
+ <zipfileset prefix="datastore_server/" src="${dist}/dss-sql.jar">
+ <include name="**/*.sql" />
+ </zipfileset>
+ <fileset dir="${nativeroot}">
+ <include name="**/unix.so" />
+ </fileset>
+ <manifest>
+ <attribute name="Version" value="${version.number}" />
+ <attribute name="Build-Number"
+ value="${version.number} (r${revision.number},${clean.flag})" />
+ </manifest>
+ </recursive-jar>
+ <delete file="${dist}/dss-sql.jar"/>
+ <jar update="true" destfile="${dss-jar.file}">
+ <fileset dir="../datastore_server/${sources}">
+ <include name="**/*.xml" />
+ <include name="**/*.xsd" />
+ </fileset>
+ <fileset dir="${sources}">
+ <include name="**/*.xml" />
+ <include name="**/*.xsd" />
+ </fileset>
+ <fileset dir="../${ant.project.name}/${classes}" includes="ch/systemsx/cisd/openbis/dss/BuildAndEnvironmentInfo.class"/>
+ <zipfileset src="${lib}/gwt2.0/gwt-user.jar"
+ includes="com/google/gwt/user/client/rpc/IsSerializable.class, com/google/gwt/user/client/rpc/SerializableException.class" />
+ </jar>
+ </target>
+
+ <target name="make-plugin-dist">
+ <move file="${plugin-jar.file}" tofile="${dist.lib}/datastore_server_plugin${variant}.jar" />
+ <property name="dist.file"
+ value="${dist}/datastore_server_plugin${variant}-${version.number}-r${revision.number}.zip" />
+ <zip basedir="${dist}" destfile="${dist.file}" excludes="*.zip *.jar"/>
+ <delete dir="${dist.lib}"/>
+ </target>
+
+ <target name="dist">
+ <antcall target="make-dist">
+ <param name="variant" value="" />
+ </antcall>
+ </target>
+
+ <!-- This target has been separated to allow DSS extensions to modify jar files in the distribution
+ -->
+ <target name="prepare-dist-libs" depends="dss-jar, dist-client, dist-upload-gui">
+ <copy file="${dss-jar.file}" todir="${dist.datastore_server.lib}" />
+ <copy todir="${dist.datastore_server.lib}" flatten="true">
+ <fileset dir="${lib}/jetty7/lib">
+ <include name="common/*.jar" />
+ <include name="server/*.jar" />
+ </fileset>
+ </copy>
+ <copy todir="${dist.datastore_server.lib}">
+ <fileset dir="${lib}/cisd-image_readers">
+ <include name="*.jar" />
+ </fileset>
+ </copy>
+ <copy file="${lib}/cisd-base/cisd-base.jar" todir="${dist.datastore_server.lib}" />
+ <copy file="${lib}/cisd-args4j/cisd-args4j.jar" todir="${dist.datastore_server.lib}" />
+ <copy file="${lib}/cifex/cifex.jar" todir="${dist.datastore_server.lib}" />
+ <copy file="${lib}/activation/activation.jar" todir="${dist.datastore_server.lib}" />
+ <copy file="${lib}/mail/mail.jar" todir="${dist.datastore_server.lib}" />
+ <copy file="${lib}/log4j/log4j.jar" todir="${dist.datastore_server.lib}" />
+ <copy file="${lib}/fast-md5/fast-md5.jar" todir="${dist.datastore_server.lib}" />
+ <copy file="${lib}/commons-codec/commons-codec.jar" todir="${dist.datastore_server.lib}" />
+ <copy file="${lib}/commons-io/commons-io.jar" todir="${dist.datastore_server.lib}" />
+ <copy file="${lib}/commons-lang/commons-lang.jar" todir="${dist.datastore_server.lib}" />
+ <copy file="${lib}/commons-dbcp/commons-dbcp.jar" todir="${dist.datastore_server.lib}" />
+ <copy file="${lib}/commons-pool/commons-pool.jar" todir="${dist.datastore_server.lib}" />
+ <copy file="${lib}/postgresql/postgresql.jar" todir="${dist.datastore_server.lib}" />
+ <copy file="${lib}/commons-logging/commons-logging.jar" todir="${dist.datastore_server.lib}" />
+ <copy file="${lib}/commons-httpclient/commons-httpclient.jar" todir="${dist.datastore_server.lib}" />
+ <copy file="${lib}/eodsql/eodsql.jar" todir="${dist.datastore_server.lib}" />
+ <copy file="${lib}/imagej/ij.jar" todir="${dist.datastore_server.lib}" />
+ <copy file="${lib}/bioformats/bioformats.jar" todir="${dist.datastore_server.lib}" />
+ <copy file="${lib}/jai/jai_core.jar" todir="${dist.datastore_server.lib}" />
+ <copy file="${lib}/jai/jai_codec.jar" todir="${dist.datastore_server.lib}" />
+ <copy file="${lib}/jaxb/jaxb-api.jar" todir="${dist.datastore_server.lib}" />
+ <copy file="${lib}/jaxb/jaxb-impl.jar" todir="${dist.datastore_server.lib}" />
+ <copy file="${lib}/jaxb/jsr173_1.0_api.jar" todir="${dist.datastore_server.lib}" />
+ <copy file="${lib}/spring/spring.jar" todir="${dist.datastore_server.lib}" />
+ <copy file="${lib}/slf4j/log4j12/slf4j-log4j12.jar" todir="${dist.datastore_server.lib}" />
+ <copy file="${lib}/slf4j/slf4j.jar" todir="${dist.datastore_server.lib}" />
+ <copy file="${lib}/fast-md5/fast-md5.jar" todir="${dist.datastore_server.lib}" />
+ <copy file="${lib}/csv/csv.jar" todir="${dist.datastore_server.lib}" />
+ <copy file="${lib}/jfreechart/jcommon-1.0.16.jar" todir="${dist.datastore_server.lib}" />
+ <copy file="${lib}/jfreechart/jfreechart-1.0.13.jar" todir="${dist.datastore_server.lib}" />
+ <copy file="${lib}/jython/jython.jar" todir="${dist.datastore_server.lib}" />
+ <copy file="${lib}/mina/mina-core.jar" todir="${dist.datastore_server.lib}" />
+ <copy file="${lib}/ftpserver/ftpserver-core.jar" todir="${dist.datastore_server.lib}" />
+ <copy todir="${dist.datastore_server.lib}/jython-lib" >
+ <fileset dir="${lib}/jython/jython-lib" />
+ </copy>
+ <copy file="${lib}/truezip/truezip.jar" todir="${dist.datastore_server.lib}" />
+ <copy todir="${dist.datastore_server.lib}/${dss_upload_gui}" >
+ <fileset dir="${dist.dss_upload_gui.lib}" />
+ </copy>
<copy file="${lib}/poi/poi-3.7-20101029.jar" todir="${dist.datastore_server.lib}" />
<copy file="${lib}/poi/poi-ooxml-3.7-20101029.jar" todir="${dist.datastore_server.lib}" />
<copy file="${lib}/poi/poi-ooxml-schemas-3.7-20101029.jar" todir="${dist.datastore_server.lib}" />
<copy file="${lib}/poi/ooxml-lib/dom4j-1.6.1.jar" todir="${dist.datastore_server.lib}" />
<copy file="${lib}/poi/ooxml-lib/geronimo-stax-api_1.0_spec-1.0.jar" todir="${dist.datastore_server.lib}" />
<copy file="${lib}/poi/ooxml-lib/xmlbeans-2.3.0.jar" todir="${dist.datastore_server.lib}" />
-
- <!-- The dss_upload_gui folder is no longer needed; clean it up here (not in the task that makes the zip) -->
- <delete dir="${dist.dss_upload_gui}" />
- </target>
-
- <!-- parameters:
- variant - will be used in the distribution file name
- -->
- <target name="create-distribution">
- <property name="dist.file"
- value="${dist.file.prefix}${variant}-${version.number}-r${revision.number}.zip" />
- <move file="${checksum.file}" todir="${dist.datastore_server}" />
- <zip basedir="${dist}" destfile="${dist.file}" excludes="*.zip *.jar">
- <zipfileset dir="${dss.original.dist}"
- excludes="**/datastore_server.sh, **/dss_client.sh, **/service.properties, **/log.xml, *.MD5"
- prefix="${dss}" />
- <zipfileset dir="dist"
- includes="**/service.properties, **/log.xml"
- prefix="${dss}" />
- <zipfileset file="${dss.original.dist}/datastore_server.sh"
- filemode="755"
- prefix="${dss}" />
- </zip>
- <delete dir="${dist.datastore_server}" />
- </target>
-
- <!--
- Build the checksum file.
- -->
- <target name="compute-checksum" depends="compute-separate-checksums">
- <concat-checksums />
- </target>
-
- <!--
- Compute checksum files, one per configuration file, and place them
- in the ${dist} dir.
-
- The pattern shown in the file should be:
- hash[two spaces]path_in_distribution_to_file
- e.g.,
- {0} [folder of file]{1}
- -->
- <target name="compute-separate-checksums">
- <checksum todir="${dist}" pattern="{0} etc/{1}">
- <fileset dir="dist/etc">
- <include name="service.properties" />
- <include name="log.xml" />
- <include name="openBIS.keystore" />
- </fileset>
- </checksum>
- <checksum todir="${dist}" pattern="{0} etc/{1}">
- <fileset dir="dist/etc">
- <include name="datastore_server.conf" />
- </fileset>
- </checksum>
- <checksum todir="${dist}" pattern="{0} ./{1}">
- <fileset dir="dist">
- <include name="datastore_server.sh" />
- </fileset>
- </checksum>
-
- </target>
-
- <!-- parameters:
- variant - will be used in the distribution file name
- -->
- <target name="make-dist" depends="prepare-dist-libs, compute-checksum, create-distribution" />
-
- <!--
- dss-client-jar is designed to be called from make-dist. Thus, it does not depend on compile, but
- should be called after dss-jar. -->
- <target name="dss-client-jar" depends="">
- <mkdir dir="${dist.dss_client.lib}" />
- <build-info revision="revision.number" version="version.number" clean="clean.flag" />
- <echo file="${build.info.file}">${version.number}:${revision.number}:${clean.flag}</echo>
- <recursive-jar destfile="${dss-client-jar.file}">
- <fileset dir="${classes}">
- <include name="ch/systemsx/cisd/common/**/*.class" />
- <include name="ch/systemsx/cisd/openbis/generic/shared/**/*.class" />
- <include name="ch/systemsx/cisd/openbis/dss/client/**/*.class" />
- <include name="ch/systemsx/cisd/openbis/dss/generic/shared/api/**/*.class" />
- <include name="ch/systemsx/cisd/openbis/dss/generic/shared/utils/**/*.class" />
- <include name="${build.info.filename}" />
+
+ <!-- The dss_upload_gui folder is no longer needed; clean it up here (not in the task that makes the zip) -->
+ <delete dir="${dist.dss_upload_gui}" />
+ </target>
+
+ <!-- parameters:
+ variant - will be used in the distribution file name
+ -->
+ <target name="create-distribution">
+ <property name="dist.file"
+ value="${dist.file.prefix}${variant}-${version.number}-r${revision.number}.zip" />
+ <move file="${checksum.file}" todir="${dist.datastore_server}" />
+ <zip basedir="${dist}" destfile="${dist.file}" excludes="*.zip *.jar">
+ <zipfileset dir="${dss.original.dist}"
+ excludes="**/datastore_server.sh, **/dss_client.sh, **/service.properties, **/log.xml, *.MD5"
+ prefix="${dss}" />
+ <zipfileset dir="dist"
+ includes="**/service.properties, **/log.xml"
+ prefix="${dss}" />
+ <zipfileset file="${dss.original.dist}/datastore_server.sh"
+ filemode="755"
+ prefix="${dss}" />
+ </zip>
+ <delete dir="${dist.datastore_server}" />
+ </target>
+
+ <!--
+ Build the checksum file.
+ -->
+ <target name="compute-checksum" depends="compute-separate-checksums">
+ <concat-checksums />
+ </target>
+
+ <!--
+ Compute checksum files, one per configuration file, and place them
+ in the ${dist} dir.
+
+ The pattern shown in the file should be:
+ hash[two spaces]path_in_distribution_to_file
+ e.g.,
+ {0} [folder of file]{1}
+ -->
+ <target name="compute-separate-checksums">
+ <checksum todir="${dist}" pattern="{0} etc/{1}">
+ <fileset dir="dist/etc">
+ <include name="service.properties" />
+ <include name="log.xml" />
+ <include name="openBIS.keystore" />
</fileset>
- <manifest>
- <attribute name="Main-Class" value="ch.systemsx.cisd.openbis.dss.client.api.cli.DssClient" />
- <attribute name="Class-Path"
- value="cisd-base.jar cisd-args4j.jar stream-supporting-httpinvoker.jar log4j.jar commons-lang.jar commons-io.jar commons-logging.jar
- commons-codec.jar commons-httpclient.jar spring.jar jline.jar jython.jar poi-3.7-20101029.jar poi-ooxml-3.7-20101029.jar poi-ooxml-schemas-3.7-20101029.jar dom4j-1.6.1.jar geronimo-stax-api_1.0_spec-1.0.jar xmlbeans-2.3.0.jar" />
- <attribute name="Version" value="${version.number}" />
- <attribute name="Build-Number"
- value="${version.number} (r${revision.number},${clean.flag})" />
- </manifest>
- </recursive-jar>
- <jar update="true" destfile="${dss-client-jar.file}">
- <fileset dir="../${ant.project.name}/${classes}" includes="ch/systemsx/cisd/openbis/dss/BuildAndEnvironmentInfo.class"/>
- <zipfileset src="${lib}/gwt2.0/gwt-user.jar"
- includes="com/google/gwt/user/client/rpc/IsSerializable.class, com/google/gwt/user/client/rpc/SerializableException.class" />
- </jar>
- </target>
-
- <target name="dist-client">
- <antcall target="make-dist-client">
- <param name="variant" value="${variant}" />
- </antcall>
- </target>
+ </checksum>
+ <checksum todir="${dist}" pattern="{0} etc/{1}">
+ <fileset dir="dist/etc">
+ <include name="datastore_server.conf" />
+ </fileset>
+ </checksum>
+ <checksum todir="${dist}" pattern="{0} ./{1}">
+ <fileset dir="dist">
+ <include name="datastore_server.sh" />
+ </fileset>
+ </checksum>
- <target name="make-dist-client" depends="dss-client-jar">
- <copy file="${dss-client-jar.file}" todir="${dist.dss_client.lib}" />
- <copy file="${lib}/cisd-base/cisd-base.jar" todir="${dist.dss_client.lib}" />
- <copy file="${lib}/cisd-args4j/cisd-args4j.jar" todir="${dist.dss_client.lib}" />
- <copy file="${lib}/spring/third-party/stream-supporting-httpinvoker.jar" todir="${dist.dss_client.lib}" />
- <copy file="${lib}/log4j/log4j.jar" todir="${dist.dss_client.lib}" />
- <copy file="${lib}/commons-lang/commons-lang.jar" todir="${dist.dss_client.lib}" />
- <copy file="${lib}/commons-io/commons-io.jar" todir="${dist.dss_client.lib}" />
- <copy file="${lib}/commons-logging/commons-logging.jar" todir="${dist.dss_client.lib}" />
- <copy file="${lib}/commons-codec/commons-codec.jar" todir="${dist.dss_client.lib}" />
- <copy file="${lib}/commons-httpclient/commons-httpclient.jar" todir="${dist.dss_client.lib}" />
- <copy file="${lib}/spring/spring.jar" todir="${dist.dss_client.lib}" />
- <copy file="${lib}/jline/jline.jar" todir="${dist.dss_client.lib}" />
- <copy file="${lib}/jython/standalone/jython.jar" todir="${dist.dss_client.lib}" />
+ </target>
+
+ <!-- parameters:
+ variant - will be used in the distribution file name
+ -->
+ <target name="make-dist" depends="prepare-dist-libs, compute-checksum, create-distribution" />
+
+ <!--
+ dss-client-jar is designed to be called from make-dist. Thus, it does not depend on compile, but
+ should be called after dss-jar. -->
+ <target name="dss-client-jar" depends="">
+ <mkdir dir="${dist.dss_client.lib}" />
+ <build-info revision="revision.number" version="version.number" clean="clean.flag" />
+ <echo file="${build.info.file}">${version.number}:${revision.number}:${clean.flag}</echo>
+ <recursive-jar destfile="${dss-client-jar.file}">
+ <fileset dir="${classes}">
+ <include name="ch/systemsx/cisd/common/**/*.class" />
+ <include name="ch/systemsx/cisd/openbis/generic/shared/**/*.class" />
+ <include name="ch/systemsx/cisd/openbis/dss/client/**/*.class" />
+ <include name="ch/systemsx/cisd/openbis/dss/generic/shared/api/**/*.class" />
+ <include name="ch/systemsx/cisd/openbis/dss/generic/shared/utils/**/*.class" />
+ <include name="${build.info.filename}" />
+ </fileset>
+ <manifest>
+ <attribute name="Main-Class" value="ch.systemsx.cisd.openbis.dss.client.api.cli.DssClient" />
+ <attribute name="Class-Path"
+ value="cisd-base.jar cisd-args4j.jar stream-supporting-httpinvoker.jar log4j.jar commons-lang.jar commons-io.jar commons-logging.jar
+ commons-codec.jar commons-httpclient.jar spring.jar jline.jar jython.jar poi-3.7-20101029.jar poi-ooxml-3.7-20101029.jar poi-ooxml-schemas-3.7-20101029.jar dom4j-1.6.1.jar geronimo-stax-api_1.0_spec-1.0.jar xmlbeans-2.3.0.jar" />
+ <attribute name="Version" value="${version.number}" />
+ <attribute name="Build-Number"
+ value="${version.number} (r${revision.number},${clean.flag})" />
+ </manifest>
+ </recursive-jar>
+ <jar update="true" destfile="${dss-client-jar.file}">
+ <fileset dir="../${ant.project.name}/${classes}" includes="ch/systemsx/cisd/openbis/dss/BuildAndEnvironmentInfo.class"/>
+ <zipfileset src="${lib}/gwt2.0/gwt-user.jar"
+ includes="com/google/gwt/user/client/rpc/IsSerializable.class, com/google/gwt/user/client/rpc/SerializableException.class" />
+ </jar>
+ </target>
+
+ <target name="dist-client">
+ <antcall target="make-dist-client">
+ <param name="variant" value="${variant}" />
+ </antcall>
+ </target>
+
+ <target name="make-dist-client" depends="dss-client-jar">
+ <copy file="${dss-client-jar.file}" todir="${dist.dss_client.lib}" />
+ <copy file="${lib}/cisd-base/cisd-base.jar" todir="${dist.dss_client.lib}" />
+ <copy file="${lib}/cisd-args4j/cisd-args4j.jar" todir="${dist.dss_client.lib}" />
+ <copy file="${lib}/spring/third-party/stream-supporting-httpinvoker.jar" todir="${dist.dss_client.lib}" />
+ <copy file="${lib}/log4j/log4j.jar" todir="${dist.dss_client.lib}" />
+ <copy file="${lib}/commons-lang/commons-lang.jar" todir="${dist.dss_client.lib}" />
+ <copy file="${lib}/commons-io/commons-io.jar" todir="${dist.dss_client.lib}" />
+ <copy file="${lib}/commons-logging/commons-logging.jar" todir="${dist.dss_client.lib}" />
+ <copy file="${lib}/commons-codec/commons-codec.jar" todir="${dist.dss_client.lib}" />
+ <copy file="${lib}/commons-httpclient/commons-httpclient.jar" todir="${dist.dss_client.lib}" />
+ <copy file="${lib}/spring/spring.jar" todir="${dist.dss_client.lib}" />
+ <copy file="${lib}/jline/jline.jar" todir="${dist.dss_client.lib}" />
+ <copy file="${lib}/jython/standalone/jython.jar" todir="${dist.dss_client.lib}" />
<copy file="${lib}/poi/poi-3.7-20101029.jar" todir="${dist.dss_client.lib}" />
<copy file="${lib}/poi/poi-ooxml-3.7-20101029.jar" todir="${dist.dss_client.lib}" />
<copy file="${lib}/poi/poi-ooxml-schemas-3.7-20101029.jar" todir="${dist.dss_client.lib}" />
<copy file="${lib}/poi/ooxml-lib/dom4j-1.6.1.jar" todir="${dist.dss_client.lib}" />
<copy file="${lib}/poi/ooxml-lib/geronimo-stax-api_1.0_spec-1.0.jar" todir="${dist.dss_client.lib}" />
<copy file="${lib}/poi/ooxml-lib/xmlbeans-2.3.0.jar" todir="${dist.dss_client.lib}" />
- <property name="dist.file"
- value="${dist.client.file.prefix}${variant}-${version.number}-r${revision.number}.zip" />
-
- <zip destfile="${dist.file}">
- <zipfileset dir="${dist.dss_client.lib}"
- prefix="${dss_client}/lib" />
- <zipfileset file="${dss.original.dist}/dss_client.sh"
- filemode="755"
- prefix="${dss_client}" />
- </zip>
- <delete dir="${dist.dss_client}" />
-
- </target>
-
-
- <!--
- dss-upload-gui-jar is designed to be called from make-dist. Thus, it does not depend on compile, but
- should be called after dss-jar. -->
- <target name="dss-upload-gui-jar" depends="">
- <mkdir dir="${dist.dss_upload_gui.lib}" />
- <build-info revision="revision.number" version="version.number" clean="clean.flag" />
- <echo file="${build.info.file}">${version.number}:${revision.number}:${clean.flag}</echo>
- <recursive-jar destfile="${dss-upload-gui-jar.file}">
- <fileset dir="${classes}">
- <include name="ch/systemsx/cisd/common/**/*.class" />
- <include name="ch/systemsx/cisd/openbis/generic/shared/**/*.class" />
- <include name="ch/systemsx/cisd/openbis/dss/client/**/*.class" />
- <include name="ch/systemsx/cisd/openbis/dss/generic/shared/api/**/*.class" />
- <include name="ch/systemsx/cisd/openbis/dss/generic/shared/utils/**/*.class" />
- <include name="org/python/core/SyspathArchiveHack.class" />
- <include name="${build.info.filename}" />
+ <property name="dist.file"
+ value="${dist.client.file.prefix}${variant}-${version.number}-r${revision.number}.zip" />
+
+ <zip destfile="${dist.file}">
+ <zipfileset dir="${dist.dss_client.lib}"
+ prefix="${dss_client}/lib" />
+ <zipfileset file="${dss.original.dist}/dss_client.sh"
+ filemode="755"
+ prefix="${dss_client}" />
+ </zip>
+ <delete dir="${dist.dss_client}" />
+
+ </target>
+
+
+ <!--
+ dss-upload-gui-jar is designed to be called from make-dist. Thus, it does not depend on compile, but
+ should be called after dss-jar. -->
+ <target name="dss-upload-gui-jar" depends="">
+ <mkdir dir="${dist.dss_upload_gui.lib}" />
+ <build-info revision="revision.number" version="version.number" clean="clean.flag" />
+ <echo file="${build.info.file}">${version.number}:${revision.number}:${clean.flag}</echo>
+ <recursive-jar destfile="${dss-upload-gui-jar.file}">
+ <fileset dir="${classes}">
+ <include name="ch/systemsx/cisd/common/**/*.class" />
+ <include name="ch/systemsx/cisd/openbis/generic/shared/**/*.class" />
+ <include name="ch/systemsx/cisd/openbis/dss/client/**/*.class" />
+ <include name="ch/systemsx/cisd/openbis/dss/generic/shared/api/**/*.class" />
+ <include name="ch/systemsx/cisd/openbis/dss/generic/shared/utils/**/*.class" />
+ <include name="org/python/core/SyspathArchiveHack.class" />
+ <include name="${build.info.filename}" />
</fileset>
<fileset dir="resource">
<include name="wait.gif" />
<include name="wrong.png" />
<include name="ok.png" />
- </fileset>
- <manifest>
- <attribute name="Main-Class" value="ch.systemsx.cisd.openbis.dss.client.api.gui.DataSetUploadClient" />
- <attribute name="Class-Path"
- value="cisd-base.jar cisd-args4j.jar stream-supporting-httpinvoker.jar log4j.jar commons-lang.jar commons-io.jar commons-logging.jar
- commons-codec.jar commons-httpclient.jar spring.jar jline.jar jython.jar poi-3.7-20101029.jar poi-ooxml-3.7-20101029.jar poi-ooxml-schemas-3.7-20101029.jar dom4j-1.6.1.jar geronimo-stax-api_1.0_spec-1.0.jar xmlbeans-2.3.0.jar" />
- <attribute name="Version" value="${version.number}" />
- <attribute name="Build-Number"
- value="${version.number} (r${revision.number},${clean.flag})" />
- </manifest>
- </recursive-jar>
- <jar update="true" destfile="${dss-upload-gui-jar.file}">
- <fileset dir="../${ant.project.name}/${classes}" includes="ch/systemsx/cisd/openbis/dss/BuildAndEnvironmentInfo.class"/>
- <zipfileset src="${lib}/gwt2.0/gwt-user.jar"
- includes="com/google/gwt/user/client/rpc/IsSerializable.class, com/google/gwt/user/client/rpc/SerializableException.class" />
- </jar>
- </target>
-
- <target name="dist-upload-gui">
- <antcall target="make-dist-upload-gui">
- <param name="variant" value="${variant}" />
- </antcall>
- </target>
-
- <target name="make-dist-upload-gui" depends="dss-upload-gui-jar">
- <antcall target="copy-and-sign-jar">
- <param name="dir" value="${dist.dss_upload_gui.lib}" />
- <param name="jar" value="dss_upload_gui.jar" />
- </antcall>
- <antcall target="copy-and-sign-jar">
- <param name="dir" value="${lib}/cisd-base" />
- <param name="jar" value="cisd-base.jar" />
- </antcall>
- <antcall target="copy-and-sign-jar">
- <param name="dir" value="${lib}/cisd-args4j" />
- <param name="jar" value="cisd-args4j.jar" />
- </antcall>
- <antcall target="copy-and-sign-jar">
- <param name="dir" value="${lib}/cisd-base" />
- <param name="jar" value="cisd-base.jar" />
- </antcall>
- <antcall target="copy-and-sign-jar">
- <param name="dir" value="${lib}/commons-codec" />
- <param name="jar" value="commons-codec.jar" />
- </antcall>
- <antcall target="copy-and-sign-jar">
- <param name="dir" value="${lib}/commons-httpclient" />
- <param name="jar" value="commons-httpclient.jar" />
- </antcall>
- <antcall target="copy-and-sign-jar">
- <param name="dir" value="${lib}/commons-io" />
- <param name="jar" value="commons-io.jar" />
- </antcall>
- <antcall target="copy-and-sign-jar">
- <param name="dir" value="${lib}/commons-lang" />
- <param name="jar" value="commons-lang.jar" />
- </antcall>
- <antcall target="copy-and-sign-jar">
- <param name="dir" value="${lib}/commons-logging" />
- <param name="jar" value="commons-logging.jar" />
- </antcall>
- <antcall target="copy-and-sign-jar">
- <param name="dir" value="${lib}/commons-codec" />
- <param name="jar" value="commons-codec.jar" />
- </antcall>
- <antcall target="copy-and-sign-jar">
- <param name="dir" value="${lib}/spring" />
- <param name="jar" value="spring.jar" />
- </antcall>
- <antcall target="copy-and-sign-jar">
- <param name="dir" value="${lib}/spring/third-party" />
- <param name="jar" value="stream-supporting-httpinvoker.jar" />
- </antcall>
- <antcall target="copy-and-sign-jar">
- <param name="dir" value="${lib}/jython/standalone" />
- <param name="jar" value="jython.jar" />
- </antcall>
+ </fileset>
+ <manifest>
+ <attribute name="Main-Class" value="ch.systemsx.cisd.openbis.dss.client.api.gui.DataSetUploadClient" />
+ <attribute name="Class-Path"
+ value="cisd-base.jar cisd-args4j.jar stream-supporting-httpinvoker.jar log4j.jar commons-lang.jar commons-io.jar commons-logging.jar
+ commons-codec.jar commons-httpclient.jar spring.jar jline.jar jython.jar poi-3.7-20101029.jar poi-ooxml-3.7-20101029.jar poi-ooxml-schemas-3.7-20101029.jar dom4j-1.6.1.jar geronimo-stax-api_1.0_spec-1.0.jar xmlbeans-2.3.0.jar" />
+ <attribute name="Version" value="${version.number}" />
+ <attribute name="Build-Number"
+ value="${version.number} (r${revision.number},${clean.flag})" />
+ </manifest>
+ </recursive-jar>
+ <jar update="true" destfile="${dss-upload-gui-jar.file}">
+ <fileset dir="../${ant.project.name}/${classes}" includes="ch/systemsx/cisd/openbis/dss/BuildAndEnvironmentInfo.class"/>
+ <zipfileset src="${lib}/gwt2.0/gwt-user.jar"
+ includes="com/google/gwt/user/client/rpc/IsSerializable.class, com/google/gwt/user/client/rpc/SerializableException.class" />
+ </jar>
+ </target>
+
+ <target name="dist-upload-gui">
+ <antcall target="make-dist-upload-gui">
+ <param name="variant" value="${variant}" />
+ </antcall>
+ </target>
+
+ <target name="make-dist-upload-gui" depends="dss-upload-gui-jar">
+ <antcall target="copy-and-sign-jar">
+ <param name="dir" value="${dist.dss_upload_gui.lib}" />
+ <param name="jar" value="dss_upload_gui.jar" />
+ </antcall>
+ <antcall target="copy-and-sign-jar">
+ <param name="dir" value="${lib}/cisd-base" />
+ <param name="jar" value="cisd-base.jar" />
+ </antcall>
+ <antcall target="copy-and-sign-jar">
+ <param name="dir" value="${lib}/cisd-args4j" />
+ <param name="jar" value="cisd-args4j.jar" />
+ </antcall>
+ <antcall target="copy-and-sign-jar">
+ <param name="dir" value="${lib}/cisd-base" />
+ <param name="jar" value="cisd-base.jar" />
+ </antcall>
+ <antcall target="copy-and-sign-jar">
+ <param name="dir" value="${lib}/commons-codec" />
+ <param name="jar" value="commons-codec.jar" />
+ </antcall>
+ <antcall target="copy-and-sign-jar">
+ <param name="dir" value="${lib}/commons-httpclient" />
+ <param name="jar" value="commons-httpclient.jar" />
+ </antcall>
+ <antcall target="copy-and-sign-jar">
+ <param name="dir" value="${lib}/commons-io" />
+ <param name="jar" value="commons-io.jar" />
+ </antcall>
+ <antcall target="copy-and-sign-jar">
+ <param name="dir" value="${lib}/commons-lang" />
+ <param name="jar" value="commons-lang.jar" />
+ </antcall>
+ <antcall target="copy-and-sign-jar">
+ <param name="dir" value="${lib}/commons-logging" />
+ <param name="jar" value="commons-logging.jar" />
+ </antcall>
+ <antcall target="copy-and-sign-jar">
+ <param name="dir" value="${lib}/commons-codec" />
+ <param name="jar" value="commons-codec.jar" />
+ </antcall>
+ <antcall target="copy-and-sign-jar">
+ <param name="dir" value="${lib}/spring" />
+ <param name="jar" value="spring.jar" />
+ </antcall>
+ <antcall target="copy-and-sign-jar">
+ <param name="dir" value="${lib}/spring/third-party" />
+ <param name="jar" value="stream-supporting-httpinvoker.jar" />
+ </antcall>
+ <antcall target="copy-and-sign-jar">
+ <param name="dir" value="${lib}/jython/standalone" />
+ <param name="jar" value="jython.jar" />
+ </antcall>
<antcall target="copy-and-sign-jar">
<param name="dir" value="${lib}/poi" />
<param name="jar" value="poi-3.7-20101029.jar" />
@@ -414,11 +414,11 @@
<antcall target="copy-and-sign-jar">
<param name="dir" value="${lib}/poi" />
<param name="jar" value="poi-ooxml-schemas-3.7-20101029.jar" />
- </antcall>
- <antcall target="copy-and-sign-jar">
- <param name="dir" value="${lib}/log4j" />
- <param name="jar" value="log4j.jar" />
- </antcall>
+ </antcall>
+ <antcall target="copy-and-sign-jar">
+ <param name="dir" value="${lib}/log4j" />
+ <param name="jar" value="log4j.jar" />
+ </antcall>
<antcall target="copy-and-sign-jar">
<param name="dir" value="${lib}/poi/ooxml-lib" />
<param name="jar" value="dom4j-1.6.1.jar" />
@@ -431,45 +431,45 @@
<param name="dir" value="${lib}/poi/ooxml-lib" />
<param name="jar" value="xmlbeans-2.3.0.jar" />
</antcall>
- <property name="dist.file"
- value="${dist.upload-gui.file.prefix}${variant}-${version.number}-r${revision.number}.zip" />
-
- <zip destfile="${dist.file}">
- <zipfileset dir="${dist.dss_upload_gui.lib}"
- prefix="${dss_upload_gui}/lib" />
- </zip>
-
- <!-- Do NOT delete the directory here; it will be cleaned up in another part of the dist process
- <delete dir="${dist.dss_upload_gui}" />
- -->
-
- </target>
-
- <target name="copy-and-sign-jar">
- <copy file="${dir}/${jar}" todir="${dist.dss_upload_gui.lib}" />
- <signjar jar="${dist.dss_upload_gui.lib}/${jar}"
- keystore="../openbis/etc/dev.keystore"
- alias="openbis"
- storepass="openbistest"/>
- </target>
-
- <target name="ci" depends="run-tests, check-dependencies, dist">
- </target>
-
- <target name="api-doc">
- <javadoc
- destdir="targets/docs/api"
- access="public"
- author="true"
- version="true"
- classpath="${ecp}:../common/targets/classes">
- <fileset dir="${sources}">
- <include name="ch/systemsx/cisd/openbis/dss/component/*.java" />
- <include name="ch/systemsx/cisd/openbis/dss/rpc/client/*.java" />
- <include name="ch/systemsx/cisd/openbis/dss/rpc/shared/*.java" />
- <exclude name="ch/systemsx/cisd/openbis/dss/rpc/shared/FileInfoDssBuilder.java" />
- </fileset>
- </javadoc>
- </target>
-
+ <property name="dist.file"
+ value="${dist.upload-gui.file.prefix}${variant}-${version.number}-r${revision.number}.zip" />
+
+ <zip destfile="${dist.file}">
+ <zipfileset dir="${dist.dss_upload_gui.lib}"
+ prefix="${dss_upload_gui}/lib" />
+ </zip>
+
+ <!-- Do NOT delete the directory here; it will be cleaned up in another part of the dist process
+ <delete dir="${dist.dss_upload_gui}" />
+ -->
+
+ </target>
+
+ <target name="copy-and-sign-jar">
+ <copy file="${dir}/${jar}" todir="${dist.dss_upload_gui.lib}" />
+ <signjar jar="${dist.dss_upload_gui.lib}/${jar}"
+ keystore="../openbis/etc/dev.keystore"
+ alias="openbis"
+ storepass="openbistest"/>
+ </target>
+
+ <target name="ci" depends="run-tests, check-dependencies, dist">
+ </target>
+
+ <target name="api-doc">
+ <javadoc
+ destdir="targets/docs/api"
+ access="public"
+ author="true"
+ version="true"
+ classpath="${ecp}:../common/targets/classes">
+ <fileset dir="${sources}">
+ <include name="ch/systemsx/cisd/openbis/dss/component/*.java" />
+ <include name="ch/systemsx/cisd/openbis/dss/rpc/client/*.java" />
+ <include name="ch/systemsx/cisd/openbis/dss/rpc/shared/*.java" />
+ <exclude name="ch/systemsx/cisd/openbis/dss/rpc/shared/FileInfoDssBuilder.java" />
+ </fileset>
+ </javadoc>
+ </target>
+
</project>
\ No newline at end of file
--
GitLab