db-jdo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From an...@apache.org
Subject svn commit: r1076009 - in /db/jdo/trunk/tck: build.properties maven.xml project.properties project.xml src/conf/jdori-jdoconfig.xml src/conf/jdori-pmf.properties
Date Tue, 01 Mar 2011 20:05:45 GMT
Author: andyj
Date: Tue Mar  1 20:05:45 2011
New Revision: 1076009

URL: http://svn.apache.org/viewvc?rev=1076009&view=rev
Log:
JDO-676 use DN 3.0 M2

Modified:
    db/jdo/trunk/tck/build.properties
    db/jdo/trunk/tck/maven.xml
    db/jdo/trunk/tck/project.properties
    db/jdo/trunk/tck/project.xml
    db/jdo/trunk/tck/src/conf/jdori-jdoconfig.xml
    db/jdo/trunk/tck/src/conf/jdori-pmf.properties

Modified: db/jdo/trunk/tck/build.properties
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck/build.properties?rev=1076009&r1=1076008&r2=1076009&view=diff
==============================================================================
--- db/jdo/trunk/tck/build.properties (original)
+++ db/jdo/trunk/tck/build.properties Tue Mar  1 20:05:45 2011
@@ -29,7 +29,7 @@
 # Properties for the execution of the TCK
 #
 iut.runtck.sysproperties = -Xmx512m
-iut.runtck.classpath = ${datanucleus.jdori.jarfile}${path.separator}${datanucleus.enhancer.jarfile}${path.separator}${datanucleus.rdbms.jarfile}${path.separator}${datanucleus.jpa.jarfile}${path.separator}${jta.jarfile}${path.separator}${xmlparser}${path.separator}${asm.jarfile}${path.separator}${logging.log4j.jarfile}${path.separator}${datanucleus.connectionpool.jarfile}
+iut.runtck.classpath = ${datanucleus.jdori.jarfile}${path.separator}${datanucleus.enhancer.jarfile}${path.separator}${datanucleus.rdbms.jarfile}${path.separator}${datanucleus.jdo.jarfile}${path.separator}${datanucleus.jpa.jarfile}${path.separator}${jta.jarfile}${path.separator}${xmlparser}${path.separator}${asm.jarfile}${path.separator}${logging.log4j.jarfile}${path.separator}${datanucleus.connectionpool.jarfile}
 
 ##
 # Properties for the execution of the IUT enhancer
@@ -42,7 +42,7 @@ iut.enhancer.main = org.datanucleus.enha
 iut.enhancer.options = -v -d "${enhanced.dir}"
 iut.enhancer.args = ${jdo.tck.jdometadata.files}
 iut.enhancer.sysproperties =
-iut.enhancer.cp = ${datanucleus.enhancer.jarfile}${path.separator}${datanucleus.jdori.jarfile}${path.separator}${logging.log4j.jarfile}${path.separator}${asm.jarfile}
+iut.enhancer.cp = ${datanucleus.enhancer.jarfile}${path.separator}${datanucleus.jdo.jarfile}${path.separator}${datanucleus.jdori.jarfile}${path.separator}${logging.log4j.jarfile}${path.separator}${asm.jarfile}
 
 ##
 # Properties for the datastore

Modified: db/jdo/trunk/tck/maven.xml
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck/maven.xml?rev=1076009&r1=1076008&r2=1076009&view=diff
==============================================================================
--- db/jdo/trunk/tck/maven.xml (original)
+++ db/jdo/trunk/tck/maven.xml Tue Mar  1 20:05:45 2011
@@ -647,6 +647,7 @@
                     <pathelement location="${enhanced.dir}"/>
                 </path>
                 <echo>datanucleus.enhancer.jarfile is ${datanucleus.enhancer.jarfile}</echo>
+                <echo>datanucleus.jdo.jarfile is ${datanucleus.jdo.jarfile}</echo>
                 <echo>datanucleus.jpa.jarfile is ${datanucleus.jpa.jarfile}</echo>
                 <echo>jdori.enhancer.classpath is ${jdori.enhancer.classpath}</echo>
                 <echo>enhance.classpath is ${enhance.classpath}</echo>
@@ -714,6 +715,7 @@
         <pathelement location="${datanucleus.jdori.jarfile}" />
         <pathelement location="${datanucleus.enhancer.jarfile}" />
         <pathelement location="${datanucleus.rdbms.jarfile}" />
+        <pathelement location="${datanucleus.jdo.jarfile}" />
         <pathelement location="${datanucleus.jpa.jarfile}" />
         <pathelement location="${jta.jarfile}" />
         <pathelement location="${xmlparser}" />
