clickstream build.xml,1.4,1.5

Update of /cvsroot/opensymphony/clickstream
In directory sc8-pr-cvs1:/tmp/cvs-serv22177/clickstream

Modified Files:
	build.xml 
Log Message:
Include the XML in the jar file. Name the jar clickstream-0.6.jar.

Index: build.xml
===================================================================
RCS file: /cvsroot/opensymphony/clickstream/build.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- build.xml	18 Jun 2002 09:08:23 -0000	1.4
+++ build.xml	2 Sep 2003 10:03:47 -0000	1.5
@@ -1,51 +1,70 @@
-<project name="clickstream" default="jar" basedir=".">
-    <!-- Setup details -->
-    <target name="init">
-
-        <!-- project properties -->
-        <property name="name" value="clickstream" />
-        <property name="Name" value="Clickstream" />
-        <property name="version" value="0.6" />
-        <property name="zip_version" value="0-6" />
-
-        <!-- directory properties -->
-        <property name="lib" value="lib" />
-        <property name="web" value="web" />
-        <property name="tmp" value="tmp" />
-        <property name="build" value="build" />
-        <property name="src" value="src" />
-        <property name="dist" value="dist" />
-        <property name="deployment" value="deployment" />
-        <property name="docs" value="docs" />
-
-        <!-- document properties -->
-        <property name="packages" value="com.opensymphony.clickstream.*" />
-
-    </target>
-
-
-    <!-- Classpath -->
-    <path id="cp">
-        <fileset dir="lib">
-            <include name="**/*.jar" />
-        </fileset>
-    </path>
-
-
-    <!-- Compile Java -->
-    <target name="java" depends="init">
-        <mkdir dir="${build}"/>
-        <javac srcdir="${src}" destdir="${build}" classpathref="cp" debug="on"/>
-    </target>
-
-
-    <!-- Build jar archive -->
-    <target name="jar" depends="java">
-        <mkdir dir="${dist}"/>
-        <jar basedir="${build}" jarfile="${dist}/${name}.jar" />
+<project name="clickstream" default="jar" basedir=".">
+    <!-- Setup details -->
+    <target name="init">
+
+        <!-- project properties -->
+        <property name="name" value="clickstream"/>
+        <property name="Name" value="Clickstream"/>
+        <property name="version" value="0.6"/>
+        <property name="zip_version" value="0-6"/>
+
+        <!-- directory properties -->
+        <property name="lib" value="lib"/>
+        <property name="web" value="web"/>
+        <property name="tmp" value="tmp"/>
+        <property name="build" value="build"/>
+        <property name="src" value="src"/>
+        <property name="dist" value="dist"/>
+        <property name="deployment" value="deployment"/>
+        <property name="docs" value="docs"/>
+
+        <!-- document properties -->
+        <property name="packages" value="com.opensymphony.clickstream.*"/>
+
     </target>
 
-    <target name="distribution" depends="jar, docs">
+    <!-- Classpath -->
+    <path id="cp">
+        <fileset dir="lib">
+            <include name="**/*.jar"/>
+        </fileset>
+    </path>
+
+    <!-- Compile Java -->
+    <target name="java" depends="init">
+        <mkdir dir="${build}"/>
+        <javac srcdir="${src}" destdir="${build}" classpathref="cp" debug="on"/>
+    </target>
+
+    <!-- Build jar archive -->
+    <target name="jar" depends="java">
+        <mkdir dir="${dist}"/>
+        <jar basedir="${build}" jarfile="${dist}/${name}-${version}.jar" >
+            <metainf dir="${src}/meta-inf">
+                <include name="**.xml"/>
+            </metainf>
+        </jar>
+    </target>
+
+    <!-- Generate JavaDoc -->
+    <target name="docs" depends="init">
+        <mkdir dir="${docs}/api"/>
+        <javadoc sourcepath="${src}"
+            destdir="${docs}/api"
+            packagenames="${packages}"
+            classpathref="cp"
+            author="true"
+            version="true"
+            windowTitle="${Name} ${version} API"
+            doctitle="${Name}"
+            footer="See &lt;a href=&quot;http://www.opensymphony.com&quot;&gt;www.opensymphony.com&lt;/a&gt; for more information."
+            use="true"
+            verbose="false"/>
+        <copy overwrite="yes" file="${docs}/main.css" tofile="${docs}/api/stylesheet.css"/>
+    </target>
+
+    <!-- Distribution archives -->
+    <target name="dist" depends="jar, docs">
         <mkdir dir="${dist}/zip"/>
         <mkdir dir="${dist}/zip/src"/>
         <mkdir dir="${dist}/zip/lib"/>
@@ -69,36 +88,19 @@
         <copy file="${web}/clickstreams.jsp" todir="${dist}/zip/web"/>
 
 
-        <copy file="${dist}/clickstream.jar" todir="${dist}/zip"/>
+        <copy file="${dist}/${name}-${version}.jar" todir="${dist}/zip"/>
 
         <zip zipfile="${dist}/${name}_${zip_version}.zip" basedir="${dist}/zip"/>
         <delete dir="${dist}/zip"/>
 
-    </target>
-
-    <!-- Generate JavaDoc -->
-    <target name="docs" depends="init">
-        <mkdir dir="${docs}/api" />
-        <javadoc sourcepath="${src}"
-            destdir="${docs}/api"
-            packagenames="${packages}"
-            classpathref="cp"
-            author="true"
-            version="true"
-            windowTitle="${Name} ${version} API"
-            doctitle="${Name}"
-            footer="See &lt;a href=&quot;http://www.opensymphony.com&quot;&gt;www.opensymphony.com&lt;/a&gt; for more information."
-            use="true"
-            verbose="false" />
-        <copy overwrite="yes" file="${docs}/main.css" tofile="${docs}/api/stylesheet.css"/>
     </target>
-
-    <!-- Remove all built files -->
-    <target name="clean" depends="init">
-        <delete dir="${tmp}" />
-        <delete dir="${docs}/api" />
-        <delete dir="${build}" />
-        <delete dir="${dist}" />
-    </target>
-
-</project>
+
+    <!-- Remove all built files -->
+    <target name="clean" depends="init">
+        <delete dir="${tmp}"/>
+        <delete dir="${docs}/api"/>
+        <delete dir="${build}"/>
+        <delete dir="${dist}"/>
+    </target>
+
+</project>




-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf