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/08/21 23:22:58 UTC
[1/2] tomee git commit: Whitelist MP jars for scanning instead of all
jars. Caused issues with some CXF stuff.
Repository: tomee
Updated Branches:
refs/heads/tomee-7.1.x 86379b927 -> 11b75830c
Whitelist MP jars for scanning instead of all jars. Caused issues with some CXF stuff.
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/abfc263a
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/abfc263a
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/abfc263a
Branch: refs/heads/tomee-7.1.x
Commit: abfc263afb956827910e55232a33d60fc7b5939b
Parents: 86379b9
Author: Roberto Cortez <ra...@yahoo.com>
Authored: Tue Aug 21 12:04:40 2018 +0100
Committer: Roberto Cortez <ra...@yahoo.com>
Committed: Tue Aug 21 12:04:40 2018 +0100
----------------------------------------------------------------------
.../main/java/org/apache/openejb/config/DeploymentLoader.java | 2 +-
.../src/main/java/org/apache/tomee/installer/Installer.java | 7 +++++++
2 files changed, 8 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/abfc263a/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java b/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java
index d602f81..48a6b1f 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java
@@ -1108,7 +1108,7 @@ public class DeploymentLoader implements DeploymentFilterable {
try {
UrlSet urlSet = new UrlSet(ParentClassLoaderFinder.Helper.get());
urlSet = URLs.cullSystemJars(urlSet);
- final PatternFilter containerIncludes = new PatternFilter(SystemInstance.get().getProperty(OPENEJB_CONTAINER_INCLUDES, ".*"));
+ final PatternFilter containerIncludes = new PatternFilter(SystemInstance.get().getProperty(OPENEJB_CONTAINER_INCLUDES, ".*(geronimo|mp-jwt|failsafe).*"));
final PatternFilter containerExcludes = new PatternFilter(SystemInstance.get().getProperty(OPENEJB_CONTAINER_EXCLUDES, ""));
urlSet = NewLoaderLogic.applyBuiltinExcludes(urlSet, containerIncludes, containerExcludes);
containerUrls = urlSet.getUrls();
http://git-wip-us.apache.org/repos/asf/tomee/blob/abfc263a/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installer.java
----------------------------------------------------------------------
diff --git a/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installer.java b/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installer.java
index 301dfd5..40422f1 100644
--- a/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installer.java
+++ b/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installer.java
@@ -788,6 +788,13 @@ public class Installer implements InstallerInterface {
systemPropertiesWriter.write("# javax.xml.soap.SOAPFactory = com.sun.xml.messaging.saaj.soap.ver1_1.SOAPFactory1_1Impl\n");
systemPropertiesWriter.write("# javax.xml.soap.SOAPConnectionFactory = com.sun.xml.messaging.saaj.client.p2p.HttpSOAPConnectionFactory\n");
systemPropertiesWriter.write("# javax.xml.soap.MetaFactory = com.sun.xml.messaging.saaj.soap.SAAJMetaFactoryImpl\n");
+
+ systemPropertiesWriter.write("#\n");
+ systemPropertiesWriter.write("# Which paths / libraries should be scanned?\n");
+ systemPropertiesWriter.write("openejb.scan.webapp.container = true\n");
+ systemPropertiesWriter.write("openejb.scan.webapp.container.includes = .*(geronimo|mp-jwt|failsafe).*\n");
+ systemPropertiesWriter.write("openejb.scan.webapp.container.excludes = \n");
+
} catch (final IOException e) {
// ignored, this file is far to be mandatory
} finally {
[2/2] tomee git commit: Add polling-domain to exclusions.list so that
the persistence units are not picked up twice
Posted by jg...@apache.org.
Add polling-domain to exclusions.list so that the persistence units are not picked up twice
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/11b75830
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/11b75830
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/11b75830
Branch: refs/heads/tomee-7.1.x
Commit: 11b75830c01449f8237a0e9c53cfc8d1cb8b5a7a
Parents: abfc263
Author: Jonathan Gallimore <jg...@tomitribe.com>
Authored: Wed Aug 22 00:22:06 2018 +0100
Committer: Jonathan Gallimore <jg...@tomitribe.com>
Committed: Wed Aug 22 00:22:06 2018 +0100
----------------------------------------------------------------------
.../src/test/java/jug/rest/arquillian/SubjectServiceTomEETest.java | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/11b75830/examples/polling-parent/polling-web/src/test/java/jug/rest/arquillian/SubjectServiceTomEETest.java
----------------------------------------------------------------------
diff --git a/examples/polling-parent/polling-web/src/test/java/jug/rest/arquillian/SubjectServiceTomEETest.java b/examples/polling-parent/polling-web/src/test/java/jug/rest/arquillian/SubjectServiceTomEETest.java
index aadd71e..200d477 100644
--- a/examples/polling-parent/polling-web/src/test/java/jug/rest/arquillian/SubjectServiceTomEETest.java
+++ b/examples/polling-parent/polling-web/src/test/java/jug/rest/arquillian/SubjectServiceTomEETest.java
@@ -31,6 +31,7 @@ import org.jboss.arquillian.junit.Arquillian;
import org.jboss.arquillian.test.api.ArquillianResource;
import org.jboss.shrinkwrap.api.asset.ClassLoaderAsset;
import org.jboss.shrinkwrap.api.asset.EmptyAsset;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
import org.jboss.shrinkwrap.api.spec.WebArchive;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -56,6 +57,7 @@ public class SubjectServiceTomEETest {
.addAsWebInfResource(new ClassLoaderAsset("META-INF/env-entries.properties"), "env-entries.properties")
.addAsWebInfResource(new ClassLoaderAsset("META-INF/resources.xml"), "resources.xml")
.addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml")
+ .addAsWebInfResource(new StringAsset("polling-domain"), "exclusions.list")
.addPackage(PollingRouter.class.getPackage()) // core
.addPackage(SubjectDao.class.getPackage()) // core
.addPackage(SubjectService.class.getPackage()) // front