Return-Path: Delivered-To: apmail-db-jdo-commits-archive@www.apache.org Received: (qmail 46822 invoked from network); 30 Apr 2008 06:51:50 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 30 Apr 2008 06:51:50 -0000 Received: (qmail 29279 invoked by uid 500); 30 Apr 2008 06:51:51 -0000 Mailing-List: contact jdo-commits-help@db.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: jdo-dev@db.apache.org Delivered-To: mailing list jdo-commits@db.apache.org Received: (qmail 29268 invoked by uid 99); 30 Apr 2008 06:51:51 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 29 Apr 2008 23:51:51 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 30 Apr 2008 06:50:53 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id B14DC23889F5; Tue, 29 Apr 2008 23:51:10 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r652304 - in /db/jdo/trunk/tck2: ./ src/conf/ Date: Wed, 30 Apr 2008 06:51:10 -0000 To: jdo-commits@db.apache.org From: andyj@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080430065110.B14DC23889F5@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: andyj Date: Tue Apr 29 23:51:09 2008 New Revision: 652304 URL: http://svn.apache.org/viewvc?rev=652304&view=rev Log: [JDO-592] Migrate to use datanucleus instead of jpox Modified: db/jdo/trunk/tck2/build.properties db/jdo/trunk/tck2/maven.xml db/jdo/trunk/tck2/project.properties db/jdo/trunk/tck2/project.xml db/jdo/trunk/tck2/src/conf/iut-jdoconfig.xml db/jdo/trunk/tck2/src/conf/iut-persistence.xml db/jdo/trunk/tck2/src/conf/iut-pmf.properties db/jdo/trunk/tck2/src/conf/jdori-jdoconfig.xml db/jdo/trunk/tck2/src/conf/jdori-persistence.xml db/jdo/trunk/tck2/src/conf/jdori-pmf.properties db/jdo/trunk/tck2/src/conf/log4j.properties Modified: db/jdo/trunk/tck2/build.properties URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/build.properties?rev=652304&r1=652303&r2=652304&view=diff ============================================================================== --- db/jdo/trunk/tck2/build.properties (original) +++ db/jdo/trunk/tck2/build.properties Tue Apr 29 23:51:09 2008 @@ -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}${logging.log4j.jarfile}${path.separator}${asm.jarfile}${path.separator}${jpox.dbcp.jarfile}${path.separator}${jpox.c3p0.jarfile} +iut.runtck.classpath = ${datanucleus.jdori.jarfile}${path.separator}${datanucleus.jdori.jarfile}${path.separator}${logging.log4j.jarfile}${path.separator}${asm.jarfile}${path.separator}${datanucleus.connectionpool.jarfile} ## # Properties for the execution of the IUT enhancer @@ -38,11 +38,11 @@ # # ${jdo.tck.jdometadata.files} contains the list of jdo metadata files # -iut.enhancer.main = org.jpox.enhancer.JPOXEnhancer +iut.enhancer.main = org.datanucleus.enhancer.DataNucleusEnhancer 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}${logging.log4j.jarfile}${path.separator}${asm.jarfile} +iut.enhancer.cp = ${datanucleus.enhancer.jarfile}${path.separator}${datanucleus.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=652304&r1=652303&r2=652304&view=diff ============================================================================== --- db/jdo/trunk/tck2/maven.xml (original) +++ db/jdo/trunk/tck2/maven.xml Tue Apr 29 23:51:09 2008 @@ -611,8 +611,8 @@ - jpox.enhancer.jarfile is ${jpox.enhancer.jarfile} - jpox.javafive.jarfile is ${jpox.javafive.jarfile} + datanucleus.enhancer.jarfile is ${datanucleus.enhancer.jarfile} + datanucleus.javafive.jarfile is ${datanucleus.javafive.jarfile} jdori.enhancer.classpath is ${jdori.enhancer.classpath} enhance.classpath is ${enhance.classpath} - - - - + + + + - - + @@ -713,7 +712,7 @@ - + Modified: db/jdo/trunk/tck2/project.properties URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/project.properties?rev=652304&r1=652303&r2=652304&view=diff ============================================================================== --- db/jdo/trunk/tck2/project.properties (original) +++ db/jdo/trunk/tck2/project.properties Tue Apr 29 23:51:09 2008 @@ -24,13 +24,13 @@ jdo.tck.excludelist = ${basedir}/src/conf/exclude.list # Maven repository -maven.repo.remote = http://repo1.maven.org/maven,http://www.jpox.org/downloads/maven,http://www.jpox.org/downloads/maven-nightly,http://maven1.glassfishwiki.org +maven.repo.remote = http://repo1.maven.org/maven,http://www.datanucleus.org/downloads/maven,http://www.datanucleus.org/downloads/maven-nightly,http://maven1.glassfishwiki.org maven.checkstyle.properties = ${basedir}/../jdo_checks.xml # iut properties file iut.pmf.properties = iut-pmf.properties -# The IUT enhancer, defaults to JPOX enhancer +# The IUT enhancer, defaults to RI enhancer iut.enhanced.dir = ${maven.build.dir}/enhanced/iut # JUnit settings @@ -56,10 +56,10 @@ # dependencies jdo.api.jarfile = ${pom.getDependencyPath('javax.jdo:jdo2-api')} -jpox.jdori.jarfile = ${pom.getDependencyPath('jpox:jpox-core')} -jpox.enhancer.jarfile = ${pom.getDependencyPath('jpox:jpox-enhancer')} -jpox.rdbms.jarfile = ${pom.getDependencyPath('jpox:jpox-rdbms')} -jpox.javafive.jarfile = ${pom.getDependencyPath('jpox:jpox-java5')} +datanucleus.jdori.jarfile = ${pom.getDependencyPath('org.datanucleus:datanucleus-core')} +datanucleus.enhancer.jarfile = ${pom.getDependencyPath('org.datanucleus:datanucleus-enhancer')} +datanucleus.rdbms.jarfile = ${pom.getDependencyPath('org.datanucleus:datanucleus-rdbms')} +datanucleus.javafive.jarfile = ${pom.getDependencyPath('org.datanucleus:datanucleus-java5')} asm.jarfile = ${pom.getDependencyPath('asm:asm')} junit.jarfile = ${pom.getDependencyPath('junit:junit')} jta.jarfile = ${pom.getDependencyPath('javax.transaction:transaction-api')} @@ -77,19 +77,18 @@ # JDORI enhancer jdori.enhanced.dir = ${maven.build.dir}/enhanced/jdori -jdori.enhancer.main = org.jpox.enhancer.JPOXEnhancer +jdori.enhancer.main = org.datanucleus.enhancer.DataNucleusEnhancer jdori.enhancer.options = -enhancerName asm -v -d "${enhanced.dir}" jdori.enhancer.args = ${jdo.tck.jdometadata.files} # connection pooling dependencies -jpox.dbcp.jarfile = ${pom.getDependencyPath('jpox:jpox-dbcp')} -jpox.c3p0.jarfile = ${pom.getDependencyPath('jpox:jpox-c3p0')} +datanucleus.connectionpool.jarfile = ${pom.getDependencyPath('org.datanucleus:datanucleus-connectionpool')} c3p0.jarfile = ${pom.getDependencyPath('c3p0')} dbcp.jarfile = ${pom.getDependencyPath('commons-dbcp')} pool.jarfile = ${pom.getDependencyPath('commons-pool')} collections.jarfile = ${pom.getDependencyPath('commons-collections')} -# jpox dependencies +# datanucleus dependencies jdo.tck.pcclasses.sources = \ Modified: db/jdo/trunk/tck2/project.xml URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/project.xml?rev=652304&r1=652303&r2=652304&view=diff ============================================================================== --- db/jdo/trunk/tck2/project.xml (original) +++ db/jdo/trunk/tck2/project.xml Tue Apr 29 23:51:09 2008 @@ -57,28 +57,28 @@ 2.1-SNAPSHOT - jpox - jpox-core - 1.2-SNAPSHOT - http://www.jpox.org/downloads/maven-nightly + org.datanucleus + datanucleus-core + 1.0-SNAPSHOT + http://www.datanucleus.org/downloads/maven-nightly - jpox - jpox-rdbms - 1.2-SNAPSHOT - http://www.jpox.org/downloads/maven-nightly + org.datanucleus + datanucleus-rdbms + 1.0-SNAPSHOT + http://www.datanucleus.org/downloads/maven-nightly - jpox - jpox-enhancer - 1.2-SNAPSHOT - http://www.jpox.org/downloads/maven-nightly + org.datanucleus + datanucleus-enhancer + 1.0-SNAPSHOT + http://www.datanucleus.org/downloads/maven-nightly - jpox - jpox-java5 - 1.2-SNAPSHOT - http://www.jpox.org/downloads/maven-nightly + org.datanucleus + datanucleus-java5 + 1.0-SNAPSHOT + http://www.datanucleus.org/downloads/maven-nightly org.apache.derby @@ -128,16 +128,10 @@ - jpox - jpox-c3p0 - 1.2-SNAPSHOT - http://www.jpox.org/downloads/maven-nightly - - - jpox - jpox-dbcp - 1.2-SNAPSHOT - http://www.jpox.org/downloads/maven-nightly + org.datanucleus + datanucleus-connectionpool + 1.0-SNAPSHOT + http://www.datanucleus.org/downloads/maven-nightly c3p0 Modified: db/jdo/trunk/tck2/src/conf/iut-jdoconfig.xml URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/conf/iut-jdoconfig.xml?rev=652304&r1=652303&r2=652304&view=diff ============================================================================== --- db/jdo/trunk/tck2/src/conf/iut-jdoconfig.xml (original) +++ db/jdo/trunk/tck2/src/conf/iut-jdoconfig.xml Tue Apr 29 23:51:09 2008 @@ -24,7 +24,7 @@ Default unnamed pmf --> - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + /> @@ -201,7 +201,7 @@ - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + @@ -82,4 +82,4 @@ reversemapping/orm.xml --> - \ No newline at end of file + Modified: db/jdo/trunk/tck2/src/conf/iut-pmf.properties URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/conf/iut-pmf.properties?rev=652304&r1=652303&r2=652304&view=diff ============================================================================== --- db/jdo/trunk/tck2/src/conf/iut-pmf.properties (original) +++ db/jdo/trunk/tck2/src/conf/iut-pmf.properties Tue Apr 29 23:51:09 2008 @@ -19,7 +19,7 @@ # # IUT PMF Properties # Edit these properties for the Implementation Under Test -javax.jdo.PersistenceManagerFactoryClass=org.jpox.PersistenceManagerFactoryImpl +javax.jdo.PersistenceManagerFactoryClass=org.datanucleus.jdo.JDOPersistenceManagerFactory javax.jdo.option.ConnectionDriverName=org.apache.derby.jdbc.EmbeddedDriver javax.jdo.option.ConnectionURL=jdbc:derby:jdotckdb javax.jdo.option.ConnectionUserName=tckuser @@ -29,13 +29,13 @@ javax.jdo.option.RestoreValues=false javax.jdo.option.Mapping=derby -org.jpox.validateTables=false -org.jpox.validateConstraints=false -org.jpox.autoCreateSchema=false -org.jpox.autoCreateTables=false -org.jpox.autoCreateConstraints=false -org.jpox.autoCreateColumns=false -org.jpox.rdbms.CheckExistTablesOrViews=false -org.jpox.autoStartMechanism=None -#org.jpox.connectionPoolingType=DBCP -org.jpox.connectionPoolingType=C3P0 +datanucleus.validateTables=false +datanucleus.validateConstraints=false +datanucleus.autoCreateSchema=false +datanucleus.autoCreateTables=false +datanucleus.autoCreateConstraints=false +datanucleus.autoCreateColumns=false +datanucleus.rdbms.CheckExistTablesOrViews=false +datanucleus.autoStartMechanism=None +#datanucleus.connectionPoolingType=DBCP +datanucleus.connectionPoolingType=C3P0 Modified: db/jdo/trunk/tck2/src/conf/jdori-jdoconfig.xml URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/conf/jdori-jdoconfig.xml?rev=652304&r1=652303&r2=652304&view=diff ============================================================================== --- db/jdo/trunk/tck2/src/conf/jdori-jdoconfig.xml (original) +++ db/jdo/trunk/tck2/src/conf/jdori-jdoconfig.xml Tue Apr 29 23:51:09 2008 @@ -24,7 +24,7 @@ Default unnamed pmf --> - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + /> @@ -201,7 +201,7 @@ - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + @@ -89,17 +89,17 @@ - - - - - - - - - - - + + + + + + + + + + + @@ -114,4 +114,4 @@ reversemapping/orm.xml --> - \ No newline at end of file + Modified: db/jdo/trunk/tck2/src/conf/jdori-pmf.properties URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/conf/jdori-pmf.properties?rev=652304&r1=652303&r2=652304&view=diff ============================================================================== --- db/jdo/trunk/tck2/src/conf/jdori-pmf.properties (original) +++ db/jdo/trunk/tck2/src/conf/jdori-pmf.properties Tue Apr 29 23:51:09 2008 @@ -18,7 +18,7 @@ # ------------------------------------------------------------------- # # JDORI PMF Properties -javax.jdo.PersistenceManagerFactoryClass=org.jpox.PersistenceManagerFactoryImpl +javax.jdo.PersistenceManagerFactoryClass=org.datanucleus.jdo.JDOPersistenceManagerFactory javax.jdo.option.ConnectionDriverName=org.apache.derby.jdbc.EmbeddedDriver javax.jdo.option.ConnectionURL=jdbc:derby:jdotckdb javax.jdo.option.ConnectionUserName=tckuser @@ -27,16 +27,16 @@ javax.jdo.option.RetainValues=false javax.jdo.option.RestoreValues=false -org.jpox.metadata.validate=false -org.jpox.validateTables=false -org.jpox.validateConstraints=false -org.jpox.autoCreateSchema=false -org.jpox.autoCreateTables=false -org.jpox.autoCreateConstraints=false -org.jpox.autoCreateColumns=false -org.jpox.rdbms.CheckExistTablesOrViews=false -org.jpox.autoStartMechanism=None -#org.jpox.initializePrimaryKeyColumnInfo=true -#org.jpox.connectionPoolingType=DBCP -org.jpox.connectionPoolingType=C3P0 -org.jpox.implementationCreatorName=asm +datanucleus.metadata.validate=false +datanucleus.validateTables=false +datanucleus.validateConstraints=false +datanucleus.autoCreateSchema=false +datanucleus.autoCreateTables=false +datanucleus.autoCreateConstraints=false +datanucleus.autoCreateColumns=false +datanucleus.rdbms.CheckExistTablesOrViews=false +datanucleus.autoStartMechanism=None +#datanucleus.initializePrimaryKeyColumnInfo=true +#datanucleus.connectionPoolingType=DBCP +datanucleus.connectionPoolingType=C3P0 +datanucleus.implementationCreatorName=asm Modified: db/jdo/trunk/tck2/src/conf/log4j.properties URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/conf/log4j.properties?rev=652304&r1=652303&r2=652304&view=diff ============================================================================== --- db/jdo/trunk/tck2/src/conf/log4j.properties (original) +++ db/jdo/trunk/tck2/src/conf/log4j.properties Tue Apr 29 23:51:09 2008 @@ -49,42 +49,22 @@ #log4j.appender..layout = org.apache.log4j.PatternLayout #log4j.appender..layout.ConversionPattern = %d{HH:mm:ss,SSS} (%t) %-5p [%c] - %m%n -############################# -# JPOX loggers and appenders -############################# - -# JPOX loggers -log4j.logger.JPOX = INFO, JPOX -log4j.additivity.JPOX = false - -# For more details on JPOX logging see http://www.jpox.org/docs/1_2/logging.html -#log4j.logger.JPOX.JDO = INFO, JPOX -#log4j.logger.JPOX.Persistence = INFO, JPOX -#log4j.logger.JPOX.Query = INFO, JPOX -#log4j.logger.JPOX.Lifecycle = INFO, JPOX -#log4j.logger.JPOX.Reachability = INFO, JPOX -#log4j.logger.JPOX.Cache = INFO, JPOX -#log4j.logger.JPOX.ClassLoading = INFO, JPOX -#log4j.logger.JPOX.MetaData = DEBUG, JPOX -#log4j.logger.JPOX.General = DEBUG, JPOX -#log4j.logger.JPOX.Transaction = INFO, JPOX -#log4j.logger.JPOX.Store.Poid = INFO, JPOX -#log4j.logger.JPOX.Datastore = DEBUG, JPOX -#log4j.logger.JPOX.Datastore.Schema = INFO, JPOX -#log4j.logger.JPOX.Datastore.Persist = INFO, JPOX -#log4j.logger.JPOX.Datastore.Retrieve = INFO, JPOX -#log4j.logger.JPOX.SchemaTool = INFO, JPOX - -# JPOX enhancer -log4j.logger.JPOX.Enhancer = INFO, JPOX -log4j.additivity.JPOX.Enhancer = false +################################### +# DataNucleus loggers and appenders +################################### + +# DataNucleus loggers +# For more details on DataNucleus logging see +# http://www.datanucleus.org/products/accessplatform/logging.html +log4j.logger.DataNucleus = INFO, DataNucleus +log4j.additivity.DataNucleus = false # C3P0 loggers -log4j.logger.com.mchange.v2 = INFO, JPOX +log4j.logger.com.mchange.v2 = INFO, DataNucleus log4j.additivity.com.mchange.v2 = false -# JPOX appenders -log4j.appender.JPOX = org.apache.jdo.tck.util.TCKFileAppender -log4j.appender.JPOX.File = jpox.txt -log4j.appender.JPOX.layout = org.apache.log4j.PatternLayout -log4j.appender.JPOX.layout.ConversionPattern = %d{HH:mm:ss,SSS} (%t) %-5p [%c] - %m%n +# DataNucleus appenders +log4j.appender.DataNucleus = org.apache.jdo.tck.util.TCKFileAppender +log4j.appender.DataNucleus.File = datanucleus.txt +log4j.appender.DataNucleus.layout = org.apache.log4j.PatternLayout +log4j.appender.DataNucleus.layout.ConversionPattern = %d{HH:mm:ss,SSS} (%t) %-5p [%c] - %m%n