Author: arminw
Date: Tue May 15 08:34:16 2007
New Revision: 538223
URL: http://svn.apache.org/viewvc?view=rev&rev=538223
Log:
fix 'ojb-quickstart' target issues
Modified:
db/ojb/branches/OJB_1_0_RELEASE/build.properties
db/ojb/branches/OJB_1_0_RELEASE/build.xml
db/ojb/branches/OJB_1_0_RELEASE/src/ojb-blank/build.xml
Modified: db/ojb/branches/OJB_1_0_RELEASE/build.properties
URL:
http://svn.apache.org/viewvc/db/ojb/branches/OJB_1_0_RELEASE/build.properties?view=diff&rev=538223&r1=538222&r2=538223
==============================================================================
--- db/ojb/branches/OJB_1_0_RELEASE/build.properties (original)
+++ db/ojb/branches/OJB_1_0_RELEASE/build.properties Tue May 15 08:34:16 2007
@@ -112,7 +112,7 @@
build.doc=${build.dir}/doc
build.mavendist = ${build.dir}/mavendist
build.javadoc=${build.dir}/javadoc
-build.check= ${build.dir}/check
+build.check= ${build.dir}/checkstyle
junit.dir = ${build.dir}/test/ojb
junit.fork=true
@@ -130,8 +130,9 @@
deprecation=true
# ojb-blank and tutorial properties
-ojb-blank.resource.includes=OJB*.properties,repository.dtd,repository_database.xml,repository_internal.xml
-ojb-blank.lib.includes=antlr*.jar,commons*.jar,hsqldb*.jar,log4j*.jar,torque*.jar,velocity*.jar,xdoclet*.jar,xjavadoc*.jar
+ojb-blank.resource.excludes=repository_user.xml,web.xml
+ojb-blank.lib.includes=asm*.jar,cglib*.jar,concurrent*.jar,antlr*.jar,commons*.jar\
+,hsqldb*.jar,log4j*.jar,torque*.jar,velocity*.jar,xdoclet*.jar,xjavadoc*.jar
tutorial1.src.dir=${src.samples}/tutorial1/src/java
tutorial1.src.includes=org/apache/ojb/tutorial1/**
Modified: db/ojb/branches/OJB_1_0_RELEASE/build.xml
URL:
http://svn.apache.org/viewvc/db/ojb/branches/OJB_1_0_RELEASE/build.xml?view=diff&rev=538223&r1=538222&r2=538223
==============================================================================
--- db/ojb/branches/OJB_1_0_RELEASE/build.xml (original)
+++ db/ojb/branches/OJB_1_0_RELEASE/build.xml Tue May 15 08:34:16 2007
@@ -665,7 +665,7 @@
<copy file="${dist}/${archive}.jar" todir="${build.ojb-blank}/lib"/>
<copy todir="${build.ojb-blank}/src/resources">
<fileset dir="${config.dir}"
- includes="${ojb-blank.resource.includes}"/>
+ excludes="${ojb-blank.resource.excludes}"/>
<filterset>
<filter token="VALIDATION_QUERY" value="${validationQuery}"/>
<filter token="TEST_ON_BORROW" value="${testOnBorrow}"/>
@@ -711,11 +711,12 @@
<!-- Tutorial 1 -->
<echo message="* Build Tutorial 1 *"/>
<delete dir="${build.ojb-quickstart}" verbose="false"
failonerror="false"/>
- <unjar src="${dist}/ojb-blank.jar" dest="${build.dir}/ojb-quickstart"/>
<copy todir="${build.ojb-quickstart}/src/java">
<fileset dir="${tutorial1.src.dir}"
includes="${tutorial1.src.includes}"/>
</copy>
+ <sleep seconds="1"/>
+ <unjar src="${dist}/ojb-blank.jar" dest="${build.dir}/ojb-quickstart"/>
<ant antfile="${build.ojb-quickstart}/build.xml"
inheritall="false"
dir="${build.ojb-quickstart}"
@@ -742,11 +743,12 @@
<!-- Tutorial 2 -->
<echo message="* Build Tutorial 2 *"/>
<delete dir="${build.ojb-quickstart}" verbose="false"
failonerror="false"/>
- <unjar src="${dist}/ojb-blank.jar" dest="${build.dir}/ojb-quickstart"/>
<copy todir="${build.ojb-quickstart}/src/java">
<fileset dir="${tutorial2.src.dir}"
includes="${tutorial2.src.includes}"/>
</copy>
+ <sleep seconds="1"/>
+ <unjar src="${dist}/ojb-blank.jar" dest="${build.dir}/ojb-quickstart"/>
<ant antfile="${build.ojb-quickstart}/build.xml"
inheritall="false"
dir="${build.ojb-quickstart}"
@@ -1551,42 +1553,6 @@
</target>
<!-- ================================================================== -->
- <!-- Browse Demo Database -->
- <!-- ================================================================== -->
- <target name="browse-db" depends="init"
- description="browses the test database">
- <java fork="yes" classname="org.hsqldb.util.DatabaseManagerSwing"
- dir="${build.test}" taskname="browse" failonerror="false">
- <classpath refid="runtime-classpath"/>
- <arg value="-url"/>
- <arg value="jdbc:hsqldb:OJB"/>
-
- </java>
- </target>
-
- <!-- ================================================================== -->
- <!-- start Florian's reverse db tool -->
- <!-- ================================================================== -->
- <target name="reverse-db"
- description="Starts the OJB RDBMS reverse engineering tool">
- <java fork="yes"
classname="org.apache.ojb.tools.mapping.reversedb.Main"
- dir="${build.test}" taskname="reversedb" failonerror="false" >
- <classpath refid="runtime-classpath"/>
- </java>
- </target>
-
- <!-- ================================================================== -->
- <!-- start Florian's new reverse db tool
-->
- <!-- ================================================================== -->
- <target name="reverse-db2"
- description="Starts the next generation OJB RDBMS reverse
engineering tool">
- <java fork="yes"
classname="org.apache.ojb.tools.mapping.reversedb2.Main"
- dir="${build.test}" taskname="reversedb2" failonerror="false" >
- <classpath refid="runtime-classpath"/>
- </java>
- </target>
-
- <!-- ================================================================== -->
<!-- Build OQL Parser classes from oql-ojb.g grammar -->
<!-- ================================================================== -->
<target name="oql" depends="init"
@@ -1790,7 +1756,43 @@
</ojbdoclet>
</target>
- <!-- ==================================================================
-->
+ <!-- ================================================================== -->
+ <!-- Browse Demo Database -->
+ <!-- ================================================================== -->
+ <target name="browse-db" depends="init"
+ description="browses the test database">
+ <java fork="yes" classname="org.hsqldb.util.DatabaseManagerSwing"
+ dir="${build.test}" taskname="browse" failonerror="false">
+ <classpath refid="runtime-classpath"/>
+ <arg value="-url"/>
+ <arg value="jdbc:hsqldb:OJB"/>
+
+ </java>
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- start Florian's reverse db tool -->
+ <!-- ================================================================== -->
+ <target name="reverse-db"
+ description="Starts the OJB RDBMS reverse engineering tool">
+ <java fork="yes"
classname="org.apache.ojb.tools.mapping.reversedb.Main"
+ dir="${build.test}" taskname="reversedb" failonerror="false" >
+ <classpath refid="runtime-classpath"/>
+ </java>
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- start Florian's new reverse db tool
-->
+ <!-- ================================================================== -->
+ <target name="reverse-db2"
+ description="Starts the next generation OJB RDBMS reverse
engineering tool">
+ <java fork="yes"
classname="org.apache.ojb.tools.mapping.reversedb2.Main"
+ dir="${build.test}" taskname="reversedb2" failonerror="false" >
+ <classpath refid="runtime-classpath"/>
+ </java>
+ </target>
+
+ <!-- ================================================================== -->
<!-- Generate the JCA adapter for the OTM
-->
<!-- ==================================================================
-->
<target name="jca-compile">
Modified: db/ojb/branches/OJB_1_0_RELEASE/src/ojb-blank/build.xml
URL:
http://svn.apache.org/viewvc/db/ojb/branches/OJB_1_0_RELEASE/src/ojb-blank/build.xml?view=diff&rev=538223&r1=538222&r2=538223
==============================================================================
--- db/ojb/branches/OJB_1_0_RELEASE/src/ojb-blank/build.xml (original)
+++ db/ojb/branches/OJB_1_0_RELEASE/src/ojb-blank/build.xml Tue May 15 08:34:16
2007
@@ -96,9 +96,6 @@
<target name="build" depends="xdoclet">
<copy todir="${build.dir}/">
<fileset dir="${source.resource.dir}">
- <include name="*.properties"/>
- <include name="*.dtd"/>
- <include name="repositor*.xml"/>
<exclude name="build.properties"/>
</fileset>
<filterset>
@@ -134,7 +131,7 @@
<map from="${basedir}\${lib.dir}" to="lib"/>
<map from="${basedir}/${lib.dir}" to="lib"/>
</pathconvert>
- <copy todir="${build.dir}">
+ <copy todir="${build.dir}" overwrite="true">
<fileset dir="${source.resource.dir}">
<include name="*.bat"/>
<include name="*.sh"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
