From 021e8a498e08f64c1c553a6f8f188269eb45c164 Mon Sep 17 00:00:00 2001
From: Donald Woods <dwoods@apache.org>
Date: Fri, 13 Aug 2010 20:33:50 +0000
Subject: [PATCH] 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
---
 LICENSE.txt => LICENSE                        |  0
 NOTICE.txt => NOTICE                          |  0
 openjpa-all/pom.xml                           | 13 ++++
 .../appended-resources/META-INF/NOTICE.vm     | 11 +++-
 openjpa-examples/image-gallery/pom.xml        | 20 ------
 openjpa-integration/validation/pom.xml        | 64 ++++++-------------
 openjpa-project/{LICENSE.txt => LICENSE}      |  0
 openjpa-project/{NOTICE.txt => NOTICE}        | 10 +--
 openjpa-project/assembly.xml                  |  6 +-
 openjpa-project/pom.xml                       | 11 +++-
 10 files changed, 61 insertions(+), 74 deletions(-)
 rename LICENSE.txt => LICENSE (100%)
 rename NOTICE.txt => NOTICE (100%)
 rename openjpa-project/{LICENSE.txt => LICENSE} (100%)
 rename openjpa-project/{NOTICE.txt => NOTICE} (80%)

diff --git a/LICENSE.txt b/LICENSE
similarity index 100%
rename from LICENSE.txt
rename to LICENSE
diff --git a/NOTICE.txt b/NOTICE
similarity index 100%
rename from NOTICE.txt
rename to NOTICE
diff --git a/openjpa-all/pom.xml b/openjpa-all/pom.xml
index 6c4b598f3..1f160e00e 100644
--- a/openjpa-all/pom.xml
+++ b/openjpa-all/pom.xml
@@ -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>
diff --git a/openjpa-all/src/main/appended-resources/META-INF/NOTICE.vm b/openjpa-all/src/main/appended-resources/META-INF/NOTICE.vm
index 7ad5456eb..b972c99bc 100644
--- a/openjpa-all/src/main/appended-resources/META-INF/NOTICE.vm
+++ b/openjpa-all/src/main/appended-resources/META-INF/NOTICE.vm
@@ -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
diff --git a/openjpa-examples/image-gallery/pom.xml b/openjpa-examples/image-gallery/pom.xml
index 94537cd68..ef71e36de 100644
--- a/openjpa-examples/image-gallery/pom.xml
+++ b/openjpa-examples/image-gallery/pom.xml
@@ -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>
diff --git a/openjpa-integration/validation/pom.xml b/openjpa-integration/validation/pom.xml
index f70498015..dd5f44ca3 100644
--- a/openjpa-integration/validation/pom.xml
+++ b/openjpa-integration/validation/pom.xml
@@ -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>
@@ -109,6 +87,23 @@
                 </property>
             </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>
@@ -165,18 +160,6 @@
     </profiles>
 
     <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>
@@ -185,11 +168,6 @@
             <type>test-jar</type>
             <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>
diff --git a/openjpa-project/LICENSE.txt b/openjpa-project/LICENSE
similarity index 100%
rename from openjpa-project/LICENSE.txt
rename to openjpa-project/LICENSE
diff --git a/openjpa-project/NOTICE.txt b/openjpa-project/NOTICE
similarity index 80%
rename from openjpa-project/NOTICE.txt
rename to openjpa-project/NOTICE
index 57b8320e3..84c2f67ae 100644
--- a/openjpa-project/NOTICE.txt
+++ b/openjpa-project/NOTICE
@@ -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 software developed by the:
 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.
 
diff --git a/openjpa-project/assembly.xml b/openjpa-project/assembly.xml
index abd0094fc..89d1c4d93 100644
--- a/openjpa-project/assembly.xml
+++ b/openjpa-project/assembly.xml
@@ -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>
diff --git a/openjpa-project/pom.xml b/openjpa-project/pom.xml
index 10e2ff1c0..d0d665cf0 100644
--- a/openjpa-project/pom.xml
+++ b/openjpa-project/pom.xml
@@ -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>