Hi,
I propose to adapt the README.html and the RunRules.html under tck.
Attached you find a patch, please have a look.
Regards Michael
Hi Andy, hi Craig,
I renamed all the 2.3 Metadata artifacts to 3.0, e.g jdo_2_3.xsd to
jdo_3_0.xsd, etc. (see revision 947505). I changed all the .jdo,
.jdoquery and .orm files in tck to refer the 3.0 xsd files.
I also added a JDO3.MF Manifest file to the root directory and changed
the projects.properties in api and tck to refer JDO3.MF and API3.MF.
Regards Michael
Hi Craig,
Will this be affected by renaming all the schema files in api/src/
schema/javax/jdo?
There won't be a jdo_2_3.xsd or any other 2_3 artifacts, just 3.0. And
the content will also be changed.
Good point.
I've just added "3.0" DTD/XSD local variants into the "datanucleus-core" jar
that we use when people specify those in their XML files. Since we'll have
users who may have specified "2.3" variants in their XML files, I'll retain
support for those and direct them to the 3.0 local copies. Will be in our
nightly builds from tonight.
--
*Michael Bouschen*
*Prokurist*
akquinet t...@spree GmbH
Bülowstr. 66, D-10783 Berlin
Fon: +49 30 235 520-33
Fax: +49 30 217 520-12
Email: [email protected]
Url: www.akquinet.de <http://www.akquinet.de>
akquinet t...@spree GmbH, Berlin
Geschäftsführung: Martin Weber, Prof. Dr. Christian Roth
Amtsgericht Berlin-Charlottenburg HRB 86780 B
USt.-Id. Nr.: DE 225 964 680
Index: README.html
===================================================================
--- README.html (Revision 947754)
+++ README.html (Arbeitskopie)
@@ -18,10 +18,10 @@
<HTML>
<HEAD>
<META HTTP-EQUIV="CONTENT-TYPE" CONTENT="text/html; charset=utf-8">
- <TITLE>JDO 2 TCK README</TITLE>
+ <TITLE>JDO 3 TCK README</TITLE>
</HEAD>
<BODY LANG="en-US" DIR="LTR">
-<H1>The JDO 2 Technology Compatibility Kit</H1>
+<H1>The JDO 3 Technology Compatibility Kit</H1>
<UL>
<LI><a href="#overview">Overview</a></LI>
<!-- For minor release change documentation
@@ -43,23 +43,19 @@
</UL></LI>
</UL>
<a name="overview"></a>
-<H2>Overview of the JDO 2 Technology Compatibility Kit</H2>
+<H2>Overview of the JDO 3 Technology Compatibility Kit</H2>
<p>
-The JDO 2 project includes the JDO 2 TCK and its dependencies:
+The JDO 3 project includes the JDO 3 TCK and its dependencies:
</p>
<UL>
- <LI>api2 contains source to build jdo2-api-2.3.jar, which defines the JDO
API version 2.3 for Java 1.5 and later.</LI>
- <LI>api2-legacy contains source to build jdo2-api-legacy-2.3.jar, which
defines the JDO API version 2.3 for Java 1.4 and earlier. *** THIS IS
DEPRECATED IN JDO2.3+</LI>
- <LI>core20 contains the JDO2 core, including utility and metadata model
classes</LI>
- <LI>enhancer20 contains the utility classes used for verifying enhanced
files</LI>
- <LI>tck2 contains the JDO 2.3 Technology Compatibility Kit for Java 1.5
and later.</LI>
- <LI>tck2-legacy contains the JDO 2.3 Technology Compatibility Kit for Java
1.4 and earlier. *** THIS IS DEPRECATED IN JDO2.3+</LI>
+ <LI>api contains source to build jdo-api-3.0.jar, which defines the JDO
API version 3.0 for Java 1.5 and later.</LI>
+ <LI>tck contains the JDO 3.0 Technology Compatibility Kit for Java 1.5 and
later.</LI>
</UL>
<p>
JDO releases may be downloaded from <a
href="http://db.apache.org/jdo/downloads.html";>the Apache JDO downloads
page</a>. Minor updates of releases are only available as source from the
Subversion repository. Follow the instructions <a href="#building">below</a> to
build the TCK from source.
<p>
For complete rules for certifying a JDO implementation,
-see RunRules.html in the top level tck2 project directory.
+see RunRules.html in the top level tck project directory.
</p>
<!-- When creating a new minor release branch, list changes from the major
release here
@@ -94,7 +90,7 @@
Mevenide is a nice maven plugin for IDEs available from
http://mevenide.codehaus.org.
In Netbeans, after you install the plugin, you can open an
existing maven project by File -> Open Project -> Open Project Folder.
-Navigate to a directory including a maven project (e.g. api2) and choose this
+Navigate to a directory including a maven project (e.g. api) 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.
@@ -102,7 +98,7 @@
<a name="jndi"></a>
<h3>JNDI implementation (fscontext.jar and providerutil.jar)</h3>
<p>
-The JNDI test cases in tck2 need a JNDI implementation.
+The JNDI test cases in tck 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
@@ -116,15 +112,11 @@
<h2>Building the TCK from Source</h2>
For instructions for checking out the JDO source, see the Apache JDO <a
href="http://db.apache.org/jdo/svn.html";>source code</a> page.
<p>
-If you are using Java 1.5, before building, edit project.properties in the
tck2 directory to comment out the line that sets maven.compile.compilerargs:
-<pre>
-#maven.compile.compilerargs= -proc:none
-</pre>
To build the TCK dependencies, change to the top level directory of the branch
you are working in (or trunk if you are using the latest unreleased code) and
run
<pre>
-maven tck2.default
+maven tck.default
</pre>
-Then change to the "tck2" directory and run
+Then change to the "tck" directory and run
<pre>
maven build
</pre>
@@ -133,13 +125,13 @@
<a name="running"></a>
<h2>Running the TCK</h2>
<p>
-In the tck2 project, run "maven build" to build the tck. This will
+In the tck 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.
</p>
<p>
You may use the following custom goals and command line options
-with the tck2 project:
+with the tck project:
</p>
<a name="goals"></a>
<h3>Custom Goals</h3>
@@ -167,7 +159,7 @@
<a name="cli"></a>
<h3>Command Line Options</h3>
<DL>
- <DT>-Djdo.tck.cfglist=<i>configuration file list</i><DD>Overrides the
definition of jdo.tck.cfglist found in 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 file) and put the test into the
jdo.tck.classes property.
+ <DT>-Djdo.tck.cfglist=<i>configuration file list</i><DD>Overrides the
definition of jdo.tck.cfglist found in tck/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 file) and put the test into the
jdo.tck.classes property.
<DT>-Djdo.tck.dblist=<i>database list</i><DD>Overrides the property
value in project.properties by supplying one or more space-separated database
names
<DT>-Djdo.tck.identitytypes=<i>identity type list</i><DD>Overrides the
property value in project.properties by supplying one or more space-separated
identity types (applicationidentity or datastoreidentity) to use for this run.
<DT>-Djdo.tck.cleanupaftertest=<i>boolean</i><DD>When false, data is
retained in the database after the test. This allows inspection of data after
test is run. Default is true.
Index: tck/RunRules.html
===================================================================
--- tck/RunRules.html (Revision 947754)
+++ tck/RunRules.html (Arbeitskopie)
@@ -18,7 +18,7 @@
<HTML>
<HEAD>
<META HTTP-EQUIV="CONTENT-TYPE" CONTENT="text/html; charset=utf-8">
- <TITLE>JDO 2.3 Technology Compatibility Kit Run Rules</TITLE>
+ <TITLE>JDO 3.0 Technology Compatibility Kit Run Rules</TITLE>
<STYLE>
<!--
@page { size: 8.5in 11in }
@@ -26,10 +26,10 @@
</STYLE>
</HEAD>
<BODY LANG="en-US" DIR="LTR">
-<H1 ALIGN=CENTER>Running the JDO 2.3 Technology Compatibility Kit</H1>
+<H1 ALIGN=CENTER>Running the JDO 3.0 Technology Compatibility Kit</H1>
<P ALIGN=CENTER><BR><BR>
</P>
-<P ALIGN=CENTER>6-June-2008</P>
+<P ALIGN=CENTER>24-May-2010</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
@@ -76,7 +76,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.1) and contains:</P>
+ jdo-tck-3.0) 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>
