Apache
/
openjpa
mirror of https://github.com/apache/openjpa.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

OPENJPA-1754 Include Apache BVal and spec api in openjpa-all and binary assembly to complete the JPA 2.0 picture 

git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@985350 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Donald Woods 2010-08-13 20:33:50 +00:00
parent 3b8f7948b0
commit 021e8a498e
10 changed files with 61 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
LICENSE.txt → LICENSE
View File

0
NOTICE.txt → NOTICE
View File

13
openjpa-all/pom.xml
View File

@ -119,5 +119,18 @@
<groupId>commons-dbcp</groupId> <groupId>commons-dbcp</groupId>
<artifactId>commons-dbcp</artifactId> <artifactId>commons-dbcp</artifactId>
</dependency> </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> </dependencies>
</project> </project>

11
openjpa-all/src/main/appended-resources/META-INF/NOTICE.vm
View File

@ -19,17 +19,24 @@
openjpa-all includes software developed by the: openjpa-all includes software developed by the:
Apache Commons Collections project Apache Commons Collections project
Apache Commons Collections project
Apache Commons DBCP project
Apache Commons Lang project Apache Commons Lang project
Apache Commons Logging project Apache Commons Logging project
Apache Commons Pool 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 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 OpenJPA includes software developed by the SERP project
Copyright (c) 2002-2006, A. Abram White. All rights reserved. Copyright (c) 2002-2006, A. Abram White. All rights reserved.
OpenJPA includes the persistence and orm schemas from the JPA specifications. 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 OpenJPA elects to include this software in this distribution under the
CDDL license. You can obtain a copy of the License at: CDDL license. You can obtain a copy of the License at:
https://glassfish.dev.java.net/public/CDDL+GPL.html https://glassfish.dev.java.net/public/CDDL+GPL.html

20
openjpa-examples/image-gallery/pom.xml
View File

@ -69,26 +69,6 @@
</profiles> </profiles>
<dependencies> <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> <dependency>
<groupId>org.apache.openjpa</groupId> <groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-all</artifactId> <artifactId>openjpa-all</artifactId>

64
openjpa-integration/validation/pom.xml
View File

@ -48,33 +48,11 @@
</property> </property>
</activation> </activation>
<dependencies> <dependencies>
<!-- use openjpa-all which includes Apache BVal and depends -->
<dependency> <dependency>
<groupId>org.apache.geronimo.specs</groupId> <groupId>org.apache.openjpa</groupId>
<artifactId>geronimo-validation_1.0_spec</artifactId> <artifactId>openjpa-all</artifactId>
<scope>test</scope> <version>${project.version}</version>
</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>
</dependency> </dependency>
</dependencies> </dependencies>
</profile> </profile>
@ -109,6 +87,23 @@
</property> </property>
</activation> </activation>
<dependencies> <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> <dependency>
<groupId>javax.validation</groupId> <groupId>javax.validation</groupId>
<artifactId>validation-api</artifactId> <artifactId>validation-api</artifactId>
@ -165,18 +160,6 @@
</profiles> </profiles>
<dependencies> <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> <dependency>
<groupId>org.apache.openjpa</groupId> <groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-persistence-jdbc</artifactId> <artifactId>openjpa-persistence-jdbc</artifactId>
@ -185,11 +168,6 @@
<type>test-jar</type> <type>test-jar</type>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency>
<groupId>commons-dbcp</groupId>
<artifactId>commons-dbcp</artifactId>
<scope>test</scope>
</dependency>
<dependency> <dependency>
<groupId>org.apache.derby</groupId> <groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId> <artifactId>derby</artifactId>

0
openjpa-project/LICENSE.txt → openjpa-project/LICENSE
View File

10
openjpa-project/NOTICE.txt → openjpa-project/NOTICE
View File

@ -1,17 +1,20 @@
Apache OpenJPA Aggregate Jar with Dependencies Apache OpenJPA binary assembly
Copyright 2006-2010 The Apache Software Foundation Copyright 2006-2010 The Apache Software Foundation
This product includes software developed at This product includes software developed at
The Apache Software Foundation (http://www.apache.org/). 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 Collections project
Apache Commons DBCP project Apache Commons DBCP project
Apache Commons Lang project Apache Commons Lang project
Apache Commons Logging project
Apache Commons Pool project Apache Commons Pool project
Apache Derby 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 Apache Incubtor - Bean Validation project
SERP project SERP project
@ -19,7 +22,6 @@ The OpenJPA binary assembly includes software developed by the:
The following copyright notice(s) were affixed to portions of this code The following copyright notice(s) were affixed to portions of this code
with which this file is now or was at one time distributed. with which this file is now or was at one time distributed.
OpenJPA includes software developed by the SERP project OpenJPA includes software developed by the SERP project
Copyright (c) 2002-2006, A. Abram White. All rights reserved. Copyright (c) 2002-2006, A. Abram White. All rights reserved.

6
openjpa-project/assembly.xml
View File

@ -37,9 +37,7 @@
<include>NOTICE</include> <include>NOTICE</include>
<include>README.txt</include> <include>README.txt</include>
<include>DISCLAIMER.txt</include> <include>DISCLAIMER.txt</include>
<include>LICENSE.txt</include>
<include>STATUS.txt</include> <include>STATUS.txt</include>
<include>NOTICE.txt</include>
<include>RELEASE-NOTES</include> <include>RELEASE-NOTES</include>
<include>RELEASE-NOTES.html</include> <include>RELEASE-NOTES.html</include>
<include>RELEASE-NOTES.txt</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-jta_1.1_spec</include>
<include>org.apache.geronimo.specs:geronimo-jpa_2.0_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-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> </includes>
</dependencySet> </dependencySet>
</dependencySets> </dependencySets>

11
openjpa-project/pom.xml
View File

@ -443,11 +443,18 @@
<artifactId>commons-dbcp</artifactId> <artifactId>commons-dbcp</artifactId>
</dependency> </dependency>
<!-- excluded optional dependency that user should provide with BV impl <!-- included for Apache Bean Validation provider -->
<dependency> <dependency>
<groupId>org.apache.geronimo.specs</groupId> <groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-validation_1.0_spec</artifactId> <artifactId>geronimo-validation_1.0_spec</artifactId>
</dependency> </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> </dependencies>
</project> </project>