Index: build.xml
===================================================================
RCS file: /cvsroot/dspace/dspace/build.xml,v
retrieving revision 1.47
diff -b -w -u -r1.47 build.xml
--- build.xml	13 Feb 2006 10:33:49 -0000	1.47
+++ build.xml	29 Mar 2006 07:44:19 -0000
@@ -112,6 +112,25 @@
 
   
   <!-- ============================================================= -->
+  <!-- Version and Timestamp to label JAR and WAR files.             -->
+  <!-- ============================================================= -->
+
+  <!-- get DSpace version from first line of CHANGES, for manifest. -->
+  <loadproperties srcFile="CHANGES">
+    <filterchain>
+      <headfilter lines="1" />
+      <prefixlines prefix="manifest.implementation.version = " />
+    </filterchain>
+  </loadproperties>
+
+  <echo level="debug" message="manifest.implementation.version = ${manifest.implementation.version}" />
+
+  <tstamp>
+    <format property="build.date"
+            pattern="EEE, dd MMM yyyy HH:mm:ss ZZZZ" />
+  </tstamp>
+
+  <!-- ============================================================= -->
   <!-- Compile the source code                                       -->
   <!-- ============================================================= -->
 
@@ -130,11 +149,62 @@
 
 
   <!-- ============================================================= -->
+  <!-- Build a dspace.jar file in lib                                -->
+  <!-- ============================================================= -->
+
+  <target name="dspace_jar"
+          depends="compile">
+
+    <!-- Set this flag if JAR is out of date, to switch entire target. -->
+    <!-- Otherwise it creates a new build number and manifest every    -->
+    <!-- time whether or not any dependent files have changed.         -->
+    <uptodate property="dspace.jar.uptodate"
+              targetfile="build/lib/dspace.jar">
+      <srcfiles dir="build/classes" />
+      <srcfiles dir="." includes="CHANGES" />
+    </uptodate>
+    <antcall target="dspace_jar_internal"/>
+  </target>
+
+  <target name="dspace_jar_internal"
+          unless="dspace.jar.uptodate"
+          depends="compile">
+
+     <mkdir dir="build/lib"/>
+
+     <!-- Set build.number to serial number of this build.
+        - This is really only useful for local debugging.
+       -->
+     <buildnumber />
+     <loadproperties srcFile="build.number" />
+
+     <tempfile property="dspace.jar.manifest" suffix=".mf" prefix="temp_" />
+     <manifest file="${dspace.jar.manifest}">
+       <attribute name="Specification-Title" value="DSpace Digital Repository" />
+       <attribute name="Specification-Version" value="1" />
+       <attribute name="Specification-Vendor" value="Massachusetts Institute of Technology, Hewlett-Packard Company" />
+       <attribute name="Implementation-Title" value="DSpace Digital Repository" />
+       <attribute name="Implementation-Version" value="${manifest.implementation.version}" />
+       <attribute name="Build-Username" value="${user.name}" />
+       <attribute name="Build-Environment" value="${os.arch} ${os.name} ${os.version}" />
+       <attribute name="Build-Date" value="${build.date}" />
+       <attribute name="Build-Number" value="${build.number}" />
+     </manifest>
+
+     <jar jarfile="build/lib/dspace.jar"
+          index="true"
+          manifest="${dspace.jar.manifest}"
+          basedir="build/classes" />
+
+     <delete file="${dspace.jar.manifest}" quiet="true" verbose="false" />
+  </target>
+
+  <!-- ============================================================= -->
   <!-- Build the .war files                                          -->
   <!-- ============================================================= -->
 
   <target name="build_wars"
-          depends="compile"
+          depends="compile,dspace_jar"
           description="Build the .war files">  
     <!-- Build DSpace UI .war -->
     <copy file="etc/dspace-web.xml"
@@ -185,6 +255,58 @@
        </lib>
        <classes dir="build/classes" />
     </war>
