arminw 2005/08/27 05:52:33 Modified: . build.properties build.xml Log: merge 1.x trunk with 1.0.x branch Revision Changes Path 1.74 +5 -3 db-ojb/build.properties Index: build.properties =================================================================== RCS file: /home/cvs/db-ojb/build.properties,v retrieving revision 1.73 retrieving revision 1.74 diff -u -r1.73 -r1.74 --- build.properties 11 Mar 2005 18:49:56 -0000 1.73 +++ build.properties 27 Aug 2005 12:52:33 -0000 1.74 @@ -149,6 +149,7 @@ org.apache.ojb.broker.metadata,\ org.apache.ojb.broker.metadata.fieldaccess,\ org.apache.ojb.broker.cache,\ +org.apache.ojb.broker.locking,\ org.apache.ojb.broker.util,\ org.apache.ojb.broker.util.logging,\ org.apache.ojb.broker.util.sequence,\ @@ -158,11 +159,12 @@ org.apache.ojb.broker.transaction.*,\ org.odmg,\ org.apache.ojb.odmg,\ +org.apache.ojb.odmg.oql,\ org.odbms,\ org.apache.ojb.junit,\ org.apache.ojb.performance -copyright=(C) 2002 - 2004 Apache Software Foundation <br>All rights reserved. Published under the Apache License 2.0. <br> <a href="http://db.apache.org/ojb";>http://db.apache.org/ojb</a> +copyright=(C) 2002 - 2005 Apache Software Foundation <br>All rights reserved. Published under the Apache License 2.0. <br> <a href="http://db.apache.org/ojb";>http://db.apache.org/ojb</a> icon=<img src="../images/ojb-200.png" alt="ObJectRelationalBridge"> br=<br> hr=<hr> @@ -175,7 +177,7 @@ minor=1 build=0 version=${major}.${minor}.${build} -versiondate=2004-07-29 +versiondate=2005-10-15 ojb-filename-prefix=${project-name}-${version} # 1.172 +2 -2 db-ojb/build.xml Index: build.xml =================================================================== RCS file: /home/cvs/db-ojb/build.xml,v retrieving revision 1.171 retrieving revision 1.172 diff -u -r1.171 -r1.172 --- build.xml 26 Aug 2005 18:44:35 -0000 1.171 +++ build.xml 27 Aug 2005 12:52:33 -0000 1.172 @@ -1236,7 +1236,7 @@ <target name="performance" depends="prepare-repository, copy-testdb" description="Performance benchmark, compare the PB-api/ODMG-api with direct JDBC calls"> - <java fork="yes" classname="org.apache.ojb.broker.CompareApiPerformanceTests" + <java fork="yes" classname="org.apache.ojb.compare.CompareApiPerformanceTests" dir="${build.test}/ojb" taskname="ojb" failonerror="true" > <classpath refid="runtime-classpath"/> <arg value="2500"/>
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
