db-jdo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mcai...@apache.org
Subject svn commit: r637306 - in /db/jdo/branches/2.1: README.txt api2-legacy/project.xml api2/project.xml enhancer20/project.xml model20/project.xml tck2-legacy/RunRules.html tck2-legacy/project.xml tck2/RunRules.html tck2/project.xml util20/project.xml
Date Fri, 14 Mar 2008 23:53:10 GMT
Author: mcaisse
Date: Fri Mar 14 16:53:08 2008
New Revision: 637306

URL: http://svn.apache.org/viewvc?rev=637306&view=rev
Log:
JDO-561, JDO-562 Updated version numbers in */project.xml. Updated RunRules.html (2x) and
README.txt for 2.1.

Modified:
    db/jdo/branches/2.1/README.txt
    db/jdo/branches/2.1/api2-legacy/project.xml
    db/jdo/branches/2.1/api2/project.xml
    db/jdo/branches/2.1/enhancer20/project.xml
    db/jdo/branches/2.1/model20/project.xml
    db/jdo/branches/2.1/tck2-legacy/RunRules.html
    db/jdo/branches/2.1/tck2-legacy/project.xml
    db/jdo/branches/2.1/tck2/RunRules.html
    db/jdo/branches/2.1/tck2/project.xml
    db/jdo/branches/2.1/util20/project.xml

Modified: db/jdo/branches/2.1/README.txt
URL: http://svn.apache.org/viewvc/db/jdo/branches/2.1/README.txt?rev=637306&r1=637305&r2=637306&view=diff
==============================================================================
--- db/jdo/branches/2.1/README.txt (original)
+++ db/jdo/branches/2.1/README.txt Fri Mar 14 16:53:08 2008
@@ -1,18 +1,27 @@
 This is the official release of the JDO 2 project. It includes
-the JDO 2.0 TCK and its dependencies:
+the JDO 2.1 TCK and its dependencies:
 
-- api20 contains source to build jdo.jar, which defines the JDO API version 2.0
+- api2 contains source to build jdo2-api-2.1.jar, which defines the JDO API
+  version 2.1 for Java 1.5 and later.
+- api2-legacy contains source to build jdo2-api-legacy-2.1.jar, which defines
+  the JDO API version 2.1 for Java 1.4 and earlier.
 - core20 contains the JDO2 core, including utility and metadata model classes
 - enhancer20 contains the utility classes used for verifying enhanced files
-- tck20 contains the JDO 2.0 Technology Compatibility Kit
+- tck2 contains the JDO 2.1 Technology Compatibility Kit for Java 1.5 and later.
+- tck2-legacy contains the JDO 2.1 Technology Compatibility Kit for Java 1.4
+  and earlier.
 
 -------------
 Prerequisites
 -------------
 
+The following are needed to successfully run the TCK. (For complete rules for
+certifying a JDO implementation, see RunRules.html in the top level
+tck2 or tck2-legacy project directory.)
+
 - Maven
-You must have Maven version 1.0.1 or 1.0.2 to build the projects from source
-and to execute the TCK. You can download maven from 
+You must have Maven version 1.0.1, 1.0.2, or 1.1 to build the projects
+from source and to execute the TCK. You can download maven from 
 http://maven.apache.org/start/download.html
 
 Note that maven uses the user.home system property for the location
@@ -23,7 +32,7 @@
 MAVEN_OPTS.
 
 - JNDI implementation (fscontext.jar and providerutil.jar)
-The JNDI test cases in tck20 need a JNDI implementation.
+The JNDI test cases in tck2 need a JNDI implementation.
 The TCK is configured to use Sun's JNDI implementation.
 To use your own implementation, put the implementation
 jar files into lib/ext and update jndi.properties in the TCK directory
@@ -34,15 +43,12 @@
 the downloaded zip. It includes the jars fscontext.jar and providerutil.jar.
 
 - JPOX
-The Reference Implementation for JDO 2.0 is JPOX 1.1.0. The tck20 subproject 
+The Reference Implementation for JDO 2.1 is JPOX 1.2. The tck2 subproject 
 automatically downloads the JPOX jar files via maven configuration.
 
