camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cmoulli...@apache.org
Subject [12/50] git commit: CAMEL-7053 remove the dependency of hibernat
Date Fri, 17 Oct 2014 08:40:05 GMT
CAMEL-7053 remove the dependency of hibernat

Conflicts:
	components/camel-jpa/pom.xml


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/ee02b82d
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/ee02b82d
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/ee02b82d

Branch: refs/remotes/origin/camel-2.13.x
Commit: ee02b82d61af5cff753ee4f7ec7c45f7f212db13
Parents: d1628b4
Author: Willem Jiang <willem.jiang@gmail.com>
Authored: Wed Sep 17 09:54:43 2014 +0800
Committer: Willem Jiang <willem.jiang@gmail.com>
Committed: Wed Sep 17 11:03:46 2014 +0800

----------------------------------------------------------------------
 components/camel-jpa/pom.xml                          |  9 +--------
 .../processor/jpa/JpaRouteSkipLockedEntityTest.java   | 11 +++++------
 .../src/test/resources/META-INF/persistence.xml       | 14 ++++++++------
 .../processor/jpa/springJpaRouteSkipLockedTest.xml    |  6 +++---
 4 files changed, 17 insertions(+), 23 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/ee02b82d/components/camel-jpa/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-jpa/pom.xml b/components/camel-jpa/pom.xml
index e133fce..4912c73 100644
--- a/components/camel-jpa/pom.xml
+++ b/components/camel-jpa/pom.xml
@@ -65,7 +65,7 @@
       <artifactId>geronimo-jpa_2.0_spec</artifactId>
       <scope>provided</scope>
     </dependency>
-    
+
     <!-- test dependencies -->
     <dependency>
       <groupId>org.apache.camel</groupId>
@@ -102,12 +102,6 @@
       <artifactId>junit</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-    	<groupId>org.hibernate</groupId>
-    	<artifactId>hibernate-entitymanager</artifactId>
-    	<version>${hibernate-version}</version>
-    	<scope>test</scope>
-    </dependency>
   </dependencies>
 
   <build>
@@ -119,7 +113,6 @@
         <configuration>
           <persistenceXmlFile>${project.basedir}/src/test/resources/META-INF/persistence.xml</persistenceXmlFile>
           <includes>org/apache/camel/examples/*.class</includes>
-          <excludes>org/apache/camel/examples/VersionedItem.class</excludes>
           <addDefaultConstructor>true</addDefaultConstructor>
           <enforcePropertyRestrictions>true</enforcePropertyRestrictions>
         </configuration>

http://git-wip-us.apache.org/repos/asf/camel/blob/ee02b82d/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaRouteSkipLockedEntityTest.java
----------------------------------------------------------------------
diff --git a/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaRouteSkipLockedEntityTest.java
b/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaRouteSkipLockedEntityTest.java
index 3c95a06..c61d9b1 100644
--- a/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaRouteSkipLockedEntityTest.java
+++ b/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaRouteSkipLockedEntityTest.java
@@ -26,12 +26,13 @@ import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.examples.VersionedItem;
 import org.apache.camel.spring.SpringRouteBuilder;
-import org.hibernate.engine.spi.SessionImplementor;
+import org.junit.Ignore;
 import org.junit.Test;
 
 /**
  * @version
  */
