You are viewing a plain text version of this content. The canonical link for it is here.
Posted to ojb-dev@db.apache.org by ar...@apache.org on 2007/05/15 20:28:07 UTC
svn commit: r538272 - in /db/ojb/trunk: build.properties build.xml
src/ojb-blank/build.xml
Author: arminw
Date: Tue May 15 11:28:07 2007
New Revision: 538272
URL: http://svn.apache.org/viewvc?view=rev&rev=538272
Log:
fix 'ojb-quickstart' target issues
Modified:
db/ojb/trunk/build.properties
db/ojb/trunk/build.xml
db/ojb/trunk/src/ojb-blank/build.xml
Modified: db/ojb/trunk/build.properties
URL: http://svn.apache.org/viewvc/db/ojb/trunk/build.properties?view=diff&rev=538272&r1=538271&r2=538272
==============================================================================
--- db/ojb/trunk/build.properties (original)
+++ db/ojb/trunk/build.properties Tue May 15 11:28:07 2007
@@ -88,6 +88,7 @@
src.forrest=${src.doc}/forrest
src.javadoc=${src.doc}/javadoc
src.ojb-blank=${src.dir}/ojb-blank
+src.check=${src.dir}/etc/checkstyle
config.dir=${src.dir}/config
ojb=${source}/ojb
etc=${source}/etc
@@ -108,11 +109,12 @@
build.desttest = ${build.dir}/classes/test
build.desttools = ${build.dir}/classes/tools
build.destsamples = ${build.dir}/classes/samples
-build.destjca = ${build.dir}/classes/jca
+#build.destjca = ${build.dir}/classes/jca
build.test = ${build.dir}/test
build.doc=${build.dir}/doc
build.mavendist = ${build.dir}/mavendist
build.javadoc=${build.dir}/javadoc
+build.check= ${build.dir}/checkstyle
junit.dir = ${build.dir}/test/ojb
junit.fork=true
@@ -130,8 +132,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
#
@@ -185,6 +188,10 @@
version=${major}.${minor}.${build}
versiondate=2008-XX-XX
ojb-filename-prefix=${project-name}-${version}
+
+#checkstyle.version.pattern=\\$Revision.*\\$
+#checkstyle.author.pattern=\\S
+checkstyle.license.file=${src.check}/license-check.txt
#
### ANT properties end here
Modified: db/ojb/trunk/build.xml
URL: http://svn.apache.org/viewvc/db/ojb/trunk/build.xml?view=diff&rev=538272&r1=538271&r2=538272
==============================================================================
--- db/ojb/trunk/build.xml (original)
+++ db/ojb/trunk/build.xml Tue May 15 11:28:07 2007
@@ -327,7 +327,7 @@
<property name="jdbcRuntimeDriver" value="${torque.database.driver}"/>
</target>
- <target name="prepare-repository" depends="checkP6Spy, useP6Spy, dontUseP6Spy">
+ <target name="prepare-repository" depends="prepare,checkP6Spy, useP6Spy, dontUseP6Spy">
<delete dir="${build.test}" verbose="false"/>
<mkdir dir="${build.test}"/>
<mkdir dir="${build.test}/ojb"/>
@@ -353,7 +353,7 @@
<filter token="TEST_ON_RETURN" value="${testOnReturn}" />
</filterset>
<fileset dir="${config.dir}"
- includes="repository*,OJB.properties,OJB-logging*,cache.ccf,commons-logging.*,log4j*,simplelog.*,spy.*"
+ includes="repository*,OJB.properties,OJB-logging*,cache.ccf,oscache.properties,commons-logging.*,log4j*,simplelog.*,spy.*"
excludes="web.xml, repository.xml"
/>
<fileset dir="${build.srctest}/org/apache/ojb"
@@ -418,14 +418,6 @@
depends="prepare, prepare-repository"
if="use-ddlutils">
- <copy todir="${build.test}">
- <fileset dir="${src.dir}/schema" includes="*.xml,*.dtd"/>
- <filterset>
- <filter token="DATABASE_DEFAULT" value="${project}" />
- </filterset>
-
- </copy>
-
<taskdef name="ddlToDatabase"
classname="org.apache.ddlutils.task.DdlToDatabaseTask">
<classpath refid="runtime-classpath"/>
@@ -435,6 +427,13 @@
<classpath refid="runtime-classpath"/>
</taskdef>
+ <copy todir="${build.test}">
+ <fileset dir="${src.dir}/schema" includes="*.xml,*.dtd"/>
+ <filterset>
+ <filter token="DATABASE_DEFAULT" value="${project}" />
+ </filterset>
+ </copy>
+
<ddlToDatabase usedelimitedsqlidentifiers="false"
useinternaldtd="true">
<database driverclassname="${torque.database.driver}"
@@ -654,7 +653,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}"/>
@@ -700,12 +699,13 @@
<!-- 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="${src.samples}">
<include name="org/apache/ojb/tutorial1/**"/>
</fileset>
</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}"
@@ -732,12 +732,13 @@
<!-- 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="${src.samples}">
<include name="org/apache/ojb/tutorial2/**"/>
</fileset>
</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}"
@@ -1252,6 +1253,7 @@
<target name="run-test" depends="junit-environment-check, prepare-repository, copy-testdb, prepare-test-suite">
<junit printsummary="yes" showoutput="true" fork="yes" dir="${build.test}/ojb">
<jvmarg value="-DOJB.bootLogLevel=INFO" />
+ <jvmarg value="-DOJB.skip.issues=${OJB.skip.issues}" />
<classpath refid="junit-classpath"/>
<formatter type="plain" />
<test name="${test.package}"
@@ -1440,7 +1442,7 @@
<ant target="copy-testdb"/>
</target>
- <target name="perf-test-jar" depends="init">
+ <target name="perf-test-jar" depends="prepare">
<!-- compile perf classes -->
<javac srcdir="${build.srctest}"
includes="**/performance/*"
@@ -1468,20 +1470,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>
-
- <!-- ================================================================== -->
<!-- Compiles the sample & tutorial classes -->
<!-- ================================================================== -->
<target name="compile-samples">
@@ -1578,6 +1566,91 @@
</condition>
</target>
+ <!-- ================================================================== -->
+ <!-- Runs Checkstyle over OJB -->
+ <!-- ================================================================== -->
+ <target name="checkstyle"
+ depends="prepare"
+ description="Checks the sourcecode via Checkstyle">
+ <fail message="Due to licensing issues, OJB is not distributed with Checkstyle. If you want to use this task, then please put the checkstyle jar into the lib subdirectory.">
+ <condition>
+ <not>
+ <available classpathref="compilation-classpath"
+ resource="checkstyletask.properties"/>
+ </not>
+ </condition>
+ </fail>
+
+ <taskdef resource="checkstyletask.properties"
+ classpathref="compilation-classpath"/>
+
+ <mkdir dir="${build.check}"/>
+ <checkstyle config="${src.check}/ojb-checks.xml"
+ failOnViolation="false"
+ classpathref="compilation-classpath">
+ <fileset dir="${src.java}"
+ includes="**/*.java"/>
+
+ <formatter type="plain" usefile="false"/>
+ <!-- Location of cache-file (project specific) -->
+ <property key="checkstyle.cache.file" file="${build.check}/checkstyle/cachefile"/>
+ </checkstyle>
+ </target>
+
+<!-- ================================================================== -->
+<!-- emma coverage, on the-fly-instrumentation -->
+<!-- see http://emma.sourceforge.net -->
+<!-- -->
+<!-- ================================================================== -->
+
+ <target name="coverage-init" depends="main">
+ <!-- output directory used for EMMA coverage reports: -->
+ <property name="coverage.dir" value="${basedir}/coverage" />
+
+ <!-- directory that contains emma.jar and emma_ant.jar: -->
+ <property name="emma.dir" value="${lib}" />
+
+ <!-- path element used by EMMA taskdef below: -->
+ <path id="emma.lib" >
+ <pathelement location="${emma.dir}/emma.jar" />
+ <pathelement location="${emma.dir}/emma_ant.jar" />
+ </path>
+
+ <!-- this loads <emma> and <emmajava> custom tasks: -->
+ <taskdef resource="emma_ant.properties" classpathref="emma.lib" />
+ </target>
+
+ <!-- coverage for pb-api -->
+ <target name="coverage_pb" depends="coverage-init,prepare-testdb"
+ description="Code coverage test for PB layer" >
+ <emmajava enabled="true"
+ classname="org.apache.ojb.broker.AllTests"
+ libclasspathref="emma.lib"
+ fullmetadata="yes"
+ filter="org.apache.ojb.broker.*"
+ sourcepath="${src.java}"
+ dir="${build.test}/ojb"
+ classpathref="runtime-classpath">
+ <txt outfile="${coverage.dir}_pb/coverage.txt" />
+ <html outfile="${coverage.dir}_pb/coverage.html" />
+ </emmajava>
+ </target>
+
+ <!-- coverage for odmg-api -->
+ <target name="coverage_odmg" depends="coverage-init,prepare-testdb"
+ description="Code coverage test for ODMG layer">
+ <emmajava enabled="true"
+ classname="org.apache.ojb.odmg.AllTests"
+ libclasspathref="emma.lib"
+ fullmetadata="yes"
+ filter="org.apache.ojb.broker.*"
+ sourcepath="${src.java}"
+ dir="${build.test}/ojb"
+ classpathref="runtime-classpath">
+ <txt outfile="${coverage.dir}_odmg/coverage.txt" />
+ <html outfile="${coverage.dir}_odmg/coverage.html" />
+ </emmajava>
+ </target>
<!-- ================================================================== -->
<!-- Targets for the sample session bean ejb jar -->
@@ -1650,83 +1723,25 @@
</ojbdoclet>
</target>
-<!-- ================================================================== -->
-<!-- emma coverage, on the-fly-instrumentation -->
-<!-- see http://emma.sourceforge.net -->
-<!-- -->
-<!-- ================================================================== -->
-
- <target name="coverage-init" depends="main">
- <!-- output directory used for EMMA coverage reports: -->
- <property name="coverage.dir" value="${basedir}/coverage" />
-
- <!-- directory that contains emma.jar and emma_ant.jar: -->
- <property name="emma.dir" value="${lib}" />
-
- <!-- path element used by EMMA taskdef below: -->
- <path id="emma.lib" >
- <pathelement location="${emma.dir}/emma.jar" />
- <pathelement location="${emma.dir}/emma_ant.jar" />
- </path>
+ <!-- ================================================================== -->
+ <!-- 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"/>
- <!-- this loads <emma> and <emmajava> custom tasks: -->
- <taskdef resource="emma_ant.properties" classpathref="emma.lib" />
+ </java>
</target>
- <!-- coverage for pb-api -->
- <target name="coverage_pb" depends="coverage-init,prepare-testdb"
- description="Code coverage test for PB layer" >
- <emmajava enabled="true"
- classname="org.apache.ojb.broker.AllTests"
- libclasspathref="emma.lib"
- fullmetadata="yes"
- filter="org.apache.ojb.broker.*"
- sourcepath="${src.java}"
- dir="${build.test}/ojb"
- classpathref="runtime-classpath">
- <txt outfile="${coverage.dir}_pb/coverage.txt" />
- <html outfile="${coverage.dir}_pb/coverage.html" />
- </emmajava>
- </target>
-
- <!-- coverage for odmg-api -->
- <target name="coverage_odmg" depends="coverage-init,prepare-testdb"
- description="Code coverage test for ODMG layer">
- <emmajava enabled="true"
- classname="org.apache.ojb.odmg.AllTests"
- libclasspathref="emma.lib"
- fullmetadata="yes"
- filter="org.apache.ojb.broker.*"
- sourcepath="${src.java}"
- dir="${build.test}/ojb"
- classpathref="runtime-classpath">
- <txt outfile="${coverage.dir}_odmg/coverage.txt" />
- <html outfile="${coverage.dir}_odmg/coverage.html" />
- </emmajava>
- </target>
-
-
<!-- ================================================================== -->
<!-- End of targets -->
<!-- ================================================================== -->
- <!-- coverage for otm-api -->
- <!--<target name="coverage_otm" depends="coverage-init,prepare-testdb"-->
- <!--description="Code coverage test for OTM layer">-->
- <!--<emmajava enabled="true" -->
- <!--classname="org.apache.ojb.otm.AllTests"-->
- <!--libclasspathref="emma.lib"-->
- <!--fullmetadata="yes"-->
- <!--filter="org.apache.ojb.broker.*"-->
- <!--sourcepath="${src.java}"-->
- <!--dir="${build.test}/ojb"-->
- <!--classpathref="runtime-classpath">-->
- <!--<txt outfile="${coverage.dir}_otm/coverage.txt" />-->
- <!--<html outfile="${coverage.dir}_otm/coverage.html" />-->
- <!--</emmajava>-->
- <!--</target>-->
-
<!-- ================================================================== -->
<!-- Generate the JCA adapter for the OTM -->
<!-- ================================================================== -->
@@ -1774,27 +1789,5 @@
<!--</fileset>-->
<!--</jar>-->
<!--</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>-->
</project>
Modified: db/ojb/trunk/src/ojb-blank/build.xml
URL: http://svn.apache.org/viewvc/db/ojb/trunk/src/ojb-blank/build.xml?view=diff&rev=538272&r1=538271&r2=538272
==============================================================================
--- db/ojb/trunk/src/ojb-blank/build.xml (original)
+++ db/ojb/trunk/src/ojb-blank/build.xml Tue May 15 11:28:07 2007
@@ -85,7 +85,7 @@
<ojbrepository destinationFile="${build.dir}/repository_user.xml"/>
<torqueschema databaseName="${databaseName}"
- dtdUrl="http://db.apache.org/torque/dtd/database_3_0_1.dtd"
+ dtdUrl="http://db.apache.org/torque/dtd/database_3_1.dtd"
destinationFile="${build.dir}/database/project-schema.xml"/>
</ojbdoclet>
</target>
@@ -96,21 +96,18 @@
<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>
<filter token="JCD_ALIAS" value="${jcdAlias}"/>
<filter token="DBMS_NAME" value="${dbmsName}"/>
<filter token="JDBC_LEVEL" value="${jdbcLevel}"/>
- <filter token="DRIVER_NAME" value="${torque.database.driver}"/>
+ <filter token="DRIVER_NAME" value="${jdbcRuntimeDriver}"/>
<filter token="URL_PROTOCOL" value="${urlProtocol}"/>
<filter token="URL_SUBPROTOCOL" value="${urlSubprotocol}"/>
<filter token="URL_DBALIAS" value="${urlDbalias}"/>
- <filter token="USER_NAME" value="${torque.database.user}"/>
- <filter token="USER_PASSWD" value="${torque.database.password}"/>
+ <filter token="USER_NAME" value="${databaseUser}"/>
+ <filter token="USER_PASSWD" value="${databasePassword}"/>
</filterset>
</copy>
<mkdir dir="${build.dir}/lib"/>
@@ -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"/>
@@ -163,6 +160,12 @@
value="${torque.output.dir}"/>
<property name="torque.useClasspath"
value="true"/>
+ <property name="torque.database.driver"
+ value="${jdbcRuntimeDriver}"/>
+ <property name="torque.database.user"
+ value="${databaseUser}"/>
+ <property name="torque.database.password"
+ value="${databasePassword}"/>
<!-- We want Torque to also process the schema for OJB's internal tables.
If you do not require them, put a comment around this copy task -->
@@ -231,3 +234,4 @@
</java>
</target>
</project>
+
---------------------------------------------------------------------
To unsubscribe, e-mail: ojb-dev-unsubscribe@db.apache.org
For additional commands, e-mail: ojb-dev-help@db.apache.org