[jira] [Assigned] (TOMEE-2559) TomEE dependency matrix
[ https://issues.apache.org/jira/browse/TOMEE-2559?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Cesar Hernandez reassigned TOMEE-2559: -- Assignee: Willes Reis > TomEE dependency matrix > --- > > Key: TOMEE-2559 > URL: https://issues.apache.org/jira/browse/TOMEE-2559 > Project: TomEE > Issue Type: Documentation >Reporter: Cesar Hernandez >Assignee: Willes Reis >Priority: Major > Labels: documentation > > The current project Dev oriented documentation > [http://tomee.apache.org/community/sources.html] can be improved with an > automated procedure that generates the following: > > # We could have in TomEE site, further information about > the target for each project version", I meant tomee versions between 7.0, > 7.1 and 8.0. Would be the same page > http://tomee.apache.org/comparison.html showing > implementations by version. Eg. tomee-7.0 (JSP v1, JSF v2, ...) / tomee-7.1 > (JSP v2, JSF v3, ...) / tomee-8.0 (JSP v3, JSF v4, ...). > # Current strategy for control version (semantic version) of the > maven project, changing of major/minor version when is a fix or > enhancements and who does it (responsibility). > # While working on an issue with MP rest client on current TomEE master, I > invested a couple of hours understanding how the relationship > betweenMicroProfile boom, rest-client jar and cxf versions worked all > together.From Tomee pom file [1] I was able to quickly identify how current > masteris structured, but then the journey to check releases and > correlationsstarted and I was navigating around CXF release notes, JIRA, MP > githubrelease pages, rest-client releases etc.I think it would be nice to > have a dev-oriented documentation that can saveus time in the future. > [1][https://github.com/apache/tomee/blob/master/pom.xml#L200-L218] -- This message was sent by Atlassian JIRA (v7.6.3#76005)
buildbot success in on tomee-trunk-ubuntu-jvm8
The Buildbot has detected a restored build on builder tomee-trunk-ubuntu-jvm8 while building tomee. Full details are available at: https://ci.apache.org/builders/tomee-trunk-ubuntu-jvm8/builds/1124 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: bb_qnode7_ubuntu Build Reason: The SingleBranchScheduler scheduler named 'on-tomee-trunk-ubuntu-jvm8-commit' triggered this build Build Source Stamp: [branch master] c93188b83f299986159cf702ffb12ae34270d348 Blamelist: Jonathan Gallimore Build succeeded! Sincerely, -The Buildbot
[jira] [Updated] (TOMEE-2559) TomEE dependency matrix
[ https://issues.apache.org/jira/browse/TOMEE-2559?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Willes Reis updated TOMEE-2559: --- Labels: documentation (was: docuentation) > TomEE dependency matrix > --- > > Key: TOMEE-2559 > URL: https://issues.apache.org/jira/browse/TOMEE-2559 > Project: TomEE > Issue Type: Documentation >Reporter: Cesar Hernandez >Priority: Major > Labels: documentation > > The current project Dev oriented documentation > [http://tomee.apache.org/community/sources.html] can be improved with an > automated procedure that generates the following: > > # We could have in TomEE site, further information about > the target for each project version", I meant tomee versions between 7.0, > 7.1 and 8.0. Would be the same page > http://tomee.apache.org/comparison.html showing > implementations by version. Eg. tomee-7.0 (JSP v1, JSF v2, ...) / tomee-7.1 > (JSP v2, JSF v3, ...) / tomee-8.0 (JSP v3, JSF v4, ...). > # Current strategy for control version (semantic version) of the > maven project, changing of major/minor version when is a fix or > enhancements and who does it (responsibility). > # While working on an issue with MP rest client on current TomEE master, I > invested a couple of hours understanding how the relationship > betweenMicroProfile boom, rest-client jar and cxf versions worked all > together.From Tomee pom file [1] I was able to quickly identify how current > masteris structured, but then the journey to check releases and > correlationsstarted and I was navigating around CXF release notes, JIRA, MP > githubrelease pages, rest-client releases etc.I think it would be nice to > have a dev-oriented documentation that can saveus time in the future. > [1][https://github.com/apache/tomee/blob/master/pom.xml#L200-L218] -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Updated] (TOMEE-2559) TomEE dependency matrix
[ https://issues.apache.org/jira/browse/TOMEE-2559?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Willes Reis updated TOMEE-2559: --- Summary: TomEE dependency matrix (was: TomeEE dependency matrix) > TomEE dependency matrix > --- > > Key: TOMEE-2559 > URL: https://issues.apache.org/jira/browse/TOMEE-2559 > Project: TomEE > Issue Type: Documentation >Reporter: Cesar Hernandez >Priority: Major > Labels: docuentation > > The current project Dev oriented documentation > [http://tomee.apache.org/community/sources.html] can be improved with an > automated procedure that generates the following: > > # We could have in TomEE site, further information about > the target for each project version", I meant tomee versions between 7.0, > 7.1 and 8.0. Would be the same page > http://tomee.apache.org/comparison.html showing > implementations by version. Eg. tomee-7.0 (JSP v1, JSF v2, ...) / tomee-7.1 > (JSP v2, JSF v3, ...) / tomee-8.0 (JSP v3, JSF v4, ...). > # Current strategy for control version (semantic version) of the > maven project, changing of major/minor version when is a fix or > enhancements and who does it (responsibility). > # While working on an issue with MP rest client on current TomEE master, I > invested a couple of hours understanding how the relationship > betweenMicroProfile boom, rest-client jar and cxf versions worked all > together.From Tomee pom file [1] I was able to quickly identify how current > masteris structured, but then the journey to check releases and > correlationsstarted and I was navigating around CXF release notes, JIRA, MP > githubrelease pages, rest-client releases etc.I think it would be nice to > have a dev-oriented documentation that can saveus time in the future. > [1][https://github.com/apache/tomee/blob/master/pom.xml#L200-L218] -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[tomee] branch master updated: Imports
This is an automated email from the ASF dual-hosted git repository.
jgallimore pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomee.git
The following commit(s) were added to refs/heads/master by this push:
new c93188b Imports
c93188b is described below
commit c93188b83f299986159cf702ffb12ae34270d348
Author: Jonathan Gallimore
AuthorDate: Thu Jul 4 22:11:10 2019 +0100
Imports
---
.../apache/openejb/resource/jdbc/ManagedConnectionBehaviorTest.java | 6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git
a/container/openejb-core/src/test/java/org/apache/openejb/resource/jdbc/ManagedConnectionBehaviorTest.java
b/container/openejb-core/src/test/java/org/apache/openejb/resource/jdbc/ManagedConnectionBehaviorTest.java
index c17bdfe..ee65536 100644
---
a/container/openejb-core/src/test/java/org/apache/openejb/resource/jdbc/ManagedConnectionBehaviorTest.java
+++
b/container/openejb-core/src/test/java/org/apache/openejb/resource/jdbc/ManagedConnectionBehaviorTest.java
@@ -54,7 +54,11 @@ import javax.sql.DataSource;
import javax.transaction.Transaction;
import javax.transaction.TransactionManager;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotEquals;
+
public class ManagedConnectionBehaviorTest {
@Test
[jira] [Created] (TOMEE-2561) Bad state in second connection to same datasource in same TX
Jonathan Gallimore created TOMEE-2561: - Summary: Bad state in second connection to same datasource in same TX Key: TOMEE-2561 URL: https://issues.apache.org/jira/browse/TOMEE-2561 Project: TomEE Issue Type: Bug Affects Versions: 7.1.1, 7.0.6, 8.0.0-M3 Reporter: Jonathan Gallimore Assignee: Jonathan Gallimore Fix For: 8.0.0-M4, 7.0.7, 7.1.2 There's a case where, particularly if you're using XA, if you use a second connection to the same datasource in the same transaction, ManagedConnection will fetch the delegate transaction from the transaction registry, but the xaConnection and xaResource fields are dropped. -- This message was sent by Atlassian JIRA (v7.6.3#76005)
buildbot success in on tomee-7.0.x-ubuntu-jvm8
The Buildbot has detected a restored build on builder tomee-7.0.x-ubuntu-jvm8 while building tomee. Full details are available at: https://ci.apache.org/builders/tomee-7.0.x-ubuntu-jvm8/builds/40 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: bb_qnode7_ubuntu Build Reason: The SingleBranchScheduler scheduler named 'on-tomee-7.0.x-ubuntu-jvm8-commit' triggered this build Build Source Stamp: [branch tomee-7.0.x] eb355a3e1ad5fe3a90e7b19f30918296fb92e977 Blamelist: Jonathan Gallimore Build succeeded! Sincerely, -The Buildbot
[tomee] 06/06: Unit test for ManagedConnection behaviour
This is an automated email from the ASF dual-hosted git repository.
jgallimore pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomee.git
commit b6d92c0378503de776c66df6675374db0091aa08
Author: Jonathan Gallimore
AuthorDate: Thu Jul 4 21:58:06 2019 +0100
Unit test for ManagedConnection behaviour
---
.../jdbc/ManagedConnectionBehaviorTest.java| 72 +-
1 file changed, 69 insertions(+), 3 deletions(-)
diff --git
a/container/openejb-core/src/test/java/org/apache/openejb/resource/jdbc/ManagedConnectionBehaviorTest.java
b/container/openejb-core/src/test/java/org/apache/openejb/resource/jdbc/ManagedConnectionBehaviorTest.java
index a5e65cd..c17bdfe 100644
---
a/container/openejb-core/src/test/java/org/apache/openejb/resource/jdbc/ManagedConnectionBehaviorTest.java
+++
b/container/openejb-core/src/test/java/org/apache/openejb/resource/jdbc/ManagedConnectionBehaviorTest.java
@@ -19,10 +19,13 @@ package org.apache.openejb.resource.jdbc;
import org.apache.geronimo.transaction.manager.GeronimoTransactionManager;
import org.apache.openejb.resource.GeronimoTransactionManagerFactory;
import org.apache.openejb.resource.TransactionManagerWrapper;
+import org.apache.openejb.resource.jdbc.managed.local.ManagedConnection;
import org.apache.openejb.resource.jdbc.managed.local.ManagedDataSource;
import org.junit.Test;
import java.io.PrintWriter;
+import java.lang.reflect.Field;
+import java.lang.reflect.Proxy;
import java.sql.Array;
import java.sql.Blob;
import java.sql.CallableStatement;
@@ -51,9 +54,7 @@ import javax.sql.DataSource;
import javax.transaction.Transaction;
import javax.transaction.TransactionManager;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.*;
public class ManagedConnectionBehaviorTest {
@Test
@@ -123,7 +124,72 @@ public class ManagedConnectionBehaviorTest {
assertTrue(myDs.connections.iterator().next().commit);
myDs.connections.clear();
}
+{ // 2 connections, same TX
+mgr.begin();
+final Connection connection1 = ds.getConnection();
+
+assertTrue(myDs.connections.isEmpty()); // not yet needed
+connection1.createBlob(); // just to call something
+
+// second connection should be the same as it comes from the tx
registry
+final Connection connection2 = ds.getConnection();
+connection2.createBlob(); // just to call something
+
+assertEquals(connection1, connection2);
+
+for (final MyConn conn : myDs.connections) {
+assertFalse(conn.closed);
+}
+
+mgr.commit();
+
+for (final MyConn conn : myDs.connections) {
+assertTrue(conn.closed);
+assertTrue(conn.commit);
+assertFalse(conn.rollback);
+}
+
+myDs.connections.clear();
+}
+{ // 2 connections, same TX
+final Connection connection1 = ds.getConnection();
+final Connection connection2 = ds.getConnection();
+
+assertNotEquals(connection1, connection2);
+
+mgr.begin();
+assertTrue(myDs.connections.isEmpty()); // not yet needed
+connection1.createBlob(); // just to call something
+connection2.createBlob(); // just to call something
+
+for (final MyConn conn : myDs.connections) {
+assertFalse(conn.closed);
+}
+
+final ManagedConnection mc1 = (ManagedConnection)
Proxy.getInvocationHandler(connection1);
+final ManagedConnection mc2 = (ManagedConnection)
Proxy.getInvocationHandler(connection2);
+
+assertEquals(getFieldValue(mc1, "xaConnection"),
getFieldValue(mc2, "xaConnection"));
+assertEquals(getFieldValue(mc1, "xaResource"), getFieldValue(mc2,
"xaResource"));
+assertEquals(getFieldValue(mc1, "delegate"), getFieldValue(mc2,
"delegate"));
+
+mgr.commit();
+
+for (final MyConn conn : myDs.connections) {
+assertTrue(conn.closed);
+assertTrue(conn.commit);
+assertFalse(conn.rollback);
+}
+
+myDs.connections.clear();
+}
+
+}
+private Object getFieldValue(final Object object, final String fieldName)
throws NoSuchFieldException, IllegalAccessException {
+final Field xaConnectionField =
object.getClass().getDeclaredField(fieldName);
+xaConnectionField.setAccessible(true);
+return xaConnectionField.get(object);
}
public static class MyDs implements DataSource {
[tomee] 05/06: Unused code
This is an automated email from the ASF dual-hosted git repository.
jgallimore pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomee.git
commit 5a89befa9369895f120ed8506df9f3e9924fb9db
Author: Jonathan Gallimore
AuthorDate: Thu Jul 4 21:38:09 2019 +0100
Unused code
---
.../apache/openejb/resource/jdbc/managed/xa/ManagedXADataSource.java | 3 ---
1 file changed, 3 deletions(-)
diff --git
a/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/managed/xa/ManagedXADataSource.java
b/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/managed/xa/ManagedXADataSource.java
index 42013c7..c111874 100644
---
a/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/managed/xa/ManagedXADataSource.java
+++
b/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/managed/xa/ManagedXADataSource.java
@@ -18,8 +18,6 @@
package org.apache.openejb.resource.jdbc.managed.xa;
import org.apache.openejb.resource.jdbc.managed.local.ManagedDataSource;
-import org.apache.openejb.util.LogCategory;
-import org.apache.openejb.util.Logger;
import java.lang.reflect.Proxy;
import java.sql.Connection;
@@ -30,7 +28,6 @@ import javax.transaction.TransactionSynchronizationRegistry;
public class ManagedXADataSource extends ManagedDataSource {
-private static final Logger LOGGER =
Logger.getInstance(LogCategory.OPENEJB_RESOURCE_JDBC,
ManagedXADataSource.class);
private static final Class[] CONNECTION_CLASS = new
Class[]{Connection.class};
private final TransactionManager txMgr;
[tomee] 01/06: TOMEE-2557 add debug logging for ManagedConnection
This is an automated email from the ASF dual-hosted git repository.
jgallimore pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomee.git
commit 255e2842fe310e172aa7f314c9bab39b39221ae5
Author: Jonathan Gallimore
AuthorDate: Wed Jul 3 01:14:47 2019 +0100
TOMEE-2557 add debug logging for ManagedConnection
---
.../jdbc/managed/local/ManagedConnection.java | 63 --
1 file changed, 59 insertions(+), 4 deletions(-)
diff --git
a/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/managed/local/ManagedConnection.java
b/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/managed/local/ManagedConnection.java
index 45ef356..9445a30 100644
---
a/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/managed/local/ManagedConnection.java
+++
b/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/managed/local/ManagedConnection.java
@@ -39,9 +39,13 @@ import java.lang.reflect.Proxy;
import java.sql.Connection;
import java.sql.SQLException;
import java.sql.Wrapper;
+import java.util.Arrays;
import java.util.Objects;
public class ManagedConnection implements InvocationHandler {
+
+private static final Logger LOGGER =
Logger.getInstance(LogCategory.OPENEJB_RESOURCE_JDBC, ManagedConnection.class);
+
private final TransactionManager transactionManager;
private final Key key;
private final TransactionSynchronizationRegistry registry;
@@ -50,6 +54,7 @@ public class ManagedConnection implements InvocationHandler {
protected XAConnection xaConnection;
private Transaction currentTransaction;
private boolean closed;
+private StackTraceElement[] createdAt;
public ManagedConnection(final CommonDataSource ds,
final TransactionManager txMgr,
@@ -59,6 +64,10 @@ public class ManagedConnection implements InvocationHandler {
registry = txRegistry;
closed = false;
key = new Key(ds, user, password);
+
+if (LOGGER.isDebugEnabled()) {
+createdAt = new Throwable().getStackTrace();
+}
}
public XAResource getXAResource() throws SQLException {
@@ -151,11 +160,11 @@ public class ManagedConnection implements
InvocationHandler {
setAutoCommit(false);
} catch (final SQLException xae) { // we are alreay in
a transaction so this can't be called from a user perspective - some XA
DataSource prevents it in their code
final String message = "Can't set auto commit to
false cause the XA datasource doesn't support it, this is likely an issue";
-final Logger logger =
Logger.getInstance(LogCategory.OPENEJB_RESOURCE_JDBC, ManagedConnection.class);
-if (logger.isDebugEnabled()) { // we don't want to
print the exception by default
-logger.warning(message, xae);
+
+if (LOGGER.isDebugEnabled()) { // we don't want to
print the exception by default
+LOGGER.warning(message, xae);
} else {
-logger.warning(message);
+LOGGER.warning(message);
}
}
}
@@ -206,6 +215,21 @@ public class ManagedConnection implements
InvocationHandler {
delegate = Connection.class.cast(connection);
xaResource = new LocalXAResource(delegate);
}
+
+if (LOGGER.isDebugEnabled()) {
+LOGGER.debug("Created new " +
+((XAConnection.class.isInstance(connection)) ? "XAConnection"
: "Connection") +
+" xaConnection = " +
+((xaConnection == null) ? "null" : xaConnection.toString()) +
+" delegate = " +
+((delegate == null) ? "null" : delegate.toString())
+);
+}
+
+if (LOGGER.isDebugEnabled()) {
+this.createdAt = new Throwable().getStackTrace();
+}
+
return connection;
}
@@ -270,13 +294,30 @@ public class ManagedConnection implements
InvocationHandler {
}
private void closeConnection(final boolean force) {
+
+if (LOGGER.isDebugEnabled()) {
+LOGGER.debug("Closing connection " + this.toString() + ", force =
" + force + ", closed = " + this.closed);
+if (createdAt != null) {
+LOGGER.debug("Connection created at: " +
Arrays.toString(createdAt));
+}
+
+LOGGER.debug("Connection closed at: " + Arrays.toString(new
Throwable().getStackTrace()));
+}
+
if (!force && closed) {
return;
}
try {
if (xaConnection != null) { // handles the underlying connection
+if
[tomee] branch master updated (f708d61 -> b6d92c0)
This is an automated email from the ASF dual-hosted git repository. jgallimore pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/tomee.git. from f708d61 Merge pull request #496 from Daniel-Dos/TOMEE-2551 new 255e284 TOMEE-2557 add debug logging for ManagedConnection new 64d3ce5 Attempting to avoid edge case with using multiple connections from the same datasource in the same transaction new 262f219 Checkstyle new 864b6fa Fix test failures for custom ORM with CMP new 5a89bef Unused code new b6d92c0 Unit test for ManagedConnection behaviour The 6 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../tests/cmp/sample/CustomOrmXmlCastTest.java | 2 +- .../tests/cmp/sample/CustomOrmXmlTest.java | 2 +- .../openejb/resource/jdbc/managed/local/Key.java | 81 ++ .../jdbc/managed/local/ManagedConnection.java | 124 + .../jdbc/managed/local/ManagedDataSource.java | 34 +- .../jdbc/managed/xa/ManagedXADataSource.java | 5 + .../jdbc/ManagedConnectionBehaviorTest.java| 72 +++- 7 files changed, 264 insertions(+), 56 deletions(-) create mode 100644 container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/managed/local/Key.java
[tomee] 04/06: Fix test failures for custom ORM with CMP
This is an automated email from the ASF dual-hosted git repository.
jgallimore pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomee.git
commit 864b6fa2b78bcdf4112ad4f94eaa6f223f3e13e2
Author: Jonathan Gallimore
AuthorDate: Thu Jul 4 21:22:46 2019 +0100
Fix test failures for custom ORM with CMP
---
.../openejb/arquillian/tests/cmp/sample/CustomOrmXmlCastTest.java | 2 +-
.../apache/openejb/arquillian/tests/cmp/sample/CustomOrmXmlTest.java| 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git
a/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/cmp/sample/CustomOrmXmlCastTest.java
b/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/cmp/sample/CustomOrmXmlCastTest.java
index af88bd9..6aa5d6e 100644
---
a/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/cmp/sample/CustomOrmXmlCastTest.java
+++
b/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/cmp/sample/CustomOrmXmlCastTest.java
@@ -46,7 +46,7 @@ public class CustomOrmXmlCastTest {
LocalMovie.class, LocalMovieHome.class,
MovieBean.class, MovieDetails.class,
MoviesBusiness.class, MoviesBusinessBean.class,
MoviesBusinessHome.class, MoviesServlet.class,
MoviesServlet2.class)
-.addAsResource(new
ClassLoaderAsset("org/apache/openejb/arquillian/tests/cmp/sample/custom-orm.xml"),
"META-INF/custom-orm.xml")
+.addAsResource(new
ClassLoaderAsset("org/apache/openejb/arquillian/tests/cmp/sample/custom-orm.xml"),
"META-INF/openejb-cmp-generated-orm.xml")
.addAsResource(new
ClassLoaderAsset("org/apache/openejb/arquillian/tests/cmp/sample/persistence.xml"),
"META-INF/persistence.xml")
.addAsWebInfResource(new
ClassLoaderAsset("org/apache/openejb/arquillian/tests/cmp/sample/openejb-jar.xml"),
"openejb-jar.xml")
.addAsWebInfResource(new
ClassLoaderAsset("org/apache/openejb/arquillian/tests/cmp/sample/ejb-jar.xml"),
"ejb-jar.xml")
diff --git
a/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/cmp/sample/CustomOrmXmlTest.java
b/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/cmp/sample/CustomOrmXmlTest.java
index d48d27e..97bb17d 100644
---
a/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/cmp/sample/CustomOrmXmlTest.java
+++
b/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/cmp/sample/CustomOrmXmlTest.java
@@ -46,7 +46,7 @@ public class CustomOrmXmlTest {
LocalMovie.class, LocalMovieHome.class,
MovieBean.class, MovieDetails.class,
MoviesBusiness.class, MoviesBusinessBean.class,
MoviesBusinessHome.class,
MoviesServlet.class)
-.addAsResource(new
ClassLoaderAsset("org/apache/openejb/arquillian/tests/cmp/sample/custom-orm.xml"),
"META-INF/custom-orm.xml")
+.addAsResource(new
ClassLoaderAsset("org/apache/openejb/arquillian/tests/cmp/sample/custom-orm.xml"),
"META-INF/openejb-cmp-generated-orm.xml")
.addAsResource(new
ClassLoaderAsset("org/apache/openejb/arquillian/tests/cmp/sample/persistence.xml"),
"META-INF/persistence.xml")
.addAsWebInfResource(new
ClassLoaderAsset("org/apache/openejb/arquillian/tests/cmp/sample/openejb-jar.xml"),
"openejb-jar.xml")
.addAsWebInfResource(new
ClassLoaderAsset("org/apache/openejb/arquillian/tests/cmp/sample/ejb-jar.xml"),
"ejb-jar.xml")
[tomee] 02/06: Attempting to avoid edge case with using multiple connections from the same datasource in the same transaction
This is an automated email from the ASF dual-hosted git repository.
jgallimore pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomee.git
commit 64d3ce583ce92c0d33975fcedbd0d4e079b63798
Author: Jonathan Gallimore
AuthorDate: Thu Jul 4 15:21:17 2019 +0100
Attempting to avoid edge case with using multiple connections from the
same datasource in the same transaction
---
.../openejb/resource/jdbc/managed/local/Key.java | 81 ++
.../jdbc/managed/local/ManagedConnection.java | 63 +
.../jdbc/managed/local/ManagedDataSource.java | 34 +++--
.../jdbc/managed/xa/ManagedXADataSource.java | 12
4 files changed, 142 insertions(+), 48 deletions(-)
diff --git
a/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/managed/local/Key.java
b/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/managed/local/Key.java
new file mode 100644
index 000..87351c7
--- /dev/null
+++
b/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/managed/local/Key.java
@@ -0,0 +1,81 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.openejb.resource.jdbc.managed.local;
+
+import javax.sql.CommonDataSource;
+import java.util.Objects;
+
+public class Key {
+private final CommonDataSource ds;
+private final String user;
+private final String pwd;
+private final int hash;
+
+public Key(final CommonDataSource ds, final String user, final String pwd)
{
+this.ds = ds;
+this.user = user;
+this.pwd = pwd;
+
+int result = ds.hashCode();
+result = 31 * result + (user != null ? user.hashCode() : 0);
+result = 31 * result + (pwd != null ? pwd.hashCode() : 0);
+hash = result;
+}
+
+public CommonDataSource getDs() {
+return ds;
+}
+
+public String getUser() {
+return user;
+}
+
+public String getPwd() {
+return pwd;
+}
+
+@Override
+public boolean equals(final Object o) {
+if (this == o) {
+return true;
+}
+if (o == null || getClass() != o.getClass()) {
+return false;
+}
+
+Key key = Key.class.cast(o);
+return (ds == key.ds || ds.equals(key.ds)) &&
+Objects.equals(user, key.user) &&
+Objects.equals(pwd, key.pwd);
+}
+
+@Override
+public String toString() {
+return "Key{" +
+"ds=" + ds +
+", user='" + user + '\'' +
+", pwd='*'" +
+", hash=" + hash +
+'}';
+}
+
+@Override
+public int hashCode() {
+return hash;
+}
+}
diff --git
a/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/managed/local/ManagedConnection.java
b/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/managed/local/ManagedConnection.java
index 9445a30..95cf1fa 100644
---
a/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/managed/local/ManagedConnection.java
+++
b/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/managed/local/ManagedConnection.java
@@ -40,7 +40,6 @@ import java.sql.Connection;
import java.sql.SQLException;
import java.sql.Wrapper;
import java.util.Arrays;
-import java.util.Objects;
public class ManagedConnection implements InvocationHandler {
@@ -152,7 +151,7 @@ public class ManagedConnection implements InvocationHandler
{
throw new SQLException("Unable to enlist connection
the transaction", e);
}
-registry.putResource(key, delegate);
+registry.putResource(key, proxy);
transaction.registerSynchronization(new
ClosingSynchronization());
if (xaConnection == null) {
@@ -168,8 +167,19 @@ public class ManagedConnection implements
InvocationHandler {
}
}
}
-} else if (delegate == null) { // shouldn't happen
-delegate = connection;
+
[tomee] 03/06: Checkstyle
This is an automated email from the ASF dual-hosted git repository. jgallimore pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/tomee.git commit 262f2192ebcb0e5c886736b1d04ff17a753b494b Author: Jonathan Gallimore AuthorDate: Thu Jul 4 21:06:55 2019 +0100 Checkstyle --- .../apache/openejb/resource/jdbc/managed/xa/ManagedXADataSource.java | 4 1 file changed, 4 deletions(-) diff --git a/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/managed/xa/ManagedXADataSource.java b/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/managed/xa/ManagedXADataSource.java index 341cf23..42013c7 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/managed/xa/ManagedXADataSource.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/managed/xa/ManagedXADataSource.java @@ -17,8 +17,6 @@ package org.apache.openejb.resource.jdbc.managed.xa; -import org.apache.openejb.resource.jdbc.managed.local.Key; -import org.apache.openejb.resource.jdbc.managed.local.ManagedConnection; import org.apache.openejb.resource.jdbc.managed.local.ManagedDataSource; import org.apache.openejb.util.LogCategory; import org.apache.openejb.util.Logger; @@ -27,8 +25,6 @@ import java.lang.reflect.Proxy; import java.sql.Connection; import java.sql.SQLException; import javax.sql.CommonDataSource; -import javax.transaction.SystemException; -import javax.transaction.Transaction; import javax.transaction.TransactionManager; import javax.transaction.TransactionSynchronizationRegistry;
[tomee] branch tomee-7.0.x updated: Fix build - s/SHAPSHOT/SNAPSHOT
This is an automated email from the ASF dual-hosted git repository.
jgallimore pushed a commit to branch tomee-7.0.x
in repository https://gitbox.apache.org/repos/asf/tomee.git
The following commit(s) were added to refs/heads/tomee-7.0.x by this push:
new eb355a3 Fix build - s/SHAPSHOT/SNAPSHOT
eb355a3 is described below
commit eb355a3e1ad5fe3a90e7b19f30918296fb92e977
Author: Jonathan Gallimore
AuthorDate: Thu Jul 4 19:45:08 2019 +
Fix build - s/SHAPSHOT/SNAPSHOT
---
arquillian/arquillian-tomee-tests/pom.xml | 30 +++---
examples/arquillian-jpa/pom.xml| 2 +-
.../bean-validation-design-by-contract/pom.xml | 2 +-
examples/bval-evaluation-redeployment/pom.xml | 4 +--
examples/cdi-realm/pom.xml | 2 +-
examples/change-jaxws-url/pom.xml | 4 +--
examples/connector-ear/pom.xml | 2 +-
examples/connector-war/pom.xml | 2 +-
examples/datasource-ciphered-password/pom.xml | 2 +-
examples/datasource-definition/pom.xml | 2 +-
examples/datasource-versioning/pom.xml | 2 +-
examples/deltaspike-fullstack/pom.xml | 2 +-
examples/dynamic-datasource-routing/pom.xml| 2 +-
examples/mbean-auto-registration/pom.xml | 2 +-
examples/moviefun-rest/pom.xml | 2 +-
examples/moviefun/pom.xml | 2 +-
examples/mtom/pom.xml | 2 +-
examples/multi-jpa-provider-testing/pom.xml| 2 +-
examples/multiple-arquillian-adapters/pom.xml | 2 +-
examples/multiple-tomee-arquillian/pom.xml | 2 +-
examples/pojo-webservice/pom.xml | 4 +--
examples/polling-parent/pom.xml| 2 +-
examples/projectstage-demo/pom.xml | 2 +-
examples/quartz-app/pom.xml| 2 +-
examples/resources-declared-in-webapp/pom.xml | 2 +-
examples/resources-jmx-example/pom.xml | 2 +-
examples/rest-example-with-application/pom.xml | 2 +-
examples/rest-example/pom.xml | 4 +--
examples/rest-on-ejb/pom.xml | 2 +-
examples/simple-cmp2/pom.xml | 2 +-
pom.xml| 2 +-
tomee/apache-tomee/pom.xml | 7 +
32 files changed, 56 insertions(+), 49 deletions(-)
diff --git a/arquillian/arquillian-tomee-tests/pom.xml
b/arquillian/arquillian-tomee-tests/pom.xml
index 8848ff3..ff53086 100644
--- a/arquillian/arquillian-tomee-tests/pom.xml
+++ b/arquillian/arquillian-tomee-tests/pom.xml
@@ -161,7 +161,7 @@
${maven.test.skip}
-javaagent:${settings.localRepository}/org/apache/tomee/openejb-javaagent/${project.version}/openejb-javaagent-${project.version}.jar
-7.0.7-SHAPSHOT
+7.0.7-SNAPSHOT
tomee-embedded
tomee-embedded
@@ -260,7 +260,7 @@
${skip.remote.webprofile}
true
-7.0.7-SHAPSHOT
+7.0.7-SNAPSHOT
webprofile
tomee-remote
tomee-remote
@@ -294,7 +294,7 @@
${skip.embedded}
-javaagent:${settings.localRepository}/org/apache/tomee/openejb-javaagent/${project.version}/openejb-javaagent-${project.version}.jar
-XX:+CMSClassUnloadingEnabled -XX:MaxPermSize=768M
-7.0.7-SHAPSHOT
+7.0.7-SNAPSHOT
tomee-embedded
tomee-embedded
@@ -310,7 +310,7 @@
${skip.remote.plume}
true
-7.0.7-SHAPSHOT
+7.0.7-SNAPSHOT
plume
tomee-remote
tomee-remote
@@ -330,7 +330,7 @@
${skip.remote.plus}
true
-7.0.7-SHAPSHOT
+7.0.7-SNAPSHOT
plus
tomee-remote
tomee-remote
@@ -346,7 +346,7 @@
${skip.webapp.webprofile}
-7.0.7-SHAPSHOT
+7.0.7-SNAPSHOT
${tomcat.version}
tomee-webapp
tomee-webapp
@@ -363,7 +363,7 @@
${skip.webapp.plus}
-7.0.7-SHAPSHOT
+7.0.7-SNAPSHOT
${tomcat.version}
tomee-plus-webapp
tomee-webapp
@@ -380,7 +380,7 @@
[jira] [Created] (TOMEE-2560) Translate to portuguese: examples/async-methods
Daniel Dias created TOMEE-2560: -- Summary: Translate to portuguese: examples/async-methods Key: TOMEE-2560 URL: https://issues.apache.org/jira/browse/TOMEE-2560 Project: TomEE Issue Type: Sub-task Components: Examples and Documentation Reporter: Daniel Dias Translate into Portuguese the README file using a suffix `_pt` to allow the Tomee Website to pick up and configure this version and corresponding language . -- This message was sent by Atlassian JIRA (v7.6.3#76005)
