You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jdo-commits@db.apache.org by an...@apache.org on 2007/12/17 11:56:58 UTC
svn commit: r604819 - in /db/jdo/trunk: tck2-legacy/build.properties
tck2-legacy/maven.xml tck2-legacy/project.properties tck2/build.properties
tck2/maven.xml tck2/project.properties
Author: andyj
Date: Mon Dec 17 02:56:46 2007
New Revision: 604819
URL: http://svn.apache.org/viewvc?rev=604819&view=rev
Log:
JDO-560 - Renamed log4j.jarfile -> logging.log4j.jarfile, logging.jarfile -> logging.commons.jarfile to avoid Maven1.1 shortcoming
Modified:
db/jdo/trunk/tck2-legacy/build.properties
db/jdo/trunk/tck2-legacy/maven.xml
db/jdo/trunk/tck2-legacy/project.properties
db/jdo/trunk/tck2/build.properties
db/jdo/trunk/tck2/maven.xml
db/jdo/trunk/tck2/project.properties
Modified: db/jdo/trunk/tck2-legacy/build.properties
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2-legacy/build.properties?rev=604819&r1=604818&r2=604819&view=diff
==============================================================================
--- db/jdo/trunk/tck2-legacy/build.properties (original)
+++ db/jdo/trunk/tck2-legacy/build.properties Mon Dec 17 02:56:46 2007
@@ -29,7 +29,7 @@
# Properties for the execution of the TCK
#
iut.runtck.sysproperties = -Xmx512m
-iut.runtck.classpath = ${jpox.jdori.jarfile}${path.separator}${jpox.jdori.jarfile}${path.separator}${log4j.jarfile}${path.separator}${asm.jarfile}${path.separator}${jpox.dbcp.jarfile}${path.separator}${jpox.c3p0.jarfile}
+iut.runtck.classpath = ${jpox.jdori.jarfile}${path.separator}${jpox.jdori.jarfile}${path.separator}${logging.log4j.jarfile}${path.separator}${asm.jarfile}${path.separator}${jpox.dbcp.jarfile}${path.separator}${jpox.c3p0.jarfile}
##
# Properties for the execution of the IUT enhancer
@@ -42,7 +42,7 @@
iut.enhancer.options = -v -d "${enhanced.dir}"
iut.enhancer.args = ${jdo.tck.jdometadata.files}
iut.enhancer.sysproperties =
-iut.enhancer.cp = ${jpox.enhancer.jarfile}${path.separator}${jpox.jdori.jarfile}${path.separator}${log4j.jarfile}${path.separator}${asm.jarfile}
+iut.enhancer.cp = ${jpox.enhancer.jarfile}${path.separator}${jpox.jdori.jarfile}${path.separator}${logging.log4j.jarfile}${path.separator}${asm.jarfile}
##
# Properties for the datastore
Modified: db/jdo/trunk/tck2-legacy/maven.xml
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2-legacy/maven.xml?rev=604819&r1=604818&r2=604819&view=diff
==============================================================================
--- db/jdo/trunk/tck2-legacy/maven.xml (original)
+++ db/jdo/trunk/tck2-legacy/maven.xml Mon Dec 17 02:56:46 2007
@@ -654,7 +654,7 @@
<pathelement location="${jta.jarfile}" />
<pathelement location="${xmlparser}" />
<pathelement location="${asm.jarfile}" />
- <pathelement location="${log4j.jarfile}" />
+ <pathelement location="${logging.log4j.jarfile}" />
<pathelement location="${jpox.dbcp.jarfile}" />
<pathelement location="${jpox.c3p0.jarfile}" />
</path>
@@ -682,7 +682,7 @@
<!-- JUnit jar file -->
<pathelement location="${junit.jarfile}"/>
<!-- Commons-logging jar file (for compiling pa/pc classes) -->
- <pathelement location="${logging.jarfile}"/>
+ <pathelement location="${logging.commons.jarfile}"/>
</path>
<!-- Common TCK execution classpath -->
@@ -692,7 +692,7 @@
<!-- JDO jar file -->
<pathelement location="${jdo.api.jarfile}"/>
<!-- Commons logging jar file -->
- <pathelement location="${logging.jarfile}"/>
+ <pathelement location="${logging.commons.jarfile}"/>
<pathelement location="${jta.jarfile}" />
<!-- JUnit jar file -->
<pathelement location="${junit.jarfile}"/>
Modified: db/jdo/trunk/tck2-legacy/project.properties
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2-legacy/project.properties?rev=604819&r1=604818&r2=604819&view=diff
==============================================================================
--- db/jdo/trunk/tck2-legacy/project.properties (original)
+++ db/jdo/trunk/tck2-legacy/project.properties Mon Dec 17 02:56:46 2007
@@ -61,8 +61,8 @@
jta.jarfile = ${pom.getDependencyPath('javax.transaction:transaction-api')}
springcore.jarfile = ${pom.getDependencyPath('org.springframework:spring-core')}
springbeans.jarfile = ${pom.getDependencyPath('org.springframework:spring-beans')}
-logging.jarfile = ${pom.getDependencyPath('commons-logging:commons-logging')}
-log4j.jarfile = ${pom.getDependencyPath('log4j')}
+logging.commons.jarfile = ${pom.getDependencyPath('commons-logging:commons-logging')}
+logging.log4j.jarfile = ${pom.getDependencyPath('log4j')}
derby.jarfile = ${pom.getDependencyPath('org.apache.derby:derby')}
derbytools.jarfile = ${pom.getDependencyPath('org.apache.derby:derbytools')}
util20.jarfile = ${pom.getDependencyPath('org.apache.jdo:jdo2-util')}
Modified: db/jdo/trunk/tck2/build.properties
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/build.properties?rev=604819&r1=604818&r2=604819&view=diff
==============================================================================
--- db/jdo/trunk/tck2/build.properties (original)
+++ db/jdo/trunk/tck2/build.properties Mon Dec 17 02:56:46 2007
@@ -29,7 +29,7 @@
# Properties for the execution of the TCK
#
iut.runtck.sysproperties = -Xmx512m
-iut.runtck.classpath = ${jpox.jdori.jarfile}${path.separator}${jpox.jdori.jarfile}${path.separator}${log4j.jarfile}${path.separator}${asm.jarfile}${path.separator}${jpox.dbcp.jarfile}${path.separator}${jpox.c3p0.jarfile}
+iut.runtck.classpath = ${jpox.jdori.jarfile}${path.separator}${jpox.jdori.jarfile}${path.separator}${logging.log4j.jarfile}${path.separator}${asm.jarfile}${path.separator}${jpox.dbcp.jarfile}${path.separator}${jpox.c3p0.jarfile}
##
# Properties for the execution of the IUT enhancer
@@ -42,7 +42,7 @@
iut.enhancer.options = -v -d "${enhanced.dir}"
iut.enhancer.args = ${jdo.tck.jdometadata.files}
iut.enhancer.sysproperties =
-iut.enhancer.cp = ${jpox.enhancer.jarfile}${path.separator}${jpox.jdori.jarfile}${path.separator}${log4j.jarfile}${path.separator}${asm.jarfile}
+iut.enhancer.cp = ${jpox.enhancer.jarfile}${path.separator}${jpox.jdori.jarfile}${path.separator}${logging.log4j.jarfile}${path.separator}${asm.jarfile}
##
# Properties for the datastore
Modified: db/jdo/trunk/tck2/maven.xml
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/maven.xml?rev=604819&r1=604818&r2=604819&view=diff
==============================================================================
--- db/jdo/trunk/tck2/maven.xml (original)
+++ db/jdo/trunk/tck2/maven.xml Mon Dec 17 02:56:46 2007
@@ -677,7 +677,7 @@
<pathelement location="${jta.jarfile}" />
<pathelement location="${xmlparser}" />
<pathelement location="${asm.jarfile}" />
- <pathelement location="${log4j.jarfile}" />
+ <pathelement location="${logging.log4j.jarfile}" />
<pathelement location="${jpox.dbcp.jarfile}" />
<pathelement location="${jpox.c3p0.jarfile}" />
</path>
@@ -705,7 +705,7 @@
<!-- JUnit jar file -->
<pathelement location="${junit.jarfile}"/>
<!-- Commons-logging jar file (for compiling pa/pc classes) -->
- <pathelement location="${logging.jarfile}"/>
+ <pathelement location="${logging.commons.jarfile}"/>
<!-- Java 1.5 jar file -->
<pathelement location="${jpox.javafive.jarfile}" />
<!-- JPA jar file -->
@@ -719,7 +719,7 @@
<!-- JDO jar file -->
<pathelement location="${jdo.api.jarfile}"/>
<!-- Commons logging jar file -->
- <pathelement location="${logging.jarfile}"/>
+ <pathelement location="${logging.commons.jarfile}"/>
<pathelement location="${jta.jarfile}" />
<!-- JPA jar file -->
<pathelement location="${jpa.jarfile}" />
Modified: db/jdo/trunk/tck2/project.properties
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/project.properties?rev=604819&r1=604818&r2=604819&view=diff
==============================================================================
--- db/jdo/trunk/tck2/project.properties (original)
+++ db/jdo/trunk/tck2/project.properties Mon Dec 17 02:56:46 2007
@@ -65,8 +65,8 @@
jta.jarfile = ${pom.getDependencyPath('javax.transaction:transaction-api')}
springcore.jarfile = ${pom.getDependencyPath('org.springframework:spring-core')}
springbeans.jarfile = ${pom.getDependencyPath('org.springframework:spring-beans')}
-logging.jarfile = ${pom.getDependencyPath('commons-logging:commons-logging')}
-log4j.jarfile = ${pom.getDependencyPath('log4j')}
+logging.commons.jarfile = ${pom.getDependencyPath('commons-logging:commons-logging')}
+logging.log4j.jarfile = ${pom.getDependencyPath('log4j')}
derby.jarfile = ${pom.getDependencyPath('org.apache.derby:derby')}
derbytools.jarfile = ${pom.getDependencyPath('org.apache.derby:derbytools')}
util20.jarfile = ${pom.getDependencyPath('org.apache.jdo:jdo2-util')}