You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openjpa.apache.org by dw...@apache.org on 2010/08/13 22:33:51 UTC
svn commit: r985350 - in /openjpa/trunk: ./ openjpa-all/
openjpa-all/src/main/appended-resources/META-INF/
openjpa-examples/image-gallery/ openjpa-integration/validation/
openjpa-project/
Author: dwoods
Date: Fri Aug 13 20:33:50 2010
New Revision: 985350
URL: http://svn.apache.org/viewvc?rev=985350&view=rev
Log:
OPENJPA-1754 Include Apache BVal and spec api in openjpa-all and binary assembly to complete the JPA 2.0 picture
Added:
openjpa/trunk/LICENSE
- copied unchanged from r985297, openjpa/trunk/LICENSE.txt
openjpa/trunk/NOTICE
- copied unchanged from r985297, openjpa/trunk/NOTICE.txt
openjpa/trunk/openjpa-project/LICENSE
- copied unchanged from r985297, openjpa/trunk/openjpa-project/LICENSE.txt
openjpa/trunk/openjpa-project/NOTICE
- copied, changed from r985297, openjpa/trunk/openjpa-project/NOTICE.txt
Removed:
openjpa/trunk/LICENSE.txt
openjpa/trunk/NOTICE.txt
openjpa/trunk/openjpa-project/LICENSE.txt
openjpa/trunk/openjpa-project/NOTICE.txt
Modified:
openjpa/trunk/openjpa-all/pom.xml
openjpa/trunk/openjpa-all/src/main/appended-resources/META-INF/NOTICE.vm
openjpa/trunk/openjpa-examples/image-gallery/pom.xml
openjpa/trunk/openjpa-integration/validation/pom.xml
openjpa/trunk/openjpa-project/assembly.xml
openjpa/trunk/openjpa-project/pom.xml
Modified: openjpa/trunk/openjpa-all/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-all/pom.xml?rev=985350&r1=985349&r2=985350&view=diff
==============================================================================
--- openjpa/trunk/openjpa-all/pom.xml (original)
+++ openjpa/trunk/openjpa-all/pom.xml Fri Aug 13 20:33:50 2010
@@ -119,5 +119,18 @@
<groupId>commons-dbcp</groupId>
<artifactId>commons-dbcp</artifactId>
</dependency>
+ <!-- bean validation includes -->
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-validation_1.0_spec</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.bval</groupId>
+ <artifactId>org.apache.bval.bundle</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-beanutils</groupId>
+ <artifactId>commons-beanutils</artifactId>
+ </dependency>
</dependencies>
</project>
Modified: openjpa/trunk/openjpa-all/src/main/appended-resources/META-INF/NOTICE.vm
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-all/src/main/appended-resources/META-INF/NOTICE.vm?rev=985350&r1=985349&r2=985350&view=diff
==============================================================================
--- openjpa/trunk/openjpa-all/src/main/appended-resources/META-INF/NOTICE.vm (original)
+++ openjpa/trunk/openjpa-all/src/main/appended-resources/META-INF/NOTICE.vm Fri Aug 13 20:33:50 2010
@@ -19,17 +19,24 @@
openjpa-all includes software developed by the:
Apache Commons Collections project
+ Apache Commons Collections project
+ Apache Commons DBCP project
Apache Commons Lang project
Apache Commons Logging project
Apache Commons Pool project
- Apache Geronimo project (JMS 1.1, JTA 1.1 and JPA 2.0 spec apis)
+ Apache Geronimo project
+ Java EE Specs - JMS 1.1, JTA 1.1, Bean Validation 1.0 and JPA 2.0
SERP project
+
+The following copyright notice(s) were affixed to portions of this code
+with which this file is now or was at one time distributed.
+
OpenJPA includes software developed by the SERP project
Copyright (c) 2002-2006, A. Abram White. All rights reserved.
OpenJPA includes the persistence and orm schemas from the JPA specifications.
-Copyright 2005-2007 Sun Microsystems, Inc. All rights reserved.
+Copyright 2005-2009 Sun Microsystems, Inc. All rights reserved.
OpenJPA elects to include this software in this distribution under the
CDDL license. You can obtain a copy of the License at:
https://glassfish.dev.java.net/public/CDDL+GPL.html
Modified: openjpa/trunk/openjpa-examples/image-gallery/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-examples/image-gallery/pom.xml?rev=985350&r1=985349&r2=985350&view=diff
==============================================================================
--- openjpa/trunk/openjpa-examples/image-gallery/pom.xml (original)
+++ openjpa/trunk/openjpa-examples/image-gallery/pom.xml Fri Aug 13 20:33:50 2010
@@ -69,26 +69,6 @@
</profiles>
<dependencies>
- <!-- When using bval, commons-lang must be in the dependency list -->
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>commons-beanutils</groupId>
- <artifactId>commons-beanutils</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-validation_1.0_spec</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.bval</groupId>
- <artifactId>org.apache.bval.bundle</artifactId>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-all</artifactId>
Modified: openjpa/trunk/openjpa-integration/validation/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-integration/validation/pom.xml?rev=985350&r1=985349&r2=985350&view=diff
==============================================================================
--- openjpa/trunk/openjpa-integration/validation/pom.xml (original)
+++ openjpa/trunk/openjpa-integration/validation/pom.xml Fri Aug 13 20:33:50 2010
@@ -48,33 +48,11 @@
</property>
</activation>
<dependencies>
+ <!-- use openjpa-all which includes Apache BVal and depends -->
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-validation_1.0_spec</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.bval</groupId>
- <artifactId>org.apache.bval.bundle</artifactId>
- <scope>test</scope>
- <exclusions>
- <!-- force usage of the geronimo-validation_1.0_spec -->
- <exclusion>
- <groupId>javax.validation</groupId>
- <artifactId>validation-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>commons-beanutils</groupId>
- <artifactId>commons-beanutils</artifactId>
- <version>1.8.3</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <scope>test</scope>
+ <groupId>org.apache.openjpa</groupId>
+ <artifactId>openjpa-all</artifactId>
+ <version>${project.version}</version>
</dependency>
</dependencies>
</profile>
@@ -110,6 +88,23 @@
</activation>
<dependencies>
<dependency>
+ <groupId>org.apache.openjpa</groupId>
+ <artifactId>openjpa</artifactId>
+ <version>${pom.version}</version>
+ <!-- allow profiles to decide which validation spec to use -->
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-validation_1.0_spec</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>commons-dbcp</groupId>
+ <artifactId>commons-dbcp</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>javax.validation</groupId>
<artifactId>validation-api</artifactId>
<version>1.0.0.GA</version>
@@ -167,18 +162,6 @@
<dependencies>
<dependency>
<groupId>org.apache.openjpa</groupId>
- <artifactId>openjpa</artifactId>
- <version>${pom.version}</version>
- <!-- allow profiles to decide which validation spec to use -->
- <exclusions>
- <exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-validation_1.0_spec</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-persistence-jdbc</artifactId>
<version>${pom.version}</version>
<!-- <classifier>tests</classifier> -->
@@ -186,11 +169,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>commons-dbcp</groupId>
- <artifactId>commons-dbcp</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
<scope>test</scope>
Copied: openjpa/trunk/openjpa-project/NOTICE (from r985297, openjpa/trunk/openjpa-project/NOTICE.txt)
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-project/NOTICE?p2=openjpa/trunk/openjpa-project/NOTICE&p1=openjpa/trunk/openjpa-project/NOTICE.txt&r1=985297&r2=985350&rev=985350&view=diff
==============================================================================
--- openjpa/trunk/openjpa-project/NOTICE.txt (original)
+++ openjpa/trunk/openjpa-project/NOTICE Fri Aug 13 20:33:50 2010
@@ -1,17 +1,20 @@
-Apache OpenJPA Aggregate Jar with Dependencies
+Apache OpenJPA binary assembly
Copyright 2006-2010 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
-The OpenJPA binary assembly includes software developed by the:
+The OpenJPA binary assembly and openjpa-all includes software developed by the:
+ Apache Commons Beanutils project
Apache Commons Collections project
Apache Commons DBCP project
Apache Commons Lang project
+ Apache Commons Logging project
Apache Commons Pool project
Apache Derby project
- Apache Geronimo project (JMS 1.1, JTA 1.1, JPA 2.0 and Bean Validation 1.0 spec apis)
+ Apache Geronimo project
+ Java EE Specs - JMS 1.1, JTA 1.1, Bean Validation 1.0 and JPA 2.0
Apache Incubtor - Bean Validation project
SERP project
@@ -19,7 +22,6 @@ The OpenJPA binary assembly includes sof
The following copyright notice(s) were affixed to portions of this code
with which this file is now or was at one time distributed.
-
OpenJPA includes software developed by the SERP project
Copyright (c) 2002-2006, A. Abram White. All rights reserved.
Modified: openjpa/trunk/openjpa-project/assembly.xml
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-project/assembly.xml?rev=985350&r1=985349&r2=985350&view=diff
==============================================================================
--- openjpa/trunk/openjpa-project/assembly.xml (original)
+++ openjpa/trunk/openjpa-project/assembly.xml Fri Aug 13 20:33:50 2010
@@ -37,9 +37,7 @@
<include>NOTICE</include>
<include>README.txt</include>
<include>DISCLAIMER.txt</include>
- <include>LICENSE.txt</include>
<include>STATUS.txt</include>
- <include>NOTICE.txt</include>
<include>RELEASE-NOTES</include>
<include>RELEASE-NOTES.html</include>
<include>RELEASE-NOTES.txt</include>
@@ -126,7 +124,9 @@
<include>org.apache.geronimo.specs:geronimo-jta_1.1_spec</include>
<include>org.apache.geronimo.specs:geronimo-jpa_2.0_spec</include>
<include>org.apache.geronimo.specs:geronimo-jms_1.1_spec</include>
- <!-- <include>org.apache.geronimo.specs:geronimo-validation_1.0_spec</include> -->
+ <include>org.apache.geronimo.specs:geronimo-validation_1.0_spec</include>
+ <include>org.apache.bval:org.apache.bval.bundle</include>
+ <include>commons-beanutils:commons-beanutils</include>
</includes>
</dependencySet>
</dependencySets>
Modified: openjpa/trunk/openjpa-project/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-project/pom.xml?rev=985350&r1=985349&r2=985350&view=diff
==============================================================================
--- openjpa/trunk/openjpa-project/pom.xml (original)
+++ openjpa/trunk/openjpa-project/pom.xml Fri Aug 13 20:33:50 2010
@@ -443,11 +443,18 @@
<artifactId>commons-dbcp</artifactId>
</dependency>
- <!-- excluded optional dependency that user should provide with BV impl
+ <!-- included for Apache Bean Validation provider -->
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-validation_1.0_spec</artifactId>
</dependency>
- -->
+ <dependency>
+ <groupId>org.apache.bval</groupId>
+ <artifactId>org.apache.bval.bundle</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-beanutils</groupId>
+ <artifactId>commons-beanutils</artifactId>
+ </dependency>
</dependencies>
</project>