-- derby
-The default datastore for tck20 is derby. The tck20 subproject 
-automatically downloads version 10.1.1.0 of derby and derbytools.
-NOTE!! Mac OSX users must uncomment derby.storage.fileSyncTransactionLog=true 
-in tck20/src/conf/derby.properties. For details, please see the Derby JIRA 
-issue DERBY-1 at http://issues.apache.org/jira/browse/DERBY-1
+- Derby
+The default datastore for tck2 is Apache Derby. The tck2 subproject 
+automatically downloads version 10.2.1.6 of derby.jar and derbytools.jar.
 
 -------
 Notes
@@ -61,7 +67,7 @@
 You find download instructions in http://mevenide.codehaus.org/download.html.
 For Netbeans, once you installed the plugin, you should be able to open an 
 existing maven project by File -> Open Project -> Open Project Folder.
-Navigate to a directory including a maven project (e.g. api20) and choose this 
+Navigate to a directory including a maven project (e.g. api2) and choose this 
 directory. Netbeans will create a project folder. If you right-click the Maven 
 project you can examine the contents of the project.xml (see Properties) or 
 execute goals.
@@ -70,14 +76,12 @@
 Running the TCK
 -------
 
-This version of the TCK is final.  
-
-In the tck20 project, run "maven build" to build the tck.  This will 
+In the tck2 project, run "maven build" to build the tck.  This will 
 compile, enhance, install the schemas, and run all the tests on the RI on all 
 supported databases and identitytypes.
 
 You may use the following custom goals and command line options
-with the tck20 project:
+with the tck2 project:
 
 Custom Goals:
     * help - displays help text describing custom goals and options
@@ -91,12 +95,12 @@
                      on the JDO RI
     * debugtck.iut - waits for a debugger to attach and then runs the TCK
                      on the implementation under test
-
+    * cleanClasses - deletes classes and enhanced classes
 
 Command Line Options:
     -Djdo.tck.cfglist=<configuration file list>
           Overrides the definition of jdo.tck.cfglist found in
