Author: mbo
Date: Wed Apr 6 01:29:55 2005
New Revision: 160266
URL: http://svn.apache.org/viewcvs?view=rev&rev=160266
Log:
use different artifactId for 1.1 vs. 2.0 projects
Modified:
incubator/jdo/trunk/api11/project.xml
incubator/jdo/trunk/api11/xdocs/index.xml
incubator/jdo/trunk/api11/xdocs/navigation.xml
incubator/jdo/trunk/api20/project.xml
incubator/jdo/trunk/api20/xdocs/index.xml
incubator/jdo/trunk/api20/xdocs/navigation.xml
incubator/jdo/trunk/project.properties
incubator/jdo/trunk/ri11/project.properties
incubator/jdo/trunk/ri11/project.xml
incubator/jdo/trunk/ri11/xdocs/index.xml
incubator/jdo/trunk/ri11/xdocs/navigation.xml
incubator/jdo/trunk/tck11/project.properties
incubator/jdo/trunk/tck11/project.xml
incubator/jdo/trunk/tck20/project.properties
incubator/jdo/trunk/tck20/project.xml
Modified: incubator/jdo/trunk/api11/project.xml
URL:
http://svn.apache.org/viewcvs/incubator/jdo/trunk/api11/project.xml?view=diff&r1=160265&r2=160266
==============================================================================
--- incubator/jdo/trunk/api11/project.xml (original)
+++ incubator/jdo/trunk/api11/project.xml Wed Apr 6 01:29:55 2005
@@ -21,11 +21,11 @@
<!-- ============== -->
<!-- Identification -->
<!-- ============== -->
- <name>JDO API 1.1</name>
- <artifactId>jdo-api</artifactId>
+ <name>JDO1 API</name>
+ <artifactId>jdo1-api</artifactId>
<currentVersion>1.1</currentVersion>
<package>javax.jdo</package>
- <shortDescription>Java Data Object (JDO) API 1.1</shortDescription>
+ <shortDescription>Java Data Object (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 12 under the auspices of the Java Community Process.</description>
Modified: incubator/jdo/trunk/api11/xdocs/index.xml
URL:
http://svn.apache.org/viewcvs/incubator/jdo/trunk/api11/xdocs/index.xml?view=diff&r1=160265&r2=160266
==============================================================================
--- incubator/jdo/trunk/api11/xdocs/index.xml (original)
+++ incubator/jdo/trunk/api11/xdocs/index.xml Wed Apr 6 01:29:55 2005
@@ -16,10 +16,10 @@
-->
<document>
- <properties> <title>JDO API</title> </properties>
+ <properties> <title>About</title> </properties>
<body>
- <section name="JDO API">
+ <section name="JDO1 API">
<p>The Java Data Objects (JDO) API is a standard interface-based
Java model abstraction of persistence, developed as
<a href="http://www.jcp.org/en/jsr/detail?id=12";>Java Specification
Modified: incubator/jdo/trunk/api11/xdocs/navigation.xml
URL:
http://svn.apache.org/viewcvs/incubator/jdo/trunk/api11/xdocs/navigation.xml?view=diff&r1=160265&r2=160266
==============================================================================
--- incubator/jdo/trunk/api11/xdocs/navigation.xml (original)
+++ incubator/jdo/trunk/api11/xdocs/navigation.xml Wed Apr 6 01:29:55 2005
@@ -15,9 +15,7 @@
limitations under the License.
-->
-<project name="JDO API">
-
- <title>JDO API</title>
+<project name="JDO1 API">
<body>
<links>
Modified: incubator/jdo/trunk/api20/project.xml
URL:
http://svn.apache.org/viewcvs/incubator/jdo/trunk/api20/project.xml?view=diff&r1=160265&r2=160266
==============================================================================
--- incubator/jdo/trunk/api20/project.xml (original)
+++ incubator/jdo/trunk/api20/project.xml Wed Apr 6 01:29:55 2005
@@ -21,12 +21,12 @@
<!-- ============== -->
<!-- Identification -->
<!-- ============== -->
- <name>JDO</name>
- <artifactId>jdo-api</artifactId>
+ <name>JDO2 API</name>
+ <artifactId>jdo2-api</artifactId>
<currentVersion>2.0</currentVersion>
<package>javax.jdo</package>
- <shortDescription>Java Data Object (JDO) API 2.0</shortDescription>
- <description>The Java Data Objects (JDO) API is a standard interface-based
+ <shortDescription>Java Data Object 2.0 (JDO) API</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 243 under the auspices of the Java Community Process.</description>
<repository />
Modified: incubator/jdo/trunk/api20/xdocs/index.xml
URL:
http://svn.apache.org/viewcvs/incubator/jdo/trunk/api20/xdocs/index.xml?view=diff&r1=160265&r2=160266
==============================================================================
--- incubator/jdo/trunk/api20/xdocs/index.xml (original)
+++ incubator/jdo/trunk/api20/xdocs/index.xml Wed Apr 6 01:29:55 2005
@@ -16,11 +16,11 @@
-->
<document>
- <properties> <title>JDO API</title> </properties>
+ <properties> <title>About</title> </properties>
<body>
- <section name="JDO API">
- <p>The Java Data Objects (JDO) API is a standard interface-based
+ <section name="JDO2 API">
+ <p>The Java Data Objects 2.0 (JDO) API is a standard interface-based
Java model abstraction of persistence, developed as
<a href="http://www.jcp.org/en/jsr/detail?id=243";>Java Specification
Request 243</a> under the auspices of the <a href="http://www.jcp.org";>
Modified: incubator/jdo/trunk/api20/xdocs/navigation.xml
URL:
http://svn.apache.org/viewcvs/incubator/jdo/trunk/api20/xdocs/navigation.xml?view=diff&r1=160265&r2=160266
==============================================================================
--- incubator/jdo/trunk/api20/xdocs/navigation.xml (original)
+++ incubator/jdo/trunk/api20/xdocs/navigation.xml Wed Apr 6 01:29:55 2005
@@ -15,9 +15,7 @@
limitations under the License.
-->
-<project name="JDO API">
-
- <title>JDO API</title>
+<project name="JDO2 API">
<body>
<links>
Modified: incubator/jdo/trunk/project.properties
URL:
http://svn.apache.org/viewcvs/incubator/jdo/trunk/project.properties?view=diff&r1=160265&r2=160266
==============================================================================
--- incubator/jdo/trunk/project.properties (original)
+++ incubator/jdo/trunk/project.properties Wed Apr 6 01:29:55 2005
@@ -17,3 +17,5 @@
# Make sure the compiled class still work with J2SE 1.3
maven.compile.target = 1.3
+# Set the javadoc title
+maven.javadoc.windowtitle = ${pom.name} ${pom.currentVersion}
Modified: incubator/jdo/trunk/ri11/project.properties
URL:
http://svn.apache.org/viewcvs/incubator/jdo/trunk/ri11/project.properties?view=diff&r1=160265&r2=160266
==============================================================================
--- incubator/jdo/trunk/ri11/project.properties (original)
+++ incubator/jdo/trunk/ri11/project.properties Wed Apr 6 01:29:55 2005
@@ -27,7 +27,7 @@
org/apache/jdo/impl/jdoql/jdoqlc/Optimizer.java
# dependencies
-jdo.jdoapi.jarfile = ${pom.getDependencyPath('jdo:jdo-api')}
+jdo.jdoapi.jarfile = ${pom.getDependencyPath('jdo:jdo1-api')}
jdo.jdobtree.jarfile = ${pom.getDependencyPath('jdo:jdo-btree')}
junit.jarfile = ${pom.getDependencyPath('junit:junit')}
antlr.jarfile = ${pom.getDependencyPath('antlr:antlr')}
Modified: incubator/jdo/trunk/ri11/project.xml
URL:
http://svn.apache.org/viewcvs/incubator/jdo/trunk/ri11/project.xml?view=diff&r1=160265&r2=160266
==============================================================================
--- incubator/jdo/trunk/ri11/project.xml (original)
+++ incubator/jdo/trunk/ri11/project.xml Wed Apr 6 01:29:55 2005
@@ -22,9 +22,8 @@
<!-- ============== -->
<!-- Identification -->
<!-- ============== -->
- <name>JDO Reference Implementation 1.1</name>
- <artifactId>jdo-ri</artifactId>
- <id>jdo-ri</id>
+ <name>JDO1 Reference Implementation</name>
+ <artifactId>jdo1-ri</artifactId>
<currentVersion>1.1</currentVersion>
<package>org.apache.jdo</package>
<shortDescription>Java Data Object (JDO) RI</shortDescription>
@@ -58,7 +57,7 @@
</dependency>
<dependency>
<groupId>jdo</groupId>
- <artifactId>jdo-api</artifactId>
+ <artifactId>jdo1-api</artifactId>
<version>1.1</version>
</dependency>
<dependency>
Modified: incubator/jdo/trunk/ri11/xdocs/index.xml
URL:
http://svn.apache.org/viewcvs/incubator/jdo/trunk/ri11/xdocs/index.xml?view=diff&r1=160265&r2=160266
==============================================================================
--- incubator/jdo/trunk/ri11/xdocs/index.xml (original)
+++ incubator/jdo/trunk/ri11/xdocs/index.xml Wed Apr 6 01:29:55 2005
@@ -16,10 +16,10 @@
-->
<document>
- <properties> <title>JDO RI</title> </properties>
+ <properties> <title>About</title> </properties>
<body>
- <section name="JDO RI">
+ <section name="JDO1 Reference Implementation">
<p>The Java Data Objects (JDO) API is a standard interface-based
Java model abstraction of persistence, developed as
<a href="http://www.jcp.org/en/jsr/detail?id=12";>Java Specification
Modified: incubator/jdo/trunk/ri11/xdocs/navigation.xml
URL:
http://svn.apache.org/viewcvs/incubator/jdo/trunk/ri11/xdocs/navigation.xml?view=diff&r1=160265&r2=160266
==============================================================================
--- incubator/jdo/trunk/ri11/xdocs/navigation.xml (original)
+++ incubator/jdo/trunk/ri11/xdocs/navigation.xml Wed Apr 6 01:29:55 2005
@@ -15,9 +15,7 @@
limitations under the License.
-->
-<project name="JDO API">
-
- <title>JDO API</title>
+<project name="JDO1 RI">
<body>
<links>
Modified: incubator/jdo/trunk/tck11/project.properties
URL:
http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck11/project.properties?view=diff&r1=160265&r2=160266
==============================================================================
--- incubator/jdo/trunk/tck11/project.properties (original)
+++ incubator/jdo/trunk/tck11/project.properties Wed Apr 6 01:29:55 2005
@@ -43,9 +43,9 @@
jdo.tck.resultprinterclass = org.apache.jdo.tck.util.BatchResultPrinter
# dependencies
-jdo.jdoapi.jarfile = ${pom.getDependencyPath('jdo:jdo-api')}
+jdo.jdoapi.jarfile = ${pom.getDependencyPath('jdo:jdo1-api')}
jdo.jdobtree.jarfile = ${pom.getDependencyPath('jdo:jdo-btree')}
-jdo.jdori.jarfile = ${pom.getDependencyPath('jdo:jdo-ri')}
+jdo.jdori.jarfile = ${pom.getDependencyPath('jdo:jdo1-ri')}
junit.jarfile = ${pom.getDependencyPath('junit:junit')}
antlr.jarfile = ${pom.getDependencyPath('antlr:antlr')}
jta.jarfile = ${pom.getDependencyPath('geronimo-spec:geronimo-spec-jta')}
Modified: incubator/jdo/trunk/tck11/project.xml
URL:
http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck11/project.xml?view=diff&r1=160265&r2=160266
==============================================================================
--- incubator/jdo/trunk/tck11/project.xml (original)
+++ incubator/jdo/trunk/tck11/project.xml Wed Apr 6 01:29:55 2005
@@ -23,8 +23,8 @@
<!-- ============== -->
<!-- Identification -->
<!-- ============== -->
- <name>JDO Technology Compatibility Kit 1.1</name>
- <artifactId>jdo-tck</artifactId>
+ <name>JDO1 Technology Compatibility Kit</name>
+ <artifactId>jdo1-tck</artifactId>
<currentVersion>1.1</currentVersion>
<package>org.apache.jdo.tck</package>
<shortDescription>Java Data Object (JDO) TCK</shortDescription>
@@ -60,7 +60,7 @@
</dependency>
<dependency>
<groupId>jdo</groupId>
- <artifactId>jdo-api</artifactId>
+ <artifactId>jdo1-api</artifactId>
<version>1.1</version>
</dependency>
<dependency>
@@ -70,7 +70,7 @@
</dependency>
<dependency>
<groupId>jdo</groupId>
- <artifactId>jdo-ri</artifactId>
+ <artifactId>jdo1-ri</artifactId>
<version>1.1</version>
</dependency>
<dependency>
Modified: incubator/jdo/trunk/tck20/project.properties
URL:
http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/project.properties?view=diff&r1=160265&r2=160266
==============================================================================
--- incubator/jdo/trunk/tck20/project.properties (original)
+++ incubator/jdo/trunk/tck20/project.properties Wed Apr 6 01:29:55 2005
@@ -46,7 +46,7 @@
jdo.tck.resultprinterclass = org.apache.jdo.tck.util.BatchResultPrinter
# dependencies
-jdo.jdoapi.jarfile = ${pom.getDependencyPath('jdo:jdo-api')}
+jdo.jdoapi.jarfile = ${pom.getDependencyPath('jdo:jdo2-api')}
jdo.jdobtree.jarfile = ${pom.getDependencyPath('jdo:jdo-btree')}
jpox.jdori.jarfile = ${pom.getDependencyPath('jpox:jpox')}
jpox.enhancer.jarfile = ${pom.getDependencyPath('jpox:jpox-enhancer')}
Modified: incubator/jdo/trunk/tck20/project.xml
URL:
http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/project.xml?view=diff&r1=160265&r2=160266
==============================================================================
--- incubator/jdo/trunk/tck20/project.xml (original)
+++ incubator/jdo/trunk/tck20/project.xml Wed Apr 6 01:29:55 2005
@@ -20,12 +20,12 @@
<!-- ============== -->
<!-- Identification -->
<!-- ============== -->
- <name>JDO Technology Compatibility Kit 2.0</name>
- <artifactId>jdo-tck</artifactId>
+ <name>JDO2 Technology Compatibility Kit</name>
+ <artifactId>jdo2-tck</artifactId>
<currentVersion>2.0</currentVersion>
<package>org.apache.jdo.tck</package>
- <shortDescription>Java Data Object (JDO) TCK</shortDescription>
- <description>The Java Data Objects (JDO) API is a standard interface-based
+ <shortDescription>Java Data Object 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 12 JSR 12 under the auspices of the Java Community Process.
@@ -53,13 +53,11 @@
<artifactId>geronimo-spec-jta</artifactId>
<version>1.0.1B-rc2</version>
</dependency>
- <!-- Restore when the jdo 2.0 api is available
<dependency>
<groupId>jdo</groupId>
- <artifactId>jdo-api</artifactId>
+ <artifactId>jdo2-api</artifactId>
<version>2.0</version>
</dependency>
--->
<dependency>
<groupId>jdo</groupId>
<artifactId>jdo-btree</artifactId>