+
+    <!-- Build DSpace LNI .war -->
+    <tempfile property="dspace-lni.war.manifest" suffix=".mf" prefix="temp_" />
+    <manifest file="${dspace-lni.war.manifest}">
+      <attribute name="Specification-Title" value="DSpace Digital Repository" />
+      <attribute name="Specification-Version" value="1" />
+      <attribute name="Specification-Vendor" value="Massachusetts Institute of Technology, Hewlett-Packard Company" />
+      <attribute name="Implementation-Title" value="DSpace Digital Repository LNI (Lightweight Network Interface)" />
+      <attribute name="Implementation-Version" value="${manifest.implementation.version}" />
+      <attribute name="Build-Username" value="${user.name}" />
+      <attribute name="Build-Environment" value="${os.arch} ${os.name} ${os.version}" />
+      <attribute name="Build-Date" value="${build.date}" />
+    </manifest>
+
+    <dependset>
+      <srcfilelist dir="etc"
+          files="lni-web.xml,server-config.wsdd" />
+      <targetfilelist dir="build" files="dspace-lni.war" />
+    </dependset>
+
+    <!-- create "server-config.wsdd" file at that name since we cannot rename
+         files when including them in the WAR. -->
+    <property name="dspace-lni.war.server-config" location="build/server-config.wsdd" />
+    <copy file="etc/lni-server-config.wsdd"
+          tofile="${dspace-lni.war.server-config}"
+          preservelastmodified="true" />
+
+    <!-- configure paths in web.xml -->
+    <copy file="etc/lni-web.xml"
+          tofile="build/lni-web.xml"
+          preservelastmodified="true">
+      <filterset begintoken="@@" endtoken="@@">
+        <filter  token="dspace.dir"
+                 value="${dspace.dir}" />
+      </filterset>
+    </copy>
+
+    <war destfile="build/dspace-lni.war"
+         manifest="${dspace-lni.war.manifest}"
+         webxml="build/lni-web.xml">
+       <lib dir="lib">
+         <exclude name="servlet.jar" />
+       </lib>
+       <lib dir="build/lib" />
+       <classes dir="build/classes">
+         <include name="Messages*.properties"/>
+       </classes>
+       <webinf file="${dspace-lni.war.server-config}" />
+    </war>
+    <delete file="${dspace-lni.war.manifest}" quiet="true" verbose="false" />
+    <delete file="${dspace-lni.war.server-config}" quiet="true" verbose="false" />
+
   </target>
   
     
@@ -228,7 +350,7 @@
   <!-- ============================================================= -->
 
   <target name="install_code"
-          depends="compile">
+          depends="compile,dspace_jar">
     <mkdir dir="${dspace.dir}/config" />
     <mkdir dir="${assetstore.dir}" />
     <mkdir dir="${handle.dir}" />
@@ -245,9 +367,8 @@
     <chmod dir="${dspace.dir}/bin" perm="u+x" includes="**/*" />
     <copy todir="${dspace.dir}/lib" preservelastmodified="true">
       <fileset dir="lib" />
+      <fileset dir="build/lib" />
     </copy>
-    <jar jarfile="${dspace.dir}/lib/dspace.jar"
-         basedir="build/classes" />
   </target>
   
   
@@ -469,4 +590,142 @@
     </javadoc>
   </target>
 