-          tck20/src/conf/configuration.list by supplying
+          tck2/src/conf/configuration.list by supplying
           one or more space-separated test configuration files.
           Test configuration files typically have the .conf extension.
           To run a single test, create a .conf file (copy an existing
@@ -120,7 +124,6 @@
 
       -Djdo.tck.debug.jvmargs=xxx - the "-Xdebug ..." arguments in the event
             you want to supply your own debug directives
-
 
 Maven looks for the following configuration files in src/conf:
     * configurations.list

Modified: db/jdo/branches/2.1/api2-legacy/project.xml
URL: http://svn.apache.org/viewvc/db/jdo/branches/2.1/api2-legacy/project.xml?rev=637306&r1=637305&r2=637306&view=diff
==============================================================================
--- db/jdo/branches/2.1/api2-legacy/project.xml (original)
+++ db/jdo/branches/2.1/api2-legacy/project.xml Fri Mar 14 16:53:08 2008
@@ -25,7 +25,7 @@
     <name>JDO2 API Legacy</name>
     <groupId>javax.jdo</groupId>
     <artifactId>jdo2-api-legacy</artifactId>
-    <currentVersion>2.1-SNAPSHOT</currentVersion>
+    <currentVersion>2.1</currentVersion>
     <package>javax.jdo</package>
     <shortDescription>Java Data Objects 2.1 (JDO) API legacy</shortDescription>
     <description>The Java Data Objects 2.1 (JDO) API is a standard interface-based


Modified: db/jdo/branches/2.1/api2/project.xml
URL: http://svn.apache.org/viewvc/db/jdo/branches/2.1/api2/project.xml?rev=637306&r1=637305&r2=637306&view=diff
==============================================================================
--- db/jdo/branches/2.1/api2/project.xml (original)
+++ db/jdo/branches/2.1/api2/project.xml Fri Mar 14 16:53:08 2008
@@ -25,7 +25,7 @@
     <name>JDO2 API</name>
     <groupId>javax.jdo</groupId>
     <artifactId>jdo2-api</artifactId>
-    <currentVersion>2.1-SNAPSHOT</currentVersion>
+    <currentVersion>2.1</currentVersion>
     <package>javax.jdo</package>
     <shortDescription>Java Data Objects 2.1 (JDO) API</shortDescription>
     <description>The Java Data Objects 2.1 (JDO) API is a standard interface-based


Modified: db/jdo/branches/2.1/enhancer20/project.xml
URL: http://svn.apache.org/viewvc/db/jdo/branches/2.1/enhancer20/project.xml?rev=637306&r1=637305&r2=637306&view=diff
==============================================================================
--- db/jdo/branches/2.1/enhancer20/project.xml (original)
+++ db/jdo/branches/2.1/enhancer20/project.xml Fri Mar 14 16:53:08 2008
@@ -26,7 +26,7 @@
     <name>JDO2 Implementation (Enhancer)</name>
     <groupId>org.apache.jdo</groupId>
     <artifactId>jdo2-enhancer</artifactId>
-    <currentVersion>2.1-SNAPSHOT</currentVersion>
+    <currentVersion>2.1</currentVersion>
     <package>org.apache.jdo</package>
     <shortDescription>Java Data Objects 2.0 (JDO) Enhancer</shortDescription>
     <description>The Java Data Objects 2.0 (JDO) API is a standard interface-based

@@ -39,17 +39,17 @@
         <dependency>
             <groupId>javax.jdo</groupId>
             <artifactId>jdo2-api</artifactId>
-            <version>2.1-SNAPSHOT</version>
+            <version>2.1</version>
         </dependency>
         <dependency>
             <groupId>org.apache.jdo</groupId>
             <artifactId>jdo2-util</artifactId>
-            <version>2.1-SNAPSHOT</version>
+            <version>2.1</version>
         </dependency>
         <dependency>
             <groupId>org.apache.jdo</groupId>
             <artifactId>jdo2-model</artifactId>
-            <version>2.1-SNAPSHOT</version>
+            <version>2.1</version>
         </dependency>
         <dependency>
             <groupId>commons-logging</groupId>

Modified: db/jdo/branches/2.1/model20/project.xml
URL: http://svn.apache.org/viewvc/db/jdo/branches/2.1/model20/project.xml?rev=637306&r1=637305&r2=637306&view=diff
==============================================================================
--- db/jdo/branches/2.1/model20/project.xml (original)
+++ db/jdo/branches/2.1/model20/project.xml Fri Mar 14 16:53:08 2008
@@ -26,7 +26,7 @@
     <name>JDO2 Implementation (Model)</name>
     <groupId>org.apache.jdo</groupId>
     <artifactId>jdo2-model</artifactId>
-    <currentVersion>2.1-SNAPSHOT</currentVersion>
+    <currentVersion>2.1</currentVersion>
     <package>org.apache.jdo</package>
     <shortDescription>Java Data Objects 2.0 (JDO) Model</shortDescription>
     <description>The Java Data Objects 2.0 (JDO) API is a standard interface-based

@@ -39,7 +39,7 @@
         <dependency>
             <groupId>org.apache.jdo</groupId>
             <artifactId>jdo2-util</artifactId>
-            <version>2.1-SNAPSHOT</version>
+            <version>2.1</version>
         </dependency>
         <dependency>
             <groupId>commons-logging</groupId>

Modified: db/jdo/branches/2.1/tck2-legacy/RunRules.html
URL: http://svn.apache.org/viewvc/db/jdo/branches/2.1/tck2-legacy/RunRules.html?rev=637306&r1=637305&r2=637306&view=diff
==============================================================================
--- db/jdo/branches/2.1/tck2-legacy/RunRules.html (original)
+++ db/jdo/branches/2.1/tck2-legacy/RunRules.html Fri Mar 14 16:53:08 2008
@@ -18,7 +18,7 @@
 <HTML>
 <HEAD>
 	<META HTTP-EQUIV="CONTENT-TYPE" CONTENT="text/html; charset=utf-8">
-	<TITLE>JDO 2.0 Technology Compatibility Kit Run Rules</TITLE>
+	<TITLE>JDO 2.1 Technology Compatibility Kit Run Rules</TITLE>
 	<META NAME="GENERATOR" CONTENT="NeoOffice/J 1.1  (Unix)">
 	<META NAME="CREATED" CONTENT="20051228;16322200">
 	<META NAME="CHANGED" CONTENT="20060412;21332100">
@@ -29,10 +29,10 @@
 	</STYLE>
 </HEAD>
 <BODY LANG="en-US" DIR="LTR">
-<H1 ALIGN=CENTER>Running the JDO 2.0 Technology Compatibility Kit</H1>
+<H1 ALIGN=CENTER>Running the JDO 2.1 Technology Compatibility Kit</H1>
 <P ALIGN=CENTER><BR><BR>
 </P>
-<P ALIGN=CENTER>13-Apr-2006</P>
+<P ALIGN=CENTER>17-March-2008</P>
 <P STYLE="margin-top: 0.17in; page-break-after: avoid"><FONT FACE="Albany, sans-serif"><FONT
SIZE=4>Overview</FONT></FONT></P>
 <P>In order to demonstrate compliance with the Java Data Objects
 specification, an implementation must successfully run all of the TCK
@@ -45,7 +45,7 @@
 configuration information and test results. For an example of the
 required posting, please see <A HREF="http://db.apache.org/jdo/tck/final">http://db.apache.org/jdo/tck/final</A>.</P>
 <P STYLE="margin-top: 0.17in; page-break-after: avoid"><FONT FACE="Albany, sans-serif"><FONT
SIZE=4>Prerequisites</FONT></FONT></P>
-<P>In order to run the TCK, you must install maven 1.0.1 or 1.0.2.
+<P>In order to run the TCK, you must install maven 1.x.x.
 M<FONT FACE="Times New Roman, serif">aven
 </FONT><A HREF="http://maven.apache.org/maven-1.x/"><FONT FACE="Times New
Roman, serif"><FONT COLOR="#000000">http://maven.apache.org/maven-1.x/
 </FONT></FONT></A><FONT FACE="Times New Roman, serif">is the</FONT>
@@ -53,7 +53,9 @@
 <P>You must test the IUT on all configurations that the IUT supports.
 This includes different hardware and operating systems, different
 versions of Java, and different datastores. The TCK supports Java
-versions from JDK 1.3 to 1.5.</P>
+versions from JDK 1.3 to 1.6. Use the tck2-legacy project to test on Java
+versions 1.4
+and earlier, and tck2 to test on Java versions 1.5 and later.</P>
 <P STYLE="margin-top: 0.17in; page-break-after: avoid"><FONT FACE="Albany, sans-serif"><FONT
SIZE=4>Installation</FONT></FONT></P>
 <P>Download the zip file from the distribution location.  Unpack the zip
 file into a directory of your choice. In this directory you will
@@ -79,7 +81,7 @@
 		README.txt for information on how to configure a different JNDI
 		implementation.</FONT></FONT></P>
 		<LI><P>the TCK directory, which has a release-specific name (e.g.
-		jdo2-tck-2.0) and contains:</P>
+		jdo2-tck-2.1) and contains:</P>
 		<UL>
 			<LI><P>maven.xml, project.properties, project.xml - the maven
 			definition of the project. These files must not be modified.</P>
