Author: rmannibucau
Date: Mon Aug 1 08:49:04 2011
New Revision: 1152704
URL: http://svn.apache.org/viewvc?rev=1152704&view=rev
Log:
adding openejb-core-hibernate and hibernate profile into openejb tomcat wabapp
Added:
openejb/trunk/openejb3/container/openejb-core-hibernate/
openejb/trunk/openejb3/container/openejb-core-hibernate/pom.xml
openejb/trunk/openejb3/container/openejb-core-hibernate/src/
openejb/trunk/openejb3/container/openejb-core-hibernate/src/main/
openejb/trunk/openejb3/container/openejb-core-hibernate/src/main/java/
openejb/trunk/openejb3/container/openejb-core-hibernate/src/test/
openejb/trunk/openejb3/container/openejb-core-hibernate/src/test/java/
Removed:
openejb/trunk/openejb3/examples/tmp.txt
Modified:
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-webapp/pom.xml
openejb/trunk/openejb3/container/openejb-core/pom.xml
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/jpa/JpaCmpEngine.java
openejb/trunk/openejb3/container/pom.xml
openejb/trunk/openejb3/examples/jpa-hibernate/pom.xml
openejb/trunk/openejb3/pom.xml
Modified:
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-webapp/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-webapp/pom.xml?rev=1152704&r1=1152703&r2=1152704&view=diff
==============================================================================
---
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-webapp/pom.xml
(original)
+++
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-webapp/pom.xml
Mon Aug 1 08:49:04 2011
@@ -19,7 +19,8 @@
<!-- $Rev: 600338 $ $Date: 2007-12-02 09:08:04 -0800 (Sun, 02 Dec 2007) $ -->
-<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";>
+<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";>
<parent>
<artifactId>openejb-tomcat</artifactId>
<groupId>org.apache.openejb</groupId>
@@ -117,34 +118,6 @@
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
- <artifactId>openejb-core</artifactId>
- <version>${project.version}</version>
- <scope>runtime</scope>
- <exclusions>
- <exclusion>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-kernel</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-webservices</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-naming</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-timer</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-security</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.openejb</groupId>
<artifactId>openejb-webservices</artifactId>
<version>${project.version}</version>
<scope>runtime</scope>
@@ -265,5 +238,93 @@
<version>10.6.1.0</version>
</dependency>
</dependencies>
+ <profiles>
+ <profile>
+ <id>openjpa</id>
+ <dependencies>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>openejb-core</artifactId>
+ <version>${project.version}</version>
+ <scope>runtime</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.geronimo.modules</groupId>
+ <artifactId>geronimo-kernel</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.geronimo.modules</groupId>
+ <artifactId>geronimo-webservices</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.geronimo.modules</groupId>
+ <artifactId>geronimo-naming</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.geronimo.modules</groupId>
+ <artifactId>geronimo-timer</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.geronimo.modules</groupId>
+ <artifactId>geronimo-security</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ </dependencies>
+ </profile>
+ <profile>
+ <id>hibernate</id>
+ <dependencies>
+ <dependency> <!-- to avoid to force exclusions everywhere -->
+ <groupId>${project.groupId}</groupId>
+ <artifactId>openejb-core</artifactId>
+ <version>${project.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.openjpa</groupId>
+ <artifactId>openjpa</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.bval</groupId>
+ <artifactId>bval-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.bval</groupId>
+ <artifactId>bval-jsr303</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>openejb-core-hibernate</artifactId>
+ <type>pom</type>
+ <version>${project.version}</version>
+ <scope>runtime</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.geronimo.modules</groupId>
+ <artifactId>geronimo-kernel</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.geronimo.modules</groupId>
+ <artifactId>geronimo-webservices</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.geronimo.modules</groupId>
+ <artifactId>geronimo-naming</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.geronimo.modules</groupId>
+ <artifactId>geronimo-timer</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.geronimo.modules</groupId>
+ <artifactId>geronimo-security</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
</project>
Added: openejb/trunk/openejb3/container/openejb-core-hibernate/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core-hibernate/pom.xml?rev=1152704&view=auto
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core-hibernate/pom.xml (added)
+++ openejb/trunk/openejb3/container/openejb-core-hibernate/pom.xml Mon Aug 1
08:49:04 2011
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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/xsd/maven-4.0.0.xsd";>
+ <parent>
+ <artifactId>container</artifactId>
+ <groupId>org.apache.openejb</groupId>
+ <version>4.0.0-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+
+ <artifactId>openejb-core-hibernate</artifactId>
+ <name>OpenEJB :: Container :: Core Hibernate</name>
+ <packaging>pom</packaging>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.openejb</groupId>
+ <artifactId>openejb-core</artifactId>
+ <version>${project.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.openjpa</groupId>
+ <artifactId>openjpa</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.bval</groupId>
+ <artifactId>bval-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.bval</groupId>
+ <artifactId>bval-jsr303</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-entitymanager</artifactId>
+ <version>${hibernate.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.hibernate.javax.persistence</groupId>
+ <artifactId>hibernate-jpa-2.0-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>cglib</groupId>
+ <artifactId>cglib</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>asm</groupId>
+ <artifactId>asm</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>cglib</groupId>
+ <artifactId>cglib-nodep</artifactId>
+ <version>${cglib.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>asm</groupId>
+ <artifactId>asm</artifactId>
+ <version>${asm.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-validator</artifactId>
+ <version>${hibernate-validator.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.validation</groupId>
+ <artifactId>validation-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-ehcache</artifactId>
+ <version>${hibernate.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.ehcache</groupId>
+ <artifactId>ehcache</artifactId>
+ <version>${ehcache.version}</version>
+ <type>pom</type>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.ehcache</groupId>
+ <artifactId>ehcache-core</artifactId>
+ <version>${ehcache.version}</version>
+ </dependency>
+ </dependencies>
+
+ <properties>
+ <asm.version>3.3.1</asm.version>
+ <cglib.version>2.2.2</cglib.version>
+ <ehcache.version>2.4.3</ehcache.version>
+ <hibernate.version>3.6.5.Final</hibernate.version>
+ <hibernate-validator.version>4.2.0.Final</hibernate-validator.version>
+ </properties>
+</project>
Modified: openejb/trunk/openejb3/container/openejb-core/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/pom.xml?rev=1152704&r1=1152703&r2=1152704&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/pom.xml (original)
+++ openejb/trunk/openejb3/container/openejb-core/pom.xml Mon Aug 1 08:49:04
2011
@@ -210,14 +210,6 @@
<version>4.0.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>org.apache.bval</groupId>
- <artifactId>bval-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.bval</groupId>
- <artifactId>bval-jsr303</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>javaee-api-embedded</artifactId>
<version>${javaee-api.version}</version>
@@ -295,10 +287,6 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.openjpa</groupId>
- <artifactId>openjpa</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.geronimo.components</groupId>
<artifactId>geronimo-connector</artifactId>
</dependency>
@@ -432,6 +420,18 @@
<groupId>org.beanshell</groupId>
<artifactId>bsh</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.openjpa</groupId>
+ <artifactId>openjpa</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.bval</groupId>
+ <artifactId>bval-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.bval</groupId>
+ <artifactId>bval-jsr303</artifactId>
+ </dependency>
</dependencies>
<profiles>
<profile>
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/jpa/JpaCmpEngine.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/jpa/JpaCmpEngine.java?rev=1152704&r1=1152703&r2=1152704&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/jpa/JpaCmpEngine.java
(original)
+++
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/jpa/JpaCmpEngine.java
Mon Aug 1 08:49:04 2011
@@ -1,3 +1,4 @@
+
/**
*
* Licensed to the Apache Software Foundation (ASF) under one or more
Modified: openejb/trunk/openejb3/container/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/pom.xml?rev=1152704&r1=1152703&r2=1152704&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/pom.xml (original)
+++ openejb/trunk/openejb3/container/pom.xml Mon Aug 1 08:49:04 2011
@@ -37,5 +37,6 @@
<module>openejb-osgi</module>
<module>openejb-activemq4</module>
<module>openejb-junit</module>
+ <module>openejb-core-hibernate</module>
</modules>
</project>
\ No newline at end of file
Modified: openejb/trunk/openejb3/examples/jpa-hibernate/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/examples/jpa-hibernate/pom.xml?rev=1152704&r1=1152703&r2=1152704&view=diff
==============================================================================
--- openejb/trunk/openejb3/examples/jpa-hibernate/pom.xml (original)
+++ openejb/trunk/openejb3/examples/jpa-hibernate/pom.xml Mon Aug 1 08:49:04
2011
@@ -78,65 +78,13 @@
<version>4.8.1</version>
<scope>test</scope>
</dependency>
- <!-- openejb container for running tests -->
+ <!-- openejb (with hibernate) container for running tests -->
<dependency>
<groupId>org.apache.openejb</groupId>
- <artifactId>openejb-core</artifactId>
+ <artifactId>openejb-core-hibernate</artifactId>
<version>4.0.0-SNAPSHOT</version>
+ <type>pom</type>
<scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>org.apache.openjpa</groupId>
- <artifactId>openjpa</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-entitymanager</artifactId>
- <version>3.6.3.Final</version>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>org.hibernate.javax.persistence</groupId>
- <artifactId>hibernate-jpa-2.0-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.persistence</groupId>
- <artifactId>persistence-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.transaction</groupId>
- <artifactId>jta</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-validator</artifactId>
- <version>4.1.0.Final</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>1.6.1</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>1.6.1</version>
- <exclusions>
- <exclusion>
- <artifactId>slf4j-api</artifactId>
- <groupId>org.slf4j</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.16</version>
</dependency>
</dependencies>
<!--
Modified: openejb/trunk/openejb3/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/pom.xml?rev=1152704&r1=1152703&r2=1152704&view=diff
==============================================================================
--- openejb/trunk/openejb3/pom.xml (original)
+++ openejb/trunk/openejb3/pom.xml Mon Aug 1 08:49:04 2011
@@ -118,8 +118,8 @@
<!-- to change easily the javaee api version -->
<javaee-api.version>6.0-SNAPSHOT</javaee-api.version>
-
- <!-- Used mainly in assembly/openejb-tomcat* projects -->
+
+ <!-- Used mainly in assembly/openejb-tomcat* projects -->
<tomcat.version>7.0.16</tomcat.version>
<!-- used mainly by jetty modules -->
@@ -131,7 +131,7 @@
-->
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <bval.version>0.2-incubating</bval.version>
+ <bval.version>0.3-incubating</bval.version>
<org.apache.activemq.version>5.4.2</org.apache.activemq.version>
<quartz.version>1.8.5</quartz.version>
<org.springframework.version>3.0.5.RELEASE</org.springframework.version>
@@ -579,65 +579,65 @@
<dependencyManagement>
<dependencies>
<dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-bundle</artifactId>
- <version>${cxf.version}</version>
- </dependency>
- <dependency>
- <groupId>xml-resolver</groupId>
- <artifactId>xml-resolver</artifactId>
- <version>1.2</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-server</artifactId>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-bundle</artifactId>
+ <version>${cxf.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>xml-resolver</groupId>
+ <artifactId>xml-resolver</artifactId>
+ <version>1.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-server</artifactId>
+ <version>${jetty.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-continuation</artifactId>
+ <version>${jetty.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-jsp-2.1</artifactId>
+ <version>${jetty.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-plus</artifactId>
+ <version>${jetty.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-jndi</artifactId>
<version>${jetty.version}</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-continuation</artifactId>
- <version>${jetty.version}</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-jsp-2.1</artifactId>
- <version>${jetty.version}</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-plus</artifactId>
- <version>${jetty.version}</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-jndi</artifactId>
- <version>${jetty.version}</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-webapp</artifactId>
- <version>${jetty.version}</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-io</artifactId>
- <version>${jetty.version}</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-http</artifactId>
- <version>${jetty.version}</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-security</artifactId>
- <version>${jetty.version}</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-util</artifactId>
- <version>${jetty.version}</version>
- </dependency>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-webapp</artifactId>
+ <version>${jetty.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-io</artifactId>
+ <version>${jetty.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-http</artifactId>
+ <version>${jetty.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-security</artifactId>
+ <version>${jetty.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-util</artifactId>
+ <version>${jetty.version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.bval</groupId>
<artifactId>bval-core</artifactId>
@@ -1010,11 +1010,11 @@
<artifactId>swizzle-stream</artifactId>
<version>1.0.2</version>
</dependency>
- <!-- <dependency>
- <groupId>org.apache.openejb</groupId>
- <artifactId>commons-dbcp-all</artifactId>
- <version>1.3-r699049</version>
- </dependency> -->
+ <!-- <dependency>
+ <groupId>org.apache.openejb</groupId>
+ <artifactId>commons-dbcp-all</artifactId>
+ <version>1.3-r699049</version>
+ </dependency> -->
<dependency>
<groupId>axis</groupId>
<artifactId>axis</artifactId>
@@ -1028,7 +1028,7 @@
<dependency>
<groupId>commons-pool</groupId>
<artifactId>commons-pool</artifactId>
- <version>1.5.5</version>
+ <version>1.5.6</version>
</dependency>
<dependency>
<groupId>org.apache.ws.security</groupId>
