You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by jf...@apache.org on 2018/10/17 01:02:09 UTC
[1/5] tomee git commit: Add required interface implementations etc
Repository: tomee
Updated Branches:
refs/heads/tomee-7.0.x 1b73ff86c -> 6709b3d9a
Add required interface implementations etc
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/515306f7
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/515306f7
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/515306f7
Branch: refs/heads/tomee-7.0.x
Commit: 515306f7ba0fa1c13720c4426f67854a339d2e30
Parents: df1983f
Author: Jonathan S. Fisher <ex...@gmail.com>
Authored: Sat Sep 29 13:10:49 2018 -0500
Committer: Jonathan S. Fisher <ex...@gmail.com>
Committed: Mon Oct 8 13:12:57 2018 -0500
----------------------------------------------------------------------
.../MBeanOpenEJBRuntimeServices.java | 26 ++++++++++++
.../MBeanOpenEJBRuntimeServicesMBean.java | 22 ++++++++++
.../eclipselink/OpenEJBRuntimeServices.java | 42 ++++++++++++++++++++
.../eclipselink/OpenEJBServerPlatform.java | 11 ++++-
4 files changed, 100 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/515306f7/container/openejb-jpa-integration/src/main/java/org/apache/openejb/jpa/integration/eclipselink/MBeanOpenEJBRuntimeServices.java
----------------------------------------------------------------------
diff --git a/container/openejb-jpa-integration/src/main/java/org/apache/openejb/jpa/integration/eclipselink/MBeanOpenEJBRuntimeServices.java b/container/openejb-jpa-integration/src/main/java/org/apache/openejb/jpa/integration/eclipselink/MBeanOpenEJBRuntimeServices.java
new file mode 100644
index 0000000..c3aae0d
--- /dev/null
+++ b/container/openejb-jpa-integration/src/main/java/org/apache/openejb/jpa/integration/eclipselink/MBeanOpenEJBRuntimeServices.java
@@ -0,0 +1,26 @@
+/*
+ * 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.jpa.integration.eclipselink;
+
+import org.eclipse.persistence.internal.sessions.AbstractSession;
+import org.eclipse.persistence.sessions.Session;
+
+public class MBeanOpenEJBRuntimeServices extends OpenEJBRuntimeServices implements MBeanOpenEJBRuntimeServicesMBean {
+ public MBeanOpenEJBRuntimeServices(Session session) {
+ super((AbstractSession) session);
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tomee/blob/515306f7/container/openejb-jpa-integration/src/main/java/org/apache/openejb/jpa/integration/eclipselink/MBeanOpenEJBRuntimeServicesMBean.java
----------------------------------------------------------------------
diff --git a/container/openejb-jpa-integration/src/main/java/org/apache/openejb/jpa/integration/eclipselink/MBeanOpenEJBRuntimeServicesMBean.java b/container/openejb-jpa-integration/src/main/java/org/apache/openejb/jpa/integration/eclipselink/MBeanOpenEJBRuntimeServicesMBean.java
new file mode 100644
index 0000000..c7b5942
--- /dev/null
+++ b/container/openejb-jpa-integration/src/main/java/org/apache/openejb/jpa/integration/eclipselink/MBeanOpenEJBRuntimeServicesMBean.java
@@ -0,0 +1,22 @@
+/*
+ * 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.jpa.integration.eclipselink;
+
+import org.eclipse.persistence.services.mbean.MBeanRuntimeServicesMBean;
+
+public interface MBeanOpenEJBRuntimeServicesMBean extends MBeanRuntimeServicesMBean {
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tomee/blob/515306f7/container/openejb-jpa-integration/src/main/java/org/apache/openejb/jpa/integration/eclipselink/OpenEJBRuntimeServices.java
----------------------------------------------------------------------
diff --git a/container/openejb-jpa-integration/src/main/java/org/apache/openejb/jpa/integration/eclipselink/OpenEJBRuntimeServices.java b/container/openejb-jpa-integration/src/main/java/org/apache/openejb/jpa/integration/eclipselink/OpenEJBRuntimeServices.java
new file mode 100644
index 0000000..db962b0
--- /dev/null
+++ b/container/openejb-jpa-integration/src/main/java/org/apache/openejb/jpa/integration/eclipselink/OpenEJBRuntimeServices.java
@@ -0,0 +1,42 @@
+/*
+ * 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.jpa.integration.eclipselink;
+
+import java.util.Locale;
+
+import org.eclipse.persistence.internal.sessions.AbstractSession;
+import org.eclipse.persistence.services.RuntimeServices;
+
+public class OpenEJBRuntimeServices extends RuntimeServices {
+
+ static {
+ PLATFORM_NAME = "OpenEJB";
+ }
+
+ public OpenEJBRuntimeServices() {
+ super();
+ }
+
+ public OpenEJBRuntimeServices(AbstractSession session) {
+ super();
+ this.session = session;
+ this.updateDeploymentTimeData();
+ }
+
+ public OpenEJBRuntimeServices(Locale locale) {
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tomee/blob/515306f7/container/openejb-jpa-integration/src/main/java/org/apache/openejb/jpa/integration/eclipselink/OpenEJBServerPlatform.java
----------------------------------------------------------------------
diff --git a/container/openejb-jpa-integration/src/main/java/org/apache/openejb/jpa/integration/eclipselink/OpenEJBServerPlatform.java b/container/openejb-jpa-integration/src/main/java/org/apache/openejb/jpa/integration/eclipselink/OpenEJBServerPlatform.java
index ea074c6..f68a962 100644
--- a/container/openejb-jpa-integration/src/main/java/org/apache/openejb/jpa/integration/eclipselink/OpenEJBServerPlatform.java
+++ b/container/openejb-jpa-integration/src/main/java/org/apache/openejb/jpa/integration/eclipselink/OpenEJBServerPlatform.java
@@ -17,6 +17,7 @@
package org.apache.openejb.jpa.integration.eclipselink;
import org.apache.geronimo.transaction.manager.TransactionImpl;
+import org.eclipse.persistence.platform.server.JMXEnabledPlatform;
import org.eclipse.persistence.platform.server.JMXServerPlatformBase;
import org.eclipse.persistence.sessions.DatabaseSession;
import org.eclipse.persistence.transaction.AbstractSynchronizationListener;
@@ -26,13 +27,14 @@ import javax.management.MBeanServer;
import javax.transaction.Synchronization;
import javax.transaction.TransactionManager;
-public class OpenEJBServerPlatform extends JMXServerPlatformBase {
+public class OpenEJBServerPlatform extends JMXServerPlatformBase implements JMXEnabledPlatform {
public OpenEJBServerPlatform(final DatabaseSession newDatabaseSession) {
super(newDatabaseSession);
try {
mBeanServer = MBeanServer.class.cast(
OpenEJBServerPlatform.class.getClassLoader().loadClass("org.apache.openejb.monitoring.LocalMBeanServer")
.getMethod("get").invoke(null));
+ this.prepareServerSpecificServicesMBean();
} catch (final Exception e) {
// no-op
}
@@ -63,4 +65,11 @@ public class OpenEJBServerPlatform extends JMXServerPlatformBase {
transaction.registerInterposedSynchronization(synchronization);
}
}
+
+ @Override
+ public void prepareServerSpecificServicesMBean() {
+ if (getDatabaseSession() != null && shouldRegisterRuntimeBean) {
+ this.setRuntimeServicesMBean(new MBeanOpenEJBRuntimeServices(getDatabaseSession()));
+ }
+ }
}
[5/5] tomee git commit: Merge branch
'issues/TOMEE-2249_eclipselink-npe' into tomee-7.0.x
Posted by jf...@apache.org.
Merge branch 'issues/TOMEE-2249_eclipselink-npe' into tomee-7.0.x
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/6709b3d9
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/6709b3d9
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/6709b3d9
Branch: refs/heads/tomee-7.0.x
Commit: 6709b3d9a381a0fad05355bf77a7f04c1a5bba57
Parents: 1b73ff8 0640376
Author: Jonathan S. Fisher <ex...@gmail.com>
Authored: Tue Oct 16 20:00:12 2018 -0500
Committer: Jonathan S. Fisher <ex...@gmail.com>
Committed: Tue Oct 16 20:00:12 2018 -0500
----------------------------------------------------------------------
.../MBeanOpenEJBRuntimeServices.java | 26 ++++++++++++
.../MBeanOpenEJBRuntimeServicesMBean.java | 22 ++++++++++
.../eclipselink/OpenEJBRuntimeServices.java | 42 ++++++++++++++++++++
.../eclipselink/OpenEJBServerPlatform.java | 13 +++++-
4 files changed, 101 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
[2/5] tomee git commit: Fix rmannibucau concern on PR and explicity
check for JMX runtime flag
Posted by jf...@apache.org.
Fix rmannibucau concern on PR and explicity check for JMX runtime flag
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/460ba29b
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/460ba29b
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/460ba29b
Branch: refs/heads/tomee-7.0.x
Commit: 460ba29b6dc0790e70b28920c47b04591d80a026
Parents: 515306f
Author: Jonathan S. Fisher <ex...@gmail.com>
Authored: Mon Oct 8 13:21:17 2018 -0500
Committer: Jonathan S. Fisher <ex...@gmail.com>
Committed: Mon Oct 8 13:21:17 2018 -0500
----------------------------------------------------------------------
.../openejb/jpa/integration/eclipselink/OpenEJBServerPlatform.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/460ba29b/container/openejb-jpa-integration/src/main/java/org/apache/openejb/jpa/integration/eclipselink/OpenEJBServerPlatform.java
----------------------------------------------------------------------
diff --git a/container/openejb-jpa-integration/src/main/java/org/apache/openejb/jpa/integration/eclipselink/OpenEJBServerPlatform.java b/container/openejb-jpa-integration/src/main/java/org/apache/openejb/jpa/integration/eclipselink/OpenEJBServerPlatform.java
index f68a962..cd73c26 100644
--- a/container/openejb-jpa-integration/src/main/java/org/apache/openejb/jpa/integration/eclipselink/OpenEJBServerPlatform.java
+++ b/container/openejb-jpa-integration/src/main/java/org/apache/openejb/jpa/integration/eclipselink/OpenEJBServerPlatform.java
@@ -68,7 +68,7 @@ public class OpenEJBServerPlatform extends JMXServerPlatformBase implements JMXE
@Override
public void prepareServerSpecificServicesMBean() {
- if (getDatabaseSession() != null && shouldRegisterRuntimeBean) {
+ if (isRuntimeServicesEnabledDefault() && getDatabaseSession() != null && shouldRegisterRuntimeBean) {
this.setRuntimeServicesMBean(new MBeanOpenEJBRuntimeServices(getDatabaseSession()));
}
}
[4/5] tomee git commit: newlines
Posted by jf...@apache.org.
newlines
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/0640376e
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/0640376e
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/0640376e
Branch: refs/heads/tomee-7.0.x
Commit: 0640376e4dd8a21a2d96f1b5f43b2ee7ecd1ecf5
Parents: f4d3e01
Author: Jonathan S. Fisher <ex...@gmail.com>
Authored: Mon Oct 8 13:25:46 2018 -0500
Committer: Jonathan S. Fisher <ex...@gmail.com>
Committed: Mon Oct 8 13:25:46 2018 -0500
----------------------------------------------------------------------
.../jpa/integration/eclipselink/MBeanOpenEJBRuntimeServices.java | 2 +-
.../integration/eclipselink/MBeanOpenEJBRuntimeServicesMBean.java | 2 +-
.../jpa/integration/eclipselink/OpenEJBRuntimeServices.java | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/0640376e/container/openejb-jpa-integration/src/main/java/org/apache/openejb/jpa/integration/eclipselink/MBeanOpenEJBRuntimeServices.java
----------------------------------------------------------------------
diff --git a/container/openejb-jpa-integration/src/main/java/org/apache/openejb/jpa/integration/eclipselink/MBeanOpenEJBRuntimeServices.java b/container/openejb-jpa-integration/src/main/java/org/apache/openejb/jpa/integration/eclipselink/MBeanOpenEJBRuntimeServices.java
index c3aae0d..5e3d967 100644
--- a/container/openejb-jpa-integration/src/main/java/org/apache/openejb/jpa/integration/eclipselink/MBeanOpenEJBRuntimeServices.java
+++ b/container/openejb-jpa-integration/src/main/java/org/apache/openejb/jpa/integration/eclipselink/MBeanOpenEJBRuntimeServices.java
@@ -23,4 +23,4 @@ public class MBeanOpenEJBRuntimeServices extends OpenEJBRuntimeServices implemen
public MBeanOpenEJBRuntimeServices(Session session) {
super((AbstractSession) session);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/tomee/blob/0640376e/container/openejb-jpa-integration/src/main/java/org/apache/openejb/jpa/integration/eclipselink/MBeanOpenEJBRuntimeServicesMBean.java
----------------------------------------------------------------------
diff --git a/container/openejb-jpa-integration/src/main/java/org/apache/openejb/jpa/integration/eclipselink/MBeanOpenEJBRuntimeServicesMBean.java b/container/openejb-jpa-integration/src/main/java/org/apache/openejb/jpa/integration/eclipselink/MBeanOpenEJBRuntimeServicesMBean.java
index c7b5942..4e229fa 100644
--- a/container/openejb-jpa-integration/src/main/java/org/apache/openejb/jpa/integration/eclipselink/MBeanOpenEJBRuntimeServicesMBean.java
+++ b/container/openejb-jpa-integration/src/main/java/org/apache/openejb/jpa/integration/eclipselink/MBeanOpenEJBRuntimeServicesMBean.java
@@ -19,4 +19,4 @@ package org.apache.openejb.jpa.integration.eclipselink;
import org.eclipse.persistence.services.mbean.MBeanRuntimeServicesMBean;
public interface MBeanOpenEJBRuntimeServicesMBean extends MBeanRuntimeServicesMBean {
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/tomee/blob/0640376e/container/openejb-jpa-integration/src/main/java/org/apache/openejb/jpa/integration/eclipselink/OpenEJBRuntimeServices.java
----------------------------------------------------------------------
diff --git a/container/openejb-jpa-integration/src/main/java/org/apache/openejb/jpa/integration/eclipselink/OpenEJBRuntimeServices.java b/container/openejb-jpa-integration/src/main/java/org/apache/openejb/jpa/integration/eclipselink/OpenEJBRuntimeServices.java
index db962b0..82b82a2 100644
--- a/container/openejb-jpa-integration/src/main/java/org/apache/openejb/jpa/integration/eclipselink/OpenEJBRuntimeServices.java
+++ b/container/openejb-jpa-integration/src/main/java/org/apache/openejb/jpa/integration/eclipselink/OpenEJBRuntimeServices.java
@@ -39,4 +39,4 @@ public class OpenEJBRuntimeServices extends RuntimeServices {
public OpenEJBRuntimeServices(Locale locale) {
}
-}
\ No newline at end of file
+}
[3/5] tomee git commit: move this method above other code
Posted by jf...@apache.org.
move this method above other code
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/f4d3e015
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/f4d3e015
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/f4d3e015
Branch: refs/heads/tomee-7.0.x
Commit: f4d3e01563bf9e37f32b9231d6a4b4a8bb0c3aa2
Parents: 460ba29
Author: Jonathan S. Fisher <ex...@gmail.com>
Authored: Mon Oct 8 13:25:03 2018 -0500
Committer: Jonathan S. Fisher <ex...@gmail.com>
Committed: Mon Oct 8 13:25:03 2018 -0500
----------------------------------------------------------------------
.../eclipselink/OpenEJBServerPlatform.java | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/f4d3e015/container/openejb-jpa-integration/src/main/java/org/apache/openejb/jpa/integration/eclipselink/OpenEJBServerPlatform.java
----------------------------------------------------------------------
diff --git a/container/openejb-jpa-integration/src/main/java/org/apache/openejb/jpa/integration/eclipselink/OpenEJBServerPlatform.java b/container/openejb-jpa-integration/src/main/java/org/apache/openejb/jpa/integration/eclipselink/OpenEJBServerPlatform.java
index cd73c26..bca85fc 100644
--- a/container/openejb-jpa-integration/src/main/java/org/apache/openejb/jpa/integration/eclipselink/OpenEJBServerPlatform.java
+++ b/container/openejb-jpa-integration/src/main/java/org/apache/openejb/jpa/integration/eclipselink/OpenEJBServerPlatform.java
@@ -46,9 +46,16 @@ public class OpenEJBServerPlatform extends JMXServerPlatformBase implements JMXE
}
@Override
- public Class getExternalTransactionControllerClass() {
+ public Class<?> getExternalTransactionControllerClass() {
return OpenEJBJTATransactionController.class;
}
+
+ @Override
+ public void prepareServerSpecificServicesMBean() {
+ if (isRuntimeServicesEnabledDefault() && getDatabaseSession() != null && shouldRegisterRuntimeBean) {
+ this.setRuntimeServicesMBean(new MBeanOpenEJBRuntimeServices(getDatabaseSession()));
+ }
+ }
public static class OpenEJBJTATransactionController extends JTATransactionController {
@Override
@@ -65,11 +72,4 @@ public class OpenEJBServerPlatform extends JMXServerPlatformBase implements JMXE
transaction.registerInterposedSynchronization(synchronization);
}
}
-
- @Override
- public void prepareServerSpecificServicesMBean() {
- if (isRuntimeServicesEnabledDefault() && getDatabaseSession() != null && shouldRegisterRuntimeBean) {
- this.setRuntimeServicesMBean(new MBeanOpenEJBRuntimeServices(getDatabaseSession()));
- }
- }
}