@@ -113,16 +115,17 @@
 				persistent classes used in the tests. These files must not be
 				modified.</P>
 				<LI><P>orm - this directory contains .orm metadata files to map
-				the persistent classes to the sql tables. These files must not be
-				modified except to add DDL-generation information (which is not
-				used by the TCK).</P>
+                the persistent classes to the sql tables. These files must not
+                be modified except to add DDL-generation information
+                (which is not used by the TCK).</P>
 				<LI><P>java - this directory contains the source code to the TCK
 				tests. These files must not be modified.</P>
 				<LI><P>conf - this directory contains the configuration
-				information for the test runs. The file iut-pmf.properties in
-				this directory must be changed to provide properties for the IUT
-				persistence manager factory. The file jndi.properties may be
-				changed to use a different jndi provider. Other files must not be
+                information for the test runs. The files iut-pmf.properties,
+                iut-jdoconfig.xml, and iut-persistence.xml in this directory
+                must be changed to provide properties for the IUT persistence
+                manager factory.  The file jndi.properties may be changed
+                to use a different jndi provider. Other files must not be
 				modified, except to put a successfully challenged test case into
 				the trunk/tck20/test/conf/exclude.list. Please see below.</P>
 			</UL>
@@ -139,10 +142,14 @@
 enhancement (optional) environment. These properties begin with
 iut.runtck and iut.enhancer. 
 </P>