@@ -746,6 +748,8 @@
         <pathelement location="${junit.jarfile}"/>
         <!-- Commons-logging jar file (for compiling pa/pc classes) -->
         <pathelement location="${logging.commons.jarfile}"/>
+        <!-- DataNucleus JDO jar file -->
+        <pathelement location="${datanucleus.jdo.jarfile}" />
         <!-- DataNucleus JPA jar file -->
         <pathelement location="${datanucleus.jpa.jarfile}" />
         <!-- JPA jar file -->

Modified: db/jdo/trunk/tck/project.properties
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck/project.properties?rev=1076009&r1=1076008&r2=1076009&view=diff
==============================================================================
--- db/jdo/trunk/tck/project.properties (original)
+++ db/jdo/trunk/tck/project.properties Tue Mar  1 20:05:45 2011
@@ -63,7 +63,8 @@ jdo.api.jarfile = ${pom.getDependencyPat
 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.jpa.jarfile = ${pom.getDependencyPath('org.datanucleus:datanucleus-jpa')}
+datanucleus.jdo.jarfile = ${pom.getDependencyPath('org.datanucleus:datanucleus-api-jdo')}
+datanucleus.jpa.jarfile = ${pom.getDependencyPath('org.datanucleus:datanucleus-api-jpa')}
 asm.jarfile = ${pom.getDependencyPath('asm:asm')}
 junit.jarfile = ${pom.getDependencyPath('junit:junit')}
 jta.jarfile = ${pom.getDependencyPath('javax.transaction:transaction-api')}

Modified: db/jdo/trunk/tck/project.xml
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck/project.xml?rev=1076009&r1=1076008&r2=1076009&view=diff
==============================================================================
--- db/jdo/trunk/tck/project.xml (original)
+++ db/jdo/trunk/tck/project.xml Tue Mar  1 20:05:45 2011
@@ -44,25 +44,31 @@ NOTE!! There are no unit tests in this p
         <dependency>
             <groupId>org.datanucleus</groupId>
             <artifactId>datanucleus-core</artifactId>
-            <version>2.2.2</version>
+            <version>3.0.0-m2</version>
             <url>http://www.datanucleus.org/downloads/maven-nightly</url>
         </dependency>
         <dependency>
             <groupId>org.datanucleus</groupId>
             <artifactId>datanucleus-rdbms</artifactId>
-            <version>2.2.2</version>
+            <version>3.0.0-m2</version>
             <url>http://www.datanucleus.org/downloads/maven-nightly</url>
         </dependency>
         <dependency>
             <groupId>org.datanucleus</groupId>
             <artifactId>datanucleus-enhancer</artifactId>
-            <version>2.1.3</version>
+            <version>3.0.0-m2</version>
             <url>http://www.datanucleus.org/downloads/maven-nightly</url>
         </dependency>
         <dependency>
             <groupId>org.datanucleus</groupId>
-            <artifactId>datanucleus-jpa</artifactId>
-            <version>2.1.5</version>
+            <artifactId>datanucleus-api-jdo</artifactId>
+            <version>3.0.0-m2</version>
+            <url>http://www.datanucleus.org/downloads/maven-nightly</url>
+        </dependency>
+        <dependency>
+            <groupId>org.datanucleus</groupId>
+            <artifactId>datanucleus-api-jpa</artifactId>
+            <version>3.0.0-m2</version>
             <url>http://www.datanucleus.org/downloads/maven-nightly</url>
         </dependency>
         <dependency>

Modified: db/jdo/trunk/tck/src/conf/jdori-jdoconfig.xml
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck/src/conf/jdori-jdoconfig.xml?rev=1076009&r1=1076008&r2=1076009&view=diff
==============================================================================
--- db/jdo/trunk/tck/src/conf/jdori-jdoconfig.xml (original)
+++ db/jdo/trunk/tck/src/conf/jdori-jdoconfig.xml Tue Mar  1 20:05:45 2011
@@ -24,7 +24,7 @@
         Default unnamed pmf
     -->
     <persistence-manager-factory
-        class="org.datanucleus.jdo.JDOPersistenceManagerFactory"
+        class="org.datanucleus.api.jdo.JDOPersistenceManagerFactory"
         connection-driver-name="org.apache.derby.jdbc.EmbeddedDriver"
         connection-url="jdbc:derby:jdotckdb"
         connection-user-name="tckuser"
@@ -52,7 +52,7 @@
     
     <persistence-manager-factory
         name="namedPMF0"
-        class="org.datanucleus.jdo.JDOPersistenceManagerFactory"
+        class="org.datanucleus.api.jdo.JDOPersistenceManagerFactory"
         connection-driver-name="org.apache.derby.jdbc.EmbeddedDriver"
         connection-url="jdbc:derby:jdotckdb"
         connection-user-name="tckuser"
@@ -79,7 +79,7 @@
     
     <persistence-manager-factory
         name=" namedPMF1  "
-        class="org.datanucleus.jdo.JDOPersistenceManagerFactory"
+        class="org.datanucleus.api.jdo.JDOPersistenceManagerFactory"
         connection-driver-name="org.apache.derby.jdbc.EmbeddedDriver"
         connection-url="jdbc:derby:jdotckdb"
         connection-user-name="tckuser"
@@ -106,7 +106,7 @@
     
     <persistence-manager-factory
         name="testInstanceLifecycleListenerStore"
-        class="org.datanucleus.jdo.JDOPersistenceManagerFactory"
+        class="org.datanucleus.api.jdo.JDOPersistenceManagerFactory"
         connection-driver-name="org.apache.derby.jdbc.EmbeddedDriver"
         connection-url="jdbc:derby:jdotckdb"
         connection-user-name="tckuser"
@@ -139,7 +139,7 @@
         
     <persistence-manager-factory
         name="testInstanceLifecycleListenerStoreGetInstance"
-        class="org.datanucleus.jdo.JDOPersistenceManagerFactory"
+        class="org.datanucleus.api.jdo.JDOPersistenceManagerFactory"
         connection-driver-name="org.apache.derby.jdbc.EmbeddedDriver"
         connection-url="jdbc:derby:jdotckdb"
         connection-user-name="tckuser"
@@ -171,7 +171,7 @@
         
     <persistence-manager-factory
         name="testInstanceLifecycleListenerStoreOverrides"
-        class="org.datanucleus.jdo.JDOPersistenceManagerFactory"
+        class="org.datanucleus.api.jdo.JDOPersistenceManagerFactory"
         connection-driver-name="org.apache.derby.jdbc.EmbeddedDriver"
         connection-url="jdbc:derby:jdotckdb"
         connection-user-name="tckuser"
@@ -201,7 +201,7 @@
         
     <persistence-manager-factory
         name="testInstanceLifecycleListenerClassesNull"
-        class="org.datanucleus.jdo.JDOPersistenceManagerFactory"
+        class="org.datanucleus.api.jdo.JDOPersistenceManagerFactory"
         connection-driver-name="org.apache.derby.jdbc.EmbeddedDriver"
         connection-url="jdbc:derby:jdotckdb"
         connection-user-name="tckuser"

Modified: db/jdo/trunk/tck/src/conf/jdori-pmf.properties
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck/src/conf/jdori-pmf.properties?rev=1076009&r1=1076008&r2=1076009&view=diff
==============================================================================
--- db/jdo/trunk/tck/src/conf/jdori-pmf.properties (original)
+++ db/jdo/trunk/tck/src/conf/jdori-pmf.properties Tue Mar  1 20:05:45 2011
@@ -18,7 +18,7 @@
 # -------------------------------------------------------------------
 #
 # JDORI PMF Properties
-javax.jdo.PersistenceManagerFactoryClass=org.datanucleus.jdo.JDOPersistenceManagerFactory
+javax.jdo.PersistenceManagerFactoryClass=org.datanucleus.api.jdo.JDOPersistenceManagerFactory
 javax.jdo.option.ConnectionDriverName=org.apache.derby.jdbc.EmbeddedDriver
 javax.jdo.option.ConnectionURL=jdbc:derby:jdotckdb
 javax.jdo.option.ConnectionUserName=tckuser
@@ -38,9 +38,9 @@ datanucleus.autoCreateConstraints=false
 datanucleus.autoCreateColumns=false
 datanucleus.rdbms.CheckExistTablesOrViews=false
 datanucleus.autoStartMechanism=None
-#datanucleus.initializePrimaryKeyColumnInfo=true
 #datanucleus.connectionPoolingType=DBCP
 datanucleus.connectionPoolingType=C3P0
+#datanucleus.connectionPool.maxStatements=20
 datanucleus.implementationCreatorName=asm
 datanucleus.rdbms.omitDatabaseMetaDataGetColumns=true
-#datanucleus.query.JDOQL.implementation=JDOQL2
+



Mime
View raw message