+@Ignore("Need the fix of OPENJPA-2461")
 public class JpaRouteSkipLockedEntityTest extends AbstractJpaTest {
     protected static final String SELECT_ALL_STRING = "select x from " + VersionedItem.class.getName()
+ " x";
     
@@ -50,9 +51,9 @@ public class JpaRouteSkipLockedEntityTest extends AbstractJpaTest {
         template.sendBody("jpa://" + VersionedItem.class.getName(), new VersionedItem("two"));
         template.sendBody("jpa://" + VersionedItem.class.getName(), new VersionedItem("three"));
         template.sendBody("jpa://" + VersionedItem.class.getName(), new VersionedItem("four"));
-
-        this.context.startRoute("first");
+        
         this.context.startRoute("second");
+        this.context.startRoute("first");
 
         assertMockEndpointsSatisfied();
        
@@ -93,7 +94,6 @@ public class JpaRouteSkipLockedEntityTest extends AbstractJpaTest {
             try {
 
                 count++;
-
                 // if (count != 1) {
                 cond1.signal();
                 // }
@@ -116,8 +116,7 @@ public class JpaRouteSkipLockedEntityTest extends AbstractJpaTest {
 
     public void setLockTimeout(int timeout) throws SQLException {
         entityManager.getTransaction().begin();
-        SessionImplementor session = entityManager.unwrap(SessionImplementor.class);
-        Connection connection = session.connection();
+        Connection connection = (Connection)entityManager.unwrap(java.sql.Connection.class);
         connection.createStatement().execute("CALL SYSCS_UTIL.SYSCS_SET_DATABASE_PROPERTY('derby.locks.waitTimeout',
'" + timeout + "')");
         entityManager.getTransaction().commit();
     }

http://git-wip-us.apache.org/repos/asf/camel/blob/ee02b82d/components/camel-jpa/src/test/resources/META-INF/persistence.xml
----------------------------------------------------------------------
diff --git a/components/camel-jpa/src/test/resources/META-INF/persistence.xml b/components/camel-jpa/src/test/resources/META-INF/persistence.xml
index b6cdcdf..439adea 100644
--- a/components/camel-jpa/src/test/resources/META-INF/persistence.xml
+++ b/components/camel-jpa/src/test/resources/META-INF/persistence.xml
@@ -88,15 +88,17 @@
   </persistence-unit>
   <!-- END SNIPPET: e2 -->
 
-  <persistence-unit name="hibernate" transaction-type="RESOURCE_LOCAL">
-  	<provider>org.hibernate.ejb.HibernatePersistence</provider>
+  <persistence-unit name="skipLockedEntiy" transaction-type="RESOURCE_LOCAL">
+  	<provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>
     <class>org.apache.camel.examples.VersionedItem</class>
 	
   <properties>
-     <property name="hibernate.connection.driver_class" value="org.apache.derby.jdbc.EmbeddedDriver"
/>
-     <property name="hibernate.connection.url" value="jdbc:derby:target/hibernate;create=true"
/>
-     <property name="hibernate.hbm2ddl.auto" value="create"/>
-   </properties>
+      <property name="openjpa.ConnectionURL" value="jdbc:derby:target/derby;create=true"/>
+      <property name="openjpa.ConnectionDriverName" value="org.apache.derby.jdbc.EmbeddedDriver"/>
+      <property name="openjpa.jdbc.SynchronizeMappings" value="buildSchema"/>
+      <property name="openjpa.Log" value="DefaultLevel=WARN, Tool=INFO"/>
+      <property name="openjpa.Multithreaded" value="false"/>
+    </properties>
   </persistence-unit>
   
 </persistence>

http://git-wip-us.apache.org/repos/asf/camel/blob/ee02b82d/components/camel-jpa/src/test/resources/org/apache/camel/processor/jpa/springJpaRouteSkipLockedTest.xml
----------------------------------------------------------------------
diff --git a/components/camel-jpa/src/test/resources/org/apache/camel/processor/jpa/springJpaRouteSkipLockedTest.xml
b/components/camel-jpa/src/test/resources/org/apache/camel/processor/jpa/springJpaRouteSkipLockedTest.xml
index 7cff3ee..1235f75 100644
--- a/components/camel-jpa/src/test/resources/org/apache/camel/processor/jpa/springJpaRouteSkipLockedTest.xml
+++ b/components/camel-jpa/src/test/resources/org/apache/camel/processor/jpa/springJpaRouteSkipLockedTest.xml
@@ -17,10 +17,10 @@
 	</bean>
 
 	<bean id="entityManagerFactory" class="org.springframework.orm.jpa.LocalEntityManagerFactoryBean">
-		<property name="persistenceUnitName" value="hibernate" />
-		<property name="jpaDialect">
+		<property name="persistenceUnitName" value="skipLockedEntiy"/>
+		<!--property name="jpaDialect">
 			<bean class="org.springframework.orm.jpa.vendor.HibernateJpaDialect" />
-		</property>
+		</property-->
 	</bean>
 
 	<bean class="org.apache.camel.component.jpa.JpaComponent" id="jpa">


Mime
View raw message