-<P>There is one properties files that must be modified to be
-IUT-specific. The iut-pmf.properties file in the TCK src/conf
-directory contains information used to construct the
-PersistenceManagerFactory used in the tests.</P>
+<P>There is are three properties files that must be modified to be
+IUT-specific, all located in the TCK src/conf directory. The
+iut-pmf.properties file contains information used to construct the
+PersistenceManagerFactory used in the tests. iut-jdoconfig.xml and
+iut-persistence.xml also contain PersistenceManagerFactory properties
+used only in tests in the
+org.apache.jdo.tck.api.persistencemanagerfactory.config package.
+</P>
 <P>SQL DDL files are provided for the sql table definitions. The
 existing files must not be changed, but files may be added in the
 directory in order to provide DDL for additional databases supported

Modified: db/jdo/branches/2.1/tck2-legacy/project.xml
URL: http://svn.apache.org/viewvc/db/jdo/branches/2.1/tck2-legacy/project.xml?rev=637306&r1=637305&r2=637306&view=diff
==============================================================================
--- db/jdo/branches/2.1/tck2-legacy/project.xml (original)
+++ db/jdo/branches/2.1/tck2-legacy/project.xml Fri Mar 14 16:53:08 2008
@@ -24,7 +24,7 @@
     <name>JDO2 Technology Compatibility Kit Legacy</name>
     <groupId>org.apache.jdo</groupId>
     <artifactId>jdo2-tck-legacy</artifactId>
-    <currentVersion>2.1-SNAPSHOT</currentVersion>
+    <currentVersion>2.1</currentVersion>
     <package>org.apache.jdo.tck</package>
     <shortDescription>Java Data Objects 2.0 (JDO) TCK Legacy</shortDescription>
     <description>The Java Data Objects 2.0 (JDO) API is a standard interface-based
Java model abstraction of persistence, developed as Java Specification Request JSR 243 under
the auspices of the Java Community Process. The Legacy version works with Java SE 1.3.
@@ -39,39 +39,39 @@
         <dependency>
             <groupId>javax.jdo</groupId>
             <artifactId>jdo2-api-legacy</artifactId>
-            <version>2.1-SNAPSHOT</version>
+            <version>2.1</version>
         </dependency>
         <dependency>
             <groupId>org.apache.jdo</groupId>
             <artifactId>jdo2-enhancer</artifactId>
-            <version>2.1-SNAPSHOT</version>
+            <version>2.1</version>
         </dependency>
         <dependency>
             <groupId>org.apache.jdo</groupId>
             <artifactId>jdo2-util</artifactId>
-            <version>2.1-SNAPSHOT</version>
+            <version>2.1</version>
         </dependency>
         <dependency>
             <groupId>org.apache.jdo</groupId>
             <artifactId>jdo2-model</artifactId>
-            <version>2.1-SNAPSHOT</version>
+            <version>2.1</version>
         </dependency>
         <dependency>
             <groupId>jpox</groupId>
             <artifactId>jpox-core</artifactId>
-            <version>1.2-SNAPSHOT</version>
+            <version>1.2</version>
             <url>http://www.jpox.org/downloads/maven-nightly</url>
         </dependency>
         <dependency>
             <groupId>jpox</groupId>
             <artifactId>jpox-rdbms</artifactId>
