Author: bdudney
Date: Fri Jul 28 09:14:56 2006
New Revision: 426595
URL: http://svn.apache.org/viewvc?rev=426595&view=rev
Log:
more maven conversion, almost there\!
Added:
incubator/cayenne/main/trunk/cayenne/cayenne-java-1.5/pom.xml
incubator/cayenne/main/trunk/cayenne/cayenne-java-1.5/src/main/
incubator/cayenne/main/trunk/cayenne/cayenne-java-1.5/src/main/java/
- copied from r426326,
incubator/cayenne/main/trunk/cayenne/cayenne-java-1.5/src/cayenne/java/
incubator/cayenne/main/trunk/cayenne/cayenne-java-1.5/src/main/java/org/
- copied from r426594,
incubator/cayenne/main/trunk/cayenne/cayenne-java-1.5/src/cayenne/java/org/
incubator/cayenne/main/trunk/cayenne/cayenne-java/cayenne/src/main/resources/org/
incubator/cayenne/main/trunk/cayenne/cayenne-java/cayenne/src/main/resources/org/apache/
incubator/cayenne/main/trunk/cayenne/cayenne-java/cayenne/src/main/resources/org/apache/cayenne/
incubator/cayenne/main/trunk/cayenne/cayenne-java/cayenne/src/main/resources/org/apache/cayenne/dba/
incubator/cayenne/main/trunk/cayenne/cayenne-java/cayenne/src/main/resources/org/apache/cayenne/dba/db2/
incubator/cayenne/main/trunk/cayenne/cayenne-java/cayenne/src/main/resources/org/apache/cayenne/dba/db2/types.xml
- copied unchanged from r426577,
incubator/cayenne/main/trunk/cayenne/cayenne-java/cayenne/src/main/java/org/apache/cayenne/dba/db2/types.xml
incubator/cayenne/main/trunk/cayenne/cayenne-java/cayenne/src/main/resources/org/apache/cayenne/dba/derby/
incubator/cayenne/main/trunk/cayenne/cayenne-java/cayenne/src/main/resources/org/apache/cayenne/dba/derby/types.xml
- copied unchanged from r426577,
incubator/cayenne/main/trunk/cayenne/cayenne-java/cayenne/src/main/java/org/apache/cayenne/dba/derby/types.xml
incubator/cayenne/main/trunk/cayenne/cayenne-java/cayenne/src/main/resources/org/apache/cayenne/dba/firebird/
incubator/cayenne/main/trunk/cayenne/cayenne-java/cayenne/src/main/resources/org/apache/cayenne/dba/firebird/types.xml
- copied unchanged from r426577,
incubator/cayenne/main/trunk/cayenne/cayenne-java/cayenne/src/main/java/org/apache/cayenne/dba/firebird/types.xml
incubator/cayenne/main/trunk/cayenne/cayenne-java/cayenne/src/main/resources/org/apache/cayenne/dba/frontbase/
incubator/cayenne/main/trunk/cayenne/cayenne-java/cayenne/src/main/resources/org/apache/cayenne/dba/frontbase/types.xml
- copied unchanged from r426577,
incubator/cayenne/main/trunk/cayenne/cayenne-java/cayenne/src/main/java/org/apache/cayenne/dba/frontbase/types.xml
incubator/cayenne/main/trunk/cayenne/cayenne-java/cayenne/src/main/resources/org/apache/cayenne/dba/hsqldb/
incubator/cayenne/main/trunk/cayenne/cayenne-java/cayenne/src/main/resources/org/apache/cayenne/dba/hsqldb/types.xml
- copied unchanged from r426577,
incubator/cayenne/main/trunk/cayenne/cayenne-java/cayenne/src/main/java/org/apache/cayenne/dba/hsqldb/types.xml
incubator/cayenne/main/trunk/cayenne/cayenne-java/cayenne/src/main/resources/org/apache/cayenne/dba/ingress/
incubator/cayenne/main/trunk/cayenne/cayenne-java/cayenne/src/main/resources/org/apache/cayenne/dba/ingress/types.xml
- copied unchanged from r426577,
incubator/cayenne/main/trunk/cayenne/cayenne-java/cayenne/src/main/java/org/apache/cayenne/dba/ingres/types.xml
incubator/cayenne/main/trunk/cayenne/cayenne-java/cayenne/src/main/resources/org/apache/cayenne/dba/mysql/
incubator/cayenne/main/trunk/cayenne/cayenne-java/cayenne/src/main/resources/org/apache/cayenne/dba/mysql/types.xml
- copied unchanged from r426577,
incubator/cayenne/main/trunk/cayenne/cayenne-java/cayenne/src/main/java/org/apache/cayenne/dba/mysql/types.xml
incubator/cayenne/main/trunk/cayenne/cayenne-java/cayenne/src/main/resources/org/apache/cayenne/dba/openbase/
incubator/cayenne/main/trunk/cayenne/cayenne-java/cayenne/src/main/resources/org/apache/cayenne/dba/openbase/types.xml
- copied unchanged from r426577,
incubator/cayenne/main/trunk/cayenne/cayenne-java/cayenne/src/main/java/org/apache/cayenne/dba/openbase/types.xml
incubator/cayenne/main/trunk/cayenne/cayenne-java/cayenne/src/main/resources/org/apache/cayenne/dba/oracle/
incubator/cayenne/main/trunk/cayenne/cayenne-java/cayenne/src/main/resources/org/apache/cayenne/dba/oracle/types-oracle8.xml
- copied unchanged from r426577,
incubator/cayenne/main/trunk/cayenne/cayenne-java/cayenne/src/main/java/org/apache/cayenne/dba/oracle/types-oracle8.xml
incubator/cayenne/main/trunk/cayenne/cayenne-java/cayenne/src/main/resources/org/apache/cayenne/dba/oracle/types.xml
- copied unchanged from r426577,
incubator/cayenne/main/trunk/cayenne/cayenne-java/cayenne/src/main/java/org/apache/cayenne/dba/oracle/types.xml
incubator/cayenne/main/trunk/cayenne/cayenne-java/cayenne/src/main/resources/org/apache/cayenne/dba/postgress/
incubator/cayenne/main/trunk/cayenne/cayenne-java/cayenne/src/main/resources/org/apache/cayenne/dba/postgress/types.xml
- copied unchanged from r426577,
incubator/cayenne/main/trunk/cayenne/cayenne-java/cayenne/src/main/java/org/apache/cayenne/dba/postgres/types.xml
incubator/cayenne/main/trunk/cayenne/cayenne-java/cayenne/src/main/resources/org/apache/cayenne/dba/sqlserver/
incubator/cayenne/main/trunk/cayenne/cayenne-java/cayenne/src/main/resources/org/apache/cayenne/dba/sqlserver/types.xml
- copied unchanged from r426577,
incubator/cayenne/main/trunk/cayenne/cayenne-java/cayenne/src/main/java/org/apache/cayenne/dba/sqlserver/types.xml
incubator/cayenne/main/trunk/cayenne/cayenne-java/cayenne/src/main/resources/org/apache/cayenne/dba/sybase/
incubator/cayenne/main/trunk/cayenne/cayenne-java/cayenne/src/main/resources/org/apache/cayenne/dba/sybase/types.xml
- copied unchanged from r426577,
incubator/cayenne/main/trunk/cayenne/cayenne-java/cayenne/src/main/java/org/apache/cayenne/dba/sybase/types.xml
incubator/cayenne/main/trunk/cayenne/cayenne-java/cayenne/src/main/resources/org/apache/cayenne/dba/types.xml
- copied unchanged from r426577,
incubator/cayenne/main/trunk/cayenne/cayenne-java/cayenne/src/main/java/org/apache/cayenne/dba/types.xml
incubator/cayenne/main/trunk/cayenne/cayenne-java/cayenne/src/main/resources/org/apache/cayenne/tools/
incubator/cayenne/main/trunk/cayenne/cayenne-java/cayenne/src/main/resources/org/apache/cayenne/tools/antlib.xml
- copied unchanged from r426577,
incubator/cayenne/main/trunk/cayenne/cayenne-java/cayenne/src/main/java/org/apache/cayenne/tools/antlib.xml
Removed:
incubator/cayenne/main/trunk/cayenne/cayenne-java-1.5/src/cayenne/java/
incubator/cayenne/main/trunk/cayenne/cayenne-java/cayenne/src/main/java/org/apache/cayenne/dba/db2/types.xml
incubator/cayenne/main/trunk/cayenne/cayenne-java/cayenne/src/main/java/org/apache/cayenne/dba/derby/types.xml
incubator/cayenne/main/trunk/cayenne/cayenne-java/cayenne/src/main/java/org/apache/cayenne/dba/firebird/types.xml
incubator/cayenne/main/trunk/cayenne/cayenne-java/cayenne/src/main/java/org/apache/cayenne/dba/frontbase/types.xml
incubator/cayenne/main/trunk/cayenne/cayenne-java/cayenne/src/main/java/org/apache/cayenne/dba/hsqldb/types.xml
incubator/cayenne/main/trunk/cayenne/cayenne-java/cayenne/src/main/java/org/apache/cayenne/dba/ingres/types.xml
incubator/cayenne/main/trunk/cayenne/cayenne-java/cayenne/src/main/java/org/apache/cayenne/dba/mysql/types.xml
incubator/cayenne/main/trunk/cayenne/cayenne-java/cayenne/src/main/java/org/apache/cayenne/dba/openbase/types.xml
incubator/cayenne/main/trunk/cayenne/cayenne-java/cayenne/src/main/java/org/apache/cayenne/dba/oracle/types-oracle8.xml
incubator/cayenne/main/trunk/cayenne/cayenne-java/cayenne/src/main/java/org/apache/cayenne/dba/oracle/types.xml
incubator/cayenne/main/trunk/cayenne/cayenne-java/cayenne/src/main/java/org/apache/cayenne/dba/postgres/types.xml
incubator/cayenne/main/trunk/cayenne/cayenne-java/cayenne/src/main/java/org/apache/cayenne/dba/sqlserver/types.xml
incubator/cayenne/main/trunk/cayenne/cayenne-java/cayenne/src/main/java/org/apache/cayenne/dba/sybase/types.xml
incubator/cayenne/main/trunk/cayenne/cayenne-java/cayenne/src/main/java/org/apache/cayenne/dba/types.xml
incubator/cayenne/main/trunk/cayenne/cayenne-java/cayenne/src/main/java/org/apache/cayenne/tools/antlib.xml
Modified:
incubator/cayenne/main/trunk/cayenne-jpa/pom.xml
incubator/cayenne/main/trunk/cayenne-regression-profiler/pom.xml
incubator/cayenne/main/trunk/cayenne/cayenne-java-1.5/ (props changed)
incubator/cayenne/main/trunk/cayenne/cayenne-java/cayenne/pom.xml
incubator/cayenne/main/trunk/cayenne/cayenne-java/dvmodeler/pom.xml
incubator/cayenne/main/trunk/cayenne/cayenne-java/modeler/pom.xml
incubator/cayenne/main/trunk/pom.xml
Modified: incubator/cayenne/main/trunk/cayenne-jpa/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne-jpa/pom.xml?rev=426595&r1=426594&r2=426595&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne-jpa/pom.xml (original)
+++ incubator/cayenne/main/trunk/cayenne-jpa/pom.xml Fri Jul 28 09:14:56 2006
@@ -3,57 +3,27 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.cayenne</groupId>
- <artifactId>cayenne-jpa</artifactId>
- <packaging>jar</packaging>
- <version>3.0-incubating-SNAPSHOT</version>
- <name>Cayenne JPA Implementation</name>
- <url>http://incubator.apache.org/cayenne</url>
- <organization>
- <name>Apache Software Foundation (incubating)</name>
- </organization>
+
+ <parent>
+ <groupId>org.apache.cayenne</groupId>
+ <artifactId>cayenne-parent</artifactId>
+ <version>3.0-incubating-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>cayenne-jpa</artifactId>
+ <packaging>jar</packaging>
+
+ <name>Cayenne JPA Implementation</name>
+
+ <url>http://incubator.apache.org/cayenne</url>
+ <organization>
+ <name>Apache Software Foundation (incubating)</name>
+ </organization>
<description>
This project is dedicated to making Cayenne a JPA provider.
</description>
- <mailingLists>
- <mailingList>
- <name>Development List</name>
- <subscribe>
- [EMAIL PROTECTED]
- </subscribe>
- <unsubscribe>
- [EMAIL PROTECTED]
- </unsubscribe>
- <post>[email protected]</post>
- <archive>
-
http://objectstyle.org/cayenne/lists/cayenne-user
- </archive>
- </mailingList>
- <mailingList>
- <name>User List</name>
- <subscribe>
- [EMAIL PROTECTED]
- </subscribe>
- <unsubscribe>
- [EMAIL PROTECTED]
- </unsubscribe>
- <post>[email protected]</post>
- <archive>
-
http://objectstyle.org/cayenne/lists/cayenne-user
- </archive>
- </mailingList>
- <mailingList>
- <name>Commits List</name>
- <subscribe>
- [EMAIL PROTECTED]
- </subscribe>
- <unsubscribe>
- [EMAIL PROTECTED]
- </unsubscribe>
- </mailingList>
- </mailingLists>
- <developers>
+ <!-- developers>
<developer>
<id>andrus</id>
<name>Andrus Adamchik</name>
@@ -111,25 +81,34 @@
<enabled>false</enabled>
</releases>
</repository>
- </repositories>
+ </repositories -->
<dependencies>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jpa_3.0_spec</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
- <dependency>
+ <dependency>
+ <groupId>org.apache.cayenne.core</groupId>
+ <artifactId>cayenne-jdk1.4-core</artifactId>
+ <version>${version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cayenne.core</groupId>
+ <artifactId>cayenne-jdk1.5-core</artifactId>
+ <version>${version}</version>
+ </dependency>
+
+ <!-- dependency>
<groupId>org.apache.cayenne</groupId>
<artifactId>cayenne-nodeps</artifactId>
<version>3.0-incubating-SNAPSHOT</version>
- </dependency>
+ </dependency -->
<dependency>
<groupId>cglib</groupId>
<artifactId>cglib-nodep</artifactId>
@@ -168,18 +147,6 @@
</configuration>
</plugin>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
-
<artifactId>surefire-report-maven-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <showProtected>true</showProtected>
- <showPackage>false</showPackage>
- </configuration>
- </plugin>
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
@@ -193,7 +160,7 @@
</plugins>
</build>
- <reporting>
+ <!--reporting>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -215,7 +182,7 @@
</reportSets>
</plugin>
</plugins>
- </reporting>
+ </reporting-->
<profiles>
<profile>
Modified: incubator/cayenne/main/trunk/cayenne-regression-profiler/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne-regression-profiler/pom.xml?rev=426595&r1=426594&r2=426595&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne-regression-profiler/pom.xml (original)
+++ incubator/cayenne/main/trunk/cayenne-regression-profiler/pom.xml Fri Jul 28
09:14:56 2006
@@ -1,11 +1,18 @@
<?xml version="1.0"?><project>
<modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.cayenne</groupId>
+ <artifactId>cayenne-parent</artifactId>
+ <version>3.0-incubating-SNAPSHOT</version>
+ </parent>
+
<groupId>org.apache.cayenne</groupId>
<artifactId>cayenne-regression-profiler</artifactId>
<packaging>war</packaging>
+
<name>Cayenne Regression Profiler Web Application</name>
- <version>1.2-SNAPSHOT</version>
- <url>http://incubator.apache.org/cayenne/</url>
+
<build>
<finalName>cayenne-regression-profiler</finalName>
<plugins>
@@ -142,24 +149,30 @@
</dependencies>
</profile>
</profiles>
+
<repositories>
+
<repository>
<id>objectstyle</id>
<name>ObjectStyle Public Maven2 repo</name>
<url>http://objectstyle.org/maven2</url>
</repository>
+
</repositories>
+
<dependencies>
+
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
- <version>2.4</version>
- <scope>provided</scope>
</dependency>
+
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.1</version>
+ <scope>compile</scope>
</dependency>
+
</dependencies>
-</project>
\ No newline at end of file
+
+</project>
Propchange: incubator/cayenne/main/trunk/cayenne/cayenne-java-1.5/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Fri Jul 28 09:14:56 2006
@@ -1 +1,2 @@
+target
build
Added: incubator/cayenne/main/trunk/cayenne/cayenne-java-1.5/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-java-1.5/pom.xml?rev=426595&view=auto
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-java-1.5/pom.xml (added)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-java-1.5/pom.xml Fri Jul 28
09:14:56 2006
@@ -0,0 +1,191 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright 2006 The Apache Software Foundation
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<!-- $Rev$ $Date$ -->
+
+<project
+ xmlns="http://maven.apache.org/POM/4.0.0";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.cayenne</groupId>
+ <artifactId>cayenne-core-parent</artifactId>
+ <version>3.0-incubating-SNAPSHOT</version>
+ </parent>
+
+ <groupId>org.apache.cayenne.core</groupId>
+ <artifactId>cayenne-jdk1.5-core</artifactId>
+ <name>Cayenne Java 1.5 Core</name>
+ <packaging>jar</packaging>
+
+ <dependencies>
+
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-beans</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>hessian</groupId>
+ <artifactId>hessian</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>jgroups</groupId>
+ <artifactId>jgroups</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>ant</groupId>
+ <artifactId>ant</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-dbcp</groupId>
+ <artifactId>commons-dbcp</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-pool</groupId>
+ <artifactId>commons-pool</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>velocity</groupId>
+ <artifactId>velocity</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.objectstyle.ashwood</groupId>
+ <artifactId>ashwood</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>jms</groupId>
+ <artifactId>jms</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>jivesoftware</groupId>
+ <artifactId>smack</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>jivesoftware</groupId>
+ <artifactId>smackx</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>foundrylogic.vpp</groupId>
+ <artifactId>vpp</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>jdom</groupId>
+ <artifactId>jdom</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>mockrunner</groupId>
+ <artifactId>mockrunner</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.cayenne.core</groupId>
+ <artifactId>cayenne-jdk1.4-core</artifactId>
+ <version>${version}</version>
+ </dependency>
+
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <includes>
+ <include>**/*Tst.java</include>
+ </includes>
+ </configuration>
+ </plugin>
+
+ <!-- plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>bundle-test-jar</id>
+ <phase>package</phase>
+ <goals>
+ <goal>test-jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin -->
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+
+ </plugins>
+ </build>
+
+</project>
Modified: incubator/cayenne/main/trunk/cayenne/cayenne-java/cayenne/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-java/cayenne/pom.xml?rev=426595&r1=426594&r2=426595&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-java/cayenne/pom.xml (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-java/cayenne/pom.xml Fri Jul
28 09:14:56 2006
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright 2006 The Apache Software Foundation
-
+
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,164 +17,170 @@
<!-- $Rev$ $Date$ -->
-<project
- xmlns="http://maven.apache.org/POM/4.0.0";
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
-
+
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.cayenne.core</groupId>
- <artifactId>cayenne-core-parent</artifactId>
- <version>3.0-incubating-SNAPSHOT</version>
+ <groupId>org.apache.cayenne.core</groupId>
+ <artifactId>cayenne-core-parent</artifactId>
+ <version>3.0-incubating-SNAPSHOT</version>
</parent>
+ <description>Cayenne Java 1.4 Core</description>
<artifactId>cayenne-jdk1.4-core</artifactId>
<name>Cayenne Java 1.4 Core</name>
<packaging>jar</packaging>
<dependencies>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-core</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-beans</artifactId>
- </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-beans</artifactId>
+ </dependency>
<dependency>
<groupId>com.caucho</groupId>
<artifactId>hessian</artifactId>
</dependency>
- <dependency>
- <groupId>servletapi</groupId>
- <artifactId>servlet-api</artifactId>
- </dependency>
-
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </dependency>
<dependency>
<groupId>jgroups</groupId>
<artifactId>jgroups-all</artifactId>
</dependency>
- <dependency>
- <groupId>ant</groupId>
- <artifactId>ant</artifactId>
- </dependency>
-
- <dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- </dependency>
-
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- </dependency>
-
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </dependency>
-
- <dependency>
- <groupId>commons-dbcp</groupId>
- <artifactId>commons-dbcp</artifactId>
- </dependency>
-
- <dependency>
- <groupId>commons-pool</groupId>
- <artifactId>commons-pool</artifactId>
- </dependency>
-
- <dependency>
- <groupId>velocity</groupId>
- <artifactId>velocity</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.objectstyle.ashwood</groupId>
- <artifactId>ashwood</artifactId>
- </dependency>
+ <dependency>
+ <groupId>ant</groupId>
+ <artifactId>ant</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-dbcp</groupId>
+ <artifactId>commons-dbcp</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-pool</groupId>
+ <artifactId>commons-pool</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>velocity</groupId>
+ <artifactId>velocity</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.objectstyle.ashwood</groupId>
+ <artifactId>ashwood</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jms_1.1_spec</artifactId>
</dependency>
- <dependency>
- <groupId>jivesoftware</groupId>
- <artifactId>smack</artifactId>
- </dependency>
-
- <dependency>
- <groupId>jivesoftware</groupId>
- <artifactId>smackx</artifactId>
- </dependency>
-
- <dependency>
- <groupId>foundrylogic.vpp</groupId>
- <artifactId>vpp</artifactId>
- </dependency>
-
- <dependency>
- <groupId>jdom</groupId>
- <artifactId>jdom</artifactId>
- </dependency>
-
- <dependency>
- <groupId>mockrunner</groupId>
- <artifactId>mockrunner</artifactId>
- </dependency>
+ <dependency>
+ <groupId>oro</groupId>
+ <artifactId>oro</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>jivesoftware</groupId>
+ <artifactId>smack</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>jivesoftware</groupId>
+ <artifactId>smackx</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>foundrylogic.vpp</groupId>
+ <artifactId>vpp</artifactId>
+ </dependency>
<dependency>
<groupId>opensymphony</groupId>
<artifactId>oscache</artifactId>
</dependency>
+ <dependency>
+ <groupId>jdom</groupId>
+ <artifactId>jdom</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>mockrunner</groupId>
+ <artifactId>mockrunner</artifactId>
+ </dependency>
+
</dependencies>
<build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <includes>
- <include>**/*Tst.java</include>
- </includes>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <executions>
- <execution>
- <id>bundle-test-jar</id>
- <phase>package</phase>
- <goals>
- <goal>test-jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
+ <plugins>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <includes>
+ <include>**/*Tst.java</include>
+ </includes>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>bundle-test-jar</id>
+ <phase>package</phase>
+ <goals>
+ <goal>test-jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
- </plugins>
+ </plugins>
</build>
</project>
Modified: incubator/cayenne/main/trunk/cayenne/cayenne-java/dvmodeler/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-java/dvmodeler/pom.xml?rev=426595&r1=426594&r2=426595&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-java/dvmodeler/pom.xml
(original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-java/dvmodeler/pom.xml Fri Jul
28 09:14:56 2006
@@ -38,7 +38,7 @@
<dependencies>
<dependency>
- <groupId>servletapi</groupId>
+ <groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
</dependency>
@@ -124,19 +124,19 @@
</dependencies>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
- <manifest>
- <mainClass>org.apache.cayenne.dataview.Main</mainClass>
- </manifest>
- </archive>
- </configuration>
- </plugin>
- </plugins>
- </build>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifest>
+ <mainClass>org.apache.cayenne.dataview.Main</mainClass>
+ </manifest>
+ </archive>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
Modified: incubator/cayenne/main/trunk/cayenne/cayenne-java/modeler/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-java/modeler/pom.xml?rev=426595&r1=426594&r2=426595&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-java/modeler/pom.xml (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-java/modeler/pom.xml Fri Jul
28 09:14:56 2006
@@ -42,7 +42,7 @@
</dependency>
<dependency>
- <groupId>servletapi</groupId>
+ <groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
</dependency>
Modified: incubator/cayenne/main/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/pom.xml?rev=426595&r1=426594&r2=426595&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/pom.xml (original)
+++ incubator/cayenne/main/trunk/pom.xml Fri Jul 28 09:14:56 2006
@@ -29,15 +29,16 @@
<version>3.0-incubating-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Cayenne</name>
- <description>Apache Cayenne is a powerful, full-featured Java Object
Relational Mapping framework. It is open source and completely free. Cayenne
cross-platform modeling GUI tools place it in the league of its own, making it
a very attractive choice over both closed source commercial products and
traditional "edit your own XML" open source solutions.
-
-Cayenne provides management of persistent Java objects mapped to relational
databases, single method call queries and updates (including atomic updates of
all modified objects), seamless integration of multiple databases into a single
virtual data source. Cayenne is distributed with CayenneModeler - a complete
GUI mapping tool. Cayenne has been successfully deployed in production
environment on high volume sites and has a constantly growing international
community.
-
-Cayenne is a true open source project drawing its strength from the developer
and user community.
- </description>
+ <description>Apache Cayenne is a powerful, full-featured Java Object
Relational Mapping framework currently in incubation.</description>
<url>http://incubator.apache.org/cayenne</url>
+ <modules>
+ <module>cayenne</module>
+ <module>cayenne-jpa</module>
+ <module>cayenne-regression-profiler</module>
+ </modules>
+
<issueManagement>
<system>jira</system>
<url>http://issues.apache.org/cayenne/browse/CAY</url>
@@ -282,9 +283,16 @@
</dependency>
<dependency>
- <groupId>servletapi</groupId>
+ <groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<version>2.4</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>oro</groupId>
+ <artifactId>oro</artifactId>
+ <version>2.0.8</version>
</dependency>
<dependency>
@@ -446,6 +454,8 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
+ <showProtected>true</showProtected>
+ <showPackage>false</showPackage>
<links>
<link>http://java.sun.com/j2ee/1.4/docs/api</link>
<link>http://java.sun.com/j2se/1.5.0/docs/api</link>
