Author: bdudney
Date: Wed Aug 23 05:31:32 2006
New Revision: 434026
URL: http://svn.apache.org/viewvc?rev=434026&view=rev
Log:
changing from cayenne-jdk1.x-core to cayenne-jdk1.x
Added:
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/
- copied from r433736,
incubator/cayenne/main/trunk/core/cayenne-jdk1.4-core/
incubator/cayenne/main/trunk/core/cayenne-jdk1.5/
- copied from r433736,
incubator/cayenne/main/trunk/core/cayenne-jdk1.5-core/
Removed:
incubator/cayenne/main/trunk/core/cayenne-jdk1.4-core/
incubator/cayenne/main/trunk/core/cayenne-jdk1.5-core/
Modified:
incubator/cayenne/main/trunk/assembly/cayenne-generic/pom.xml
incubator/cayenne/main/trunk/assembly/cayenne-generic/src/main/assembly/main.xml
incubator/cayenne/main/trunk/assembly/cayenne-osx/pom.xml
incubator/cayenne/main/trunk/assembly/cayenne-osx/src/main/assembly/main-osx.xml
incubator/cayenne/main/trunk/assembly/cayenne-win/pom.xml
incubator/cayenne/main/trunk/assembly/cayenne-win/src/main/assembly/main-win.xml
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/pom.xml
incubator/cayenne/main/trunk/core/cayenne-jdk1.5/pom.xml
incubator/cayenne/main/trunk/core/cayenne-jpa/pom.xml
incubator/cayenne/main/trunk/core/pom.xml
incubator/cayenne/main/trunk/modeler/modeler/pom.xml
incubator/cayenne/main/trunk/other/cayenne-regression-profiler/pom.xml
Modified: incubator/cayenne/main/trunk/assembly/cayenne-generic/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/assembly/cayenne-generic/pom.xml?rev=434026&r1=434025&r2=434026&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/assembly/cayenne-generic/pom.xml (original)
+++ incubator/cayenne/main/trunk/assembly/cayenne-generic/pom.xml Wed Aug 23
05:31:32 2006
@@ -40,13 +40,13 @@
<dependency>
<groupId>org.apache.cayenne.core</groupId>
- <artifactId>cayenne-jdk1.4-core</artifactId>
+ <artifactId>cayenne-jdk1.4</artifactId>
<version>${version}</version>
</dependency>
<dependency>
<groupId>org.apache.cayenne.core</groupId>
- <artifactId>cayenne-jdk1.5-core</artifactId>
+ <artifactId>cayenne-jdk1.5</artifactId>
<version>${version}</version>
</dependency>
@@ -143,14 +143,14 @@
<artifactItem>
<groupId>org.apache.cayenne.core</groupId>
- <artifactId>cayenne-jdk1.4-core</artifactId>
+ <artifactId>cayenne-jdk1.4</artifactId>
<version>${version}</version>
<classifier>javadoc</classifier>
</artifactItem>
<artifactItem>
<groupId>org.apache.cayenne.core</groupId>
- <artifactId>cayenne-jdk1.5-core</artifactId>
+ <artifactId>cayenne-jdk1.5</artifactId>
<version>${version}</version>
<classifier>javadoc</classifier>
</artifactItem>
@@ -178,14 +178,14 @@
<artifactItem>
<groupId>org.apache.cayenne.core</groupId>
- <artifactId>cayenne-jdk1.4-core</artifactId>
+ <artifactId>cayenne-jdk1.4</artifactId>
<version>${version}</version>
<classifier>sources</classifier>
</artifactItem>
<artifactItem>
<groupId>org.apache.cayenne.core</groupId>
- <artifactId>cayenne-jdk1.5-core</artifactId>
+ <artifactId>cayenne-jdk1.5</artifactId>
<version>${version}</version>
<classifier>sources</classifier>
</artifactItem>
Modified:
incubator/cayenne/main/trunk/assembly/cayenne-generic/src/main/assembly/main.xml
URL:
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/assembly/cayenne-generic/src/main/assembly/main.xml?rev=434026&r1=434025&r2=434026&view=diff
==============================================================================
---
incubator/cayenne/main/trunk/assembly/cayenne-generic/src/main/assembly/main.xml
(original)
+++
incubator/cayenne/main/trunk/assembly/cayenne-generic/src/main/assembly/main.xml
Wed Aug 23 05:31:32 2006
@@ -31,8 +31,8 @@
<dependencySet>
<outputDirectory>lib</outputDirectory>
<includes>
- <include>org.apache.cayenne.core:cayenne-jdk1.4-core</include>
- <include>org.apache.cayenne.core:cayenne-jdk1.5-core</include>
+ <include>org.apache.cayenne.core:cayenne-jdk1.4</include>
+ <include>org.apache.cayenne.core:cayenne-jdk1.5</include>
<include>org.apache.cayenne.core:cayenne-jpa</include>
</includes>
</dependencySet>
Modified: incubator/cayenne/main/trunk/assembly/cayenne-osx/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/assembly/cayenne-osx/pom.xml?rev=434026&r1=434025&r2=434026&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/assembly/cayenne-osx/pom.xml (original)
+++ incubator/cayenne/main/trunk/assembly/cayenne-osx/pom.xml Wed Aug 23
05:31:32 2006
@@ -40,13 +40,13 @@
<dependency>
<groupId>org.apache.cayenne.core</groupId>
- <artifactId>cayenne-jdk1.4-core</artifactId>
+ <artifactId>cayenne-jdk1.4</artifactId>
<version>${version}</version>
</dependency>
<dependency>
<groupId>org.apache.cayenne.core</groupId>
- <artifactId>cayenne-jdk1.5-core</artifactId>
+ <artifactId>cayenne-jdk1.5</artifactId>
<version>${version}</version>
</dependency>
@@ -143,14 +143,14 @@
<artifactItem>
<groupId>org.apache.cayenne.core</groupId>
- <artifactId>cayenne-jdk1.4-core</artifactId>
+ <artifactId>cayenne-jdk1.4</artifactId>
<version>${version}</version>
<classifier>javadoc</classifier>
</artifactItem>
<artifactItem>
<groupId>org.apache.cayenne.core</groupId>
- <artifactId>cayenne-jdk1.5-core</artifactId>
+ <artifactId>cayenne-jdk1.5</artifactId>
<version>${version}</version>
<classifier>javadoc</classifier>
</artifactItem>
@@ -178,14 +178,14 @@
<artifactItem>
<groupId>org.apache.cayenne.core</groupId>
- <artifactId>cayenne-jdk1.4-core</artifactId>
+ <artifactId>cayenne-jdk1.4</artifactId>
<version>${version}</version>
<classifier>sources</classifier>
</artifactItem>
<artifactItem>
<groupId>org.apache.cayenne.core</groupId>
- <artifactId>cayenne-jdk1.5-core</artifactId>
+ <artifactId>cayenne-jdk1.5</artifactId>
<version>${version}</version>
<classifier>sources</classifier>
</artifactItem>
Modified:
incubator/cayenne/main/trunk/assembly/cayenne-osx/src/main/assembly/main-osx.xml
URL:
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/assembly/cayenne-osx/src/main/assembly/main-osx.xml?rev=434026&r1=434025&r2=434026&view=diff
==============================================================================
---
incubator/cayenne/main/trunk/assembly/cayenne-osx/src/main/assembly/main-osx.xml
(original)
+++
incubator/cayenne/main/trunk/assembly/cayenne-osx/src/main/assembly/main-osx.xml
Wed Aug 23 05:31:32 2006
@@ -31,8 +31,8 @@
<dependencySet>
<outputDirectory>lib</outputDirectory>
<includes>
- <include>org.apache.cayenne.core:cayenne-jdk1.4-core</include>
- <include>org.apache.cayenne.core:cayenne-jdk1.5-core</include>
+ <include>org.apache.cayenne.core:cayenne-jdk1.4</include>
+ <include>org.apache.cayenne.core:cayenne-jdk1.5</include>
<include>org.apache.cayenne.core:cayenne-jpa</include>
</includes>
</dependencySet>
Modified: incubator/cayenne/main/trunk/assembly/cayenne-win/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/assembly/cayenne-win/pom.xml?rev=434026&r1=434025&r2=434026&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/assembly/cayenne-win/pom.xml (original)
+++ incubator/cayenne/main/trunk/assembly/cayenne-win/pom.xml Wed Aug 23
05:31:32 2006
@@ -40,13 +40,13 @@
<dependency>
<groupId>org.apache.cayenne.core</groupId>
- <artifactId>cayenne-jdk1.4-core</artifactId>
+ <artifactId>cayenne-jdk1.4</artifactId>
<version>${version}</version>
</dependency>
<dependency>
<groupId>org.apache.cayenne.core</groupId>
- <artifactId>cayenne-jdk1.5-core</artifactId>
+ <artifactId>cayenne-jdk1.5</artifactId>
<version>${version}</version>
</dependency>
@@ -143,14 +143,14 @@
<artifactItem>
<groupId>org.apache.cayenne.core</groupId>
- <artifactId>cayenne-jdk1.4-core</artifactId>
+ <artifactId>cayenne-jdk1.4</artifactId>
<version>${version}</version>
<classifier>javadoc</classifier>
</artifactItem>
<artifactItem>
<groupId>org.apache.cayenne.core</groupId>
- <artifactId>cayenne-jdk1.5-core</artifactId>
+ <artifactId>cayenne-jdk1.5</artifactId>
<version>${version}</version>
<classifier>javadoc</classifier>
</artifactItem>
@@ -178,14 +178,14 @@
<artifactItem>
<groupId>org.apache.cayenne.core</groupId>
- <artifactId>cayenne-jdk1.4-core</artifactId>
+ <artifactId>cayenne-jdk1.4</artifactId>
<version>${version}</version>
<classifier>sources</classifier>
</artifactItem>
<artifactItem>
<groupId>org.apache.cayenne.core</groupId>
- <artifactId>cayenne-jdk1.5-core</artifactId>
+ <artifactId>cayenne-jdk1.5</artifactId>
<version>${version}</version>
<classifier>sources</classifier>
</artifactItem>
Modified:
incubator/cayenne/main/trunk/assembly/cayenne-win/src/main/assembly/main-win.xml
URL:
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/assembly/cayenne-win/src/main/assembly/main-win.xml?rev=434026&r1=434025&r2=434026&view=diff
==============================================================================
---
incubator/cayenne/main/trunk/assembly/cayenne-win/src/main/assembly/main-win.xml
(original)
+++
incubator/cayenne/main/trunk/assembly/cayenne-win/src/main/assembly/main-win.xml
Wed Aug 23 05:31:32 2006
@@ -31,8 +31,8 @@
<dependencySet>
<outputDirectory>lib</outputDirectory>
<includes>
- <include>org.apache.cayenne.core:cayenne-jdk1.4-core</include>
- <include>org.apache.cayenne.core:cayenne-jdk1.5-core</include>
+ <include>org.apache.cayenne.core:cayenne-jdk1.4</include>
+ <include>org.apache.cayenne.core:cayenne-jdk1.5</include>
<include>org.apache.cayenne.core:cayenne-jpa</include>
</includes>
</dependencySet>
Modified: incubator/cayenne/main/trunk/core/cayenne-jdk1.4/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/pom.xml?rev=434026&r1=433736&r2=434026&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/core/cayenne-jdk1.4/pom.xml (original)
+++ incubator/cayenne/main/trunk/core/cayenne-jdk1.4/pom.xml Wed Aug 23
05:31:32 2006
@@ -28,7 +28,7 @@
</parent>
<description>Cayenne Java 1.4 Core</description>
- <artifactId>cayenne-jdk1.4-core</artifactId>
+ <artifactId>cayenne-jdk1.4</artifactId>
<name>Cayenne Java 1.4 Core</name>
<packaging>jar</packaging>
Modified: incubator/cayenne/main/trunk/core/cayenne-jdk1.5/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.5/pom.xml?rev=434026&r1=433736&r2=434026&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/core/cayenne-jdk1.5/pom.xml (original)
+++ incubator/cayenne/main/trunk/core/cayenne-jdk1.5/pom.xml Wed Aug 23
05:31:32 2006
@@ -28,7 +28,7 @@
</parent>
<description>Cayenne Java 1.5 Core</description>
- <artifactId>cayenne-jdk1.5-core</artifactId>
+ <artifactId>cayenne-jdk1.5</artifactId>
<name>Cayenne Java 1.5 Core</name>
<packaging>jar</packaging>
@@ -136,7 +136,7 @@
<dependency>
<groupId>org.apache.cayenne.core</groupId>
- <artifactId>cayenne-jdk1.4-core</artifactId>
+ <artifactId>cayenne-jdk1.4</artifactId>
<version>${version}</version>
</dependency>
Modified: incubator/cayenne/main/trunk/core/cayenne-jpa/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jpa/pom.xml?rev=434026&r1=434025&r2=434026&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/core/cayenne-jpa/pom.xml (original)
+++ incubator/cayenne/main/trunk/core/cayenne-jpa/pom.xml Wed Aug 23 05:31:32
2006
@@ -28,13 +28,13 @@
<dependency>
<groupId>org.apache.cayenne.core</groupId>
- <artifactId>cayenne-jdk1.4-core</artifactId>
+ <artifactId>cayenne-jdk1.4</artifactId>
<version>${version}</version>
</dependency>
<dependency>
<groupId>org.apache.cayenne.core</groupId>
- <artifactId>cayenne-jdk1.5-core</artifactId>
+ <artifactId>cayenne-jdk1.5</artifactId>
<version>${version}</version>
</dependency>
Modified: incubator/cayenne/main/trunk/core/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/pom.xml?rev=434026&r1=434025&r2=434026&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/core/pom.xml (original)
+++ incubator/cayenne/main/trunk/core/pom.xml Wed Aug 23 05:31:32 2006
@@ -36,8 +36,8 @@
<packaging>pom</packaging>
<modules>
- <module>cayenne-jdk1.4-core</module>
- <module>cayenne-jdk1.5-core</module>
+ <module>cayenne-jdk1.4</module>
+ <module>cayenne-jdk1.5</module>
<module>cayenne-jpa-agent</module>
<module>cayenne-jpa</module>
</modules>
Modified: incubator/cayenne/main/trunk/modeler/modeler/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/modeler/modeler/pom.xml?rev=434026&r1=434025&r2=434026&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/modeler/modeler/pom.xml (original)
+++ incubator/cayenne/main/trunk/modeler/modeler/pom.xml Wed Aug 23 05:31:32
2006
@@ -90,13 +90,13 @@
<dependency>
<groupId>org.apache.cayenne.core</groupId>
- <artifactId>cayenne-jdk1.4-core</artifactId>
+ <artifactId>cayenne-jdk1.4</artifactId>
<version>${version}</version>
</dependency>
<dependency>
<groupId>org.apache.cayenne.core</groupId>
- <artifactId>cayenne-jdk1.4-core</artifactId>
+ <artifactId>cayenne-jdk1.4</artifactId>
<version>${version}</version>
<classifier>tests</classifier>
<scope>test</scope>
Modified: incubator/cayenne/main/trunk/other/cayenne-regression-profiler/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/other/cayenne-regression-profiler/pom.xml?rev=434026&r1=434025&r2=434026&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/other/cayenne-regression-profiler/pom.xml
(original)
+++ incubator/cayenne/main/trunk/other/cayenne-regression-profiler/pom.xml Wed
Aug 23 05:31:32 2006
@@ -65,12 +65,12 @@
<dependencies>
<dependency>
<groupId>org.apache.cayenne.core</groupId>
- <artifactId>cayenne-jdk1.4-core</artifactId>
+ <artifactId>cayenne-jdk1.4</artifactId>
<version>${version}</version>
</dependency>
<dependency>
<groupId>org.apache.cayenne.core</groupId>
- <artifactId>cayenne-jdk1.5-core</artifactId>
+ <artifactId>cayenne-jdk1.5</artifactId>
<version>${version}</version>
</dependency>
</dependencies>
