arminw 2005/02/19 13:41:46
Modified: . Tag: OJB_1_0_RELEASE build.xml
Log:
fix lockservlet-war generation
Revision Changes Path
No revision
No revision
1.144.2.20 +17 -7 db-ojb/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/db-ojb/build.xml,v
retrieving revision 1.144.2.19
retrieving revision 1.144.2.20
diff -u -r1.144.2.19 -r1.144.2.20
--- build.xml 9 Feb 2005 21:06:11 -0000 1.144.2.19
+++ build.xml 19 Feb 2005 21:41:46 -0000 1.144.2.20
@@ -507,7 +507,7 @@
<!-- ==================================================================
-->
<!-- Build sample war-file for deployment in tomcat
-->
<!-- ==================================================================
-->
- <target name="lockservlet-war" depends="jar, prepare-testdb"
+ <target name="lockservlet-war" depends="jar, prepare, prepare-repository"
description="Builds The Lockserver servlet for deployment in
tomcat">
<property name="build.servlet" value="${build.dir}/lock-servlet"/>
@@ -522,7 +522,9 @@
<!-- 2. OJB.properties and repository*.* files -->
<copy todir="${build.servlet}/WEB-INF/classes">
- <fileset dir="${build.test}/ojb"
includes="*.properties,*.dtd,*.xml"/>
+ <fileset dir="${build.test}/ojb"
includes="*.properties,*.dtd,*.xml">
+ <exclude name="Test_*"/>
+ </fileset>
</copy>
<copy todir="${build.servlet}/WEB-INF">
@@ -532,9 +534,17 @@
<!-- 3. additional jar files -->
<copy todir="${build.servlet}/WEB-INF/lib">
<fileset dir="${lib}">
- <include name="log4j*.jar"/>
- <include name="commons-logging*.jar"/>
- <include name="commons-lang*.jar"/>
+ <include name="**/*.jar"/>
+ <exclude name="jdo*.jar"/>
+ <exclude name="ant-*.jar"/>
+ <exclude name="xerces*.jar"/>
+ <exclude name="xml-*.jar"/>
+ <exclude name="xalan*.jar"/>
+ <exclude name="jakarta-regexp*.jar"/>
+ <exclude name="torque*.jar"/>
+ <exclude name="velocity*.jar"/>
+ <exclude name="xdoclet*.jar"/>
+ <exclude name="xjava*.jar"/>
</fileset>
</copy>
@@ -544,7 +554,7 @@
<fileset dir="${build.dest}"
includes="org/apache/ojb/broker/locking/**"/>
</copy>
- <jar jarfile="${dist}/ojb-lockserver.war" basedir="${build.dir}"
+ <jar jarfile="${dist}/ojb-lockserver.war" basedir="${build.servlet}"
includes="WEB-INF/**"/>
</target>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
