ODE-1042: Upgraded OPENJPA to 2.4.2
Project: http://git-wip-us.apache.org/repos/asf/ode/repo Commit: http://git-wip-us.apache.org/repos/asf/ode/commit/9441572d Tree: http://git-wip-us.apache.org/repos/asf/ode/tree/9441572d Diff: http://git-wip-us.apache.org/repos/asf/ode/diff/9441572d Branch: refs/heads/ode-1.3.x Commit: 9441572d46ac2c322f183bd990e2c8b5ad3be20f Parents: d1f67ce Author: sathwik <[email protected]> Authored: Thu Jul 20 14:52:39 2017 +0530 Committer: sathwik <[email protected]> Committed: Thu Jul 20 14:52:39 2017 +0530 ---------------------------------------------------------------------- Rakefile | 3 +- .../il/dbutil/DatabaseConnectionManager.java | 7 ++-- .../src/test/resources/log4j2.xml | 37 ++++++++++++++++++++ .../apache/ode/dao/jpa/CorrelatorDAOImpl.java | 5 ++- .../java/org/apache/ode/dao/jpa/OpenJPADAO.java | 2 +- .../org/apache/ode/dao/jpa/ProcessDAOImpl.java | 2 +- dependencies.rb | 31 ++++++++-------- .../simple/GeronimoDelegateSupport.java | 9 +++-- tasks/h2.rake | 4 +-- .../java/org/apache/ode/utils/DbIsolation.java | 5 ++- 10 files changed, 74 insertions(+), 31 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ode/blob/9441572d/Rakefile ---------------------------------------------------------------------- diff --git a/Rakefile b/Rakefile index e008f04..036fd18 100644 --- a/Rakefile +++ b/Rakefile @@ -35,7 +35,7 @@ Buildr::Hibernate::REQUIRES[:xdoclet] = Buildr.group("xdoclet", "xdoclet-xdoclet # XMLBeans addon must use the same version as we do. Buildr::XMLBeans::REQUIRES.xmlbeans.version = artifact(XMLBEANS).version -Buildr::OpenJPA::REQUIRES[0] = "org.apache.openjpa:openjpa:jar:1.2.0" +Buildr::OpenJPA::REQUIRES=[ OPENJPA, COMMONS.lang, COMMONS.collections, JAVAX.transaction, JAVAX.persistence] # dirty workaround for BUILDR-541/BUILDR-508 Java.classpath << Buildr::OpenJPA::REQUIRES @@ -126,6 +126,7 @@ define "ode" do #specify version of web console in urlrewrite.xml build do + mkdir_p project.path_to("target") cp _("src/main/webapp/WEB-INF/urlrewrite.xml"), _(:target) text = File.read(_(:target, "urlrewrite.xml")) changed_text = text.gsub(/\$\{version\}/, artifact(ODE_WEB_CONSOLE).version) http://git-wip-us.apache.org/repos/asf/ode/blob/9441572d/bpel-epr/src/main/java/org/apache/ode/il/dbutil/DatabaseConnectionManager.java ---------------------------------------------------------------------- diff --git a/bpel-epr/src/main/java/org/apache/ode/il/dbutil/DatabaseConnectionManager.java b/bpel-epr/src/main/java/org/apache/ode/il/dbutil/DatabaseConnectionManager.java index c965cc2..6057835 100644 --- a/bpel-epr/src/main/java/org/apache/ode/il/dbutil/DatabaseConnectionManager.java +++ b/bpel-epr/src/main/java/org/apache/ode/il/dbutil/DatabaseConnectionManager.java @@ -73,16 +73,19 @@ public class DatabaseConnectionManager { false, // match all false); // select one assume match + JDBCDriverMCF mcf = new JDBCDriverMCF(); + _connectionManager = new GenericConnectionManager( transactionSupport, poolingSupport, null, connectionTracker, (RecoverableTransactionManager) _txm, + mcf, getClass().getName(), getClass().getClassLoader()); - JDBCDriverMCF mcf = new JDBCDriverMCF(); + try { mcf.setDriver(driverClass); mcf.setConnectionURL(url); @@ -93,7 +96,7 @@ public class DatabaseConnectionManager { mcf.setPassword(password); } _connectionManager.doStart(); - _dataSource = (DataSource) mcf.createConnectionFactory(_connectionManager); + _dataSource = (DataSource) _connectionManager.createConnectionFactory(); } catch (Exception ex) { String errmsg = __msgs.msgOdeDbPoolStartupFailed(url); __log.error(errmsg, ex); http://git-wip-us.apache.org/repos/asf/ode/blob/9441572d/dao-jpa-ojpa-derby/src/test/resources/log4j2.xml ---------------------------------------------------------------------- diff --git a/dao-jpa-ojpa-derby/src/test/resources/log4j2.xml b/dao-jpa-ojpa-derby/src/test/resources/log4j2.xml new file mode 100644 index 0000000..21313ee --- /dev/null +++ b/dao-jpa-ojpa-derby/src/test/resources/log4j2.xml @@ -0,0 +1,37 @@ +<Configuration> + <Appenders> + <File name="FILE" fileName="target/test/test.log" append="false"> + <PatternLayout pattern="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/> + </File> + <Console name="STDOUT" target="SYSTEM_OUT"> + <PatternLayout pattern="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/> + </Console> + <Async name="Async"> + <AppenderRef ref="FILE"/> + <AppenderRef ref="STDOUT"/> + </Async> + </Appenders> + + <Loggers> + <Logger name="org.apache.ode" level="info" additivity="false"> + <AppenderRef ref="FILE"/> + </Logger> + <Logger name="org.apache.axis2" level="info" additivity="false"> + <AppenderRef ref="FILE"/> + </Logger> + <Logger name="org.hibernate" level="warn" additivity="false"> + <AppenderRef ref="FILE"/> + </Logger> + <Logger name="org.apache.openjpa" level="warn" additivity="false"> + <AppenderRef ref="FILE"/> + </Logger> + <Logger name="org.springframework" level="error" additivity="false"> + <AppenderRef ref="FILE"/> + </Logger> + + <Root level="info"> + <AppenderRef ref="Async"/> + </Root> + </Loggers> + +</Configuration> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ode/blob/9441572d/dao-jpa/src/main/java/org/apache/ode/dao/jpa/CorrelatorDAOImpl.java ---------------------------------------------------------------------- diff --git a/dao-jpa/src/main/java/org/apache/ode/dao/jpa/CorrelatorDAOImpl.java b/dao-jpa/src/main/java/org/apache/ode/dao/jpa/CorrelatorDAOImpl.java index 514fda8..717a3c3 100644 --- a/dao-jpa/src/main/java/org/apache/ode/dao/jpa/CorrelatorDAOImpl.java +++ b/dao-jpa/src/main/java/org/apache/ode/dao/jpa/CorrelatorDAOImpl.java @@ -185,11 +185,10 @@ public class CorrelatorDAOImpl extends OpenJPADAO implements CorrelatorDAO { } List<MessageRouteDAO> candidateRoutes = (List<MessageRouteDAO>) qry.getResultList(); - if (candidateRoutes.size() > 0) { + if (!candidateRoutes.isEmpty()) { List<MessageRouteDAO> matchingRoutes = new ArrayList<MessageRouteDAO>(); boolean routed = false; - for (int i = 0; i < candidateRoutes.size(); i++) { - MessageRouteDAO route = candidateRoutes.get(i); + for (MessageRouteDAO route: candidateRoutes) { if ("all".equals(route.getRoute())) { matchingRoutes.add(route); } else { http://git-wip-us.apache.org/repos/asf/ode/blob/9441572d/dao-jpa/src/main/java/org/apache/ode/dao/jpa/OpenJPADAO.java ---------------------------------------------------------------------- diff --git a/dao-jpa/src/main/java/org/apache/ode/dao/jpa/OpenJPADAO.java b/dao-jpa/src/main/java/org/apache/ode/dao/jpa/OpenJPADAO.java index 32ddc09..95b012b 100644 --- a/dao-jpa/src/main/java/org/apache/ode/dao/jpa/OpenJPADAO.java +++ b/dao-jpa/src/main/java/org/apache/ode/dao/jpa/OpenJPADAO.java @@ -54,7 +54,7 @@ public class OpenJPADAO { @SuppressWarnings("unchecked") protected <T> T getSingleResult(Query qry) { List res = qry.getResultList(); - if (res.size() == 0) return null; + if (res.isEmpty()) return null; return (T) res.get(0); } http://git-wip-us.apache.org/repos/asf/ode/blob/9441572d/dao-jpa/src/main/java/org/apache/ode/dao/jpa/ProcessDAOImpl.java ---------------------------------------------------------------------- diff --git a/dao-jpa/src/main/java/org/apache/ode/dao/jpa/ProcessDAOImpl.java b/dao-jpa/src/main/java/org/apache/ode/dao/jpa/ProcessDAOImpl.java index 1e28662..435604c 100644 --- a/dao-jpa/src/main/java/org/apache/ode/dao/jpa/ProcessDAOImpl.java +++ b/dao-jpa/src/main/java/org/apache/ode/dao/jpa/ProcessDAOImpl.java @@ -95,7 +95,7 @@ public class ProcessDAOImpl extends OpenJPADAO implements ProcessDAO { qry.setParameter("ckey", correlatorId); qry.setParameter("process", this); List res = qry.getResultList(); - if (res.size() == 0) return null; + if (res.isEmpty()) return null; return (CorrelatorDAO) res.get(0); } http://git-wip-us.apache.org/repos/asf/ode/blob/9441572d/dependencies.rb ---------------------------------------------------------------------- diff --git a/dependencies.rb b/dependencies.rb index 424a224..d08531b 100644 --- a/dependencies.rb +++ b/dependencies.rb @@ -56,14 +56,14 @@ AXIS2_WAR = "org.apache.axis2:axis2-webapp:war:1.6.2" BACKPORT = "backport-util-concurrent:backport-util-concurrent:jar:3.1" COMMONS = struct( :codec =>"commons-codec:commons-codec:jar:1.3", - :collections =>"commons-collections:commons-collections:jar:3.2.1", - :dbcp =>"commons-dbcp:commons-dbcp:jar:1.2.2", + :collections =>"commons-collections:commons-collections:jar:3.2.2", + :dbcp =>"commons-dbcp:commons-dbcp:jar:1.4", :fileupload =>"commons-fileupload:commons-fileupload:jar:1.2", :httpclient =>"commons-httpclient:commons-httpclient:jar:3.1", - :lang =>"commons-lang:commons-lang:jar:2.4", + :lang =>"commons-lang:commons-lang:jar:2.6", :logging =>"commons-logging:commons-logging:jar:1.1.1", :io =>"commons-io:commons-io:jar:1.4", - :pool =>"commons-pool:commons-pool:jar:1.4", + :pool =>"commons-pool:commons-pool:jar:1.6", :primitives =>"commons-primitives:commons-primitives:jar:1.0", :beanutils =>"commons-beanutils:commons-beanutils:jar:1.8.2" ) @@ -72,8 +72,8 @@ DERBY_TOOLS = "org.apache.derby:derbytools:jar:10.5.3.0_1" DOM4J = "dom4j:dom4j:jar:1.6.1" GERONIMO = struct( :kernel =>"org.apache.geronimo.modules:geronimo-kernel:jar:2.0.1", - :transaction =>"org.apache.geronimo.components:geronimo-transaction:jar:2.0.1", - :connector =>"org.apache.geronimo.components:geronimo-connector:jar:2.0.1" + :transaction =>"org.apache.geronimo.components:geronimo-transaction:jar:3.1.3", + :connector =>"org.apache.geronimo.components:geronimo-connector:jar:3.1.3" ) HIBERNATE = [ "org.hibernate:hibernate-core:jar:3.3.2.GA", "javassist:javassist:jar:3.9.0.GA", "antlr:antlr:jar:2.7.6", "asm:asm:jar:3.3.1", "cglib:cglib:jar:2.2", "net.sf.ehcache:ehcache:jar:1.2.3" ] @@ -81,19 +81,19 @@ HSQLDB = "org.hsqldb:hsqldb:jar:2.3.3" JAVAX = struct( :activation =>"javax.activation:activation:jar:1.1", #:activation =>"geronimo-spec:geronimo-spec-activation:jar:1.0.2-rc4", - :connector =>"org.apache.geronimo.specs:geronimo-j2ee-connector_1.5_spec:jar:1.0", + :connector =>"org.apache.geronimo.specs:geronimo-j2ee-connector_1.6_spec:jar:1.0", :ejb =>"org.apache.geronimo.specs:geronimo-ejb_2.1_spec:jar:1.1", :javamail =>"org.apache.geronimo.specs:geronimo-javamail_1.4_spec:jar:1.7.1", :jms =>"geronimo-spec:geronimo-spec-jms:jar:1.1-rc4", - :persistence =>"javax.persistence:persistence-api:jar:1.0", + :persistence =>"javax.persistence:persistence-api:jar:2.0", :servlet =>"org.apache.geronimo.specs:geronimo-servlet_2.4_spec:jar:1.0", :stream =>"stax:stax-api:jar:1.0.1", - :transaction =>"org.apache.geronimo.specs:geronimo-jta_1.1_spec:jar:1.1", - :resource =>"org.apache.geronimo.specs:geronimo-j2ee-connector_1.5_spec:jar:1.0" + :transaction =>"org.apache.geronimo.specs:geronimo-jta_1.1_spec:jar:1.1.1", + :resource =>"org.apache.geronimo.specs:geronimo-j2ee-connector_1.6_spec:jar:1.0" ) JAXEN = "jaxen:jaxen:jar:1.1.4" JBI = group("org.apache.servicemix.specs.jbi-api-1.0", :under=>"org.apache.servicemix.specs", :version=>"1.1.0") -JENCKS = "org.jencks:jencks:jar:all:1.3" +JENCKS = "org.jencks:jencks:jar:all:2.2" JIBX = "org.jibx:jibx-run:jar:1.2.1" KARAF = [ "org.apache.felix:org.osgi.core:jar:1.4.0", @@ -104,8 +104,9 @@ KARAF = [ ] LOG4J = "log4j:log4j:jar:1.2.17" LOG4J2 = group("log4j-api", "log4j-core", "log4j-slf4j-impl", "log4j-web", :under=>"org.apache.logging.log4j", :version=>"2.3") -OPENJPA = ["org.apache.openjpa:openjpa:jar:1.2.3", - "net.sourceforge.serp:serp:jar:1.13.1"] +OPENJPA = ["org.apache.openjpa:openjpa:jar:2.4.2", + "net.sourceforge.serp:serp:jar:1.15.1", + "org.apache.xbean:xbean-asm5-shaded:jar:4.5"] SAXON = ["net.sourceforge.saxon:saxon:jar:9.1.0.8", "net.sourceforge.saxon:saxon:jar:xpath:9.1.0.8", "net.sourceforge.saxon:saxon:jar:dom:9.1.0.8", "net.sourceforge.saxon:saxon:jar:xqj:9.1.0.8"] SERVICEMIX = [ @@ -139,7 +140,7 @@ SLF4J = group(%w{ slf4j-api jcl-over-slf4j}, :under=>"org.slf4j", :version=>"1.7 SPRING = ["org.springframework:spring:jar:2.5.6"] SPRING_OSGI = ["org.springframework.osgi:spring-osgi-core:jar:1.2.0"] SPRING_TEST = ["org.springframework:spring-test:jar:2.5.6"] -TRANQL = [ "tranql:tranql-connector:jar:1.1", COMMONS.primitives ] +TRANQL = [ "org.tranql:tranql-connector:jar:1.8", COMMONS.primitives ] WOODSTOX = "woodstox:wstx-asl:jar:3.2.4" WSDL4J = "wsdl4j:wsdl4j:jar:1.6.3" XALAN = "xalan:xalan:jar:2.7.1" @@ -277,4 +278,4 @@ TOMEE = struct( ) ODE_WEB_CONSOLE = "org.apache.ode:ode-console:jar:0.1.0" -TUCKEY_URLREWRITE = "org.tuckey:urlrewritefilter:jar:4.0.4" \ No newline at end of file +TUCKEY_URLREWRITE = "org.tuckey:urlrewritefilter:jar:4.0.4" http://git-wip-us.apache.org/repos/asf/ode/blob/9441572d/scheduler-simple/src/test/java/org/apache/ode/scheduler/simple/GeronimoDelegateSupport.java ---------------------------------------------------------------------- diff --git a/scheduler-simple/src/test/java/org/apache/ode/scheduler/simple/GeronimoDelegateSupport.java b/scheduler-simple/src/test/java/org/apache/ode/scheduler/simple/GeronimoDelegateSupport.java index 6596cea..4d98272 100644 --- a/scheduler-simple/src/test/java/org/apache/ode/scheduler/simple/GeronimoDelegateSupport.java +++ b/scheduler-simple/src/test/java/org/apache/ode/scheduler/simple/GeronimoDelegateSupport.java @@ -54,23 +54,26 @@ public class GeronimoDelegateSupport extends DelegateSupport { TransactionSupport transactionSupport = LocalTransactions.INSTANCE; ConnectionTracker connectionTracker = new ConnectionTrackingCoordinator(); - PoolingSupport poolingSupport = new SinglePool(1, 1, + PoolingSupport poolingSupport = new SinglePool(1, 1, CONNECTION_MAX_WAIT_MILLIS, CONNECTION_MAX_IDLE_MINUTES, true, // match one false, // match all false); // select one assume match + JDBCDriverMCF mcf = new JDBCDriverMCF(); + _connectionManager = new GenericConnectionManager( transactionSupport, poolingSupport, null, connectionTracker, (RecoverableTransactionManager) txm, + mcf, getClass().getName(), getClass().getClassLoader()); - JDBCDriverMCF mcf = new JDBCDriverMCF(); + try { mcf.setDriver(driverClass); mcf.setConnectionURL(url); @@ -81,7 +84,7 @@ public class GeronimoDelegateSupport extends DelegateSupport { mcf.setPassword(password); } _connectionManager.doStart(); - return (DataSource) mcf.createConnectionFactory(_connectionManager); + return (DataSource) _connectionManager.createConnectionFactory(); } catch (Exception ex) { throw new RuntimeException(ex); } http://git-wip-us.apache.org/repos/asf/ode/blob/9441572d/tasks/h2.rake ---------------------------------------------------------------------- diff --git a/tasks/h2.rake b/tasks/h2.rake index 60aa873..253d970 100644 --- a/tasks/h2.rake +++ b/tasks/h2.rake @@ -17,7 +17,7 @@ module H2 - REQUIRES = "com.h2database:h2:jar:1.3.176" + REQUIRES = "com.h2database:h2:jar:1.4.196" #Java.classpath << REQUIRES @@ -40,4 +40,4 @@ module H2 end end end -end \ No newline at end of file +end http://git-wip-us.apache.org/repos/asf/ode/blob/9441572d/utils/src/main/java/org/apache/ode/utils/DbIsolation.java ---------------------------------------------------------------------- diff --git a/utils/src/main/java/org/apache/ode/utils/DbIsolation.java b/utils/src/main/java/org/apache/ode/utils/DbIsolation.java index 74a7340..3367c5b 100644 --- a/utils/src/main/java/org/apache/ode/utils/DbIsolation.java +++ b/utils/src/main/java/org/apache/ode/utils/DbIsolation.java @@ -56,12 +56,11 @@ public class DbIsolation { public static void setIsolationLevel(Connection c) throws SQLException { try { if (_isolationLevel != 0 && c.getTransactionIsolation() != _isolationLevel) { - if (__log.isDebugEnabled()) __log.debug("Set isolation level to "+_isolationLevel); + __log.debug("Set isolation level to "+_isolationLevel); c.setTransactionIsolation(_isolationLevel); } } catch (Exception e) { - if (__log.isDebugEnabled()) - __log.debug("Error while setting isolation level to "+_isolationLevel, e); + __log.debug("Error while setting isolation level to "+_isolationLevel, e); } }
