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 2008/04/30 08:51:10 UTC
svn commit: r652304 - in /db/jdo/trunk/tck2: ./ src/conf/
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 @@
<path refid="jdori.enhancer.classpath"/>
<pathelement location="${enhanced.dir}"/>
</path>
- <echo> jpox.enhancer.jarfile is ${jpox.enhancer.jarfile}</echo>
- <echo> jpox.javafive.jarfile is ${jpox.javafive.jarfile}</echo>
+ <echo> datanucleus.enhancer.jarfile is ${datanucleus.enhancer.jarfile}</echo>
+ <echo> datanucleus.javafive.jarfile is ${datanucleus.javafive.jarfile}</echo>
<echo>jdori.enhancer.classpath is ${jdori.enhancer.classpath}</echo>
<echo>enhance.classpath is ${enhance.classpath}</echo>
<java fork="yes" failonerror="yes"
@@ -676,16 +676,15 @@
<!-- Jar files for the Reference Implementation -->
<path id="jdo.jdori.classpath">
- <pathelement location="${jpox.jdori.jarfile}" />
- <pathelement location="${jpox.enhancer.jarfile}" />
- <pathelement location="${jpox.rdbms.jarfile}" />
- <pathelement location="${jpox.javafive.jarfile}" />
+ <pathelement location="${datanucleus.jdori.jarfile}" />
+ <pathelement location="${datanucleus.enhancer.jarfile}" />
+ <pathelement location="${datanucleus.rdbms.jarfile}" />
+ <pathelement location="${datanucleus.javafive.jarfile}" />
<pathelement location="${jta.jarfile}" />
<pathelement location="${xmlparser}" />
<pathelement location="${asm.jarfile}" />
<pathelement location="${logging.log4j.jarfile}" />
- <pathelement location="${jpox.dbcp.jarfile}" />
- <pathelement location="${jpox.c3p0.jarfile}" />
+ <pathelement location="${datanucleus.connectionpool.jarfile}" />
</path>
<!-- Jar files for connection pooling -->
@@ -713,7 +712,7 @@
<!-- Commons-logging jar file (for compiling pa/pc classes) -->
<pathelement location="${logging.commons.jarfile}"/>
<!-- Java 1.5 jar file -->
- <pathelement location="${jpox.javafive.jarfile}" />
+ <pathelement location="${datanucleus.javafive.jarfile}" />
<!-- JPA jar file -->
<pathelement location="${jpa.jarfile}" />
</path>
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 @@
<version>2.1-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>jpox</groupId>
- <artifactId>jpox-core</artifactId>
- <version>1.2-SNAPSHOT</version>
- <url>http://www.jpox.org/downloads/maven-nightly</url>
+ <groupId>org.datanucleus</groupId>
+ <artifactId>datanucleus-core</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <url>http://www.datanucleus.org/downloads/maven-nightly</url>
</dependency>
<dependency>
- <groupId>jpox</groupId>
- <artifactId>jpox-rdbms</artifactId>
- <version>1.2-SNAPSHOT</version>
- <url>http://www.jpox.org/downloads/maven-nightly</url>
+ <groupId>org.datanucleus</groupId>
+ <artifactId>datanucleus-rdbms</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <url>http://www.datanucleus.org/downloads/maven-nightly</url>
</dependency>
<dependency>
- <groupId>jpox</groupId>
- <artifactId>jpox-enhancer</artifactId>
- <version>1.2-SNAPSHOT</version>
- <url>http://www.jpox.org/downloads/maven-nightly</url>
+ <groupId>org.datanucleus</groupId>
+ <artifactId>datanucleus-enhancer</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <url>http://www.datanucleus.org/downloads/maven-nightly</url>
</dependency>
<dependency>
- <groupId>jpox</groupId>
- <artifactId>jpox-java5</artifactId>
- <version>1.2-SNAPSHOT</version>
- <url>http://www.jpox.org/downloads/maven-nightly</url>
+ <groupId>org.datanucleus</groupId>
+ <artifactId>datanucleus-java5</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <url>http://www.datanucleus.org/downloads/maven-nightly</url>
</dependency>
<dependency>
<groupId>org.apache.derby</groupId>
@@ -128,16 +128,10 @@
</dependency>
<!-- dependencies for connection pooling -->
<dependency>
- <groupId>jpox</groupId>
- <artifactId>jpox-c3p0</artifactId>
- <version>1.2-SNAPSHOT</version>
- <url>http://www.jpox.org/downloads/maven-nightly</url>
- </dependency>
- <dependency>
- <groupId>jpox</groupId>
- <artifactId>jpox-dbcp</artifactId>
- <version>1.2-SNAPSHOT</version>
- <url>http://www.jpox.org/downloads/maven-nightly</url>
+ <groupId>org.datanucleus</groupId>
+ <artifactId>datanucleus-connectionpool</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <url>http://www.datanucleus.org/downloads/maven-nightly</url>
</dependency>
<dependency>
<groupId>c3p0</groupId>
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
-->
<persistence-manager-factory
- class="org.jpox.PersistenceManagerFactoryImpl"
+ class="org.datanucleus.jdo.JDOPersistenceManagerFactory"
connection-driver-name="org.apache.derby.jdbc.EmbeddedDriver"
connection-url="jdbc:derby:jdotckdb"
connection-user-name="tckuser"
@@ -37,22 +37,22 @@
<property name="javax.jdo.mapping.Schema" value="schemaDoesNotExist"/>
<property name="javax.jdo.option.Mapping" value="standard"/>
<property name="jdo.tck.mapping" value="0"/>
- <property name="org.jpox.metadata.validate" value="false"/>
- <property name="org.jpox.validateTables" value="false"/>
- <property name="org.jpox.validateConstraints" value="false"/>
- <property name="org.jpox.autoCreateSchema" value="false"/>
- <property name="org.jpox.autoCreateTables" value="false"/>
- <property name="org.jpox.autoCreateConstraints" value="false"/>
- <property name="org.jpox.autoCreateColumns" value="false"/>
- <property name="org.jpox.rdbms.CheckExistTablesOrViews" value="false"/>
- <property name="org.jpox.autoStartMechanism" value="None"/>
- <property name="org.jpox.connectionPoolingType" value="C3P0"/>
- <property name="org.jpox.implementationCreatorName" value="asm"/>
+ <property name="datanucleus.metadata.validate" value="false"/>
+ <property name="datanucleus.validateTables" value="false"/>
+ <property name="datanucleus.validateConstraints" value="false"/>
+ <property name="datanucleus.autoCreateSchema" value="false"/>
+ <property name="datanucleus.autoCreateTables" value="false"/>
+ <property name="datanucleus.autoCreateConstraints" value="false"/>
+ <property name="datanucleus.autoCreateColumns" value="false"/>
+ <property name="datanucleus.rdbms.CheckExistTablesOrViews" value="false"/>
+ <property name="datanucleus.autoStartMechanism" value="None"/>
+ <property name="datanucleus.connectionPoolingType" value="C3P0"/>
+ <property name="datanucleus.implementationCreatorName" value="asm"/>
</persistence-manager-factory>
<persistence-manager-factory
name="namedPMF0"
- class="org.jpox.PersistenceManagerFactoryImpl"
+ class="org.datanucleus.jdo.JDOPersistenceManagerFactory"
connection-driver-name="org.apache.derby.jdbc.EmbeddedDriver"
connection-url="jdbc:derby:jdotckdb"
connection-user-name="tckuser"
@@ -64,22 +64,22 @@
<property name="javax.jdo.mapping.Schema" value="schemaDoesNotExist"/>
<property name="javax.jdo.option.Mapping" value="standard"/>
- <property name="org.jpox.metadata.validate" value="false"/>
- <property name="org.jpox.validateTables" value="false"/>
- <property name="org.jpox.validateConstraints" value="false"/>
- <property name="org.jpox.autoCreateSchema" value="false"/>
- <property name="org.jpox.autoCreateTables" value="false"/>
- <property name="org.jpox.autoCreateConstraints" value="false"/>
- <property name="org.jpox.autoCreateColumns" value="false"/>
- <property name="org.jpox.rdbms.CheckExistTablesOrViews" value="false"/>
- <property name="org.jpox.autoStartMechanism" value="None"/>
- <property name="org.jpox.connectionPoolingType" value="C3P0"/>
- <property name="org.jpox.implementationCreatorName" value="asm"/>
+ <property name="datanucleus.metadata.validate" value="false"/>
+ <property name="datanucleus.validateTables" value="false"/>
+ <property name="datanucleus.validateConstraints" value="false"/>
+ <property name="datanucleus.autoCreateSchema" value="false"/>
+ <property name="datanucleus.autoCreateTables" value="false"/>
+ <property name="datanucleus.autoCreateConstraints" value="false"/>
+ <property name="datanucleus.autoCreateColumns" value="false"/>
+ <property name="datanucleus.rdbms.CheckExistTablesOrViews" value="false"/>
+ <property name="datanucleus.autoStartMechanism" value="None"/>
+ <property name="datanucleus.connectionPoolingType" value="C3P0"/>
+ <property name="datanucleus.implementationCreatorName" value="asm"/>
</persistence-manager-factory>
<persistence-manager-factory
name=" namedPMF1 "
- class="org.jpox.PersistenceManagerFactoryImpl"
+ class="org.datanucleus.jdo.JDOPersistenceManagerFactory"
connection-driver-name="org.apache.derby.jdbc.EmbeddedDriver"
connection-url="jdbc:derby:jdotckdb"
connection-user-name="tckuser"
@@ -91,22 +91,22 @@
<property name="javax.jdo.mapping.Schema" value="schemaDoesNotExist"/>
<property name="javax.jdo.option.Mapping" value="standard"/>
- <property name="org.jpox.metadata.validate" value="false"/>
- <property name="org.jpox.validateTables" value="false"/>
- <property name="org.jpox.validateConstraints" value="false"/>
- <property name="org.jpox.autoCreateSchema" value="false"/>
- <property name="org.jpox.autoCreateTables" value="false"/>
- <property name="org.jpox.autoCreateConstraints" value="false"/>
- <property name="org.jpox.autoCreateColumns" value="false"/>
- <property name="org.jpox.rdbms.CheckExistTablesOrViews" value="false"/>
- <property name="org.jpox.autoStartMechanism" value="None"/>
- <property name="org.jpox.connectionPoolingType" value="C3P0"/>
- <property name="org.jpox.implementationCreatorName" value="asm"/>
+ <property name="datanucleus.metadata.validate" value="false"/>
+ <property name="datanucleus.validateTables" value="false"/>
+ <property name="datanucleus.validateConstraints" value="false"/>
+ <property name="datanucleus.autoCreateSchema" value="false"/>
+ <property name="datanucleus.autoCreateTables" value="false"/>
+ <property name="datanucleus.autoCreateConstraints" value="false"/>
+ <property name="datanucleus.autoCreateColumns" value="false"/>
+ <property name="datanucleus.rdbms.CheckExistTablesOrViews" value="false"/>
+ <property name="datanucleus.autoStartMechanism" value="None"/>
+ <property name="datanucleus.connectionPoolingType" value="C3P0"/>
+ <property name="datanucleus.implementationCreatorName" value="asm"/>
</persistence-manager-factory>
<persistence-manager-factory
name="testInstanceLifecycleListenerStore"
- class="org.jpox.PersistenceManagerFactoryImpl"
+ class="org.datanucleus.jdo.JDOPersistenceManagerFactory"
connection-driver-name="org.apache.derby.jdbc.EmbeddedDriver"
connection-url="jdbc:derby:jdotckdb"
connection-user-name="tckuser"
@@ -118,17 +118,17 @@
<property name="javax.jdo.mapping.Schema" value="schemaDoesNotExist"/>
<property name="javax.jdo.option.Mapping" value="standard"/>
- <property name="org.jpox.metadata.validate" value="false"/>
- <property name="org.jpox.validateTables" value="false"/>
- <property name="org.jpox.validateConstraints" value="false"/>
- <property name="org.jpox.autoCreateSchema" value="false"/>
- <property name="org.jpox.autoCreateTables" value="false"/>
- <property name="org.jpox.autoCreateConstraints" value="false"/>
- <property name="org.jpox.autoCreateColumns" value="false"/>
- <property name="org.jpox.rdbms.CheckExistTablesOrViews" value="false"/>
- <property name="org.jpox.autoStartMechanism" value="None"/>
- <property name="org.jpox.connectionPoolingType" value="C3P0"/>
- <property name="org.jpox.implementationCreatorName" value="asm"/>
+ <property name="datanucleus.metadata.validate" value="false"/>
+ <property name="datanucleus.validateTables" value="false"/>
+ <property name="datanucleus.validateConstraints" value="false"/>
+ <property name="datanucleus.autoCreateSchema" value="false"/>
+ <property name="datanucleus.autoCreateTables" value="false"/>
+ <property name="datanucleus.autoCreateConstraints" value="false"/>
+ <property name="datanucleus.autoCreateColumns" value="false"/>
+ <property name="datanucleus.rdbms.CheckExistTablesOrViews" value="false"/>
+ <property name="datanucleus.autoStartMechanism" value="None"/>
+ <property name="datanucleus.connectionPoolingType" value="C3P0"/>
+ <property name="datanucleus.implementationCreatorName" value="asm"/>
<instance-lifecycle-listener
listener="org.apache.jdo.tck.api.persistencemanagerfactory.config.StoreListener"
@@ -139,7 +139,7 @@
<persistence-manager-factory
name="testInstanceLifecycleListenerStoreGetInstance"
- class="org.jpox.PersistenceManagerFactoryImpl"
+ class="org.datanucleus.jdo.JDOPersistenceManagerFactory"
connection-driver-name="org.apache.derby.jdbc.EmbeddedDriver"
connection-url="jdbc:derby:jdotckdb"
connection-user-name="tckuser"
@@ -151,17 +151,17 @@
<property name="javax.jdo.mapping.Schema" value="schemaDoesNotExist"/>
<property name="javax.jdo.option.Mapping" value="standard"/>
- <property name="org.jpox.metadata.validate" value="false"/>
- <property name="org.jpox.validateTables" value="false"/>
- <property name="org.jpox.validateConstraints" value="false"/>
- <property name="org.jpox.autoCreateSchema" value="false"/>
- <property name="org.jpox.autoCreateTables" value="false"/>
- <property name="org.jpox.autoCreateConstraints" value="false"/>
- <property name="org.jpox.autoCreateColumns" value="false"/>
- <property name="org.jpox.rdbms.CheckExistTablesOrViews" value="false"/>
- <property name="org.jpox.autoStartMechanism" value="None"/>
- <property name="org.jpox.connectionPoolingType" value="C3P0"/>
- <property name="org.jpox.implementationCreatorName" value="asm"/>
+ <property name="datanucleus.metadata.validate" value="false"/>
+ <property name="datanucleus.validateTables" value="false"/>
+ <property name="datanucleus.validateConstraints" value="false"/>
+ <property name="datanucleus.autoCreateSchema" value="false"/>
+ <property name="datanucleus.autoCreateTables" value="false"/>
+ <property name="datanucleus.autoCreateConstraints" value="false"/>
+ <property name="datanucleus.autoCreateColumns" value="false"/>
+ <property name="datanucleus.rdbms.CheckExistTablesOrViews" value="false"/>
+ <property name="datanucleus.autoStartMechanism" value="None"/>
+ <property name="datanucleus.connectionPoolingType" value="C3P0"/>
+ <property name="datanucleus.implementationCreatorName" value="asm"/>
<instance-lifecycle-listener
listener="org.apache.jdo.tck.api.persistencemanagerfactory.config.StoreListenerGetInstance"
@@ -171,7 +171,7 @@
<persistence-manager-factory
name="testInstanceLifecycleListenerStoreOverrides"
- class="org.jpox.PersistenceManagerFactoryImpl"
+ class="org.datanucleus.jdo.JDOPersistenceManagerFactory"
connection-driver-name="org.apache.derby.jdbc.EmbeddedDriver"
connection-url="jdbc:derby:jdotckdb"
connection-user-name="tckuser"
@@ -183,17 +183,17 @@
<property name="javax.jdo.mapping.Schema" value="schemaDoesNotExist"/>
<property name="javax.jdo.option.Mapping" value="standard"/>
- <property name="org.jpox.metadata.validate" value="false"/>
- <property name="org.jpox.validateTables" value="false"/>
- <property name="org.jpox.validateConstraints" value="false"/>
- <property name="org.jpox.autoCreateSchema" value="false"/>
- <property name="org.jpox.autoCreateTables" value="false"/>
- <property name="org.jpox.autoCreateConstraints" value="false"/>
- <property name="org.jpox.autoCreateColumns" value="false"/>
- <property name="org.jpox.rdbms.CheckExistTablesOrViews" value="false"/>
- <property name="org.jpox.autoStartMechanism" value="None"/>
- <property name="org.jpox.connectionPoolingType" value="C3P0"/>
- <property name="org.jpox.implementationCreatorName" value="asm"/>
+ <property name="datanucleus.metadata.validate" value="false"/>
+ <property name="datanucleus.validateTables" value="false"/>
+ <property name="datanucleus.validateConstraints" value="false"/>
+ <property name="datanucleus.autoCreateSchema" value="false"/>
+ <property name="datanucleus.autoCreateTables" value="false"/>
+ <property name="datanucleus.autoCreateConstraints" value="false"/>
+ <property name="datanucleus.autoCreateColumns" value="false"/>
+ <property name="datanucleus.rdbms.CheckExistTablesOrViews" value="false"/>
+ <property name="datanucleus.autoStartMechanism" value="None"/>
+ <property name="datanucleus.connectionPoolingType" value="C3P0"/>
+ <property name="datanucleus.implementationCreatorName" value="asm"/>
/>
</persistence-manager-factory>
@@ -201,7 +201,7 @@
<persistence-manager-factory
name="testInstanceLifecycleListenerClassesNull"
- class="org.jpox.PersistenceManagerFactoryImpl"
+ class="org.datanucleus.jdo.JDOPersistenceManagerFactory"
connection-driver-name="org.apache.derby.jdbc.EmbeddedDriver"
connection-url="jdbc:derby:jdotckdb"
connection-user-name="tckuser"
@@ -213,17 +213,17 @@
<property name="javax.jdo.mapping.Schema" value="schemaDoesNotExist"/>
<property name="javax.jdo.option.Mapping" value="standard"/>
- <property name="org.jpox.metadata.validate" value="false"/>
- <property name="org.jpox.validateTables" value="false"/>
- <property name="org.jpox.validateConstraints" value="false"/>
- <property name="org.jpox.autoCreateSchema" value="false"/>
- <property name="org.jpox.autoCreateTables" value="false"/>
- <property name="org.jpox.autoCreateConstraints" value="false"/>
- <property name="org.jpox.autoCreateColumns" value="false"/>
- <property name="org.jpox.rdbms.CheckExistTablesOrViews" value="false"/>
- <property name="org.jpox.autoStartMechanism" value="None"/>
- <property name="org.jpox.connectionPoolingType" value="C3P0"/>
- <property name="org.jpox.implementationCreatorName" value="asm"/>
+ <property name="datanucleus.metadata.validate" value="false"/>
+ <property name="datanucleus.validateTables" value="false"/>
+ <property name="datanucleus.validateConstraints" value="false"/>
+ <property name="datanucleus.autoCreateSchema" value="false"/>
+ <property name="datanucleus.autoCreateTables" value="false"/>
+ <property name="datanucleus.autoCreateConstraints" value="false"/>
+ <property name="datanucleus.autoCreateColumns" value="false"/>
+ <property name="datanucleus.rdbms.CheckExistTablesOrViews" value="false"/>
+ <property name="datanucleus.autoStartMechanism" value="None"/>
+ <property name="datanucleus.connectionPoolingType" value="C3P0"/>
+ <property name="datanucleus.implementationCreatorName" value="asm"/>
<!-- Use no classes attribute here - testing null classes behavior -->
<instance-lifecycle-listener
Modified: db/jdo/trunk/tck2/src/conf/iut-persistence.xml
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/conf/iut-persistence.xml?rev=652304&r1=652303&r2=652304&view=diff
==============================================================================
--- db/jdo/trunk/tck2/src/conf/iut-persistence.xml (original)
+++ db/jdo/trunk/tck2/src/conf/iut-persistence.xml Tue Apr 29 23:51:09 2008
@@ -57,17 +57,17 @@
<property name="javax.jdo.option.Mapping" value="derby"/>
<property name="javax.jdo.mapping.Schema" value="applicationidentity0"/>
<property name="javax.jdo.option.Mapping" value="standard"/>
- <property name="org.jpox.metadata.validate" value="false"/>
- <property name="org.jpox.validateTables" value="false"/>
- <property name="org.jpox.validateConstraints" value="false"/>
- <property name="org.jpox.autoCreateSchema" value="false"/>
- <property name="org.jpox.autoCreateTables" value="false"/>
- <property name="org.jpox.autoCreateConstraints" value="false"/>
- <property name="org.jpox.autoCreateColumns" value="false"/>
- <property name="org.jpox.rdbms.CheckExistTablesOrViews" value="false"/>
- <property name="org.jpox.autoStartMechanism" value="None"/>
- <property name="org.jpox.connectionPoolingType" value="C3P0"/>
- <property name="org.jpox.implementationCreatorName" value="asm"/>
+ <property name="datanucleus.metadata.validate" value="false"/>
+ <property name="datanucleus.validateTables" value="false"/>
+ <property name="datanucleus.validateConstraints" value="false"/>
+ <property name="datanucleus.autoCreateSchema" value="false"/>
+ <property name="datanucleus.autoCreateTables" value="false"/>
+ <property name="datanucleus.autoCreateConstraints" value="false"/>
+ <property name="datanucleus.autoCreateColumns" value="false"/>
+ <property name="datanucleus.rdbms.CheckExistTablesOrViews" value="false"/>
+ <property name="datanucleus.autoStartMechanism" value="None"/>
+ <property name="datanucleus.connectionPoolingType" value="C3P0"/>
+ <property name="datanucleus.implementationCreatorName" value="asm"/>
</properties>
</persistence-unit>
@@ -82,4 +82,4 @@
<mapping-file>reversemapping/orm.xml</mapping-file>
-->
</persistence-unit>
-</persistence>
\ No newline at end of file
+</persistence>
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
-->
<persistence-manager-factory
- class="org.jpox.PersistenceManagerFactoryImpl"
+ class="org.datanucleus.jdo.JDOPersistenceManagerFactory"
connection-driver-name="org.apache.derby.jdbc.EmbeddedDriver"
connection-url="jdbc:derby:jdotckdb"
connection-user-name="tckuser"
@@ -37,22 +37,22 @@
<property name="javax.jdo.mapping.Schema" value="schemaDoesNotExist"/>
<property name="javax.jdo.option.Mapping" value="standard"/>
<property name="jdo.tck.mapping" value="0"/>
- <property name="org.jpox.metadata.validate" value="false"/>
- <property name="org.jpox.validateTables" value="false"/>
- <property name="org.jpox.validateConstraints" value="false"/>
- <property name="org.jpox.autoCreateSchema" value="false"/>
- <property name="org.jpox.autoCreateTables" value="false"/>
- <property name="org.jpox.autoCreateConstraints" value="false"/>
- <property name="org.jpox.autoCreateColumns" value="false"/>
- <property name="org.jpox.rdbms.CheckExistTablesOrViews" value="false"/>
- <property name="org.jpox.autoStartMechanism" value="None"/>
- <property name="org.jpox.connectionPoolingType" value="C3P0"/>
- <property name="org.jpox.implementationCreatorName" value="asm"/>
+ <property name="datanucleus.metadata.validate" value="false"/>
+ <property name="datanucleus.validateTables" value="false"/>
+ <property name="datanucleus.validateConstraints" value="false"/>
+ <property name="datanucleus.autoCreateSchema" value="false"/>
+ <property name="datanucleus.autoCreateTables" value="false"/>
+ <property name="datanucleus.autoCreateConstraints" value="false"/>
+ <property name="datanucleus.autoCreateColumns" value="false"/>
+ <property name="datanucleus.rdbms.CheckExistTablesOrViews" value="false"/>
+ <property name="datanucleus.autoStartMechanism" value="None"/>
+ <property name="datanucleus.connectionPoolingType" value="C3P0"/>
+ <property name="datanucleus.implementationCreatorName" value="asm"/>
</persistence-manager-factory>
<persistence-manager-factory
name="namedPMF0"
- class="org.jpox.PersistenceManagerFactoryImpl"
+ class="org.datanucleus.jdo.JDOPersistenceManagerFactory"
connection-driver-name="org.apache.derby.jdbc.EmbeddedDriver"
connection-url="jdbc:derby:jdotckdb"
connection-user-name="tckuser"
@@ -64,22 +64,22 @@
<property name="javax.jdo.mapping.Schema" value="schemaDoesNotExist"/>
<property name="javax.jdo.option.Mapping" value="standard"/>
- <property name="org.jpox.metadata.validate" value="false"/>
- <property name="org.jpox.validateTables" value="false"/>
- <property name="org.jpox.validateConstraints" value="false"/>
- <property name="org.jpox.autoCreateSchema" value="false"/>
- <property name="org.jpox.autoCreateTables" value="false"/>
- <property name="org.jpox.autoCreateConstraints" value="false"/>
- <property name="org.jpox.autoCreateColumns" value="false"/>
- <property name="org.jpox.rdbms.CheckExistTablesOrViews" value="false"/>
- <property name="org.jpox.autoStartMechanism" value="None"/>
- <property name="org.jpox.connectionPoolingType" value="C3P0"/>
- <property name="org.jpox.implementationCreatorName" value="asm"/>
+ <property name="datanucleus.metadata.validate" value="false"/>
+ <property name="datanucleus.validateTables" value="false"/>
+ <property name="datanucleus.validateConstraints" value="false"/>
+ <property name="datanucleus.autoCreateSchema" value="false"/>
+ <property name="datanucleus.autoCreateTables" value="false"/>
+ <property name="datanucleus.autoCreateConstraints" value="false"/>
+ <property name="datanucleus.autoCreateColumns" value="false"/>
+ <property name="datanucleus.rdbms.CheckExistTablesOrViews" value="false"/>
+ <property name="datanucleus.autoStartMechanism" value="None"/>
+ <property name="datanucleus.connectionPoolingType" value="C3P0"/>
+ <property name="datanucleus.implementationCreatorName" value="asm"/>
</persistence-manager-factory>
<persistence-manager-factory
name=" namedPMF1 "
- class="org.jpox.PersistenceManagerFactoryImpl"
+ class="org.datanucleus.jdo.JDOPersistenceManagerFactory"
connection-driver-name="org.apache.derby.jdbc.EmbeddedDriver"
connection-url="jdbc:derby:jdotckdb"
connection-user-name="tckuser"
@@ -91,22 +91,22 @@
<property name="javax.jdo.mapping.Schema" value="schemaDoesNotExist"/>
<property name="javax.jdo.option.Mapping" value="standard"/>
- <property name="org.jpox.metadata.validate" value="false"/>
- <property name="org.jpox.validateTables" value="false"/>
- <property name="org.jpox.validateConstraints" value="false"/>
- <property name="org.jpox.autoCreateSchema" value="false"/>
- <property name="org.jpox.autoCreateTables" value="false"/>
- <property name="org.jpox.autoCreateConstraints" value="false"/>
- <property name="org.jpox.autoCreateColumns" value="false"/>
- <property name="org.jpox.rdbms.CheckExistTablesOrViews" value="false"/>
- <property name="org.jpox.autoStartMechanism" value="None"/>
- <property name="org.jpox.connectionPoolingType" value="C3P0"/>
- <property name="org.jpox.implementationCreatorName" value="asm"/>
+ <property name="datanucleus.metadata.validate" value="false"/>
+ <property name="datanucleus.validateTables" value="false"/>
+ <property name="datanucleus.validateConstraints" value="false"/>
+ <property name="datanucleus.autoCreateSchema" value="false"/>
+ <property name="datanucleus.autoCreateTables" value="false"/>
+ <property name="datanucleus.autoCreateConstraints" value="false"/>
+ <property name="datanucleus.autoCreateColumns" value="false"/>
+ <property name="datanucleus.rdbms.CheckExistTablesOrViews" value="false"/>
+ <property name="datanucleus.autoStartMechanism" value="None"/>
+ <property name="datanucleus.connectionPoolingType" value="C3P0"/>
+ <property name="datanucleus.implementationCreatorName" value="asm"/>
</persistence-manager-factory>
<persistence-manager-factory
name="testInstanceLifecycleListenerStore"
- class="org.jpox.PersistenceManagerFactoryImpl"
+ class="org.datanucleus.jdo.JDOPersistenceManagerFactory"
connection-driver-name="org.apache.derby.jdbc.EmbeddedDriver"
connection-url="jdbc:derby:jdotckdb"
connection-user-name="tckuser"
@@ -118,17 +118,17 @@
<property name="javax.jdo.mapping.Schema" value="schemaDoesNotExist"/>
<property name="javax.jdo.option.Mapping" value="standard"/>
- <property name="org.jpox.metadata.validate" value="false"/>
- <property name="org.jpox.validateTables" value="false"/>
- <property name="org.jpox.validateConstraints" value="false"/>
- <property name="org.jpox.autoCreateSchema" value="false"/>
- <property name="org.jpox.autoCreateTables" value="false"/>
- <property name="org.jpox.autoCreateConstraints" value="false"/>
- <property name="org.jpox.autoCreateColumns" value="false"/>
- <property name="org.jpox.rdbms.CheckExistTablesOrViews" value="false"/>
- <property name="org.jpox.autoStartMechanism" value="None"/>
- <property name="org.jpox.connectionPoolingType" value="C3P0"/>
- <property name="org.jpox.implementationCreatorName" value="asm"/>
+ <property name="datanucleus.metadata.validate" value="false"/>
+ <property name="datanucleus.validateTables" value="false"/>
+ <property name="datanucleus.validateConstraints" value="false"/>
+ <property name="datanucleus.autoCreateSchema" value="false"/>
+ <property name="datanucleus.autoCreateTables" value="false"/>
+ <property name="datanucleus.autoCreateConstraints" value="false"/>
+ <property name="datanucleus.autoCreateColumns" value="false"/>
+ <property name="datanucleus.rdbms.CheckExistTablesOrViews" value="false"/>
+ <property name="datanucleus.autoStartMechanism" value="None"/>
+ <property name="datanucleus.connectionPoolingType" value="C3P0"/>
+ <property name="datanucleus.implementationCreatorName" value="asm"/>
<instance-lifecycle-listener
listener="org.apache.jdo.tck.api.persistencemanagerfactory.config.StoreListener"
@@ -139,7 +139,7 @@
<persistence-manager-factory
name="testInstanceLifecycleListenerStoreGetInstance"
- class="org.jpox.PersistenceManagerFactoryImpl"
+ class="org.datanucleus.jdo.JDOPersistenceManagerFactory"
connection-driver-name="org.apache.derby.jdbc.EmbeddedDriver"
connection-url="jdbc:derby:jdotckdb"
connection-user-name="tckuser"
@@ -151,17 +151,17 @@
<property name="javax.jdo.mapping.Schema" value="schemaDoesNotExist"/>
<property name="javax.jdo.option.Mapping" value="standard"/>
- <property name="org.jpox.metadata.validate" value="false"/>
- <property name="org.jpox.validateTables" value="false"/>
- <property name="org.jpox.validateConstraints" value="false"/>
- <property name="org.jpox.autoCreateSchema" value="false"/>
- <property name="org.jpox.autoCreateTables" value="false"/>
- <property name="org.jpox.autoCreateConstraints" value="false"/>
- <property name="org.jpox.autoCreateColumns" value="false"/>
- <property name="org.jpox.rdbms.CheckExistTablesOrViews" value="false"/>
- <property name="org.jpox.autoStartMechanism" value="None"/>
- <property name="org.jpox.connectionPoolingType" value="C3P0"/>
- <property name="org.jpox.implementationCreatorName" value="asm"/>
+ <property name="datanucleus.metadata.validate" value="false"/>
+ <property name="datanucleus.validateTables" value="false"/>
+ <property name="datanucleus.validateConstraints" value="false"/>
+ <property name="datanucleus.autoCreateSchema" value="false"/>
+ <property name="datanucleus.autoCreateTables" value="false"/>
+ <property name="datanucleus.autoCreateConstraints" value="false"/>
+ <property name="datanucleus.autoCreateColumns" value="false"/>
+ <property name="datanucleus.rdbms.CheckExistTablesOrViews" value="false"/>
+ <property name="datanucleus.autoStartMechanism" value="None"/>
+ <property name="datanucleus.connectionPoolingType" value="C3P0"/>
+ <property name="datanucleus.implementationCreatorName" value="asm"/>
<instance-lifecycle-listener
listener="org.apache.jdo.tck.api.persistencemanagerfactory.config.StoreListenerGetInstance"
@@ -171,7 +171,7 @@
<persistence-manager-factory
name="testInstanceLifecycleListenerStoreOverrides"
- class="org.jpox.PersistenceManagerFactoryImpl"
+ class="org.datanucleus.jdo.JDOPersistenceManagerFactory"
connection-driver-name="org.apache.derby.jdbc.EmbeddedDriver"
connection-url="jdbc:derby:jdotckdb"
connection-user-name="tckuser"
@@ -183,17 +183,17 @@
<property name="javax.jdo.mapping.Schema" value="schemaDoesNotExist"/>
<property name="javax.jdo.option.Mapping" value="standard"/>
- <property name="org.jpox.metadata.validate" value="false"/>
- <property name="org.jpox.validateTables" value="false"/>
- <property name="org.jpox.validateConstraints" value="false"/>
- <property name="org.jpox.autoCreateSchema" value="false"/>
- <property name="org.jpox.autoCreateTables" value="false"/>
- <property name="org.jpox.autoCreateConstraints" value="false"/>
- <property name="org.jpox.autoCreateColumns" value="false"/>
- <property name="org.jpox.rdbms.CheckExistTablesOrViews" value="false"/>
- <property name="org.jpox.autoStartMechanism" value="None"/>
- <property name="org.jpox.connectionPoolingType" value="C3P0"/>
- <property name="org.jpox.implementationCreatorName" value="asm"/>
+ <property name="datanucleus.metadata.validate" value="false"/>
+ <property name="datanucleus.validateTables" value="false"/>
+ <property name="datanucleus.validateConstraints" value="false"/>
+ <property name="datanucleus.autoCreateSchema" value="false"/>
+ <property name="datanucleus.autoCreateTables" value="false"/>
+ <property name="datanucleus.autoCreateConstraints" value="false"/>
+ <property name="datanucleus.autoCreateColumns" value="false"/>
+ <property name="datanucleus.rdbms.CheckExistTablesOrViews" value="false"/>
+ <property name="datanucleus.autoStartMechanism" value="None"/>
+ <property name="datanucleus.connectionPoolingType" value="C3P0"/>
+ <property name="datanucleus.implementationCreatorName" value="asm"/>
/>
</persistence-manager-factory>
@@ -201,7 +201,7 @@
<persistence-manager-factory
name="testInstanceLifecycleListenerClassesNull"
- class="org.jpox.PersistenceManagerFactoryImpl"
+ class="org.datanucleus.jdo.JDOPersistenceManagerFactory"
connection-driver-name="org.apache.derby.jdbc.EmbeddedDriver"
connection-url="jdbc:derby:jdotckdb"
connection-user-name="tckuser"
@@ -213,17 +213,17 @@
<property name="javax.jdo.mapping.Schema" value="schemaDoesNotExist"/>
<property name="javax.jdo.option.Mapping" value="standard"/>
- <property name="org.jpox.metadata.validate" value="false"/>
- <property name="org.jpox.validateTables" value="false"/>
- <property name="org.jpox.validateConstraints" value="false"/>
- <property name="org.jpox.autoCreateSchema" value="false"/>
- <property name="org.jpox.autoCreateTables" value="false"/>
- <property name="org.jpox.autoCreateConstraints" value="false"/>
- <property name="org.jpox.autoCreateColumns" value="false"/>
- <property name="org.jpox.rdbms.CheckExistTablesOrViews" value="false"/>
- <property name="org.jpox.autoStartMechanism" value="None"/>
- <property name="org.jpox.connectionPoolingType" value="C3P0"/>
- <property name="org.jpox.implementationCreatorName" value="asm"/>
+ <property name="datanucleus.metadata.validate" value="false"/>
+ <property name="datanucleus.validateTables" value="false"/>
+ <property name="datanucleus.validateConstraints" value="false"/>
+ <property name="datanucleus.autoCreateSchema" value="false"/>
+ <property name="datanucleus.autoCreateTables" value="false"/>
+ <property name="datanucleus.autoCreateConstraints" value="false"/>
+ <property name="datanucleus.autoCreateColumns" value="false"/>
+ <property name="datanucleus.rdbms.CheckExistTablesOrViews" value="false"/>
+ <property name="datanucleus.autoStartMechanism" value="None"/>
+ <property name="datanucleus.connectionPoolingType" value="C3P0"/>
+ <property name="datanucleus.implementationCreatorName" value="asm"/>
<!-- Use no classes attribute here - testing null classes behavior -->
<instance-lifecycle-listener
Modified: db/jdo/trunk/tck2/src/conf/jdori-persistence.xml
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/conf/jdori-persistence.xml?rev=652304&r1=652303&r2=652304&view=diff
==============================================================================
--- db/jdo/trunk/tck2/src/conf/jdori-persistence.xml (original)
+++ db/jdo/trunk/tck2/src/conf/jdori-persistence.xml Tue Apr 29 23:51:09 2008
@@ -56,17 +56,17 @@
<property name="javax.jdo.option.RetainValues" value="false"/>
<property name="javax.jdo.mapping.Schema" value="applicationidentity0"/>
<property name="javax.jdo.option.Mapping" value="standard"/>
- <property name="org.jpox.metadata.validate" value="false"/>
- <property name="org.jpox.validateTables" value="false"/>
- <property name="org.jpox.validateConstraints" value="false"/>
- <property name="org.jpox.autoCreateSchema" value="false"/>
- <property name="org.jpox.autoCreateTables" value="false"/>
- <property name="org.jpox.autoCreateConstraints" value="false"/>
- <property name="org.jpox.autoCreateColumns" value="false"/>
- <property name="org.jpox.rdbms.CheckExistTablesOrViews" value="false"/>
- <property name="org.jpox.autoStartMechanism" value="None"/>
- <property name="org.jpox.connectionPoolingType" value="C3P0"/>
- <property name="org.jpox.implementationCreatorName" value="asm"/>
+ <property name="datanucleus.metadata.validate" value="false"/>
+ <property name="datanucleus.validateTables" value="false"/>
+ <property name="datanucleus.validateConstraints" value="false"/>
+ <property name="datanucleus.autoCreateSchema" value="false"/>
+ <property name="datanucleus.autoCreateTables" value="false"/>
+ <property name="datanucleus.autoCreateConstraints" value="false"/>
+ <property name="datanucleus.autoCreateColumns" value="false"/>
+ <property name="datanucleus.rdbms.CheckExistTablesOrViews" value="false"/>
+ <property name="datanucleus.autoStartMechanism" value="None"/>
+ <property name="datanucleus.connectionPoolingType" value="C3P0"/>
+ <property name="datanucleus.implementationCreatorName" value="asm"/>
</properties>
</persistence-unit>
@@ -89,17 +89,17 @@
<property name="javax.jdo.option.RetainValues" value="false"/>
<property name="javax.jdo.mapping.Schema" value="datastoreidentity0"/>
<property name="javax.jdo.option.Mapping" value="standard"/>
- <property name="org.jpox.metadata.validate" value="false"/>
- <property name="org.jpox.validateTables" value="false"/>
- <property name="org.jpox.validateConstraints" value="false"/>
- <property name="org.jpox.autoCreateSchema" value="false"/>
- <property name="org.jpox.autoCreateTables" value="false"/>
- <property name="org.jpox.autoCreateConstraints" value="false"/>
- <property name="org.jpox.autoCreateColumns" value="false"/>
- <property name="org.jpox.rdbms.CheckExistTablesOrViews" value="false"/>
- <property name="org.jpox.autoStartMechanism" value="None"/>
- <property name="org.jpox.connectionPoolingType" value="C3P0"/>
- <property name="org.jpox.implementationCreatorName" value="asm"/>
+ <property name="datanucleus.metadata.validate" value="false"/>
+ <property name="datanucleus.validateTables" value="false"/>
+ <property name="datanucleus.validateConstraints" value="false"/>
+ <property name="datanucleus.autoCreateSchema" value="false"/>
+ <property name="datanucleus.autoCreateTables" value="false"/>
+ <property name="datanucleus.autoCreateConstraints" value="false"/>
+ <property name="datanucleus.autoCreateColumns" value="false"/>
+ <property name="datanucleus.rdbms.CheckExistTablesOrViews" value="false"/>
+ <property name="datanucleus.autoStartMechanism" value="None"/>
+ <property name="datanucleus.connectionPoolingType" value="C3P0"/>
+ <property name="datanucleus.implementationCreatorName" value="asm"/>
</properties>
</persistence-unit>
@@ -114,4 +114,4 @@
<mapping-file>reversemapping/orm.xml</mapping-file>
-->
</persistence-unit>
-</persistence>
\ No newline at end of file
+</persistence>
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.<VENDOR>.layout = org.apache.log4j.PatternLayout
#log4j.appender.<VENDOR>.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