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 mb...@apache.org on 2006/02/05 23:06:41 UTC
svn commit: r375117 - in /db/jdo/trunk: api11/project.xml ri11/maven.xml
ri11/project.properties ri11/project.xml tck11/maven.xml
tck11/project.properties tck11/project.xml
Author: mbo
Date: Sun Feb 5 14:06:40 2006
New Revision: 375117
URL: http://svn.apache.org/viewcvs?rev=375117&view=rev
Log:
JDO-297: RI11 doesn't run
- Added groupId entry in ri11 and tck11 project.xml.
- Cleaned up groupId in dependencies.
- Renamed property jdo.jdoapi.jarfile to jdo.api.jarfile
- Change version entry in api11, ri11, tck11 to be SNAPSHOT.
Modified:
db/jdo/trunk/api11/project.xml
db/jdo/trunk/ri11/maven.xml
db/jdo/trunk/ri11/project.properties
db/jdo/trunk/ri11/project.xml
db/jdo/trunk/tck11/maven.xml
db/jdo/trunk/tck11/project.properties
db/jdo/trunk/tck11/project.xml
Modified: db/jdo/trunk/api11/project.xml
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/api11/project.xml?rev=375117&r1=375116&r2=375117&view=diff
==============================================================================
--- db/jdo/trunk/api11/project.xml (original)
+++ db/jdo/trunk/api11/project.xml Sun Feb 5 14:06:40 2006
@@ -24,7 +24,7 @@
<name>JDO1 API</name>
<groupId>javax.jdo</groupId>
<artifactId>jdo1-api</artifactId>
- <currentVersion>1.1</currentVersion>
+ <currentVersion>SNAPSHOT</currentVersion>
<package>javax.jdo</package>
<shortDescription>Java Data Object (JDO) API</shortDescription>
<description>The Java Data Objects (JDO) API is a standard interface-based
Modified: db/jdo/trunk/ri11/maven.xml
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/ri11/maven.xml?rev=375117&r1=375116&r2=375117&view=diff
==============================================================================
--- db/jdo/trunk/ri11/maven.xml (original)
+++ db/jdo/trunk/ri11/maven.xml Sun Feb 5 14:06:40 2006
@@ -83,7 +83,7 @@
<ant target="runtest.list"
dir="${basedir}/test" antfile="runtest.xml">
<property name="testlist" value="${jdo.testlist}"/>
- <property name="jdoapi" value="${jdo.jdoapi.jarfile}"/>
+ <property name="jdoapi" value="${jdo.api.jarfile}"/>
<property name="jdobtree" value="${jdo.jdobtree.jarfile}"/>
<property name="jdori" value="${maven.build.dir}/classes"/>
<property name="jdoritests" value="${jdo.testclasses.jarfile}"/>
@@ -105,7 +105,7 @@
dir="${basedir}/test" antfile="runtest.xml">
<property name="policyfile" value="${jdo.security.policy}"/>
<property name="testlist" value="${jdo.testlist}"/>
- <property name="jdoapi" value="${jdo.jdoapi.jarfile}"/>
+ <property name="jdoapi" value="${jdo.api.jarfile}"/>
<property name="jdobtree" value="${jdo.jdobtree.jarfile}"/>
<property name="jdori" value="${maven.build.dir}/classes"/>
<property name="jdoritests" value="${jdo.testclasses.jarfile}"/>
@@ -129,7 +129,7 @@
<goal name="runtest.multiJVMtests" prereqs="pcclasses, testjar.build">
<ant target="runtest.multiJVMtests"
dir="${basedir}/test" antfile="runtest.xml">
- <property name="jdoapi" value="${jdo.jdoapi.jarfile}"/>
+ <property name="jdoapi" value="${jdo.api.jarfile}"/>
<property name="jdobtree" value="${jdo.jdobtree.jarfile}"/>
<property name="jdori" value="${maven.build.dir}/classes"/>
<property name="jdoritests" value="${jdo.testclasses.jarfile}"/>
@@ -361,7 +361,7 @@
<goal name="fsuid2.build">
<ant dir="${basedir}/test/fsuid2" target="build">
- <property name="jdoapi" value="${jdo.jdoapi.jarfile}"/>
+ <property name="jdoapi" value="${jdo.api.jarfile}"/>
<property name="jdori" value="${maven.build.dest}"/>
<property name="logging" value="${logging.jarfile}"/>
<property name="fsuid2.jarfile" value="${jdo.fsuid.jarfile}"/>
Modified: db/jdo/trunk/ri11/project.properties
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/ri11/project.properties?rev=375117&r1=375116&r2=375117&view=diff
==============================================================================
--- db/jdo/trunk/ri11/project.properties (original)
+++ db/jdo/trunk/ri11/project.properties Sun Feb 5 14:06:40 2006
@@ -51,8 +51,8 @@
jdo.enhancer.enhanced.dir = ${maven.build.dir}/test-classes
jdo.enhancer.main = org.apache.jdo.enhancer.Main
jdo.enhancer.options = -f -d "${jdo.enhancer.enhanced.dir}" -s "${jdo.enhancer.sourcepath}"
-jdo.enhancer.sourcepath = ${maven.build.dir}/test-classes${path.separator}${jdo.jdoapi.jarfile}
-jdo.enhancer.classpath = ${maven.build.dest}${path.separator}${jdo.jdoapi.jarfile}${path.separator}${logging.jarfile}
+jdo.enhancer.sourcepath = ${maven.build.dir}/test-classes${path.separator}${jdo.api.jarfile}
+jdo.enhancer.classpath = ${maven.build.dest}${path.separator}${jdo.api.jarfile}${path.separator}${logging.jarfile}
jdo.annotationtest.main = org.apache.jdo.impl.enhancer.util.AnnotationTest
jdo.annotationtest.options = -s "${jdo.enhancer.enhanced.dir}${path.separator}${jdo.enhancer.sourcepath}"
jdo.augmentationtest.main = org.apache.jdo.impl.enhancer.util.AugmentationTest
Modified: db/jdo/trunk/ri11/project.xml
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/ri11/project.xml?rev=375117&r1=375116&r2=375117&view=diff
==============================================================================
--- db/jdo/trunk/ri11/project.xml (original)
+++ db/jdo/trunk/ri11/project.xml Sun Feb 5 14:06:40 2006
@@ -23,8 +23,9 @@
<!-- Identification -->
<!-- ============== -->
<name>JDO1 Reference Implementation</name>
+ <groupId>org.apache.jdo</groupId>
<artifactId>jdo1-ri</artifactId>
- <currentVersion>1.1</currentVersion>
+ <currentVersion>SNAPSHOT</currentVersion>
<package>org.apache.jdo</package>
<shortDescription>Java Data Object (JDO) RI</shortDescription>
<description>The Java Data Objects (JDO) API is a standard interface-based
@@ -56,14 +57,14 @@
<version>1.0.4</version>
</dependency>
<dependency>
- <groupId>apache-jdo</groupId>
+ <groupId>javax.jdo</groupId>
<artifactId>jdo1-api</artifactId>
<version>SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>apache-jdo</groupId>
+ <groupId>org.apache.jdo</groupId>
<artifactId>jdo-btree</artifactId>
- <version>SNAPSHOT</version>
+ <version>1.1</version>
</dependency>
</dependencies>
<!-- =================== -->
Modified: db/jdo/trunk/tck11/maven.xml
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck11/maven.xml?rev=375117&r1=375116&r2=375117&view=diff
==============================================================================
--- db/jdo/trunk/tck11/maven.xml (original)
+++ db/jdo/trunk/tck11/maven.xml Sun Feb 5 14:06:40 2006
@@ -314,7 +314,7 @@
<!-- Directory where JDOTCK class files are located -->
<pathelement location="${jdo.tck.testclasses.dir}"/>
<!-- JDO jar file -->
- <pathelement location="${jdo.jdoapi.jarfile}"/>
+ <pathelement location="${jdo.api.jarfile}"/>
<pathelement location="${jta.jarfile}" />
<!-- Jar files for the implementation to be tested -->
<path refid="test_iut_jars" />
@@ -337,7 +337,7 @@
<!-- Directory where JDOTCK class files are located -->
<pathelement location="${jdo.tck.testclasses.dir}"/>
<!-- JDO jar file -->
- <pathelement location="${jdo.jdoapi.jarfile}"/>
+ <pathelement location="${jdo.api.jarfile}"/>
<pathelement location="${jta.jarfile}" />
<!-- JUnit jar file -->
<pathelement location="${junit.jarfile}"/>
Modified: db/jdo/trunk/tck11/project.properties
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck11/project.properties?rev=375117&r1=375116&r2=375117&view=diff
==============================================================================
--- db/jdo/trunk/tck11/project.properties (original)
+++ db/jdo/trunk/tck11/project.properties Sun Feb 5 14:06:40 2006
@@ -26,7 +26,7 @@
iut.enhancer.main = ${jdo.enhancer.main}
iut.enhancer.options = -f -d "${iut.enhanced.dir}" -s "${iut.enhanced.dir}${path.separator}${jdo.enhancer.sourcepath}"
iut.enhancer.args = ${jdo.tck.pcclasses.files} ${jdo.tck.paclasses.files}
-iut.enhancer.classpath = ${jdo.jdori.jarfile}${path.separator}${jdo.jdoapi.jarfile}${path.separator}${logging.jarfile}
+iut.enhancer.classpath = ${jdo.jdori.jarfile}${path.separator}${jdo.api.jarfile}${path.separator}${logging.jarfile}
iut.enhancer.sysproperties =
# JUnit settings
@@ -60,8 +60,8 @@
jdo.enhancer.main = org.apache.jdo.enhancer.Main
jdo.enhancer.options = -f -d "${jdo.enhanced.dir}" -s "${jdo.enhancer.sourcepath}"
jdo.enhancer.args = ${jdo.tck.pcclasses.files} ${jdo.tck.paclasses.files}
-jdo.enhancer.sourcepath = ${jdo.tck.testclasses.dir}${path.separator}${basedir}/test/jdo/${identitytype}${path.separator}${jdo.jdoapi.jarfile}${path.separator}${junit.jarfile}${path.separator}${logging.jarfile}
-jdo.enhancer.classpath = ${jdo.jdori.jarfile}${path.separator}${jdo.jdoapi.jarfile}${path.separator}${logging.jarfile}
+jdo.enhancer.sourcepath = ${jdo.tck.testclasses.dir}${path.separator}${basedir}/test/jdo/${identitytype}${path.separator}${jdo.api.jarfile}${path.separator}${junit.jarfile}${path.separator}${logging.jarfile}
+jdo.enhancer.classpath = ${jdo.jdori.jarfile}${path.separator}${jdo.api.jarfile}${path.separator}${logging.jarfile}
jdo.tck.pcclasses.sources = \
org/apache/jdo/tck/pc/lifecycle/StateTransitionObj.java \
Modified: db/jdo/trunk/tck11/project.xml
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck11/project.xml?rev=375117&r1=375116&r2=375117&view=diff
==============================================================================
--- db/jdo/trunk/tck11/project.xml (original)
+++ db/jdo/trunk/tck11/project.xml Sun Feb 5 14:06:40 2006
@@ -24,8 +24,9 @@
<!-- Identification -->
<!-- ============== -->
<name>JDO1 Technology Compatibility Kit</name>
+ <groupId>org.apache.jdo</groupId>
<artifactId>jdo1-tck</artifactId>
- <currentVersion>1.1</currentVersion>
+ <currentVersion>SNAPSHOT</currentVersion>
<package>org.apache.jdo.tck</package>
<shortDescription>Java Data Object (JDO) TCK</shortDescription>
<description>
@@ -64,17 +65,17 @@
<version>1.0.1B-rc2</version>
</dependency>
<dependency>
- <groupId>apache-jdo</groupId>
+ <groupId>javax.jdo</groupId>
<artifactId>jdo1-api</artifactId>
<version>SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>apache-jdo</groupId>
+ <groupId>org.apache.jdo</groupId>
<artifactId>jdo-btree</artifactId>
- <version>SNAPSHOT</version>
+ <version>1.1</version>
</dependency>
<dependency>
- <groupId>apache-jdo</groupId>
+ <groupId>org.apache.jdo</groupId>
<artifactId>jdo1-ri</artifactId>
<version>SNAPSHOT</version>
</dependency>