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 cl...@apache.org on 2010/05/19 17:11:35 UTC
svn commit: r946210 - in /db/jdo/trunk: api/ tck/ tck/src/conf/
tck/src/java/org/apache/jdo/tck/enhancement/
Author: clr
Date: Wed May 19 15:11:35 2010
New Revision: 946210
URL: http://svn.apache.org/viewvc?rev=946210&view=rev
Log:
Moved api2 to api and tck2 to tck
Added:
db/jdo/trunk/api/
- copied from r944333, db/jdo/trunk/api2/
db/jdo/trunk/tck/
- copied from r944333, db/jdo/trunk/tck2/
db/jdo/trunk/tck/src/conf/jdo-3_0-signatures.txt
- copied unchanged from r944333, db/jdo/trunk/tck2/src/conf/jdo-2_3-signatures.txt
Removed:
db/jdo/trunk/tck/src/conf/jdo-2_3-signatures.txt
db/jdo/trunk/tck/src/java/org/apache/jdo/tck/enhancement/FieldAccessModified.java
db/jdo/trunk/tck/src/java/org/apache/jdo/tck/enhancement/ImplementsPersistenceCapable.java
Modified:
db/jdo/trunk/api/m2_repo_maven_metadata.xml
db/jdo/trunk/api/pom.xml
db/jdo/trunk/api/project.xml
db/jdo/trunk/tck/project.properties
db/jdo/trunk/tck/project.xml
db/jdo/trunk/tck/src/conf/exclude.list
Modified: db/jdo/trunk/api/m2_repo_maven_metadata.xml
URL: http://svn.apache.org/viewvc/db/jdo/trunk/api/m2_repo_maven_metadata.xml?rev=946210&r1=944333&r2=946210&view=diff
==============================================================================
--- db/jdo/trunk/api/m2_repo_maven_metadata.xml (original)
+++ db/jdo/trunk/api/m2_repo_maven_metadata.xml Wed May 19 15:11:35 2010
@@ -4,12 +4,12 @@
<artifactId>jdo2-api</artifactId>
<versioning>
<versions>
- <version>2.3-ea</version>
+ <version>3.0</version>
<version>2.2</version>
<version>2.1</version>
<version>2.0</version>
</versions>
- <lastUpdated>20090505170000</lastUpdated>
+ <lastUpdated>20100514170000</lastUpdated>
</versioning>
</metadata>
Modified: db/jdo/trunk/api/pom.xml
URL: http://svn.apache.org/viewvc/db/jdo/trunk/api/pom.xml?rev=946210&r1=944333&r2=946210&view=diff
==============================================================================
--- db/jdo/trunk/api/pom.xml (original)
+++ db/jdo/trunk/api/pom.xml Wed May 19 15:11:35 2010
@@ -21,7 +21,7 @@
<groupId>javax.jdo</groupId>
<artifactId>jdo2-api</artifactId>
<name>JDO2 API</name>
- <version>2.3-SNAPSHOT</version>
+ <version>3.0</version>
<description>The Java Data Objects 2 (JDO) API is a standard interface-based Java model abstraction of persistence, developed as Java Specification Request 243 under the auspices of the Java Community Process.</description>
<build>
<sourceDirectory>src/java</sourceDirectory>
@@ -63,6 +63,16 @@
</testResource>
</testResources>
<plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>attach-sources</id>
+ <phase>none</phase>
+ </execution>
+ </executions>
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
@@ -80,7 +90,7 @@
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<archive>
- <manifestFile>API2.MF</manifestFile>
+ <manifestFile>API3.MF</manifestFile>
</archive>
</configuration>
</plugin>
Modified: db/jdo/trunk/api/project.xml
URL: http://svn.apache.org/viewvc/db/jdo/trunk/api/project.xml?rev=946210&r1=944333&r2=946210&view=diff
==============================================================================
--- db/jdo/trunk/api/project.xml (original)
+++ db/jdo/trunk/api/project.xml Wed May 19 15:11:35 2010
@@ -24,11 +24,11 @@
<!-- ============== -->
<name>JDO2 API</name>
<groupId>javax.jdo</groupId>
- <artifactId>jdo2-api</artifactId>
+ <artifactId>jdo-api</artifactId>
<currentVersion>${jdo.currentVersion}</currentVersion>
<package>javax.jdo</package>
- <shortDescription>Java Data Objects 2 (JDO) API</shortDescription>
- <description>The Java Data Objects 2 (JDO) API is a standard interface-based
+ <shortDescription>Java Data Objects (JDO) API</shortDescription>
+ <description>The Java Data Objects (JDO) API is a standard interface-based
Java model abstraction of persistence, developed as Java Specification
Request 243 under the auspices of the Java Community Process.</description>
<!-- ============ -->
Modified: db/jdo/trunk/tck/project.properties
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck/project.properties?rev=946210&r1=944333&r2=946210&view=diff
==============================================================================
--- db/jdo/trunk/tck/project.properties (original)
+++ db/jdo/trunk/tck/project.properties Wed May 19 15:11:35 2010
@@ -54,12 +54,12 @@ jdo.tck.resultprinterclass = org.apache.
jdo.tck.log.directory = ${maven.build.dir}/logs
jdo.tck.log.directory.database = ${jdo.tck.log.directory}/database
jdo.tck.log.directory.enhancer = ${jdo.tck.log.directory}/enhancer
-jdo.tck.signaturefile = ${basedir}/src/conf/jdo-2_3-signatures.txt
+jdo.tck.signaturefile = ${basedir}/src/conf/jdo-3_0-signatures.txt
jdori.pmf.properties = jdori-pmf.properties
jdori.runtck.sysproperties = -Xmx512m
# dependencies
-jdo.api.jarfile = ${pom.getDependencyPath('javax.jdo:jdo2-api')}
+jdo.api.jarfile = ${pom.getDependencyPath('javax.jdo:jdo-api')}
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')}
@@ -73,9 +73,6 @@ logging.commons.jarfile = ${pom.getDepen
logging.log4j.jarfile = ${pom.getDependencyPath('log4j')}
derby.jarfile = ${pom.getDependencyPath('org.apache.derby:derby')}
derbytools.jarfile = ${pom.getDependencyPath('org.apache.derby:derbytools')}
-util20.jarfile = ${pom.getDependencyPath('org.apache.jdo:jdo2-util')}
-model20.jarfile = ${pom.getDependencyPath('org.apache.jdo:jdo2-model')}
-enhancer20.jarfile = ${pom.getDependencyPath('org.apache.jdo:jdo2-enhancer')}
jpa.jarfile = ${pom.getDependencyPath('org.apache.geronimo.specs:geronimo-jpa_2.0_spec')}
xmlparser =
Modified: db/jdo/trunk/tck/project.xml
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck/project.xml?rev=946210&r1=944333&r2=946210&view=diff
==============================================================================
--- db/jdo/trunk/tck/project.xml (original)
+++ db/jdo/trunk/tck/project.xml Wed May 19 15:11:35 2010
@@ -23,13 +23,13 @@
<!-- ============== -->
<name>JDO2 Technology Compatibility Kit</name>
<groupId>org.apache.jdo</groupId>
- <artifactId>jdo2-tck</artifactId>
+ <artifactId>jdo-tck</artifactId>
<currentVersion>${jdo.currentVersion}</currentVersion>
<package>org.apache.jdo.tck</package>
- <shortDescription>Java Data Objects 2 (JDO) TCK</shortDescription>
- <description>The Java Data Objects 2 (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.
+ <shortDescription>Java Data Objects (JDO) TCK</shortDescription>
+ <description>The Java Data Objects (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 JDO TCK is a test suite designed to test implementations of the Java Data Objects 2 specification. In order to claim compatibility with JDO, an implementation must pass all relevant tests of the JDOTCK.
+The JDO TCK is a test suite designed to test implementations of the Java Data Objects specification. In order to claim compatibility with JDO, an implementation must pass all relevant tests of the JDOTCK.
NOTE!! There are no unit tests in this project.</description>
<!-- ============ -->
@@ -38,22 +38,7 @@ NOTE!! There are no unit tests in this p
<dependencies>
<dependency>
<groupId>javax.jdo</groupId>
- <artifactId>jdo2-api</artifactId>
- <version>${jdo.currentVersion}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.jdo</groupId>
- <artifactId>jdo2-enhancer</artifactId>
- <version>${jdo.currentVersion}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.jdo</groupId>
- <artifactId>jdo2-util</artifactId>
- <version>${jdo.currentVersion}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.jdo</groupId>
- <artifactId>jdo2-model</artifactId>
+ <artifactId>jdo-api</artifactId>
<version>${jdo.currentVersion}</version>
</dependency>
<dependency>
Modified: db/jdo/trunk/tck/src/conf/exclude.list
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck/src/conf/exclude.list?rev=946210&r1=944333&r2=946210&view=diff
==============================================================================
--- db/jdo/trunk/tck/src/conf/exclude.list (original)
+++ db/jdo/trunk/tck/src/conf/exclude.list Wed May 19 15:11:35 2010
@@ -13,6 +13,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-jdo.tck.exclude = \
-org.apache.jdo.tck.enhancement.FieldAccessModified \
-org.apache.jdo.tck.enhancement.ImplementsPersistenceCapable
+jdo.tck.exclude =