jvanzyl 01/07/09 18:43:34
Modified: build build.properties build.xml
Log:
Revision Changes Path
1.8 +2 -1 jakarta-turbine/build/build.properties
Index: build.properties
===================================================================
RCS file: /home/cvs/jakarta-turbine/build/build.properties,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- build.properties 2001/07/03 23:38:27 1.7
+++ build.properties 2001/07/10 01:43:33 1.8
@@ -23,8 +23,8 @@
deprecation = off
jdom.jar = jdom-b6.jar
omStatusFile = ../bin/src/report.turbine.om.generation
+adapterCode = true
-
# -------------------------------------------------------------------
#
# T O R Q U E C O N F I G U R A T I O N
@@ -51,3 +51,4 @@
DataDumpControlTemplate = data/dump/Control.vm
DataSQLControlTemplate = sql/load/Control.vm
securityControlTemplate = sql/security/Control.vm
+>>>>>>> 1.5
1.19 +7 -13 jakarta-turbine/build/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine/build/build.xml,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- build.xml 2001/07/03 23:38:27 1.18
+++ build.xml 2001/07/10 01:43:33 1.19
@@ -17,6 +17,7 @@
<property name="build.dest" value="${build.dir}/classes"/>
<property name="src.java.dir" value="${src.dir}/java"/>
<property name="src.test.dir" value="${src.dir}/test"/>
+ <property name="src.adapter.dir" value="${src.dir}/adapter"/>
<property name="src.dtd.dir" value="${src.dir}/dtd"/>
<property name="final.name" value="${project}-${version}"/>
<property name="final.dir" value="../${final.name}/"/>
@@ -84,11 +85,15 @@
<exclude name="**/jsp/**"/>
<exclude name="**/*FreeMarker*.java"/>
<exclude name="**/freemarker/**"/>
- <exclude name="**/assemblerbroker/util/python/*.java"/>
- <exclude name="**/samples/newtorque/input/**/*.java"/>
<exclude name="**/services/castor/*.java"/>
</fileset>
</copy>
+
+ <!-- We will control this with a property eventually -->
+ <copy todir="${build.src}/org" filtering="yes">
+ <fileset dir="${src.adapter.dir}/org"/>
+ </copy>
+
<available classname="org.apache.velocity.anakia.AnakiaTask"
property="AnakiaTask.present"/>
</target>
@@ -114,17 +119,6 @@
<fileset dir="${src.java.dir}/org">
<include name="**/*FreeMarker*.java"/>
<include name="**/freemarker/**"/>
- </fileset>
- </copy>
- </target>
-
- <!-- ================================================================== -->
- <!-- Adds JPython related files to the build directory -->
- <!-- ================================================================== -->
- <target name="prepare-python" depends="prepare">
- <copy todir="${build.src}/org" filtering="yes">
- <fileset dir="${src.java.dir}/org">
- <include name="**/assemblerbroker/util/python/*.java"/>
</fileset>
</copy>
</target>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