-            <version>1.2-SNAPSHOT</version>
+            <version>1.2</version>
             <url>http://www.jpox.org/downloads/maven-nightly</url>
         </dependency>
         <dependency>
             <groupId>jpox</groupId>
             <artifactId>jpox-enhancer</artifactId>
-            <version>1.2-SNAPSHOT</version>
+            <version>1.2</version>
             <url>http://www.jpox.org/downloads/maven-nightly</url>
         </dependency>
         <dependency>
@@ -123,13 +123,13 @@
         <dependency>
             <groupId>jpox</groupId>
             <artifactId>jpox-c3p0</artifactId>
-            <version>1.2-SNAPSHOT</version>
+            <version>1.2</version>
             <url>http://www.jpox.org/downloads/maven-nightly</url>
         </dependency>
         <dependency>
             <groupId>jpox</groupId>
             <artifactId>jpox-dbcp</artifactId>
-            <version>1.2-SNAPSHOT</version>
+            <version>1.2</version>
             <url>http://www.jpox.org/downloads/maven-nightly</url>
         </dependency>
         <dependency>

Modified: db/jdo/branches/2.1/tck2/RunRules.html
URL: http://svn.apache.org/viewvc/db/jdo/branches/2.1/tck2/RunRules.html?rev=637306&r1=637305&r2=637306&view=diff
==============================================================================
--- db/jdo/branches/2.1/tck2/RunRules.html (original)
+++ db/jdo/branches/2.1/tck2/RunRules.html Fri Mar 14 16:53:08 2008
@@ -18,7 +18,7 @@
 <HTML>
 <HEAD>
 	<META HTTP-EQUIV="CONTENT-TYPE" CONTENT="text/html; charset=utf-8">
-	<TITLE>JDO 2.0 Technology Compatibility Kit Run Rules</TITLE>
+	<TITLE>JDO 2.1 Technology Compatibility Kit Run Rules</TITLE>
 	<META NAME="GENERATOR" CONTENT="NeoOffice/J 1.1  (Unix)">
 	<META NAME="CREATED" CONTENT="20051228;16322200">
 	<META NAME="CHANGED" CONTENT="20060412;21332100">
@@ -29,10 +29,10 @@
 	</STYLE>
 </HEAD>
 <BODY LANG="en-US" DIR="LTR">
-<H1 ALIGN=CENTER>Running the JDO 2.0 Technology Compatibility Kit</H1>
+<H1 ALIGN=CENTER>Running the JDO 2.1 Technology Compatibility Kit</H1>
 <P ALIGN=CENTER><BR><BR>
 </P>
-<P ALIGN=CENTER>13-Apr-2006</P>
+<P ALIGN=CENTER>17-March-2008</P>
 <P STYLE="margin-top: 0.17in; page-break-after: avoid"><FONT FACE="Albany, sans-serif"><FONT
SIZE=4>Overview</FONT></FONT></P>
 <P>In order to demonstrate compliance with the Java Data Objects
 specification, an implementation must successfully run all of the TCK
@@ -45,7 +45,7 @@
 configuration information and test results. For an example of the
 required posting, please see <A HREF="http://db.apache.org/jdo/tck/final">http://db.apache.org/jdo/tck/final</A>.</P>
 <P STYLE="margin-top: 0.17in; page-break-after: avoid"><FONT FACE="Albany, sans-serif"><FONT
SIZE=4>Prerequisites</FONT></FONT></P>
-<P>In order to run the TCK, you must install maven 1.0.1 or 1.0.2.
+<P>In order to run the TCK, you must install maven 1.x.x.
 M<FONT FACE="Times New Roman, serif">aven
 </FONT><A HREF="http://maven.apache.org/maven-1.x/"><FONT FACE="Times New
Roman, serif"><FONT COLOR="#000000">http://maven.apache.org/maven-1.x/
 </FONT></FONT></A><FONT FACE="Times New Roman, serif">is the</FONT>
@@ -53,7 +53,9 @@
 <P>You must test the IUT on all configurations that the IUT supports.
 This includes different hardware and operating systems, different
 versions of Java, and different datastores. The TCK supports Java