+  <!-- ============================================================= -->
+  <!-- Lightweight Network Interface Client WSDL file + stubs        -->
+  <!--   these targets support the target "lni_client_jar"           -->
+  <!-- ============================================================= -->
+
+  <!-- Path to WSDL file -->
+  <property name="lni.wsdl" value="build/client/dspace-lni.wsdl" />
+
+  <!-- Namespace to use in WSDL -->
+  <property name="lni.wsdl.ns" value="http://dspace.org/xmlns/lni" />
+
+  <target name="axis_setup" depends="compile"
+    description="Set up classpath and tasks for Apache Axis ant tasks.">
+    <path id="axis.classpath">
+      <pathelement path="build/classes" />
+      <fileset dir="lib">
+        <include name="**/*.jar" />
+      </fileset>
+    </path>
+
+    <taskdef resource="axis-tasks.properties" classpathref="axis.classpath" />
+
+  </target>
+
+  <target name="lni_wsdl" depends="axis_setup"
+     description="Build WSDL for LNI, derived from server source.">
+    <mkdir dir="build/client" />
+    <axis-java2wsdl
+     classname="org.dspace.app.dav.LNISoapServlet"
+     location="http://localhost/dspace/lni/DSpaceLNI"
+     methods="lookup,propfind,proppatch,copy"
+     namespace="${lni.wsdl.ns}"
+     output="${lni.wsdl}"
+    />
+  </target>
+
+  <target name="lni_client_gen" depends="lni_wsdl,axis_setup"
+     description="Create generated LNI client source code, derived from WSDL">
+    <mkdir dir="build/client/src" />
+    <mkdir dir="build/client/classes"/>
+    <axis-wsdl2java
+      output="build/client/src"
+      verbose="true"
+      url="${lni.wsdl}">
+      <mapping
+        namespace="${lni.wsdl.ns}"
+        package="org.dspace.app.dav.client"/>
+    </axis-wsdl2java>
+  </target>
+
+  <!-- ============================================================= -->
+  <!-- Lightweight Network Interface Client JAR                      -->
+  <!--   target to call is is "lni_client_jar"                       -->
+  <!-- ============================================================= -->
+
+  <target name="lni_client_classes" depends="lni_client_gen"
+          description="Compile the LNI Client source code">
+    <mkdir dir="build/client/classes"/>
+    <mkdir dir="build/client/src"/>
+    <copy file="examples/LNISmokeTest.java"
+          todir="build/client/src"
+          preservelastmodified="true"/>
+    <copy file="src/org/dspace/app/dav/client/LNIClientUtils.java"
+          todir="build/client/src/org/dspace/app/dav/client"
+          preservelastmodified="true"/>
+    <javac srcdir="build/client/src"
+           destdir="build/client/classes"
+           listfiles="true"
+           debug="on"
+               source="1.4"
+               target="1.4">
+      <classpath>
+        <pathelement location="build/client/src" />
+        <pathelement location="build/client/classes" />
+        <path refid="build.class.path"/>
+      </classpath>
+    </javac>
+  </target>
+
+  <target name="lni_client" depends="lni_client_classes"
+    description="Make JAR containing LNI client code and smoke-test app">
+    <mkdir dir="build/client/classes"/>
+
+    <!-- first compile the generated SOAP client code. -->
+    <javac srcdir="build/client/src"
+           destdir="build/client/classes"
+           listfiles="true"
+           debug="on"
+           source="1.4"
+           target="1.4">
+      <include name="**/*.java"/>
+      <classpath refid="build.class.path"/>
+    </javac>
+
+    <!-- get DSpace version from first line of CHANGES, for manifest. -->
+    <loadproperties srcFile="CHANGES">
+      <filterchain>
+        <headfilter lines="1" />
+        <prefixlines prefix="manifest.implementation.version = " />
+      </filterchain>
+    </loadproperties>
+
+    <echo level="debug" message="manifest.implementation.version = ${manifest.implementation.version}" />
+
+    <tstamp>
+      <format property="build.date"
+              pattern="EEE, dd MMM yyyy HH:mm:ss ZZZZ" />
+    </tstamp>
+
+    <tempfile property="dspace.jar.manifest" suffix=".mf" prefix="temp_" />
+
+    <manifest file="${dspace.jar.manifest}">
+      <attribute name="Specification-Title" value="DSpace Lightweight Network Interface Client" />
+      <attribute name="Specification-Version" value="1" />
+      <attribute name="Specification-Vendor" value="Massachusetts Institute of Technology, Hewlett-Packard Company" />
+      <attribute name="Implementation-Title" value="DSpace Lightweight Network Interface Client" />
+      <attribute name="Implementation-Version" value="${manifest.implementation.version}" />
+      <attribute name="Build-Username" value="${user.name}" />
+      <attribute name="Build-Environment" value="${os.arch} ${os.name} ${os.version}" />
+      <attribute name="Build-Date" value="${build.date}" />
+
+      <!-- lets user run this with java -jar dspace-lni-client.jar -->
+      <attribute name="Main-Class" value="LNISmokeTest" />
+      <attribute name="Class-Path"
+       value="${dspace.dir}/lib/activation.jar ${dspace.dir}/lib/axis.jar ${dspace.dir}/lib/axis-ant.jar ${dspace.dir}/lib/jaxrpc.jar ${dspace.dir}/lib/saaj.jar ${dspace.dir}/lib/wsdl4j-1.5.1.jar ${dspace.dir}/lib/commons-codec-1.3.jar ${dspace.dir}/lib/commons-discovery-0.2.jar ${dspace.dir}/lib/commons-logging.jar ${dspace.dir}/lib/commons-cli.jar ${dspace.dir}/lib/jdom.jar ${dspace.dir}/lib/log4j.jar ${dspace.dir}/lib/mail.jar" />
+
+    </manifest>
+
+    <jar  jarfile="build/dspace-lni-client.jar"
+          manifest="${dspace.jar.manifest}">
+      <fileset dir="build/client/classes" />
+      <fileset dir="build/client/src" />
+      <fileset dir="build/client">
+        <include name="**/*.wsdl"/>
+      </fileset>
+    </jar>
+    <delete file="${dspace.jar.manifest}" quiet="true" verbose="false" />
+  </target>
 </project>