From 2f3e47fb25719500bef0a663419bad75f1543e4f Mon Sep 17 00:00:00 2001
From: Marek Goldmann <mgoldman@redhat.com>
Date: Thu, 23 Aug 2012 10:15:26 +0200
Subject: [PATCH] Add org.apache.openjpa module. This allows to use the OpenJPA
provider in persistence units.
---
build/build.xml | 12 ++++
build/pom.xml | 25 +++++++
.../modules/net/sourceforge/serp/main/module.xml | 29 +++++++++
.../modules/org/apache/openjpa/main/module.xml | 41 ++++++++++++
pom.xml | 76 +++++++++++++++++++++-
5 files changed, 182 insertions(+), 1 deletion(-)
create mode 100644 build/src/main/resources/modules/net/sourceforge/serp/main/module.xml
create mode 100644 build/src/main/resources/modules/org/apache/openjpa/main/module.xml
diff --git a/build/build.xml b/build/build.xml
index 78cb0ec..1719d0e 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -478,6 +478,10 @@
<maven-resource group="net.sourceforge.nekohtml" artifact="nekohtml"/>
</module-def>
+ <module-def name="net.sourceforge.serp">
+ <maven-resource group="net.sourceforge.serp" artifact="serp"/>
+ </module-def>
+
<module-def name="org.apache.commons.beanutils">
<maven-resource group="commons-beanutils" artifact="commons-beanutils"/>
</module-def>
@@ -580,6 +584,14 @@
<maven-resource group="org.apache.juddi.scout" artifact="scout"/>
</module-def>
+ <module-def name="org.apache.openjpa">
+ <maven-resource group="org.apache.openjpa" artifact="openjpa-jdbc"/>
+ <maven-resource group="org.apache.openjpa" artifact="openjpa-kernel"/>
+ <maven-resource group="org.apache.openjpa" artifact="openjpa-lib"/>
+ <maven-resource group="org.apache.openjpa" artifact="openjpa-persistence"/>
+ <maven-resource group="org.apache.openjpa" artifact="openjpa-persistence-jdbc"/>
+ </module-def>
+
<module-def name="org.apache.xalan">
<maven-resource group="xalan" artifact="serializer"/>
<maven-resource group="xalan" artifact="xalan"/>
diff --git a/build/pom.xml b/build/pom.xml
index 2ccc648..0163b93 100644
--- a/build/pom.xml
+++ b/build/pom.xml
@@ -563,6 +563,31 @@
</dependency>
<dependency>
+ <groupId>org.apache.openjpa</groupId>
+ <artifactId>openjpa-jdbc</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.openjpa</groupId>
+ <artifactId>openjpa-kernel</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.openjpa</groupId>
+ <artifactId>openjpa-lib</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.openjpa</groupId>
+ <artifactId>openjpa-persistence</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.openjpa</groupId>
+ <artifactId>openjpa-persistence-jdbc</artifactId>
+ </dependency>
+
+ <dependency>
<groupId>org.apache.ws.xmlschema</groupId>
<artifactId>xmlschema-core</artifactId>
</dependency>
diff --git a/build/src/main/resources/modules/net/sourceforge/serp/main/module.xml b/build/src/main/resources/modules/net/sourceforge/serp/main/module.xml
new file mode 100644
index 0000000..9ccd3ba
--- /dev/null
+++ b/build/src/main/resources/modules/net/sourceforge/serp/main/module.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ ~ JBoss, Home of Professional Open Source.
+ ~ Copyright 2010, Red Hat, Inc., and individual contributors
+ ~ as indicated by the @author tags. See the copyright.txt file in the
+ ~ distribution for a full listing of individual contributors.
+ ~
+ ~ This is free software; you can redistribute it and/or modify it
+ ~ under the terms of the GNU Lesser General Public License as
+ ~ published by the Free Software Foundation; either version 2.1 of
+ ~ the License, or (at your option) any later version.
+ ~
+ ~ This software is distributed in the hope that it will be useful,
+ ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ ~ Lesser General Public License for more details.
+ ~
+ ~ You should have received a copy of the GNU Lesser General Public
+ ~ License along with this software; if not, write to the Free
+ ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ -->
+
+<module xmlns="urn:jboss:module:1.1" name="net.sourceforge.serp">
+ <resources>
+ <!-- Insert resources here -->
+ </resources>
+</module>
diff --git a/build/src/main/resources/modules/org/apache/openjpa/main/module.xml b/build/src/main/resources/modules/org/apache/openjpa/main/module.xml
new file mode 100644
index 0000000..e2262b8
--- /dev/null
+++ b/build/src/main/resources/modules/org/apache/openjpa/main/module.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ ~ JBoss, Home of Professional Open Source.
+ ~ Copyright 2010, Red Hat, Inc., and individual contributors
+ ~ as indicated by the @author tags. See the copyright.txt file in the
+ ~ distribution for a full listing of individual contributors.
+ ~
+ ~ This is free software; you can redistribute it and/or modify it
+ ~ under the terms of the GNU Lesser General Public License as
+ ~ published by the Free Software Foundation; either version 2.1 of
+ ~ the License, or (at your option) any later version.
+ ~
+ ~ This software is distributed in the hope that it will be useful,
+ ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ ~ Lesser General Public License for more details.
+ ~
+ ~ You should have received a copy of the GNU Lesser General Public
+ ~ License along with this software; if not, write to the Free
+ ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ -->
+
+<module xmlns="urn:jboss:module:1.1" name="org.apache.openjpa">
+ <resources>
+ <!-- Insert resources here -->
+ </resources>
+
+ <dependencies>
+ <module name="asm.asm"/>
+ <module name="javax.persistence.api"/>
+ <module name="javax.transaction.api"/>
+ <module name="javax.validation.api"/>
+ <module name="net.sourceforge.serp"/>
+ <module name="org.apache.commons.collections"/>
+ <module name="org.apache.commons.lang"/>
+ <module name="org.jboss.as.jpa.openjpa"/>
+ <module name="org.slf4j"/>
+ </dependencies>
+</module>
diff --git a/pom.xml b/pom.xml
index c3d3169..538a3e3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -32,7 +32,6 @@
<groupId>org.jboss.as</groupId>
<artifactId>jboss-as-parent</artifactId>
<version>7.1.1.Final</version>
-
<name>JBoss Application Server: Parent Aggregator</name>
<description>JBoss Application Server: Parent Aggregator</description>
@@ -117,6 +116,7 @@
<version.org.apache.juddi.juddi-client>3.1.3</version.org.apache.juddi.juddi-client>
<version.org.apache.juddi.uddi-ws>3.1.3</version.org.apache.juddi.uddi-ws>
<version.org.apache.juddi.scout>1.2.6</version.org.apache.juddi.scout>
+ <version.org.apache.openjpa>2.2.0</version.org.apache.openjpa>
<version.org.apache.httpcomponents.httpclient>4.1.2</version.org.apache.httpcomponents.httpclient>
<version.org.apache.httpcomponents.httpcore>4.1.4</version.org.apache.httpcomponents.httpcore>
<version.org.apache.neethi>3.0.1</version.org.apache.neethi>
@@ -2785,6 +2785,80 @@
</dependency>
<dependency>
+ <groupId>org.apache.openjpa</groupId>
+ <artifactId>openjpa-jdbc</artifactId>
+ <version>${version.org.apache.openjpa}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.openjpa</groupId>
+ <artifactId>openjpa-kernel</artifactId>
+ <version>${version.org.apache.openjpa}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jms_1.1_spec</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jta_1.1_spec</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-pool</groupId>
+ <artifactId>commons-pool</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.openjpa</groupId>
+ <artifactId>openjpa-lib</artifactId>
+ <version>${version.org.apache.openjpa}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.openjpa</groupId>
+ <artifactId>openjpa-persistence</artifactId>
+ <version>${version.org.apache.openjpa}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.hibernate.javax.persistence</groupId>
+ <artifactId>hibernate-jpa-2.0-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.openjpa</groupId>
+ <artifactId>openjpa-persistence-jdbc</artifactId>
+ <version>${version.org.apache.openjpa}</version>
+ </dependency>
+
+ <dependency>
<groupId>org.apache.neethi</groupId>
<artifactId>neethi</artifactId>
<version>${version.org.apache.neethi}</version>
--
1.8.3.1