You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by jg...@apache.org on 2018/12/10 14:20:38 UTC
[1/2] tomee git commit: TOMEE-2330 fix issue with incorrect base URL
for generated persistence units
Repository: tomee
Updated Branches:
refs/heads/master 80717c2eb -> 1ff1fcc8d
TOMEE-2330 fix issue with incorrect base URL for generated persistence units
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/4d535f96
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/4d535f96
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/4d535f96
Branch: refs/heads/master
Commit: 4d535f969e9769f0403fddd100b085a0d1de15a9
Parents: 326832e
Author: Jonathan Gallimore <jg...@tomitribe.com>
Authored: Mon Dec 10 14:16:43 2018 +0000
Committer: Jonathan Gallimore <jg...@tomitribe.com>
Committed: Mon Dec 10 14:16:43 2018 +0000
----------------------------------------------------------------------
.../arquillian/tests/cmp/CmpMappingTest.java | 58 ++++++++++++++++++++
.../arquillian/tests/cmp/CmpServlet.java | 2 +-
.../apache/openejb/config/CmpJpaConversion.java | 4 +-
3 files changed, 61 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/4d535f96/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/cmp/CmpMappingTest.java
----------------------------------------------------------------------
diff --git a/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/cmp/CmpMappingTest.java b/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/cmp/CmpMappingTest.java
new file mode 100644
index 0000000..4c8cf41
--- /dev/null
+++ b/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/cmp/CmpMappingTest.java
@@ -0,0 +1,58 @@
+/*
+ * 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.arquillian.tests.cmp;
+
+import org.apache.ziplock.IO;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.container.test.api.RunAsClient;
+import org.jboss.arquillian.junit.Arquillian;
+import org.jboss.arquillian.test.api.ArquillianResource;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.ClassLoaderAsset;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.net.URL;
+
+/**
+ * @version $Rev$ $Date$
+ */
+@RunWith(Arquillian.class)
+public class CmpMappingTest {
+
+ @ArquillianResource
+ private URL url;
+
+ @Deployment(testable = false)
+ public static WebArchive createDeployment() {
+ WebArchive archive = ShrinkWrap.create(WebArchive.class, CmpMappingTest.class.getSimpleName() + ".war")
+ .addClasses(CmpServlet.class, MyCmpBean.class, MyLocalHome.class, MyLocalObject.class, MyRemoteHome.class, MyRemoteObject.class)
+ .addAsWebInfResource(new ClassLoaderAsset("org/apache/openejb/arquillian/tests/cmp/openejb-cmp-orm.xml"), "openejb-cmp-orm.xml")
+ .addAsWebInfResource(new ClassLoaderAsset("org/apache/openejb/arquillian/tests/cmp/ejb-jar.xml"), "ejb-jar.xml");
+
+ System.out.println(archive.toString(true));
+ return archive;
+ }
+
+ @Test
+ @RunAsClient
+ public void checkCmpJpaEntityORMMappings() throws Exception {
+ final String output = IO.readString(new URL(url.toExternalForm()));
+ System.out.println(output);
+ }
+}
http://git-wip-us.apache.org/repos/asf/tomee/blob/4d535f96/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/cmp/CmpServlet.java
----------------------------------------------------------------------
diff --git a/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/cmp/CmpServlet.java b/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/cmp/CmpServlet.java
index 15bdc67..c843a9c 100644
--- a/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/cmp/CmpServlet.java
+++ b/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/cmp/CmpServlet.java
@@ -21,7 +21,7 @@ public class CmpServlet extends HttpServlet {
final Collection<AppInfo> deployedApplications = assembler.getDeployedApplications();
for (final AppInfo deployedApplication : deployedApplications) {
- if ("CmpMappingTestIgnoreMe".equals(deployedApplication.appId)) {
+ if ("CmpMappingTest".equals(deployedApplication.appId)) {
final String cmpMappingsXml = deployedApplication.cmpMappingsXml;
resp.getWriter().write(cmpMappingsXml == null ? "null" : cmpMappingsXml);
}
http://git-wip-us.apache.org/repos/asf/tomee/blob/4d535f96/container/openejb-core/src/main/java/org/apache/openejb/config/CmpJpaConversion.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/config/CmpJpaConversion.java b/container/openejb-core/src/main/java/org/apache/openejb/config/CmpJpaConversion.java
index b7af43c..2965abe 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/config/CmpJpaConversion.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/config/CmpJpaConversion.java
@@ -266,10 +266,10 @@ public class CmpJpaConversion implements DynamicDeployer {
private String getPersistenceModuleId(final AppModule appModule) {
if (appModule.getModuleId() != null) {
- return appModule.getModuleId();
+ return appModule.getJarLocation();
}
for (final EjbModule ejbModule : appModule.getEjbModules()) {
- return ejbModule.getModuleId();
+ return ejbModule.getJarLocation();
}
throw new IllegalStateException("Comp must be in an ejb module, this one has none: " + appModule);
}
[2/2] tomee git commit: Merge branch 'TOMEE-2330'
Posted by jg...@apache.org.
Merge branch 'TOMEE-2330'
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/1ff1fcc8
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/1ff1fcc8
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/1ff1fcc8
Branch: refs/heads/master
Commit: 1ff1fcc8d992e663f3f6ae6ab49ffc7439df12aa
Parents: 80717c2 4d535f9
Author: Jonathan Gallimore <jg...@tomitribe.com>
Authored: Mon Dec 10 14:20:07 2018 +0000
Committer: Jonathan Gallimore <jg...@tomitribe.com>
Committed: Mon Dec 10 14:20:07 2018 +0000
----------------------------------------------------------------------
.../arquillian/tests/cmp/CmpMappingTest.java | 58 ++++++++++++++++++++
.../arquillian/tests/cmp/CmpServlet.java | 2 +-
.../apache/openejb/config/CmpJpaConversion.java | 4 +-
3 files changed, 61 insertions(+), 3 deletions(-)
----------------------------------------------------------------------