-versions from JDK 1.3 to 1.5.</P>
+versions from JDK 1.3 to 1.6. Use the tck2-legacy project to test on Java
+versions 1.4
+and earlier, and tck2 to test on Java versions 1.5 and later.</P>
 <P STYLE="margin-top: 0.17in; page-break-after: avoid"><FONT FACE="Albany, sans-serif"><FONT
SIZE=4>Installation</FONT></FONT></P>
 <P>Download the zip file from the distribution location.  Unpack the zip
 file into a directory of your choice. In this directory you will
@@ -79,7 +81,7 @@
 		README.txt for information on how to configure a different JNDI
 		implementation.</FONT></FONT></P>
 		<LI><P>the TCK directory, which has a release-specific name (e.g.
-		jdo2-tck-2.0) and contains:</P>
+		jdo2-tck-2.1) and contains:</P>
 		<UL>
 			<LI><P>maven.xml, project.properties, project.xml - the maven
 			definition of the project. These files must not be modified.</P>
@@ -113,16 +115,17 @@
 				persistent classes used in the tests. These files must not be
 				modified.</P>
 				<LI><P>orm - this directory contains .orm metadata files to map
-				the persistent classes to the sql tables. These files must not be
-				modified except to add DDL-generation information (which is not
-				used by the TCK).</P>
+                the persistent classes to the sql tables. These files must not
+                be modified except to add DDL-generation information
+                (which is not used by the TCK).</P>
 				<LI><P>java - this directory contains the source code to the TCK
 				tests. These files must not be modified.</P>
 				<LI><P>conf - this directory contains the configuration
-				information for the test runs. The file iut-pmf.properties in
-				this directory must be changed to provide properties for the IUT
-				persistence manager factory. The file jndi.properties may be
-				changed to use a different jndi provider. Other files must not be
+                information for the test runs. The files iut-pmf.properties,
+                iut-jdoconfig.xml, and iut-persistence.xml in this directory
+                must be changed to provide properties for the IUT persistence
+                manager factory.  The file jndi.properties may be changed
+                to use a different jndi provider. Other files must not be
 				modified, except to put a successfully challenged test case into
 				the trunk/tck20/test/conf/exclude.list. Please see below.</P>
 			</UL>
@@ -139,10 +142,14 @@
 enhancement (optional) environment. These properties begin with
 iut.runtck and iut.enhancer. 
 </P>
-<P>There is one properties files that must be modified to be
-IUT-specific. The iut-pmf.properties file in the TCK src/conf
-directory contains information used to construct the
-PersistenceManagerFactory used in the tests.</P>
+<P>There is are three properties files that must be modified to be
+IUT-specific, all located in the TCK src/conf directory. The
+iut-pmf.properties file contains information used to construct the
+PersistenceManagerFactory used in the tests. iut-jdoconfig.xml and
+iut-persistence.xml also contain PersistenceManagerFactory properties
+used only in tests in the
+org.apache.jdo.tck.api.persistencemanagerfactory.config package.
+</P>
 <P>SQL DDL files are provided for the sql table definitions. The
 existing files must not be changed, but files may be added in the
 directory in order to provide DDL for additional databases supported

Modified: db/jdo/branches/2.1/tck2/project.xml
URL: http://svn.apache.org/viewvc/db/jdo/branches/2.1/tck2/project.xml?rev=637306&r1=637305&r2=637306&view=diff
==============================================================================
--- db/jdo/branches/2.1/tck2/project.xml (original)
+++ db/jdo/branches/2.1/tck2/project.xml Fri Mar 14 16:53:08 2008
@@ -24,7 +24,7 @@
     <name>JDO2 Technology Compatibility Kit</name>
     <groupId>org.apache.jdo</groupId>
     <artifactId>jdo2-tck</artifactId>
-    <currentVersion>2.1-SNAPSHOT</currentVersion>
+    <currentVersion>2.1</currentVersion>
     <package>org.apache.jdo.tck</package>
     <shortDescription>Java Data Objects 2.0 (JDO) TCK</shortDescription>
     <description>The Java Data Objects 2.0 (JDO) API is a standard interface-based
Java model abstraction of persistence, developed as Java Specification Request JSR 243 under
the auspices of the Java Community Process.
@@ -39,45 +39,45 @@
         <dependency>
             <groupId>javax.jdo</groupId>
             <artifactId>jdo2-api</artifactId>
-            <version>2.1-SNAPSHOT</version>
+            <version>2.1</version>
         </dependency>
         <dependency>
             <groupId>org.apache.jdo</groupId>
             <artifactId>jdo2-enhancer</artifactId>
-            <version>2.1-SNAPSHOT</version>
+            <version>2.1</version>
         </dependency>
         <dependency>
             <groupId>org.apache.jdo</groupId>
             <artifactId>jdo2-util</artifactId>
-            <version>2.1-SNAPSHOT</version>
+            <version>2.1</version>
         </dependency>
         <dependency>
             <groupId>org.apache.jdo</groupId>
             <artifactId>jdo2-model</artifactId>
-            <version>2.1-SNAPSHOT</version>
+            <version>2.1</version>
         </dependency>
         <dependency>
             <groupId>jpox</groupId>
             <artifactId>jpox-core</artifactId>
-            <version>1.2-SNAPSHOT</version>
+            <version>1.2</version>
             <url>http://www.jpox.org/downloads/maven-nightly</url>
         </dependency>
         <dependency>
             <groupId>jpox</groupId>
             <artifactId>jpox-rdbms</artifactId>
-            <version>1.2-SNAPSHOT</version>
+            <version>1.2</version>
             <url>http://www.jpox.org/downloads/maven-nightly</url>
         </dependency>
         <dependency>
             <groupId>jpox</groupId>
             <artifactId>jpox-enhancer</artifactId>
-            <version>1.2-SNAPSHOT</version>
+            <version>1.2</version>
             <url>http://www.jpox.org/downloads/maven-nightly</url>
         </dependency>
         <dependency>
             <groupId>jpox</groupId>
             <artifactId>jpox-java5</artifactId>
-            <version>1.2-SNAPSHOT</version>
+            <version>1.2</version>
             <url>http://www.jpox.org/downloads/maven-nightly</url>
         </dependency>
         <dependency>
@@ -130,13 +130,13 @@
         <dependency>
             <groupId>jpox</groupId>
             <artifactId>jpox-c3p0</artifactId>
-            <version>1.2-SNAPSHOT</version>
+            <version>1.2</version>
             <url>http://www.jpox.org/downloads/maven-nightly</url>
         </dependency>
         <dependency>
             <groupId>jpox</groupId>
             <artifactId>jpox-dbcp</artifactId>
-            <version>1.2-SNAPSHOT</version>
+            <version>1.2</version>
             <url>http://www.jpox.org/downloads/maven-nightly</url>
         </dependency>
         <dependency>

Modified: db/jdo/branches/2.1/util20/project.xml
URL: http://svn.apache.org/viewvc/db/jdo/branches/2.1/util20/project.xml?rev=637306&r1=637305&r2=637306&view=diff
==============================================================================
--- db/jdo/branches/2.1/util20/project.xml (original)
+++ db/jdo/branches/2.1/util20/project.xml Fri Mar 14 16:53:08 2008
@@ -26,7 +26,7 @@
     <name>JDO2 Implementation (Util)</name>
     <groupId>org.apache.jdo</groupId>
     <artifactId>jdo2-util</artifactId>
-    <currentVersion>2.1-SNAPSHOT</currentVersion>
+    <currentVersion>2.1</currentVersion>
     <package>org.apache.jdo</package>
     <shortDescription>Java Data Objects 2.0 (JDO) Util</shortDescription>
     <description>The Java Data Objects 2.0 (JDO) API is a standard interface-based

@@ -39,7 +39,7 @@
         <dependency>
             <groupId>javax.jdo</groupId>
             <artifactId>jdo2-api</artifactId>
-            <version>2.1-SNAPSHOT</version>
+            <version>2.1</version>
         </dependency>
         <dependency>
             <groupId>commons-logging</groupId>



Mime
View raw message