[jira] [Work stopped] (TOMEE-2177) Tomcat8 bug 59261 backport to 7.0.70 onwards and cause tomee 1.7.5 fail in Aysn request
[ https://issues.apache.org/jira/browse/TOMEE-2177?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Work on TOMEE-2177 stopped by Jonathan Gallimore. - > Tomcat8 bug 59261 backport to 7.0.70 onwards and cause tomee 1.7.5 fail in > Aysn request > --- > > Key: TOMEE-2177 > URL: https://issues.apache.org/jira/browse/TOMEE-2177 > Project: TomEE > Issue Type: Bug >Affects Versions: 1.7.5 >Reporter: Sunny Fong >Assignee: Jonathan Gallimore >Priority: Major > > Issue has been fix in Tomee 7.0.0 > [https://github.com/apache/tomee/commit/106cbb657a702bb8aaad054feccbcf21eeb69fca#diff-53219028640a320dd51d6cad94db0b99] > But later on, the tomcat bug has been backport to tomcat 7.0.70 and cause > error on 1.7.5 which use tomcat 7.0.81. > Tomcat bug: > [https://bz.apache.org/bugzilla/show_bug.cgi?id=59261] > -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Commented] (TOMEE-2177) Tomcat8 bug 59261 backport to 7.0.70 onwards and cause tomee 1.7.5 fail in Aysn request
[ https://issues.apache.org/jira/browse/TOMEE-2177?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16396208#comment-16396208 ] Jonathan Gallimore commented on TOMEE-2177: --- I've backported this - do you have a particular test that we could use to check? I'd be happy to convert that to an Arquillian test. > Tomcat8 bug 59261 backport to 7.0.70 onwards and cause tomee 1.7.5 fail in > Aysn request > --- > > Key: TOMEE-2177 > URL: https://issues.apache.org/jira/browse/TOMEE-2177 > Project: TomEE > Issue Type: Bug >Affects Versions: 1.7.5 >Reporter: Sunny Fong >Assignee: Jonathan Gallimore >Priority: Major > > Issue has been fix in Tomee 7.0.0 > [https://github.com/apache/tomee/commit/106cbb657a702bb8aaad054feccbcf21eeb69fca#diff-53219028640a320dd51d6cad94db0b99] > But later on, the tomcat bug has been backport to tomcat 7.0.70 and cause > error on 1.7.5 which use tomcat 7.0.81. > Tomcat bug: > [https://bz.apache.org/bugzilla/show_bug.cgi?id=59261] > -- This message was sent by Atlassian JIRA (v7.6.3#76005)
tomee git commit: async listener clarification of servlet spec, fixing OpenEJBValve usage
Repository: tomee Updated Branches: refs/heads/tomee-1.7.x 1f8adb75f -> f4b052cc6 async listener clarification of servlet spec, fixing OpenEJBValve usage Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/f4b052cc Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/f4b052cc Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/f4b052cc Branch: refs/heads/tomee-1.7.x Commit: f4b052cc6b171f9c89c85d1f819ea65abced72c2 Parents: 1f8adb7 Author: Romain manni-Bucau Authored: Tue May 17 13:19:24 2016 +0200 Committer: Jonathan Gallimore Committed: Mon Mar 12 16:53:23 2018 + -- .../org/apache/tomee/catalina/OpenEJBSecurityListener.java | 1 + .../src/main/java/org/apache/tomee/catalina/OpenEJBValve.java | 6 -- 2 files changed, 5 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/tomee/blob/f4b052cc/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBSecurityListener.java -- diff --git a/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBSecurityListener.java b/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBSecurityListener.java index 6e2be0f..5c5a15f 100644 --- a/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBSecurityListener.java +++ b/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBSecurityListener.java @@ -45,6 +45,7 @@ public class OpenEJBSecurityListener implements AsyncListener { @Override public void onStartAsync(final AsyncEvent asyncEvent) throws IOException { +asyncEvent.getAsyncContext().addListener(this); // super vicious isnt it? that's in servlet spec, start != end events. enter(); } http://git-wip-us.apache.org/repos/asf/tomee/blob/f4b052cc/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBValve.java -- diff --git a/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBValve.java b/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBValve.java index 8916aa0..e0d12f3 100644 --- a/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBValve.java +++ b/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBValve.java @@ -38,7 +38,7 @@ public class OpenEJBValve extends ValveBase { public void invoke(final Request request, final Response response) throws IOException, ServletException { final OpenEJBSecurityListener listener = new OpenEJBSecurityListener(securityService, request); -if (!request.isAsync()) { +if (!request.isAsync() || request.getAsyncContextInternal() == null) { listener.enter(); try { getNext().invoke(request, response); @@ -46,7 +46,9 @@ public class OpenEJBValve extends ValveBase { listener.exit(); } } else { -request.getAsyncContext().addListener(new OpenEJBSecurityListener(securityService, request)); +request.getAsyncContextInternal().addListener(new OpenEJBSecurityListener(securityService, request)); + +// finally continue the invocation getNext().invoke(request, response); } }
[14/32] tomee git commit: Merge branch 'master' into master_j9
Merge branch 'master' into master_j9 Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/53e21ef3 Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/53e21ef3 Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/53e21ef3 Branch: refs/heads/fb_tomee8 Commit: 53e21ef3f0aa3f1c2e5071326ef98b3dad8d12c0 Parents: 65a131e f8764fe Author: Jonathan Gallimore Authored: Tue Feb 20 11:07:53 2018 + Committer: Jonathan Gallimore Committed: Tue Feb 20 11:07:53 2018 + -- .../java/org/apache/openejb/arquillian/tests/jms/EnvEntryTest.java | 2 ++ 1 file changed, 2 insertions(+) --
[26/32] tomee git commit: Removed MicroProfileClassLoaderEnricher. Using configuration to pass jar prefixes to scan in TomEEClassLoaderEnricher.
Removed MicroProfileClassLoaderEnricher. Using configuration to pass jar prefixes to scan in TomEEClassLoaderEnricher. Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/6c8604cd Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/6c8604cd Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/6c8604cd Branch: refs/heads/fb_tomee8 Commit: 6c8604cdb54c1473d2f03b9044313ab527eb245c Parents: dd524e5 Author: Roberto Cortez Authored: Tue Mar 6 00:48:06 2018 + Committer: Roberto Cortez Committed: Tue Mar 6 00:48:06 2018 + -- .../org/apache/tomee/catalina/TomcatLoader.java | 4 +- .../MicroProfileClassLoaderEnricher.java| 53 .../tomee/microprofile/MicroProfileService.java | 26 +- 3 files changed, 15 insertions(+), 68 deletions(-) -- http://git-wip-us.apache.org/repos/asf/tomee/blob/6c8604cd/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatLoader.java -- diff --git a/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatLoader.java b/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatLoader.java index 22d9337..b8baad1 100644 --- a/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatLoader.java +++ b/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatLoader.java @@ -221,6 +221,8 @@ public class TomcatLoader implements Loader { // for compatibility purpose, no more used normally by our trunk SystemInstance.get().setComponent(WebDeploymentListeners.class, new WebDeploymentListeners()); +optionalService(properties, "org.apache.tomee.microprofile.MicroProfileService"); + // tomee webapp enricher final TomEEClassLoaderEnricher classLoaderEnricher = new TomEEClassLoaderEnricher(); SystemInstance.get().setComponent(WebAppEnricher.class, classLoaderEnricher); @@ -234,8 +236,6 @@ public class TomcatLoader implements Loader { } } -optionalService(properties, "org.apache.tomee.microprofile.MicroProfileService"); - // optional services if (optionalService(properties, "org.apache.tomee.webservices.TomeeJaxRsService")) { // in embedded mode we use regex, in tomcat we use tomcat servlet mapping http://git-wip-us.apache.org/repos/asf/tomee/blob/6c8604cd/tomee/tomee-microprofile/src/main/java/org/apache/tomee/microprofile/MicroProfileClassLoaderEnricher.java -- diff --git a/tomee/tomee-microprofile/src/main/java/org/apache/tomee/microprofile/MicroProfileClassLoaderEnricher.java b/tomee/tomee-microprofile/src/main/java/org/apache/tomee/microprofile/MicroProfileClassLoaderEnricher.java deleted file mode 100644 index 7100f87..000 --- a/tomee/tomee-microprofile/src/main/java/org/apache/tomee/microprofile/MicroProfileClassLoaderEnricher.java +++ /dev/null @@ -1,53 +0,0 @@ -/* - * 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.tomee.microprofile; - -import org.apache.openejb.classloader.WebAppEnricher; -import org.apache.tomee.installer.Paths; - -import java.io.File; -import java.net.MalformedURLException; -import java.net.URL; -import java.util.Collection; -import java.util.HashSet; - -public class MicroProfileClassLoaderEnricher implements WebAppEnricher { -private static final String[] MICROPROFILE_LIBS_IMPLS_PREFIXES = new String[]{ -"geronimo-config-impl" -}; - -@SuppressWarnings("Duplicates") -@Override -public URL[] enrichment(final ClassLoader webappClassLaoder) { -final Collection urls = new HashSet<>(); - -// from prefix -final Paths paths = new Paths(new File(System.getProperty("openejb.home"))); // parameter is useless -for (final String prefix : MICROPROFILE_LIBS_IMPLS_PREFIXES) { -final File file = paths.findTomEELibJar(prefix); -if (file != null) { -
[30/32] tomee git commit: applygin Roberto's PR about MP distro + MP-config TCK + fixing pom merge issues
applygin Roberto's PR about MP distro + MP-config TCK + fixing pom merge issues Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/62f75fc6 Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/62f75fc6 Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/62f75fc6 Branch: refs/heads/fb_tomee8 Commit: 62f75fc6c7d0a7e179012e9466a43c553998e9fc Parents: 27639ab 021b9ca Author: Romain Manni-Bucau Authored: Mon Mar 12 14:25:47 2018 +0100 Committer: Romain Manni-Bucau Committed: Mon Mar 12 14:25:47 2018 +0100 -- .../arquillian/tests/jms/EnvEntryTest.java |2 + .../apache/openejb/config/DeploymentLoader.java | 12 +- .../src/main/resources/default.exclusions |4 +- .../superbiz/counter/CounterCallbacksTest.java |2 +- pom.xml | 12 +- tck/microprofile-tck/config/pom.xml | 129 ++ .../microprofile/config/ConfigurationBean.java | 25 + .../MicroProfileConfigTCKArchiveProcessor.java | 33 + .../config/MicroProfileConfigTCKExtension.java | 11 + .../config/MicroProfileConfigurationTest.java | 69 + jboss.arquillian.core.spi.LoadableExtension |1 + .../config/src/test/resources/arquillian.xml| 41 + tck/microprofile-tck/pom.xml| 37 + tck/pom.xml |1 + tomee/apache-tomee/pom.xml | 68 + .../src/main/assembly/tomee-microprofile.xml| 84 ++ tomee/pom.xml |1 + .../org/apache/tomee/catalina/TomcatLoader.java |2 + tomee/tomee-microprofile-webapp/pom.xml | 101 ++ .../src/main/assembly/war.xml | 92 ++ .../src/main/resources/META-INF/LICENSE | 1197 ++ .../src/main/resources/META-INF/NOTICE | 140 ++ 22 files changed, 2052 insertions(+), 12 deletions(-) -- http://git-wip-us.apache.org/repos/asf/tomee/blob/62f75fc6/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java -- http://git-wip-us.apache.org/repos/asf/tomee/blob/62f75fc6/pom.xml -- diff --cc pom.xml index e143fc2,0fc7f2e..92db56b --- a/pom.xml +++ b/pom.xml @@@ -94,17 -94,16 +94,17 @@@ ${project.version} -1.7 -1.7 +1.8 +1.8 +2.20 -7.0-1 +8.0-SNAPSHOT -2.4.2 -1.7.4 +3.0.0-SNAPSHOT +2.0.4 2.1 - 1.1.6 -1.0.0 ++1.1.7 3.3.0 @@@ -126,15 -125,18 +126,15 @@@ ${openejb.osgi.dynamic.import.pkg} ${project.groupId}.${project.artifactId} - 0.5-incubating -0.4-incubating ++0.5-incubating 1.1.13.Final - 2.0.0-alpha-10 + 2.0.0 1.2.6 - 9.0.5 -8.5.23 ++9.0.6 -3.1.13 -1.2.6 -2.0.0 -1.1.13.Final +3.2.1 2.10.3 7.5.3.v20111011 @@@ -175,8 -177,8 +175,8 @@@ 3.1.4 1.1 1.9.0-alpha-2 - 2.3.0-SNAPSHOT -2.2.12 -2.2.12 ++2.3.0 +2.3.3 1.7.21 1.2.17 2.0.1 http://git-wip-us.apache.org/repos/asf/tomee/blob/62f75fc6/tck/pom.xml -- http://git-wip-us.apache.org/repos/asf/tomee/blob/62f75fc6/tomee/apache-tomee/pom.xml -- http://git-wip-us.apache.org/repos/asf/tomee/blob/62f75fc6/tomee/pom.xml --
[24/32] tomee git commit: Fixed MicroProfile Config TCK tests.
Fixed MicroProfile Config TCK tests. Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/47b1f6f7 Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/47b1f6f7 Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/47b1f6f7 Branch: refs/heads/fb_tomee8 Commit: 47b1f6f774d1df5ce310aa3448485a3bd0b6047d Parents: 1c6613b Author: Roberto Cortez Authored: Sun Mar 4 23:32:21 2018 + Committer: Roberto Cortez Committed: Sun Mar 4 23:32:21 2018 + -- tck/microprofile-tck/config/pom.xml | 31 ++ .../MicroProfileConfigTCKArchiveProcessor.java | 33 .../config/MicroProfileConfigTCKExtension.java | 11 +++ jboss.arquillian.core.spi.LoadableExtension | 1 + .../config/src/test/resources/arquillian.xml| 10 +- 5 files changed, 77 insertions(+), 9 deletions(-) -- http://git-wip-us.apache.org/repos/asf/tomee/blob/47b1f6f7/tck/microprofile-tck/config/pom.xml -- diff --git a/tck/microprofile-tck/config/pom.xml b/tck/microprofile-tck/config/pom.xml index 491241c..4b6b61d 100644 --- a/tck/microprofile-tck/config/pom.xml +++ b/tck/microprofile-tck/config/pom.xml @@ -51,6 +51,10 @@ org.eclipse.microprofile.config:microprofile-config-tck + + + org.eclipse.microprofile.config.tck.ClassConverterTest + @@ -93,6 +97,33 @@ ${project.version} test + + + org.jboss.arquillian.testng + arquillian-testng-core + 1.1.13.Final + + + + org.jboss.shrinkwrap.resolver + shrinkwrap-resolver-api-maven + 2.2.2 + test + + + + org.jboss.shrinkwrap.resolver + shrinkwrap-resolver-impl-maven + 2.2.2 + test + + + + org.jboss.shrinkwrap.resolver + shrinkwrap-resolver-spi + 2.2.2 + test + http://git-wip-us.apache.org/repos/asf/tomee/blob/47b1f6f7/tck/microprofile-tck/config/src/test/java/org/apache/openejb/tck/microprofile/config/MicroProfileConfigTCKArchiveProcessor.java -- diff --git a/tck/microprofile-tck/config/src/test/java/org/apache/openejb/tck/microprofile/config/MicroProfileConfigTCKArchiveProcessor.java b/tck/microprofile-tck/config/src/test/java/org/apache/openejb/tck/microprofile/config/MicroProfileConfigTCKArchiveProcessor.java new file mode 100644 index 000..0cad5eb --- /dev/null +++ b/tck/microprofile-tck/config/src/test/java/org/apache/openejb/tck/microprofile/config/MicroProfileConfigTCKArchiveProcessor.java @@ -0,0 +1,33 @@ +package org.apache.openejb.tck.microprofile.config; + +import org.eclipse.microprofile.config.tck.converters.UpperCaseDuckConverter; +import org.jboss.arquillian.container.test.spi.client.deployment.ApplicationArchiveProcessor; +import org.jboss.arquillian.test.spi.TestClass; +import org.jboss.shrinkwrap.api.Archive; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.jboss.shrinkwrap.resolver.api.maven.Maven; + +import java.io.File; + +public class MicroProfileConfigTCKArchiveProcessor implements ApplicationArchiveProcessor { +@Override +public void process(final Archive archive, final TestClass testClass) { +if (archive instanceof WebArchive) { +// TODO - this could be fixed in the TCK by adding UpperCaseDuckConverter into org.eclipse.microprofile.config.tck.ConverterTest +JavaArchive configJar = ShrinkWrap +.create(JavaArchive.class, "config-tck-additional.jar") +.addClass(UpperCaseDuckConverter.class) +; +((WebArchive) archive).addAsLibraries(configJar); + +File[] requiredLibraries = Maven.resolver() +.loadPomFromFile("pom.xml") + .resolve("org.hamcrest:hamcrest-all:1.3") +.withTransitivity() +.asFile(); +((WebArchive) archive).addAsLibraries(requiredLibraries); +} +} +} http://git-wip-us.apache.org/repos/asf/tomee/blob/47b1f6f7/tck/microprofile-tck/config/src/test/java/org/apache/openejb/tck/microprofile/config/MicroProfileConfigTCKExtension.java -- diff --git a/tck/microprofile-tck/config/src/test/java/org/apache/openejb/tck/microprofile/config/MicroProfileConfigTCKExtension.java b/tck/microprofile-tck/config/src/test/java/org/apache/openejb/tck/microprofi
[29/32] tomee git commit: Introduced configuration properties to include / exclude urls in the Classloader.
Introduced configuration properties to include / exclude urls in the Classloader. Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/021b9ca8 Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/021b9ca8 Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/021b9ca8 Branch: refs/heads/fb_tomee8 Commit: 021b9ca8d01a78f5b7ee3438f30fd8901ff60d5b Parents: a04e4b7 Author: Roberto Cortez Authored: Fri Mar 9 16:10:56 2018 + Committer: Roberto Cortez Committed: Fri Mar 9 16:10:56 2018 + -- .../apache/openejb/config/DeploymentLoader.java | 12 +++-- .../config/src/test/resources/arquillian.xml| 2 + tomee/pom.xml | 1 - tomee/tomee-microprofile-webapp/pom.xml | 6 --- tomee/tomee-microprofile/pom.xml| 56 .../tomee/microprofile/MicroProfileService.java | 51 -- 6 files changed, 11 insertions(+), 117 deletions(-) -- http://git-wip-us.apache.org/repos/asf/tomee/blob/021b9ca8/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 1135c07..d602f81 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 @@ -60,6 +60,7 @@ import org.apache.xbean.finder.UrlSet; import org.apache.xbean.finder.archive.ClassesArchive; import org.apache.xbean.finder.filter.Filter; import org.apache.xbean.finder.filter.Filters; +import org.apache.xbean.finder.filter.PatternFilter; import java.io.BufferedInputStream; import java.io.File; @@ -81,6 +82,7 @@ import java.util.LinkedHashMap; import java.util.LinkedHashSet; import java.util.LinkedList; import java.util.List; +import java.util.Locale; import java.util.Map; import java.util.Properties; import java.util.Set; @@ -90,7 +92,6 @@ import java.util.jar.JarEntry; import java.util.jar.JarFile; import java.util.jar.Manifest; import java.util.zip.ZipEntry; -import java.util.Locale; import static java.util.Arrays.asList; @@ -116,6 +117,9 @@ public class DeploymentLoader implements DeploymentFilterable { private static String ALTDD = SystemInstance.get().getOptions().get(OPENEJB_ALTDD_PREFIX, (String) null); private volatile List containerUrls = null; +private static final String OPENEJB_CONTAINER_INCLUDES = "openejb.scan.webapp.container.includes"; +private static final String OPENEJB_CONTAINER_EXCLUDES = "openejb.scan.webapp.container.excludes"; + @Deprecated // use load(File, ExternalConfiguration) public AppModule load(final File jarFile) throws OpenEJBException { return load(jarFile, null); @@ -1098,13 +1102,15 @@ public class DeploymentLoader implements DeploymentFilterable { private void ensureContainerUrls() { if (containerUrls == null) { -if ("true".equalsIgnoreCase(SystemInstance.get().getProperty("openejb.scan.webapp.container", "false"))) { +if ("true".equalsIgnoreCase(SystemInstance.get().getProperty("openejb.scan.webapp.container", "true"))) { synchronized (this) { if (containerUrls == null) { try { UrlSet urlSet = new UrlSet(ParentClassLoaderFinder.Helper.get()); urlSet = URLs.cullSystemJars(urlSet); -urlSet = NewLoaderLogic.applyBuiltinExcludes(urlSet); +final PatternFilter containerIncludes = new PatternFilter(SystemInstance.get().getProperty(OPENEJB_CONTAINER_INCLUDES, ".*")); +final PatternFilter containerExcludes = new PatternFilter(SystemInstance.get().getProperty(OPENEJB_CONTAINER_EXCLUDES, "")); +urlSet = NewLoaderLogic.applyBuiltinExcludes(urlSet, containerIncludes, containerExcludes); containerUrls = urlSet.getUrls(); final boolean skipContainerFolders = "true".equalsIgnoreCase(SystemInstance.get().getProperty("openejb.scan.webapp.container.skip-folder", "true")); http://git-wip-us.apache.org/repos/asf/tomee/blob/021b9ca8/tck/microprofile-tck/config/src/test/resources/arquillian.xml -- diff --git a/tck/microprofile-tck/config/src/test/resources/arquillian.xml b/tck/microprofile-tck/config/src/test/resources/arquillian.xml index 629d71d..d04c730 100644 --- a/
[17/32] tomee git commit: Temporarily adding some timings
Temporarily adding some timings Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/33173147 Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/33173147 Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/33173147 Branch: refs/heads/fb_tomee8 Commit: 3317314772514172f97dda1636595abe795144c9 Parents: 646f92c Author: Jonathan Gallimore Authored: Mon Feb 26 15:13:47 2018 + Committer: Jonathan Gallimore Committed: Mon Feb 26 15:13:47 2018 + -- .../src/test/java/org/superbiz/counter/CounterCallbacksTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/tomee/blob/33173147/examples/simple-stateful-callbacks/src/test/java/org/superbiz/counter/CounterCallbacksTest.java -- diff --git a/examples/simple-stateful-callbacks/src/test/java/org/superbiz/counter/CounterCallbacksTest.java b/examples/simple-stateful-callbacks/src/test/java/org/superbiz/counter/CounterCallbacksTest.java index 6d041e3..1b3815c 100644 --- a/examples/simple-stateful-callbacks/src/test/java/org/superbiz/counter/CounterCallbacksTest.java +++ b/examples/simple-stateful-callbacks/src/test/java/org/superbiz/counter/CounterCallbacksTest.java @@ -120,7 +120,7 @@ public class CounterCallbacksTest implements ExecutionObserver { @Override public void onExecution(Object value) { -System.out.println("Test step -> " + value); +System.out.println("[" + System.currentTimeMillis() + "] Test step -> " + value); this.received.add(value); } }
[18/32] tomee git commit: Added TomEE dist profile for MicroProfile.
http://git-wip-us.apache.org/repos/asf/tomee/blob/8262b3bc/tomee/tomee-microprofile-webapp/src/main/resources/META-INF/NOTICE -- diff --git a/tomee/tomee-microprofile-webapp/src/main/resources/META-INF/NOTICE b/tomee/tomee-microprofile-webapp/src/main/resources/META-INF/NOTICE new file mode 100644 index 000..4d74e4a --- /dev/null +++ b/tomee/tomee-microprofile-webapp/src/main/resources/META-INF/NOTICE @@ -0,0 +1,124 @@ +Apache OpenEJB +Copyright 1999-2014 The Apache Software Foundation + +This product includes software developed at +The Apache Software Foundation (http://www.apache.org/). + +This product includes schema files developed for the Glassfish Java EE +reference implementation (http://java.sun.com/xml/ns/j2ee/). +Apache OpenEJB elects to include this software in this distribution +under the CDDL license. You can obtain a copy of the License at: +https://glassfish.dev.java.net/public/CDDL+GPL.html + + += +Apache Xerces Java NOTICE + +Portions of this software were originally based on the following: + - software copyright (c) 1999, IBM Corporation., http://www.ibm.com. + - software copyright (c) 1999, Sun Microsystems., http://www.sun.com. + - voluntary contributions made by Paul Eng on behalf of the + Apache Software Foundation that were originally developed at iClick, Inc., + software copyright (c) 1999. + + += +Apache OpenJPA NOTICE + +OpenJPA includes the persistence and orm schemas from the JPA specifications. +Copyright 2005-2014 Sun Microsystems, Inc. All rights reserved. + +OpenJPA elects to include this software in this distribution under the +CDDL license. You can obtain a copy of the License at: +https://glassfish.dev.java.net/public/CDDL+GPL.html +The source code is available at: +https://glassfish.dev.java.net/source/browse/glassfish/ + +OpenJPA includes software written by Miroslav Nachev + + += +Apache WebServices - XmlSchema NOTICE + +Portions Copyright 2006 International Business Machines Corp. + +Portions Copyright (C) World Wide Web Consortium 2006, 2007 and licensed under the +three-part BSD license. + + += +Apache Bean Validation NOTICE + +This product includes software developed by agimatec GmbH. +Copyright 2007-2010 Agimatec GmbH. All rights reserved. + + += +Apache MyFaces NOTICE + +This software also includes code from Facelets (https://facelets.dev.java.net/) +for the purpose of implementing Facelets PDL for JSF 2.0 support. + +This product includes schema files developed for the Glassfish Java EE +reference implementation (http://java.sun.com/xml/ns/j2ee/). +Apache Myfaces elects to include this software in this distribution +under the CDDL license. You can obtain a copy of the License at: +https://glassfish.dev.java.net/public/CDDL+GPL.html +The source code is available at: +https://glassfish.dev.java.net/source/browse/glassfish/ + + +This software also includes code from the Dojo toolkit (http://www.dojotoolkit.org/) +for the purpose of reusing existing well proven javascript code in the myfaces +javascript core, which is licensed under a modified BSD license or the Academic Free License version 2.1 +(see http://o.dojotoolkit.org/about/license and http://trac.dojotoolkit.org/browser/dojo/trunk/LICENSE for more information) + +This software also includes code from j4fry (http://www.j4fry.org/), +which is licensed under ASL 2.0. + += + - JAnsi (http://http://jansi.fusesource.org/) org.fusesource.jansi:jansi:jar:1.8 +License: Apache License 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) + += + - HawtBuf (http://fusesource.com/forge/projects/hawtbuf) +License: Apache License 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) += +FastInfoset (https://fi.java.net/) +License: Apache License 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) += +Istack Commons Runtime (https://istack-commons.java.net/) +License: CDDL v1.1 and GPL v2 (https://glassfish.java.net/public/CDDL+GPL_1_1.html) += +Jaxb Core (https://jaxb.java.net/) +License: CDDL v1.1 and GPL v2 (https://glassfish.java.net/public/CDDL+GPL_1_1.html) += +Quartz (http://quartz-scheduler.org/) +License: Apache License 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) += +el-api - Unified Expression Language is dual license
[32/32] tomee git commit: upgrading g-config to ensure we pass tck + fixing tck setup (speed improvement and removing some workarounds)
upgrading g-config to ensure we pass tck + fixing tck setup (speed improvement and removing some workarounds) Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/59c398d1 Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/59c398d1 Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/59c398d1 Branch: refs/heads/fb_tomee8 Commit: 59c398d19d715d03c0549bf92d9a70b6ba1c7644 Parents: 4a7531d Author: Romain Manni-Bucau Authored: Mon Mar 12 15:59:55 2018 +0100 Committer: Romain Manni-Bucau Committed: Mon Mar 12 15:59:55 2018 +0100 -- pom.xml | 2 +- tck/bval-embedded/pom.xml | 1 + tck/microprofile-tck/config/pom.xml | 26 ++-- .../MicroProfileConfigTCKArchiveProcessor.java | 23 --- .../config/MicroProfileConfigurationTest.java | 69 .../config/src/test/resources/arquillian.xml| 1 - tomee/tomee-microprofile-webapp/pom.xml | 16 + 7 files changed, 39 insertions(+), 99 deletions(-) -- http://git-wip-us.apache.org/repos/asf/tomee/blob/59c398d1/pom.xml -- diff --git a/pom.xml b/pom.xml index 92db56b..53ded49 100644 --- a/pom.xml +++ b/pom.xml @@ -96,7 +96,7 @@ ${project.version} 1.8 1.8 -2.20 +2.21.0 8.0-SNAPSHOT http://git-wip-us.apache.org/repos/asf/tomee/blob/59c398d1/tck/bval-embedded/pom.xml -- diff --git a/tck/bval-embedded/pom.xml b/tck/bval-embedded/pom.xml index 2ff885a..dbf59a6 100644 --- a/tck/bval-embedded/pom.xml +++ b/tck/bval-embedded/pom.xml @@ -132,6 +132,7 @@ maven-surefire-plugin ${surefire.version} + true ${project.build.directory}/dependency/beanvalidation-tck-tests-suite.xml http://git-wip-us.apache.org/repos/asf/tomee/blob/59c398d1/tck/microprofile-tck/config/pom.xml -- diff --git a/tck/microprofile-tck/config/pom.xml b/tck/microprofile-tck/config/pom.xml index 55c81d6..a218412 100644 --- a/tck/microprofile-tck/config/pom.xml +++ b/tck/microprofile-tck/config/pom.xml @@ -33,25 +33,40 @@ 1.2 + + org.apache.maven.plugins maven-surefire-plugin + 1 + true org.eclipse.microprofile.config:microprofile-config-tck - - - org.eclipse.microprofile.config.tck.ClassConverterTest - + + + org.apache.geronimo.config + geronimo-config-impl + 1.1 + provided + + + org.apache.tomee + tomee-catalina + ${project.version} + provided + + + ${project.groupId} apache-tomee @@ -61,6 +76,7 @@ test + org.eclipse.microprofile.config microprofile-config-api @@ -92,7 +108,7 @@ org.jboss.arquillian.testng arquillian-testng-core - 1.1.13.Final + ${version.arquillian} http://git-wip-us.apache.org/repos/asf/tomee/blob/59c398d1/tck/microprofile-tck/config/src/test/java/org/apache/openejb/tck/microprofile/config/MicroProfileConfigTCKArchiveProcessor.java -- diff --git a/tck/microprofile-tck/config/src/test/java/org/apache/openejb/tck/microprofile/config/MicroProfileConfigTCKArchiveProcessor.java b/tck/microprofile-tck/config/src/test/java/org/apache/openejb/tck/microprofile/config/MicroProfileConfigTCKArchiveProcessor.java index 0cad5eb..dcee75d 100644 --- a/tck/microprofile-tck/config/src/test/java/org/apache/openejb/tck/microprofile/config/MicroProfileConfigTCKArchiveProcessor.java +++ b/tck/microprofile-tck/config/src/test/java/org/apache/openejb/tck/microprofile/config/MicroProfileConfigTCKArchiveProcessor.java @@ -1,33 +1,38 @@ package org.apache.openejb.tck.microprofile.config; +import static org.apache.openejb.loader.JarLocation.jarLocation; + import org.eclipse.microprofile.config.tck.converters.UpperCaseDuckConverter; +import org.hamcrest.object.HasToString; import org.jboss.arquillian.container.test.spi.client.deployment.ApplicationArchiveProcessor; import org.jboss.arquillian.test.spi.TestClass; import org.jboss.shrinkwrap.api.Archive; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.jboss.shrinkwrap.resolver.api.maven.Maven; import java.io.File; public class MicroProfileConfigTCKArchiveProcessor implements ApplicationArchiv
[19/32] tomee git commit: Added TomEE dist profile for MicroProfile.
http://git-wip-us.apache.org/repos/asf/tomee/blob/8262b3bc/tomee/tomee-microprofile-webapp/src/main/resources/META-INF/LICENSE -- diff --git a/tomee/tomee-microprofile-webapp/src/main/resources/META-INF/LICENSE b/tomee/tomee-microprofile-webapp/src/main/resources/META-INF/LICENSE new file mode 100644 index 000..469c73b --- /dev/null +++ b/tomee/tomee-microprofile-webapp/src/main/resources/META-INF/LICENSE @@ -0,0 +1,1288 @@ + + Apache License + Version 2.0, January 2004 +http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their
[20/32] tomee git commit: Added TomEE dist profile for MicroProfile.
Added TomEE dist profile for MicroProfile. Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/8262b3bc Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/8262b3bc Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/8262b3bc Branch: refs/heads/fb_tomee8 Commit: 8262b3bc445bb70b50a6346a8f285973dac02c3b Parents: 3317314 Author: Roberto Cortez Authored: Wed Feb 28 16:44:13 2018 + Committer: Roberto Cortez Committed: Wed Feb 28 16:44:13 2018 + -- tomee/apache-tomee/pom.xml | 61 + .../src/main/assembly/tomee-microprofile.xml| 84 ++ tomee/pom.xml |2 + tomee/tomee-microprofile-webapp/pom.xml | 92 ++ .../src/main/assembly/war.xml | 92 ++ .../src/main/resources/META-INF/LICENSE | 1288 ++ .../src/main/resources/META-INF/NOTICE | 124 ++ tomee/tomee-microprofile/pom.xml| 40 + 8 files changed, 1783 insertions(+) -- http://git-wip-us.apache.org/repos/asf/tomee/blob/8262b3bc/tomee/apache-tomee/pom.xml -- diff --git a/tomee/apache-tomee/pom.xml b/tomee/apache-tomee/pom.xml index 9cc3790..08047df 100644 --- a/tomee/apache-tomee/pom.xml +++ b/tomee/apache-tomee/pom.xml @@ -36,6 +36,7 @@ ${project.build.directory}/webprofile-work-dir ${project.build.directory}/plus-work-dir ${project.build.directory}/plume-work-dir + ${project.build.directory}/microprofile-work-dir @@ -225,6 +226,25 @@ + +copy-tomcat-for-microprofile +process-resources + + copy + + + + + org.apache.tomcat + tomcat + ${tomcat.version} + zip + ${microprofile.work-dir} + apache-tomcat-${tomcat.version}.zip + + + + @@ -323,6 +343,22 @@ + +execute-microprofile-installer +prepare-package + + execute + + + +${microprofile.work-dir} +tomee-microprofile-webapp + + +new commands.SetupCommand(pom: this, log: log, project: project, ant: ant, properties: properties).execute() + + + @@ -375,6 +411,21 @@ single + +microprofile +package + + + src/main/assembly/tomee-microprofile.xml + + false + false + apache-tomee-microprofile-${project.version} + + + single + + @@ -420,6 +471,16 @@ tar.gz plume + + ${project.build.directory}/apache-tomee-microprofile-${project.version}.zip + zip + microprofile + + + ${project.build.directory}/apache-tomee-microprofile-${project.version}.tar.gz + tar.gz + microprofile + http://git-wip-us.apache.org/repos/asf/tomee/blob/8262b3bc/tomee/apache-tomee/src/main/assembly/tomee-microprofile.xml -- diff --git a/tomee/apache-tomee/src/main/assembly/tomee-microprofile.xml b/tomee/apache-tomee/src/main/assembly/tomee-microprofile.xml new file mode 100644 index 000..7b7ecd5 --- /dev/null +++ b/tomee/apache-tomee/src/main/assembly/tomee-microprofile.xml @@ -0,0 +1,84 @@ + + + + + + + tomee-microprofile + +tar.gz +zip + + false + + + ${microprofile.work-dir}/apache-tomcat-${tomcat.version} + /apache-tomee-microprofile-${project.version} + +**/* + + +LICENSE +NOTICE +**/bin/**/* +**/lib/tomcat-annotations-api*.jar + + + + ${project.basedir}/target/maven-shared-archive-resources/META-INF/ + /apache-tomee-microprofile-${project.version} + +LICENSE + + + + ${project.basedir}/src/main/resources/META-INF/microprofile/ + /apache-tomee-microprofile-${project.version} + +* + + + + ${project.basedir}/target/classes + /apache-tome
[22/32] tomee git commit: Enrich classloader to add MicroProfile Config implementation Beans.
Enrich classloader to add MicroProfile Config implementation Beans. Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/2421c524 Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/2421c524 Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/2421c524 Branch: refs/heads/fb_tomee8 Commit: 2421c524f0928d476701729eb575624f73f7b91e Parents: 856f728 Author: Roberto Cortez Authored: Fri Mar 2 01:20:01 2018 + Committer: Roberto Cortez Committed: Fri Mar 2 01:20:01 2018 + -- .../src/main/resources/default.exclusions | 4 +- .../org/apache/tomee/catalina/TomcatLoader.java | 2 + .../MicroProfileClassLoaderEnricher.java| 53 .../tomee/microprofile/MicroProfileService.java | 46 + 4 files changed, 104 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/tomee/blob/2421c524/container/openejb-core/src/main/resources/default.exclusions -- diff --git a/container/openejb-core/src/main/resources/default.exclusions b/container/openejb-core/src/main/resources/default.exclusions index f0e543b..d46396b 100644 --- a/container/openejb-core/src/main/resources/default.exclusions +++ b/container/openejb-core/src/main/resources/default.exclusions @@ -79,7 +79,9 @@ jfxrt.jar jnr- johnzon- fusemq-leveldb- -geronimo- +geronimo-connector +geronimo-javamail +geronimo-transaction google- gragent.jar groovy- http://git-wip-us.apache.org/repos/asf/tomee/blob/2421c524/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatLoader.java -- diff --git a/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatLoader.java b/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatLoader.java index 8b066e5..22d9337 100644 --- a/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatLoader.java +++ b/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatLoader.java @@ -234,6 +234,8 @@ public class TomcatLoader implements Loader { } } +optionalService(properties, "org.apache.tomee.microprofile.MicroProfileService"); + // optional services if (optionalService(properties, "org.apache.tomee.webservices.TomeeJaxRsService")) { // in embedded mode we use regex, in tomcat we use tomcat servlet mapping http://git-wip-us.apache.org/repos/asf/tomee/blob/2421c524/tomee/tomee-microprofile/src/main/java/org/apache/tomee/microprofile/MicroProfileClassLoaderEnricher.java -- diff --git a/tomee/tomee-microprofile/src/main/java/org/apache/tomee/microprofile/MicroProfileClassLoaderEnricher.java b/tomee/tomee-microprofile/src/main/java/org/apache/tomee/microprofile/MicroProfileClassLoaderEnricher.java new file mode 100644 index 000..7100f87 --- /dev/null +++ b/tomee/tomee-microprofile/src/main/java/org/apache/tomee/microprofile/MicroProfileClassLoaderEnricher.java @@ -0,0 +1,53 @@ +/* + * 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.tomee.microprofile; + +import org.apache.openejb.classloader.WebAppEnricher; +import org.apache.tomee.installer.Paths; + +import java.io.File; +import java.net.MalformedURLException; +import java.net.URL; +import java.util.Collection; +import java.util.HashSet; + +public class MicroProfileClassLoaderEnricher implements WebAppEnricher { +private static final String[] MICROPROFILE_LIBS_IMPLS_PREFIXES = new String[]{ +"geronimo-config-impl" +}; + +@SuppressWarnings("Duplicates") +@Override +public URL[] enrichment(final ClassLoader webappClassLaoder) { +final Collection urls = new HashSet<>(); + +// from prefix +final Paths paths = new Paths(new File(System.getProperty("openejb.home"))); // parameter is useless +for (final String prefix : MICROPROFILE_LIBS_IMPLS_PREFIXES) { +
[16/32] tomee git commit: some forgotten ASM upgrades
some forgotten ASM upgrades Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/646f92c4 Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/646f92c4 Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/646f92c4 Branch: refs/heads/fb_tomee8 Commit: 646f92c40e7badf844324995381d9d4431c5cf0a Parents: 069c8a3 Author: Romain Manni-Bucau Authored: Tue Feb 20 17:52:43 2018 +0100 Committer: Jonathan Gallimore Committed: Wed Feb 21 09:03:37 2018 + -- .../apache/openejb/config/PersistenceContextAnnFactory.java| 2 +- .../src/main/java/org/apache/openejb/dyni/DynamicSubclass.java | 6 +++--- .../main/java/org/apache/openejb/util/AnnotationFinder.java| 2 +- .../src/test/java/org/apache/openejb/DependencyVisitor.java| 2 +- .../src/test/java/org/apache/openejb/core/cmp/jpa/JpaTest.java | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) -- http://git-wip-us.apache.org/repos/asf/tomee/blob/646f92c4/container/openejb-core/src/main/java/org/apache/openejb/config/PersistenceContextAnnFactory.java -- diff --git a/container/openejb-core/src/main/java/org/apache/openejb/config/PersistenceContextAnnFactory.java b/container/openejb-core/src/main/java/org/apache/openejb/config/PersistenceContextAnnFactory.java index 12adae1..66e2361 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/config/PersistenceContextAnnFactory.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/config/PersistenceContextAnnFactory.java @@ -248,7 +248,7 @@ public class PersistenceContextAnnFactory { private final AsmPersistenceContext persistenceContext = new AsmPersistenceContext(); public PersistenceContextVisitor(final String className, final String memberName, final Map contexts) { -super(Opcodes.ASM5); +super(Opcodes.ASM6); this.contexts = contexts; persistenceContext.name = className + "/" + memberName; } http://git-wip-us.apache.org/repos/asf/tomee/blob/646f92c4/container/openejb-core/src/main/java/org/apache/openejb/dyni/DynamicSubclass.java -- diff --git a/container/openejb-core/src/main/java/org/apache/openejb/dyni/DynamicSubclass.java b/container/openejb-core/src/main/java/org/apache/openejb/dyni/DynamicSubclass.java index fc0ff9a..c9dd53b 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/dyni/DynamicSubclass.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/dyni/DynamicSubclass.java @@ -297,7 +297,7 @@ public class DynamicSubclass implements Opcodes { private final MethodVisitor newMethod; public MoveAnnotationsVisitor(final MethodVisitor movedMethod, final MethodVisitor newMethod) { -super(Opcodes.ASM5, movedMethod); +super(Opcodes.ASM6, movedMethod); this.newMethod = newMethod; } @@ -323,7 +323,7 @@ public class DynamicSubclass implements Opcodes { private final ClassVisitor newClass; public CopyClassAnnotations(final ClassVisitor newClass) { -super(Opcodes.ASM5); +super(Opcodes.ASM6); this.newClass = newClass; } @@ -337,7 +337,7 @@ public class DynamicSubclass implements Opcodes { private final Map visitors; public CopyMethodAnnotations(final Map visitors) { -super(Opcodes.ASM5); +super(Opcodes.ASM6); this.visitors = visitors; } http://git-wip-us.apache.org/repos/asf/tomee/blob/646f92c4/container/openejb-core/src/main/java/org/apache/openejb/util/AnnotationFinder.java -- diff --git a/container/openejb-core/src/main/java/org/apache/openejb/util/AnnotationFinder.java b/container/openejb-core/src/main/java/org/apache/openejb/util/AnnotationFinder.java index eb4587c..3f29b3a 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/util/AnnotationFinder.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/util/AnnotationFinder.java @@ -327,7 +327,7 @@ public class AnnotationFinder { private final Filter filter; public Visitor(final Filter filter) { -super(Opcodes.ASM5); +super(Opcodes.ASM6); this.filter = filter; try { http://git-wip-us.apache.org/repos/asf/tomee/blob/646f92c4/container/openejb-core/src/test/java/org/apache/openejb/DependencyVisitor.java -- diff --git a/container/openejb-core/src/test/java/org/apache/openejb/DependencyVisitor.java b/container/openejb-core/src/t
[23/32] tomee git commit: Added MicroProfile Config TCK.
Added MicroProfile Config TCK. Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/1c6613b9 Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/1c6613b9 Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/1c6613b9 Branch: refs/heads/fb_tomee8 Commit: 1c6613b9e3e734f6accdfe5cd996b1686bfc3a62 Parents: 2421c52 Author: Roberto Cortez Authored: Fri Mar 2 01:20:24 2018 + Committer: Roberto Cortez Committed: Fri Mar 2 01:20:24 2018 + -- tck/microprofile-tck/config/pom.xml | 98 .../microprofile/config/ConfigurationBean.java | 25 + .../config/MicroProfileConfigurationTest.java | 69 ++ .../config/src/test/resources/arquillian.xml| 48 ++ tck/microprofile-tck/pom.xml| 37 tck/pom.xml | 1 + 6 files changed, 278 insertions(+) -- http://git-wip-us.apache.org/repos/asf/tomee/blob/1c6613b9/tck/microprofile-tck/config/pom.xml -- diff --git a/tck/microprofile-tck/config/pom.xml b/tck/microprofile-tck/config/pom.xml new file mode 100644 index 000..491241c --- /dev/null +++ b/tck/microprofile-tck/config/pom.xml @@ -0,0 +1,98 @@ + + +http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> + + 4.0.0 + + +org.apache.tomee +microprofile-tck +7.0.5-SNAPSHOT + + + microprofile-config-tck + OpenEJB :: TCK :: MicroProfile Config TCK + + +1.2 + + + + + +org.apache.maven.plugins +maven-compiler-plugin + + 1.8 + 1.8 + + + + +org.apache.maven.plugins +maven-surefire-plugin + + + org.eclipse.microprofile.config:microprofile-config-tck + + + + + + + + + ${project.groupId} + apache-tomee + ${project.version} + zip + microprofile + test + + + + org.eclipse.microprofile.config + microprofile-config-api + ${microprofile.config.version} + test + + + + org.eclipse.microprofile.config + microprofile-config-tck + ${microprofile.config.version} + test + + + + org.testng + testng + 6.9.9 + test + + + + ${project.groupId} + arquillian-tomee-remote + ${project.version} + test + + + + http://git-wip-us.apache.org/repos/asf/tomee/blob/1c6613b9/tck/microprofile-tck/config/src/test/java/org/apache/openejb/tck/microprofile/config/ConfigurationBean.java -- diff --git a/tck/microprofile-tck/config/src/test/java/org/apache/openejb/tck/microprofile/config/ConfigurationBean.java b/tck/microprofile-tck/config/src/test/java/org/apache/openejb/tck/microprofile/config/ConfigurationBean.java new file mode 100644 index 000..3193ad9 --- /dev/null +++ b/tck/microprofile-tck/config/src/test/java/org/apache/openejb/tck/microprofile/config/ConfigurationBean.java @@ -0,0 +1,25 @@ +/* + * 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.tck.microprofile.config; + +import org.eclipse.microprofile.config.ConfigProvider; + +public class ConfigurationBean { +public String getConfig() { +return ConfigProvider.getConfig().getValue("config.test", String.class); +} +} http://git-wip-us.apache.org/repos/asf/tomee/blob/1c6613b9/tck/microprofile-tck/config/src/test/java/org/apache/openejb/tck/microprofile/config/MicroProfileConfigurationTest.java -- diff --git a/tck/microprofile-tck/config/src/test/java/org/apache/openejb/tck/microprofile/config/MicroProfileConfigurationTest.java b/tck/microprofile-tck/config/src/test/java/org/apache/openejb/tck/microprof
[jira] [Resolved] (TOMEE-2180) johnzon 1.1.7
[ https://issues.apache.org/jira/browse/TOMEE-2180?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Romain Manni-Bucau resolved TOMEE-2180. --- Resolution: Fixed > johnzon 1.1.7 > - > > Key: TOMEE-2180 > URL: https://issues.apache.org/jira/browse/TOMEE-2180 > Project: TomEE > Issue Type: Dependency upgrade >Reporter: Romain Manni-Bucau >Assignee: Romain Manni-Bucau >Priority: Major > Fix For: 8.0.0 > > -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Resolved] (TOMEE-2178) TomEE8: Update to MyFaces 2.3.0 release
[ https://issues.apache.org/jira/browse/TOMEE-2178?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Romain Manni-Bucau resolved TOMEE-2178. --- Resolution: Fixed > TomEE8: Update to MyFaces 2.3.0 release > --- > > Key: TOMEE-2178 > URL: https://issues.apache.org/jira/browse/TOMEE-2178 > Project: TomEE > Issue Type: Dependency upgrade > Components: TomEE Core Server >Affects Versions: 8.0.0 >Reporter: Thomas Andraschko >Assignee: Romain Manni-Bucau >Priority: Major > Fix For: 8.0.0 > > > MyFaces was releases last week, we should update. -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Resolved] (TOMEE-2179) tomcat 9.0.6
[ https://issues.apache.org/jira/browse/TOMEE-2179?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Romain Manni-Bucau resolved TOMEE-2179. --- Resolution: Fixed > tomcat 9.0.6 > > > Key: TOMEE-2179 > URL: https://issues.apache.org/jira/browse/TOMEE-2179 > Project: TomEE > Issue Type: Dependency upgrade >Reporter: Romain Manni-Bucau >Assignee: Romain Manni-Bucau >Priority: Major > Fix For: 8.0.0 > > -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[06/32] tomee git commit: Revert "Preparation for Microprofile"
Revert "Preparation for Microprofile" This reverts commit 36c9c47eda2ecb2bdd7f5a4ff78b8610d83589df. Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/bcce7086 Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/bcce7086 Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/bcce7086 Branch: refs/heads/fb_tomee8 Commit: bcce708630ec494669115da0807a5e3593f8a8b6 Parents: 1388139 Author: Andy Gumbrecht Authored: Mon Feb 12 18:40:12 2018 +0100 Committer: Andy Gumbrecht Committed: Mon Feb 12 21:21:43 2018 +0100 -- arquillian/arquillian-common/pom.xml| 2 +- arquillian/arquillian-openejb-embedded/pom.xml | 2 +- .../pom.xml | 2 +- arquillian/arquillian-tck/pom.xml | 2 +- arquillian/arquillian-tomee-common/pom.xml | 2 +- arquillian/arquillian-tomee-embedded/pom.xml| 2 +- .../arquillian-tomee-moviefun-example/pom.xml | 2 +- arquillian/arquillian-tomee-remote/pom.xml | 2 +- .../arquillian-tomee-codi-tests/pom.xml | 2 +- .../arquillian-tomee-config-tests/pom.xml | 2 +- .../arquillian-tomee-jaxrs-tests/pom.xml| 2 +- .../arquillian-tomee-jaxws-tests/pom.xml| 2 +- .../arquillian-tomee-jms-tests/pom.xml | 2 +- .../arquillian-tomee-webprofile-tests/pom.xml | 2 +- arquillian/arquillian-tomee-tests/pom.xml | 2 +- .../arquillian-tomee-webapp-remote/pom.xml | 2 +- arquillian/pom.xml | 2 +- arquillian/ziplock/pom.xml | 2 +- examples/access-timeout-meta/pom.xml| 2 +- examples/access-timeout/pom.xml | 2 +- examples/alternate-descriptors/pom.xml | 2 +- examples/applet/pom.xml | 2 +- examples/application-composer/pom.xml | 2 +- examples/applicationcomposer-jaxws-cdi/pom.xml | 2 +- examples/applicationexception/pom.xml | 2 +- examples/arquillian-jpa/pom.xml | 2 +- examples/async-methods/pom.xml | 2 +- examples/async-postconstruct/pom.xml| 2 +- .../bean-validation-design-by-contract/pom.xml | 2 +- .../cdi-alternative-and-stereotypes/pom.xml | 2 +- examples/cdi-application-scope/pom.xml | 2 +- examples/cdi-basic/pom.xml | 2 +- examples/cdi-ejbcontext-jaas/pom.xml| 2 +- examples/cdi-events/pom.xml | 2 +- examples/cdi-interceptors/pom.xml | 2 +- examples/cdi-produces-disposes/pom.xml | 2 +- examples/cdi-produces-field/pom.xml | 2 +- examples/cdi-realm/pom.xml | 2 +- examples/cdi-request-scope/pom.xml | 2 +- examples/cdi-session-scope/pom.xml | 2 +- examples/change-jaxws-url/pom.xml | 2 +- examples/client-resource-lookup-preview/pom.xml | 2 +- examples/component-interfaces/pom.xml | 2 +- examples/cucumber-jvm/pom.xml | 2 +- examples/custom-injection/pom.xml | 2 +- examples/datasource-ciphered-password/pom.xml | 2 +- examples/datasource-definition/pom.xml | 2 +- examples/datasource-versioning/pom.xml | 2 +- examples/decorators/pom.xml | 2 +- examples/deltaspike-configproperty/pom.xml | 2 +- examples/deltaspike-exception-handling/pom.xml | 2 +- examples/deltaspike-fullstack/pom.xml | 2 +- examples/deltaspike-i18n/pom.xml| 2 +- examples/dynamic-dao-implementation/pom.xml | 2 +- examples/dynamic-datasource-routing/pom.xml | 2 +- examples/dynamic-implementation/pom.xml | 2 +- examples/dynamic-proxy-to-access-mbean/pom.xml | 2 +- examples/ear-testing/business-logic/pom.xml | 2 +- examples/ear-testing/business-model/pom.xml | 2 +- examples/ear-testing/pom.xml| 2 +- examples/ejb-examples/pom.xml | 2 +- examples/ejb-webservice/pom.xml | 2 +- examples/groovy-cdi/pom.xml | 2 +- examples/groovy-jpa/pom.xml | 2 +- examples/groovy-spock/pom.xml | 2 +- examples/helloworld-weblogic/pom.xml| 2 +- examples/injection-of-connectionfactory/pom.xml | 2 +- examples/injection-of-datasource/pom.xml| 2 +- examples/injection-of-ejbs/pom.xml | 2 +- examples/injection-of-entitymanager/pom.xml | 2 +- examples/injection-of-env-entry/pom.xml | 2 +- examples/interceptors/pom.xml | 2 +- examples/javamail/pom.xml | 2 +- examples/jpa-eclipselink/pom.xml| 2 +- examples/jpa-enumerated/pom.xml | 2 +- examples/jpa-hibernate/pom.xml | 2 +- exa
[11/32] tomee git commit: Revert "Upgrade HSQLDB to 2.3.5"
Revert "Upgrade HSQLDB to 2.3.5" This reverts commit 7b1ad5f0aedcc2cad68b67604f0ec33acd3b511d. Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/613c847e Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/613c847e Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/613c847e Branch: refs/heads/fb_tomee8 Commit: 613c847e436d8658db45e4013a0c699560a81579 Parents: eb8199f Author: Jonathan Gallimore Authored: Thu Feb 15 18:25:54 2018 + Committer: Jonathan Gallimore Committed: Thu Feb 15 18:25:54 2018 + -- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/tomee/blob/613c847e/pom.xml -- diff --git a/pom.xml b/pom.xml index 6fc6360..58581b8 100644 --- a/pom.xml +++ b/pom.xml @@ -183,7 +183,7 @@ 1.2.17 2.0.1 4.2.0 -2.3.5 +2.3.2 1.2.20 2.7.2 4.2.18.Final
[25/32] tomee git commit: Improved MicroProfile build. Removed unneeded dependencies.
Improved MicroProfile build. Removed unneeded dependencies. Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/dd524e53 Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/dd524e53 Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/dd524e53 Branch: refs/heads/fb_tomee8 Commit: dd524e536c0c09f445978d721e2d0b95a1d7f034 Parents: 47b1f6f Author: Roberto Cortez Authored: Mon Mar 5 17:57:32 2018 + Committer: Roberto Cortez Committed: Mon Mar 5 17:57:32 2018 + -- tomee/apache-tomee/pom.xml | 7 +++ tomee/pom.xml| 4 ++-- tomee/tomee-microprofile/pom.xml | 2 ++ 3 files changed, 11 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/tomee/blob/dd524e53/tomee/apache-tomee/pom.xml -- diff --git a/tomee/apache-tomee/pom.xml b/tomee/apache-tomee/pom.xml index 08047df..08bd51f 100644 --- a/tomee/apache-tomee/pom.xml +++ b/tomee/apache-tomee/pom.xml @@ -92,6 +92,13 @@ war provided + + ${project.groupId} + tomee-microprofile-webapp + ${project.version} + war + provided + http://git-wip-us.apache.org/repos/asf/tomee/blob/dd524e53/tomee/pom.xml -- diff --git a/tomee/pom.xml b/tomee/pom.xml index d781ef5..0ac220a 100644 --- a/tomee/pom.xml +++ b/tomee/pom.xml @@ -47,12 +47,12 @@ tomee-plume-webapp tomee-webservices tomee-embedded +tomee-microprofile +tomee-microprofile-webapp apache-tomee tomee-util tomee-juli tomee-overlay-runner -tomee-microprofile -tomee-microprofile-webapp http://git-wip-us.apache.org/repos/asf/tomee/blob/dd524e53/tomee/tomee-microprofile/pom.xml -- diff --git a/tomee/tomee-microprofile/pom.xml b/tomee/tomee-microprofile/pom.xml index cd1688b..97f99f1 100644 --- a/tomee/tomee-microprofile/pom.xml +++ b/tomee/tomee-microprofile/pom.xml @@ -42,12 +42,14 @@ ${project.groupId} tomee-catalina ${project.version} + provided ${project.groupId} tomee-common ${project.version} + provided
[31/32] tomee git commit: fixing pom versions
fixing pom versions Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/4a7531dc Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/4a7531dc Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/4a7531dc Branch: refs/heads/fb_tomee8 Commit: 4a7531dcf7e470044d732b089a8d1d764a4571c2 Parents: 62f75fc Author: Romain Manni-Bucau Authored: Mon Mar 12 14:32:15 2018 +0100 Committer: Romain Manni-Bucau Committed: Mon Mar 12 14:32:15 2018 +0100 -- examples/connector-ear/pom.xml| 2 +- examples/connector-war/pom.xml| 2 +- examples/simple-ear/moviefun-business-logic/pom.xml | 2 +- examples/simple-ear/moviefun-functional-tests/pom.xml | 6 +++--- examples/simple-ear/moviefun-webapp/pom.xml | 2 +- tck/microprofile-tck/config/pom.xml | 11 +-- tck/microprofile-tck/pom.xml | 2 +- tomee/tomee-microprofile-webapp/pom.xml | 2 +- 8 files changed, 10 insertions(+), 19 deletions(-) -- http://git-wip-us.apache.org/repos/asf/tomee/blob/4a7531dc/examples/connector-ear/pom.xml -- diff --git a/examples/connector-ear/pom.xml b/examples/connector-ear/pom.xml index a17ef21..97067b0 100644 --- a/examples/connector-ear/pom.xml +++ b/examples/connector-ear/pom.xml @@ -25,7 +25,7 @@ UTF-8 -7.0.5-SNAPSHOT +8.0.0-SNAPSHOT 2.1.0 http://git-wip-us.apache.org/repos/asf/tomee/blob/4a7531dc/examples/connector-war/pom.xml -- diff --git a/examples/connector-war/pom.xml b/examples/connector-war/pom.xml index 213fa56..c7a8b69 100644 --- a/examples/connector-war/pom.xml +++ b/examples/connector-war/pom.xml @@ -21,7 +21,7 @@ OpenEJB :: Connector Examples :: Connector in WAR UTF-8 -7.0.5-SNAPSHOT +8.0.0-SNAPSHOT 2.1.0 http://git-wip-us.apache.org/repos/asf/tomee/blob/4a7531dc/examples/simple-ear/moviefun-business-logic/pom.xml -- diff --git a/examples/simple-ear/moviefun-business-logic/pom.xml b/examples/simple-ear/moviefun-business-logic/pom.xml index b1a7e99..cd44a26 100644 --- a/examples/simple-ear/moviefun-business-logic/pom.xml +++ b/examples/simple-ear/moviefun-business-logic/pom.xml @@ -78,7 +78,7 @@ org.apache.tomee openejb-core - 7.0.5-SNAPSHOT + 8.0.0-SNAPSHOT test http://git-wip-us.apache.org/repos/asf/tomee/blob/4a7531dc/examples/simple-ear/moviefun-functional-tests/pom.xml -- diff --git a/examples/simple-ear/moviefun-functional-tests/pom.xml b/examples/simple-ear/moviefun-functional-tests/pom.xml index 414d8fa..4bbf3d8 100644 --- a/examples/simple-ear/moviefun-functional-tests/pom.xml +++ b/examples/simple-ear/moviefun-functional-tests/pom.xml @@ -88,7 +88,7 @@ org.apache.tomee openejb-core - 7.0.5-SNAPSHOT + 8.0.0-SNAPSHOT test @@ -106,7 +106,7 @@ org.apache.tomee tomee-embedded - 7.0.5-SNAPSHOT + 8.0.0-SNAPSHOT test @@ -136,7 +136,7 @@ org.apache.tomee arquillian-tomee-remote - 7.0.5-SNAPSHOT + 8.0.0-SNAPSHOT test http://git-wip-us.apache.org/repos/asf/tomee/blob/4a7531dc/examples/simple-ear/moviefun-webapp/pom.xml -- diff --git a/examples/simple-ear/moviefun-webapp/pom.xml b/examples/simple-ear/moviefun-webapp/pom.xml index d070c32..cb03986 100644 --- a/examples/simple-ear/moviefun-webapp/pom.xml +++ b/examples/simple-ear/moviefun-webapp/pom.xml @@ -59,7 +59,7 @@ org.apache.tomee openejb-core - 7.0.5-SNAPSHOT + 8.0.0-SNAPSHOT test http://git-wip-us.apache.org/repos/asf/tomee/blob/4a7531dc/tck/microprofile-tck/config/pom.xml -- diff --git a/tck/microprofile-tck/config/pom.xml b/tck/microprofile-tck/config/pom.xml index 4b6b61d..55c81d6 100644 --- a/tck/microprofile-tck/config/pom.xml +++ b/tck/microprofile-tck/config/pom.xml @@ -23,7 +23,7 @@ org.apache.tomee microprofile-tck -7.0.5-SNAPSHOT +8.0.0-SNAPSHOT microprofile-config-tck @@ -37,15 +37,6 @@ org.apache.maven.plugins -maven-compiler-plugin - - 1.8 - 1.8 - - - - -org.apache.maven.plugins maven-surefire-plugin http://git-wip-us.apache.org/repos/asf/tomee/blob/4a7531dc/tck/micropro
[28/32] tomee git commit: Updated LICENSE and NOTICE to use WebProfile.
Updated LICENSE and NOTICE to use WebProfile. Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/a04e4b7d Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/a04e4b7d Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/a04e4b7d Branch: refs/heads/fb_tomee8 Commit: a04e4b7df46f6fc2b757d0a5d44d5ed42143349e Parents: 4c9a987 Author: Roberto Cortez Authored: Tue Mar 6 10:28:16 2018 + Committer: Roberto Cortez Committed: Tue Mar 6 10:28:16 2018 + -- .../src/main/resources/META-INF/LICENSE | 93 +--- .../src/main/resources/META-INF/NOTICE | 46 ++ 2 files changed, 32 insertions(+), 107 deletions(-) -- http://git-wip-us.apache.org/repos/asf/tomee/blob/a04e4b7d/tomee/tomee-microprofile-webapp/src/main/resources/META-INF/LICENSE -- diff --git a/tomee/tomee-microprofile-webapp/src/main/resources/META-INF/LICENSE b/tomee/tomee-microprofile-webapp/src/main/resources/META-INF/LICENSE index 469c73b..b71e72c 100644 --- a/tomee/tomee-microprofile-webapp/src/main/resources/META-INF/LICENSE +++ b/tomee/tomee-microprofile-webapp/src/main/resources/META-INF/LICENSE @@ -674,7 +674,7 @@ THE POSSIBILITY OF SUCH DAMAGE. = - - JSTL, JSP, Java EE Schemas, Mojarra + - JSTL, JSP, Java EE Schemas License: CDDL - @@ -1195,94 +1195,3 @@ Linking this library statically or dynamically with other modules is making a co As a special exception, the copyright holders of this library give you permission to link this library with independent modules to produce an executable, regardless of the license terms of these independent modules, and to copy and distribute the resulting executable under terms of your choice, provided that you also meet, for each linked independent module, the terms and conditions of the license of that module. An independent module is a module which is not derived from or based on this library. If you modify this library, you may extend this exception to your version of the library, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. -= -EclipseLink -ECJ - Eclipse Compiler for Java - -Eclipse Public License - v 1.0 - -THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT. - -1. DEFINITIONS - -"Contribution" means: - -a) in the case of the initial Contributor, the initial code and documentation distributed under this Agreement, and - -b) in the case of each subsequent Contributor: - -i) changes to the Program, and - -ii) additions to the Program; - -where such changes and/or additions to the Program originate from and are distributed by that particular Contributor. A Contribution 'originates' from a Contributor if it was added to the Program by such Contributor itself or anyone acting on such Contributor's behalf. Contributions do not include additions to the Program which: (i) are separate modules of software distributed in conjunction with the Program under their own license agreement, and (ii) are not derivative works of the Program. - -"Contributor" means any person or entity that distributes the Program. - -"Licensed Patents" mean patent claims licensable by a Contributor which are necessarily infringed by the use or sale of its Contribution alone or when combined with the Program. - -"Program" means the Contributions distributed in accordance with this Agreement. - -"Recipient" means anyone who receives the Program under this Agreement, including all Contributors. - -2. GRANT OF RIGHTS - -a) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free copyright license to reproduce, prepare derivative works of, publicly display, publicly perform, distribute and sublicense the Contribution of such Contributor, if any, and such derivative works, in source code and object code form. - -b) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free patent license under Licensed Patents to make, use, sell, offer to sell, import and otherwise transfer the Contribution of such Contributor, if any, in source code and object code form. This patent license shall apply to the combination of the Contribution and the Program if, at the time the Contribution is added by the Co
[21/32] tomee git commit: Updated MicroProfile to version 1.3. Updated MicroProfile Config to version 1.2.
Updated MicroProfile to version 1.3. Updated MicroProfile Config to version 1.2. Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/856f7285 Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/856f7285 Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/856f7285 Branch: refs/heads/fb_tomee8 Commit: 856f728560e13c472c996b145572758b1fbe3d5e Parents: 8262b3b Author: Roberto Cortez Authored: Fri Mar 2 01:19:05 2018 + Committer: Roberto Cortez Committed: Fri Mar 2 01:19:05 2018 + -- tomee/tomee-microprofile-webapp/pom.xml | 23 +++ tomee/tomee-microprofile/pom.xml| 14 ++ 2 files changed, 33 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/tomee/blob/856f7285/tomee/tomee-microprofile-webapp/pom.xml -- diff --git a/tomee/tomee-microprofile-webapp/pom.xml b/tomee/tomee-microprofile-webapp/pom.xml index 2a6d9a3..55ae7f0 100644 --- a/tomee/tomee-microprofile-webapp/pom.xml +++ b/tomee/tomee-microprofile-webapp/pom.xml @@ -37,8 +37,11 @@ UTF-8 -1.1.0 -1.0 +1.3 + + +1.2 +1.1 @@ -49,16 +52,28 @@ war - + org.eclipse.microprofile.config + microprofile-config-api + ${microprofile.config.api.version} + + + org.apache.geronimo.config geronimo-config-impl ${microprofile.config.impl.version} http://git-wip-us.apache.org/repos/asf/tomee/blob/856f7285/tomee/tomee-microprofile/pom.xml -- diff --git a/tomee/tomee-microprofile/pom.xml b/tomee/tomee-microprofile/pom.xml index c67d672..cd1688b 100644 --- a/tomee/tomee-microprofile/pom.xml +++ b/tomee/tomee-microprofile/pom.xml @@ -37,4 +37,18 @@ UTF-8 + + + ${project.groupId} + tomee-catalina + ${project.version} + + + + ${project.groupId} + tomee-common + ${project.version} + + +
[08/32] tomee git commit: Delete mp
Delete mp Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/0a0ddab9 Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/0a0ddab9 Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/0a0ddab9 Branch: refs/heads/fb_tomee8 Commit: 0a0ddab90e50c84197ee8be409a5a9d0a6f1920f Parents: f39497f Author: Andy Gumbrecht Authored: Mon Feb 12 22:35:05 2018 +0100 Committer: Andy Gumbrecht Committed: Mon Feb 12 22:35:05 2018 +0100 -- microprofile/microprofile-config/pom.xml| 41 - .../config/MicroprofileConfigTest.java | 37 .../java/org/superbiz/config/BeanAppScoped.java | 20 - .../src/test/resources/arquillian.xml | 33 -- microprofile/pom.xml| 46 5 files changed, 177 deletions(-) -- http://git-wip-us.apache.org/repos/asf/tomee/blob/0a0ddab9/microprofile/microprofile-config/pom.xml -- diff --git a/microprofile/microprofile-config/pom.xml b/microprofile/microprofile-config/pom.xml deleted file mode 100644 index cce11b2..000 --- a/microprofile/microprofile-config/pom.xml +++ /dev/null @@ -1,41 +0,0 @@ - - -http://maven.apache.org/POM/4.0.0"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> - - 4.0.0 - - -microprofile -org.apache.tomee -7.0.5-SNAPSHOT - - - microprofile-config - Microprofile :: Config - - - - org.apache.geronimo.config - geronimo-config-impl - - - - \ No newline at end of file http://git-wip-us.apache.org/repos/asf/tomee/blob/0a0ddab9/microprofile/microprofile-config/src/test/java/org/apache/tomee/microprofile/config/MicroprofileConfigTest.java -- diff --git a/microprofile/microprofile-config/src/test/java/org/apache/tomee/microprofile/config/MicroprofileConfigTest.java b/microprofile/microprofile-config/src/test/java/org/apache/tomee/microprofile/config/MicroprofileConfigTest.java deleted file mode 100644 index 25f2fc0..000 --- a/microprofile/microprofile-config/src/test/java/org/apache/tomee/microprofile/config/MicroprofileConfigTest.java +++ /dev/null @@ -1,37 +0,0 @@ -package org.apache.tomee.microprofile.config; - -import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.arquillian.junit.Arquillian; -import org.jboss.arquillian.test.api.ArquillianResource; -import org.jboss.shrinkwrap.api.Archive; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.asset.EmptyAsset; -import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.junit.Assert; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.superbiz.config.BeanAppScoped; - -import java.net.URL; - -@RunWith(Arquillian.class) -public class MicroprofileConfigTest { - -@Deployment -public static Archive createDeployment() { -final WebArchive war = ShrinkWrap.create(WebArchive.class) -.addClass(BeanAppScoped.class) -.addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml"); - -System.out.println(war.toString(true)); -return war; -} - -@ArquillianResource -private URL url; - -@Test -public void should_get_config_parameter() { -Assert.fail("Not yet implemented for " + url); -} -} http://git-wip-us.apache.org/repos/asf/tomee/blob/0a0ddab9/microprofile/microprofile-config/src/test/java/org/superbiz/config/BeanAppScoped.java -- diff --git a/microprofile/microprofile-config/src/test/java/org/superbiz/config/BeanAppScoped.java b/microprofile/microprofile-config/src/test/java/org/superbiz/config/BeanAppScoped.java deleted file mode 100644 index efe40ff..000 --- a/microprofile/microprofile-config/src/test/java/org/superbiz/config/BeanAppScoped.java +++ /dev/null @@ -1,20 +0,0 @@ -package org.superbiz.config; - -import org.eclipse.microprofile.config.inject.ConfigProperty; -import javax.enterprise.context.ApplicationScoped; -import org.jboss.arquillian.core.api.annotation.Inject; - -import javax.annotation.PostConstruct; - -@ApplicationScoped -public class BeanAppScoped { - -@PostConstruct -public void postConstruct() { -System.out.println("BeanAppScoped created"); -} - -@Inject -@ConfigProperty(name="my.string.value", defaultValue = "nothing") -private String myString; -} http://git-wip-us.apache.org/repos/asf/tomee/blob/0a0ddab9/microprofile/microprofile-config/src/test/resources/arquillian.xml --
[12/32] tomee git commit: move to asm6
move to asm6 Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/65a131e4 Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/65a131e4 Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/65a131e4 Branch: refs/heads/fb_tomee8 Commit: 65a131e46fe18ef3ae72390499c9222409044a01 Parents: 613c847 Author: Mark Struberg Authored: Thu Feb 15 22:59:24 2018 +0100 Committer: Jonathan Gallimore Committed: Mon Feb 19 13:47:16 2018 + -- arquillian/arquillian-tomee-common/pom.xml | 2 +- .../arquillian-tomee-webapp-remote/pom.xml | 2 +- container/openejb-core/pom.xml | 4 ++-- .../config/PersistenceContextAnnFactory.java| 12 ++-- .../apache/openejb/core/TempClassLoader.java| 6 +++--- .../openejb/core/cmp/cmp2/Cmp1Generator.java| 10 +- .../openejb/core/cmp/cmp2/Cmp2Generator.java| 12 ++-- .../apache/openejb/core/cmp/cmp2/CmpField.java | 2 +- .../apache/openejb/core/cmp/cmp2/CmrField.java | 2 +- .../apache/openejb/core/cmp/cmp2/CmrStyle.java | 2 +- .../core/cmp/cmp2/PostCreateGenerator.java | 8 .../apache/openejb/dyni/DynamicSubclass.java| 14 +++--- .../apache/openejb/util/AnnotationFinder.java | 14 +++--- .../util/proxy/LocalBeanProxyFactory.java | 10 +- .../openejb/DependenceValidationTest.java | 4 ++-- .../org/apache/openejb/DependencyVisitor.java | 20 ++-- .../openejb/config/ServiceClasspathTest.java| 6 +++--- .../config/rules/KeysAnnotationVisitor.java | 8 .../config/rules/ValidationKeysAuditorTest.java | 4 ++-- .../apache/openejb/core/cmp/jpa/JpaTest.java| 8 container/openejb-jpa-integration/pom.xml | 2 +- .../openejb/jpa/integration/MakeTxLookup.java | 10 +- pom.xml | 4 ++-- server/openejb-server/pom.xml | 2 +- tomee/apache-tomee/pom.xml | 2 +- 25 files changed, 85 insertions(+), 85 deletions(-) -- http://git-wip-us.apache.org/repos/asf/tomee/blob/65a131e4/arquillian/arquillian-tomee-common/pom.xml -- diff --git a/arquillian/arquillian-tomee-common/pom.xml b/arquillian/arquillian-tomee-common/pom.xml index 2308bf7..a45d771 100644 --- a/arquillian/arquillian-tomee-common/pom.xml +++ b/arquillian/arquillian-tomee-common/pom.xml @@ -151,7 +151,7 @@ org.apache.geronimo.javamail - xbean-asm5-shaded + xbean-asm6-shaded org.apache.xbean http://git-wip-us.apache.org/repos/asf/tomee/blob/65a131e4/arquillian/arquillian-tomee-webapp-remote/pom.xml -- diff --git a/arquillian/arquillian-tomee-webapp-remote/pom.xml b/arquillian/arquillian-tomee-webapp-remote/pom.xml index ccfbaa3..534745a 100644 --- a/arquillian/arquillian-tomee-webapp-remote/pom.xml +++ b/arquillian/arquillian-tomee-webapp-remote/pom.xml @@ -170,7 +170,7 @@ org.apache.geronimo.javamail - xbean-asm5-shaded + xbean-asm6-shaded org.apache.xbean http://git-wip-us.apache.org/repos/asf/tomee/blob/65a131e4/container/openejb-core/pom.xml -- diff --git a/container/openejb-core/pom.xml b/container/openejb-core/pom.xml index be1e710..3655f3b 100644 --- a/container/openejb-core/pom.xml +++ b/container/openejb-core/pom.xml @@ -399,7 +399,7 @@ openejb-loader-${project.version}.jar openejb-client-${project.version}.jar -xbean-finder-shaded-${xbeanVersion}.jar xbean-asm5-shaded-${xbeanVersion}.jar +xbean-finder-shaded-${xbeanVersion}.jar xbean-asm6-shaded-${xbeanVersion}.jar org.apache.openejb.config.VmDeploymentFactory @@ -558,7 +558,7 @@ org.apache.xbean - xbean-asm5-shaded + xbean-asm6-shaded org.apache.xbean http://git-wip-us.apache.org/repos/asf/tomee/blob/65a131e4/container/openejb-core/src/main/java/org/apache/openejb/config/PersistenceContextAnnFactory.java -- diff --git a/container/openejb-core/src/main/java/org/apache/openejb/config/PersistenceContextAnnFactory.java b/container/openejb-core/src/main/java/org/apache/openejb/config/PersistenceContextAnnFactory.java index ee9671c..12adae1 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/config/PersistenceContextAnnFactory.java +++ b/container/openejb-core/src/main/java/org/ap
[05/32] tomee git commit: Revert "Preparation for Microprofile"
http://git-wip-us.apache.org/repos/asf/tomee/blob/bcce7086/examples/rest-applicationcomposer/pom.xml -- diff --git a/examples/rest-applicationcomposer/pom.xml b/examples/rest-applicationcomposer/pom.xml index c6691f3..f3ef044 100644 --- a/examples/rest-applicationcomposer/pom.xml +++ b/examples/rest-applicationcomposer/pom.xml @@ -24,7 +24,7 @@ rest-applicationcomposer jar 1.1.0-SNAPSHOT - TomEE :: Examples :: REST and Application Composer + OpenEJB :: Examples :: REST and Application Composer UTF-8 http://git-wip-us.apache.org/repos/asf/tomee/blob/bcce7086/examples/rest-cdi/pom.xml -- diff --git a/examples/rest-cdi/pom.xml b/examples/rest-cdi/pom.xml index d9d363d..4e15f22 100644 --- a/examples/rest-cdi/pom.xml +++ b/examples/rest-cdi/pom.xml @@ -23,7 +23,7 @@ org.superbiz rest-cdi 1.1.0-SNAPSHOT - TomEE :: Examples :: REST XML JSON + OpenEJB :: Examples :: REST XML JSON UTF-8 http://git-wip-us.apache.org/repos/asf/tomee/blob/bcce7086/examples/rest-example-with-application/pom.xml -- diff --git a/examples/rest-example-with-application/pom.xml b/examples/rest-example-with-application/pom.xml index 77b923d..9036b84 100644 --- a/examples/rest-example-with-application/pom.xml +++ b/examples/rest-example-with-application/pom.xml @@ -25,7 +25,7 @@ rest-example-with-application war 1.1.0-SNAPSHOT - TomEE :: Examples ::REST Example With Application + OpenEJB :: Web Examples :: REST Example With Application UTF-8 http://git-wip-us.apache.org/repos/asf/tomee/blob/bcce7086/examples/rest-example/pom.xml -- diff --git a/examples/rest-example/pom.xml b/examples/rest-example/pom.xml index be16fba..fd9c366 100644 --- a/examples/rest-example/pom.xml +++ b/examples/rest-example/pom.xml @@ -25,7 +25,7 @@ rest-example war 1.1.0-SNAPSHOT - TomEE :: Examples ::REST Example + OpenEJB :: Web Examples :: REST Example UTF-8 http://git-wip-us.apache.org/repos/asf/tomee/blob/bcce7086/examples/rest-jaas/pom.xml -- diff --git a/examples/rest-jaas/pom.xml b/examples/rest-jaas/pom.xml index bd9d41b..5f655a2 100644 --- a/examples/rest-jaas/pom.xml +++ b/examples/rest-jaas/pom.xml @@ -25,7 +25,7 @@ rest-jaas 1.1.0-SNAPSHOT war - TomEE :: Examples :: JAXRS and JAAS + OpenEJB :: Examples :: JAXRS and JAAS http://git-wip-us.apache.org/repos/asf/tomee/blob/bcce7086/examples/rest-on-ejb/pom.xml -- diff --git a/examples/rest-on-ejb/pom.xml b/examples/rest-on-ejb/pom.xml index 844d900..a3e62bf 100644 --- a/examples/rest-on-ejb/pom.xml +++ b/examples/rest-on-ejb/pom.xml @@ -28,7 +28,7 @@ rest-on-ejb jar 1.1.0-SNAPSHOT - TomEE :: Examples :: REST and EJB + OpenEJB :: Examples :: REST and EJB UTF-8 http://git-wip-us.apache.org/repos/asf/tomee/blob/bcce7086/examples/rest-xml-json/pom.xml -- diff --git a/examples/rest-xml-json/pom.xml b/examples/rest-xml-json/pom.xml index d3f2a40..586edc2 100644 --- a/examples/rest-xml-json/pom.xml +++ b/examples/rest-xml-json/pom.xml @@ -23,7 +23,7 @@ org.superbiz rest-xml-json 1.1.0-SNAPSHOT - TomEE :: Examples :: REST XML JSON + OpenEJB :: Examples :: REST XML JSON UTF-8 http://git-wip-us.apache.org/repos/asf/tomee/blob/bcce7086/examples/scala-basic/pom.xml -- diff --git a/examples/scala-basic/pom.xml b/examples/scala-basic/pom.xml index ebd6bce..76eb930 100644 --- a/examples/scala-basic/pom.xml +++ b/examples/scala-basic/pom.xml @@ -25,7 +25,7 @@ scala-basic jar 1.1.0-SNAPSHOT - TomEE :: Examples :: Basic Scala + OpenEJB :: Examples :: Basic Scala UTF-8 http://git-wip-us.apache.org/repos/asf/tomee/blob/bcce7086/examples/schedule-events/pom.xml -- diff --git a/examples/schedule-events/pom.xml b/examples/schedule-events/pom.xml index 26b4aa6..2b9a29c 100644 --- a/examples/schedule-events/pom.xml +++ b/examples/schedule-events/pom.xml @@ -26,7 +26,7 @@ schedule-events jar 1.1.0-SNAPSHOT - TomEE :: Examples :: @Schedule Events + OpenEJB :: Examples :: @Schedule Events UTF-8 http://git-wip-us.apache.org/repos/asf/tomee/blob/bcce7086/examples/schedule-expression/pom.xml -- diff --git a/examples/schedule-expression/pom.xml b/examples/schedule-expression/pom.xml index 7b0e07b..905478d 100644 --- a/examples/schedule-expression/pom.xml +++ b/exam
[02/32] tomee git commit: Preparation for Microprofile
Preparation for Microprofile Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/36c9c47e Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/36c9c47e Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/36c9c47e Branch: refs/heads/fb_tomee8 Commit: 36c9c47eda2ecb2bdd7f5a4ff78b8610d83589df Parents: 118060d Author: Andy Gumbrecht Authored: Mon Feb 12 18:40:12 2018 +0100 Committer: Andy Gumbrecht Committed: Mon Feb 12 18:40:12 2018 +0100 -- arquillian/arquillian-common/pom.xml| 2 +- arquillian/arquillian-openejb-embedded/pom.xml | 2 +- .../pom.xml | 2 +- arquillian/arquillian-tck/pom.xml | 2 +- arquillian/arquillian-tomee-common/pom.xml | 2 +- arquillian/arquillian-tomee-embedded/pom.xml| 2 +- .../arquillian-tomee-moviefun-example/pom.xml | 2 +- arquillian/arquillian-tomee-remote/pom.xml | 2 +- .../arquillian-tomee-codi-tests/pom.xml | 2 +- .../arquillian-tomee-config-tests/pom.xml | 2 +- .../arquillian-tomee-jaxrs-tests/pom.xml| 2 +- .../arquillian-tomee-jaxws-tests/pom.xml| 2 +- .../arquillian-tomee-jms-tests/pom.xml | 2 +- .../arquillian-tomee-webprofile-tests/pom.xml | 2 +- arquillian/arquillian-tomee-tests/pom.xml | 2 +- .../arquillian-tomee-webapp-remote/pom.xml | 2 +- arquillian/pom.xml | 2 +- arquillian/ziplock/pom.xml | 2 +- examples/access-timeout-meta/pom.xml| 2 +- examples/access-timeout/pom.xml | 2 +- examples/alternate-descriptors/pom.xml | 2 +- examples/applet/pom.xml | 2 +- examples/application-composer/pom.xml | 2 +- examples/applicationcomposer-jaxws-cdi/pom.xml | 2 +- examples/applicationexception/pom.xml | 2 +- examples/arquillian-jpa/pom.xml | 2 +- examples/async-methods/pom.xml | 2 +- examples/async-postconstruct/pom.xml| 2 +- .../bean-validation-design-by-contract/pom.xml | 2 +- .../cdi-alternative-and-stereotypes/pom.xml | 2 +- examples/cdi-application-scope/pom.xml | 2 +- examples/cdi-basic/pom.xml | 2 +- examples/cdi-ejbcontext-jaas/pom.xml| 2 +- examples/cdi-events/pom.xml | 2 +- examples/cdi-interceptors/pom.xml | 2 +- examples/cdi-produces-disposes/pom.xml | 2 +- examples/cdi-produces-field/pom.xml | 2 +- examples/cdi-realm/pom.xml | 2 +- examples/cdi-request-scope/pom.xml | 2 +- examples/cdi-session-scope/pom.xml | 2 +- examples/change-jaxws-url/pom.xml | 2 +- examples/client-resource-lookup-preview/pom.xml | 2 +- examples/component-interfaces/pom.xml | 2 +- examples/cucumber-jvm/pom.xml | 2 +- examples/custom-injection/pom.xml | 2 +- examples/datasource-ciphered-password/pom.xml | 2 +- examples/datasource-definition/pom.xml | 2 +- examples/datasource-versioning/pom.xml | 2 +- examples/decorators/pom.xml | 2 +- examples/deltaspike-configproperty/pom.xml | 2 +- examples/deltaspike-exception-handling/pom.xml | 2 +- examples/deltaspike-fullstack/pom.xml | 2 +- examples/deltaspike-i18n/pom.xml| 2 +- examples/dynamic-dao-implementation/pom.xml | 2 +- examples/dynamic-datasource-routing/pom.xml | 2 +- examples/dynamic-implementation/pom.xml | 2 +- examples/dynamic-proxy-to-access-mbean/pom.xml | 2 +- examples/ear-testing/business-logic/pom.xml | 2 +- examples/ear-testing/business-model/pom.xml | 2 +- examples/ear-testing/pom.xml| 2 +- examples/ejb-examples/pom.xml | 2 +- examples/ejb-webservice/pom.xml | 2 +- examples/groovy-cdi/pom.xml | 2 +- examples/groovy-jpa/pom.xml | 2 +- examples/groovy-spock/pom.xml | 2 +- examples/helloworld-weblogic/pom.xml| 2 +- examples/injection-of-connectionfactory/pom.xml | 2 +- examples/injection-of-datasource/pom.xml| 2 +- examples/injection-of-ejbs/pom.xml | 2 +- examples/injection-of-entitymanager/pom.xml | 2 +- examples/injection-of-env-entry/pom.xml | 2 +- examples/interceptors/pom.xml | 2 +- examples/javamail/pom.xml | 2 +- examples/jpa-eclipselink/pom.xml| 2 +- examples/jpa-enumerated/pom.xml | 2 +- examples/jpa-hibernate/pom.xml | 2 +- examples/jsf-cdi-and-ejb/pom.xml| 2 +- examples/jsf-mana
[03/32] tomee git commit: Resolve conflict
Resolve conflict Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/d5607fcb Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/d5607fcb Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/d5607fcb Branch: refs/heads/fb_tomee8 Commit: d5607fcb467b1e1e13baeedf8d29943e6e12b206 Parents: 715e7f2 36c9c47 Author: Andy Gumbrecht Authored: Mon Feb 12 18:46:39 2018 +0100 Committer: Andy Gumbrecht Committed: Mon Feb 12 18:46:39 2018 +0100 -- arquillian/arquillian-common/pom.xml| 2 +- arquillian/arquillian-openejb-embedded/pom.xml | 2 +- .../pom.xml | 2 +- arquillian/arquillian-tck/pom.xml | 2 +- arquillian/arquillian-tomee-common/pom.xml | 2 +- arquillian/arquillian-tomee-embedded/pom.xml| 2 +- .../arquillian-tomee-moviefun-example/pom.xml | 2 +- arquillian/arquillian-tomee-remote/pom.xml | 2 +- .../arquillian-tomee-codi-tests/pom.xml | 2 +- .../arquillian-tomee-config-tests/pom.xml | 2 +- .../arquillian-tomee-jaxrs-tests/pom.xml| 2 +- .../arquillian-tomee-jaxws-tests/pom.xml| 2 +- .../arquillian-tomee-jms-tests/pom.xml | 2 +- .../arquillian-tomee-webprofile-tests/pom.xml | 2 +- arquillian/arquillian-tomee-tests/pom.xml | 2 +- .../arquillian-tomee-webapp-remote/pom.xml | 2 +- arquillian/pom.xml | 2 +- arquillian/ziplock/pom.xml | 2 +- examples/access-timeout-meta/pom.xml| 2 +- examples/access-timeout/pom.xml | 2 +- examples/alternate-descriptors/pom.xml | 2 +- examples/applet/pom.xml | 2 +- examples/application-composer/pom.xml | 2 +- examples/applicationcomposer-jaxws-cdi/pom.xml | 2 +- examples/applicationexception/pom.xml | 2 +- examples/arquillian-jpa/pom.xml | 2 +- examples/async-methods/pom.xml | 2 +- examples/async-postconstruct/pom.xml| 2 +- .../bean-validation-design-by-contract/pom.xml | 2 +- .../cdi-alternative-and-stereotypes/pom.xml | 2 +- examples/cdi-application-scope/pom.xml | 2 +- examples/cdi-basic/pom.xml | 2 +- examples/cdi-ejbcontext-jaas/pom.xml| 2 +- examples/cdi-events/pom.xml | 2 +- examples/cdi-interceptors/pom.xml | 2 +- examples/cdi-produces-disposes/pom.xml | 2 +- examples/cdi-produces-field/pom.xml | 2 +- examples/cdi-realm/pom.xml | 2 +- examples/cdi-request-scope/pom.xml | 2 +- examples/cdi-session-scope/pom.xml | 2 +- examples/change-jaxws-url/pom.xml | 2 +- examples/client-resource-lookup-preview/pom.xml | 2 +- examples/component-interfaces/pom.xml | 2 +- examples/cucumber-jvm/pom.xml | 2 +- examples/custom-injection/pom.xml | 2 +- examples/datasource-ciphered-password/pom.xml | 2 +- examples/datasource-definition/pom.xml | 2 +- examples/datasource-versioning/pom.xml | 2 +- examples/decorators/pom.xml | 2 +- examples/deltaspike-configproperty/pom.xml | 2 +- examples/deltaspike-exception-handling/pom.xml | 2 +- examples/deltaspike-fullstack/pom.xml | 2 +- examples/deltaspike-i18n/pom.xml| 2 +- examples/dynamic-dao-implementation/pom.xml | 2 +- examples/dynamic-datasource-routing/pom.xml | 2 +- examples/dynamic-implementation/pom.xml | 2 +- examples/dynamic-proxy-to-access-mbean/pom.xml | 2 +- examples/ear-testing/business-logic/pom.xml | 2 +- examples/ear-testing/business-model/pom.xml | 2 +- examples/ear-testing/pom.xml| 2 +- examples/ejb-examples/pom.xml | 2 +- examples/ejb-webservice/pom.xml | 2 +- examples/groovy-cdi/pom.xml | 2 +- examples/groovy-jpa/pom.xml | 2 +- examples/groovy-spock/pom.xml | 2 +- examples/helloworld-weblogic/pom.xml| 2 +- examples/injection-of-connectionfactory/pom.xml | 2 +- examples/injection-of-datasource/pom.xml| 2 +- examples/injection-of-ejbs/pom.xml | 2 +- examples/injection-of-entitymanager/pom.xml | 2 +- examples/injection-of-env-entry/pom.xml | 2 +- examples/interceptors/pom.xml | 2 +- examples/javamail/pom.xml | 2 +- examples/jpa-eclipselink/pom.xml| 2 +- examples/jpa-enumerated/pom.xml | 2 +- examples/jpa-hibernate/pom.xml | 2 +- examples/jsf-cdi-and-ejb/pom.xml| 2 +- examples/jsf-managedB
[15/32] tomee git commit: TOMEE-2172 Squashed commit of the following:
TOMEE-2172 Squashed commit of the following: commit 98141ca28da6411e8b12c54eeb084019f9716dce Author: Jonathan Gallimore Date: Tue Feb 20 14:55:22 2018 + Add test commit 628798d93a973708c720c531a0fc4eb2284392b4 Author: Jonathan Gallimore Date: Tue Feb 20 14:40:07 2018 + Ensure instances are returned to the pool / discarded correctly if the transaction times out Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/069c8a34 Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/069c8a34 Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/069c8a34 Branch: refs/heads/fb_tomee8 Commit: 069c8a34601259bfcb4692a3a0f10d60187b63b8 Parents: 53e21ef Author: Jonathan Gallimore Authored: Tue Feb 20 15:15:33 2018 + Committer: Jonathan Gallimore Committed: Tue Feb 20 15:16:20 2018 + -- .../openejb/core/mdb/MdbInstanceManager.java| 50 +++--- .../openejb/core/mdb/MdbPoolContainer.java | 8 +- .../mdb/TxTimeoutPoolEndpointHandlerTest.java | 167 +++ 3 files changed, 201 insertions(+), 24 deletions(-) -- http://git-wip-us.apache.org/repos/asf/tomee/blob/069c8a34/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/MdbInstanceManager.java -- diff --git a/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/MdbInstanceManager.java b/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/MdbInstanceManager.java index a74dd03..23a460f 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/MdbInstanceManager.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/MdbInstanceManager.java @@ -29,10 +29,7 @@ import org.apache.openejb.core.ThreadContext; import org.apache.openejb.core.interceptor.InterceptorData; import org.apache.openejb.core.interceptor.InterceptorStack; import org.apache.openejb.loader.Options; -import org.apache.openejb.monitoring.LocalMBeanServer; -import org.apache.openejb.monitoring.ManagedMBean; -import org.apache.openejb.monitoring.ObjectNameBuilder; -import org.apache.openejb.monitoring.StatsInterceptor; +import org.apache.openejb.monitoring.*; import org.apache.openejb.spi.SecurityService; import org.apache.openejb.util.DaemonThreadFactory; import org.apache.openejb.util.Duration; @@ -205,21 +202,21 @@ public class MdbInstanceManager { data.setBaseContext(mdbContext); beanContext.setContainerData(data); +final MBeanServer server = LocalMBeanServer.get(); + +final ObjectNameBuilder jmxName = new ObjectNameBuilder("openejb.management"); +jmxName.set("J2EEServer", "openejb"); +jmxName.set("J2EEApplication", null); +jmxName.set("EJBModule", beanContext.getModuleID()); +jmxName.set("MessageDrivenBean", beanContext.getEjbName()); +jmxName.set("j2eeType", ""); +jmxName.set("name", beanContext.getEjbName()); + // Create stats interceptor if (StatsInterceptor.isStatsActivated()) { final StatsInterceptor stats = new StatsInterceptor(beanContext.getBeanClass()); beanContext.addFirstSystemInterceptor(stats); -final MBeanServer server = LocalMBeanServer.get(); - -final ObjectNameBuilder jmxName = new ObjectNameBuilder("openejb.management"); -jmxName.set("J2EEServer", "openejb"); -jmxName.set("J2EEApplication", null); -jmxName.set("EJBModule", beanContext.getModuleID()); -jmxName.set("MessageDrivenBean", beanContext.getEjbName()); -jmxName.set("j2eeType", ""); -jmxName.set("name", beanContext.getEjbName()); - // register the invocation stats interceptor try { final ObjectName objectName = jmxName.set("j2eeType", "Invocations").build(); @@ -256,12 +253,12 @@ public class MdbInstanceManager { logger.info("Not auto-activating endpoint for " + beanContext.getDeploymentID()); } -String jmxName = beanContext.getActivationProperties().get("MdbJMXControl"); -if (jmxName == null) { -jmxName = "true"; +String jmxControlName = beanContext.getActivationProperties().get("MdbJMXControl"); +if (jmxControlName == null) { +jmxControlName = "true"; } -addJMxControl(beanContext, jmxName, activationContext); +addJMxControl(beanContext, jmxControlName, activationContext); } catch (final ResourceException e) { throw new OpenEJBException(e); @@ -278,10 +275,22 @@ public class MdbInstanceManager { try { es.awaitTermination(5, TimeUnit.MINUTES);
[01/32] tomee git commit: Preparation for Microprofile
Repository: tomee Updated Branches: refs/heads/fb_tomee8 27639abc7 -> 59c398d19 http://git-wip-us.apache.org/repos/asf/tomee/blob/36c9c47e/examples/rest-applicationcomposer/pom.xml -- diff --git a/examples/rest-applicationcomposer/pom.xml b/examples/rest-applicationcomposer/pom.xml index f3ef044..c6691f3 100644 --- a/examples/rest-applicationcomposer/pom.xml +++ b/examples/rest-applicationcomposer/pom.xml @@ -24,7 +24,7 @@ rest-applicationcomposer jar 1.1.0-SNAPSHOT - OpenEJB :: Examples :: REST and Application Composer + TomEE :: Examples :: REST and Application Composer UTF-8 http://git-wip-us.apache.org/repos/asf/tomee/blob/36c9c47e/examples/rest-cdi/pom.xml -- diff --git a/examples/rest-cdi/pom.xml b/examples/rest-cdi/pom.xml index 4e15f22..d9d363d 100644 --- a/examples/rest-cdi/pom.xml +++ b/examples/rest-cdi/pom.xml @@ -23,7 +23,7 @@ org.superbiz rest-cdi 1.1.0-SNAPSHOT - OpenEJB :: Examples :: REST XML JSON + TomEE :: Examples :: REST XML JSON UTF-8 http://git-wip-us.apache.org/repos/asf/tomee/blob/36c9c47e/examples/rest-example-with-application/pom.xml -- diff --git a/examples/rest-example-with-application/pom.xml b/examples/rest-example-with-application/pom.xml index 9036b84..77b923d 100644 --- a/examples/rest-example-with-application/pom.xml +++ b/examples/rest-example-with-application/pom.xml @@ -25,7 +25,7 @@ rest-example-with-application war 1.1.0-SNAPSHOT - OpenEJB :: Web Examples :: REST Example With Application + TomEE :: Examples ::REST Example With Application UTF-8 http://git-wip-us.apache.org/repos/asf/tomee/blob/36c9c47e/examples/rest-example/pom.xml -- diff --git a/examples/rest-example/pom.xml b/examples/rest-example/pom.xml index fd9c366..be16fba 100644 --- a/examples/rest-example/pom.xml +++ b/examples/rest-example/pom.xml @@ -25,7 +25,7 @@ rest-example war 1.1.0-SNAPSHOT - OpenEJB :: Web Examples :: REST Example + TomEE :: Examples ::REST Example UTF-8 http://git-wip-us.apache.org/repos/asf/tomee/blob/36c9c47e/examples/rest-jaas/pom.xml -- diff --git a/examples/rest-jaas/pom.xml b/examples/rest-jaas/pom.xml index 5f655a2..bd9d41b 100644 --- a/examples/rest-jaas/pom.xml +++ b/examples/rest-jaas/pom.xml @@ -25,7 +25,7 @@ rest-jaas 1.1.0-SNAPSHOT war - OpenEJB :: Examples :: JAXRS and JAAS + TomEE :: Examples :: JAXRS and JAAS http://git-wip-us.apache.org/repos/asf/tomee/blob/36c9c47e/examples/rest-on-ejb/pom.xml -- diff --git a/examples/rest-on-ejb/pom.xml b/examples/rest-on-ejb/pom.xml index a3e62bf..844d900 100644 --- a/examples/rest-on-ejb/pom.xml +++ b/examples/rest-on-ejb/pom.xml @@ -28,7 +28,7 @@ rest-on-ejb jar 1.1.0-SNAPSHOT - OpenEJB :: Examples :: REST and EJB + TomEE :: Examples :: REST and EJB UTF-8 http://git-wip-us.apache.org/repos/asf/tomee/blob/36c9c47e/examples/rest-xml-json/pom.xml -- diff --git a/examples/rest-xml-json/pom.xml b/examples/rest-xml-json/pom.xml index 586edc2..d3f2a40 100644 --- a/examples/rest-xml-json/pom.xml +++ b/examples/rest-xml-json/pom.xml @@ -23,7 +23,7 @@ org.superbiz rest-xml-json 1.1.0-SNAPSHOT - OpenEJB :: Examples :: REST XML JSON + TomEE :: Examples :: REST XML JSON UTF-8 http://git-wip-us.apache.org/repos/asf/tomee/blob/36c9c47e/examples/scala-basic/pom.xml -- diff --git a/examples/scala-basic/pom.xml b/examples/scala-basic/pom.xml index 76eb930..ebd6bce 100644 --- a/examples/scala-basic/pom.xml +++ b/examples/scala-basic/pom.xml @@ -25,7 +25,7 @@ scala-basic jar 1.1.0-SNAPSHOT - OpenEJB :: Examples :: Basic Scala + TomEE :: Examples :: Basic Scala UTF-8 http://git-wip-us.apache.org/repos/asf/tomee/blob/36c9c47e/examples/schedule-events/pom.xml -- diff --git a/examples/schedule-events/pom.xml b/examples/schedule-events/pom.xml index 2b9a29c..26b4aa6 100644 --- a/examples/schedule-events/pom.xml +++ b/examples/schedule-events/pom.xml @@ -26,7 +26,7 @@ schedule-events jar 1.1.0-SNAPSHOT - OpenEJB :: Examples :: @Schedule Events + TomEE :: Examples :: @Schedule Events UTF-8 http://git-wip-us.apache.org/repos/asf/tomee/blob/36c9c47e/examples/schedule-expression/pom.xml -- diff --git a/examples/schedule-expression/pom.xml b/examples/schedule-expression/pom.xml
[27/32] tomee git commit: Added MicroProfile Geronimo Configuration to reload system properties.
Added MicroProfile Geronimo Configuration to reload system properties. Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/4c9a987f Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/4c9a987f Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/4c9a987f Branch: refs/heads/fb_tomee8 Commit: 4c9a987f0e49fc1c62c150b638eca00f094974c7 Parents: 6c8604c Author: Roberto Cortez Authored: Tue Mar 6 01:01:54 2018 + Committer: Roberto Cortez Committed: Tue Mar 6 01:01:54 2018 + -- tck/microprofile-tck/config/src/test/resources/arquillian.xml | 1 - .../java/org/apache/tomee/microprofile/MicroProfileService.java | 5 + 2 files changed, 5 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/tomee/blob/4c9a987f/tck/microprofile-tck/config/src/test/resources/arquillian.xml -- diff --git a/tck/microprofile-tck/config/src/test/resources/arquillian.xml b/tck/microprofile-tck/config/src/test/resources/arquillian.xml index ecddd0c..629d71d 100644 --- a/tck/microprofile-tck/config/src/test/resources/arquillian.xml +++ b/tck/microprofile-tck/config/src/test/resources/arquillian.xml @@ -33,7 +33,6 @@ true config.test = SUCCESS - org.apache.geronimo.config.configsource.SystemPropertyConfigSource.copy = false http://git-wip-us.apache.org/repos/asf/tomee/blob/4c9a987f/tomee/tomee-microprofile/src/main/java/org/apache/tomee/microprofile/MicroProfileService.java -- diff --git a/tomee/tomee-microprofile/src/main/java/org/apache/tomee/microprofile/MicroProfileService.java b/tomee/tomee-microprofile/src/main/java/org/apache/tomee/microprofile/MicroProfileService.java index d669b88..70448c6 100644 --- a/tomee/tomee-microprofile/src/main/java/org/apache/tomee/microprofile/MicroProfileService.java +++ b/tomee/tomee-microprofile/src/main/java/org/apache/tomee/microprofile/MicroProfileService.java @@ -42,5 +42,10 @@ public class MicroProfileService implements Service { .getOptions() .getProperties() .setProperty(TOMEE_WEBAPP_CLASSLOADER_ENRICHMENT_PREFIXES, prefixes); + +final String microProfileReloadConfig = + System.getProperty("org.apache.geronimo.config.configsource.SystemPropertyConfigSource.copy", "false"); + System.setProperty("org.apache.geronimo.config.configsource.SystemPropertyConfigSource.copy", + microProfileReloadConfig); } }
[13/32] tomee git commit: Temporarily ignoring this test to see if we get a green build. It seems that this test ends up with ClassLoaderLogManager in a bad state, and is unable to load logging.proper
Temporarily ignoring this test to see if we get a green build. It seems that this test ends up with ClassLoaderLogManager in a bad state, and is unable to load logging.properties Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/f8764fe6 Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/f8764fe6 Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/f8764fe6 Branch: refs/heads/fb_tomee8 Commit: f8764fe69aaf3da0e2bb9a84bba2500e1a180879 Parents: 613c847 Author: Jonathan Gallimore Authored: Tue Feb 20 11:03:22 2018 + Committer: Jonathan Gallimore Committed: Tue Feb 20 11:03:22 2018 + -- .../java/org/apache/openejb/arquillian/tests/jms/EnvEntryTest.java | 2 ++ 1 file changed, 2 insertions(+) -- http://git-wip-us.apache.org/repos/asf/tomee/blob/f8764fe6/arquillian/arquillian-tomee-tests/arquillian-tomee-jms-tests/src/test/java/org/apache/openejb/arquillian/tests/jms/EnvEntryTest.java -- diff --git a/arquillian/arquillian-tomee-tests/arquillian-tomee-jms-tests/src/test/java/org/apache/openejb/arquillian/tests/jms/EnvEntryTest.java b/arquillian/arquillian-tomee-tests/arquillian-tomee-jms-tests/src/test/java/org/apache/openejb/arquillian/tests/jms/EnvEntryTest.java index 1b34223..3270588 100644 --- a/arquillian/arquillian-tomee-tests/arquillian-tomee-jms-tests/src/test/java/org/apache/openejb/arquillian/tests/jms/EnvEntryTest.java +++ b/arquillian/arquillian-tomee-tests/arquillian-tomee-jms-tests/src/test/java/org/apache/openejb/arquillian/tests/jms/EnvEntryTest.java @@ -24,6 +24,7 @@ import org.jboss.shrinkwrap.api.asset.StringAsset; import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.jboss.shrinkwrap.descriptor.api.Descriptors; import org.jboss.shrinkwrap.descriptor.api.ejbjar31.EjbJarDescriptor; +import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; @@ -32,6 +33,7 @@ import java.util.concurrent.Callable; import static org.junit.Assert.assertEquals; +@Ignore @RunWith(Arquillian.class) public class EnvEntryTest { @EJB
[10/32] tomee git commit: Revert "upgrating amq from 5.14.5 to 5.15.2"
Revert "upgrating amq from 5.14.5 to 5.15.2" This reverts commit a049ad484eb061884d0c4a0c85bbe4b250a390ff. Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/eb8199f1 Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/eb8199f1 Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/eb8199f1 Branch: refs/heads/fb_tomee8 Commit: eb8199f1dc33b2675ba2ac0af504d5ad46e9f979 Parents: a049ad4 Author: Jonathan Gallimore Authored: Thu Feb 15 12:33:04 2018 + Committer: Jonathan Gallimore Committed: Thu Feb 15 12:33:04 2018 + -- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/tomee/blob/eb8199f1/pom.xml -- diff --git a/pom.xml b/pom.xml index 0670dd2..6fc6360 100644 --- a/pom.xml +++ b/pom.xml @@ -169,7 +169,7 @@ 3.3 1.1.2 -5.15.2 +5.14.5 3.1.4.RELEASE 4.12 1.4.1
[04/32] tomee git commit: Tomcat version
Tomcat version Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/13881399 Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/13881399 Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/13881399 Branch: refs/heads/fb_tomee8 Commit: 138813998d419899e8f4a0bf30ff261a383f498a Parents: d5607fc Author: Andy Gumbrecht Authored: Mon Feb 12 18:48:10 2018 +0100 Committer: Andy Gumbrecht Committed: Mon Feb 12 18:48:10 2018 +0100 -- pom.xml | 1 - 1 file changed, 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/tomee/blob/13881399/pom.xml -- diff --git a/pom.xml b/pom.xml index 1ba0b74..53bb0f1 100644 --- a/pom.xml +++ b/pom.xml @@ -126,7 +126,6 @@ ${project.groupId}.${project.artifactId} 0.4-incubating 3.1.13 -8.5.24 1.2.6 2.0.0 1.1.13.Final
[07/32] tomee git commit: Auto stash before revert of "Preparation for Microprofile"
Auto stash before revert of "Preparation for Microprofile" Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/f39497fe Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/f39497fe Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/f39497fe Branch: refs/heads/fb_tomee8 Commit: f39497febab7a1edff4b9e96931a570dfbda5939 Parents: bcce708 Author: Andy Gumbrecht Authored: Mon Feb 12 21:23:20 2018 +0100 Committer: Andy Gumbrecht Committed: Mon Feb 12 21:23:20 2018 +0100 -- microprofile/microprofile-config/pom.xml| 41 + .../config/MicroprofileConfigTest.java | 37 .../java/org/superbiz/config/BeanAppScoped.java | 20 + .../src/test/resources/arquillian.xml | 33 ++ microprofile/pom.xml| 46 5 files changed, 177 insertions(+) -- http://git-wip-us.apache.org/repos/asf/tomee/blob/f39497fe/microprofile/microprofile-config/pom.xml -- diff --git a/microprofile/microprofile-config/pom.xml b/microprofile/microprofile-config/pom.xml new file mode 100644 index 000..cce11b2 --- /dev/null +++ b/microprofile/microprofile-config/pom.xml @@ -0,0 +1,41 @@ + + +http://maven.apache.org/POM/4.0.0"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> + + 4.0.0 + + +microprofile +org.apache.tomee +7.0.5-SNAPSHOT + + + microprofile-config + Microprofile :: Config + + + + org.apache.geronimo.config + geronimo-config-impl + + + + \ No newline at end of file http://git-wip-us.apache.org/repos/asf/tomee/blob/f39497fe/microprofile/microprofile-config/src/test/java/org/apache/tomee/microprofile/config/MicroprofileConfigTest.java -- diff --git a/microprofile/microprofile-config/src/test/java/org/apache/tomee/microprofile/config/MicroprofileConfigTest.java b/microprofile/microprofile-config/src/test/java/org/apache/tomee/microprofile/config/MicroprofileConfigTest.java new file mode 100644 index 000..25f2fc0 --- /dev/null +++ b/microprofile/microprofile-config/src/test/java/org/apache/tomee/microprofile/config/MicroprofileConfigTest.java @@ -0,0 +1,37 @@ +package org.apache.tomee.microprofile.config; + +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.junit.Arquillian; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.Archive; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.EmptyAsset; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.Assert; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.superbiz.config.BeanAppScoped; + +import java.net.URL; + +@RunWith(Arquillian.class) +public class MicroprofileConfigTest { + +@Deployment +public static Archive createDeployment() { +final WebArchive war = ShrinkWrap.create(WebArchive.class) +.addClass(BeanAppScoped.class) +.addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml"); + +System.out.println(war.toString(true)); +return war; +} + +@ArquillianResource +private URL url; + +@Test +public void should_get_config_parameter() { +Assert.fail("Not yet implemented for " + url); +} +} http://git-wip-us.apache.org/repos/asf/tomee/blob/f39497fe/microprofile/microprofile-config/src/test/java/org/superbiz/config/BeanAppScoped.java -- diff --git a/microprofile/microprofile-config/src/test/java/org/superbiz/config/BeanAppScoped.java b/microprofile/microprofile-config/src/test/java/org/superbiz/config/BeanAppScoped.java new file mode 100644 index 000..efe40ff --- /dev/null +++ b/microprofile/microprofile-config/src/test/java/org/superbiz/config/BeanAppScoped.java @@ -0,0 +1,20 @@ +package org.superbiz.config; + +import org.eclipse.microprofile.config.inject.ConfigProperty; +import javax.enterprise.context.ApplicationScoped; +import org.jboss.arquillian.core.api.annotation.Inject; + +import javax.annotation.PostConstruct; + +@ApplicationScoped +public class BeanAppScoped { + +@PostConstruct +public void postConstruct() { +System.out.println("BeanAppScoped created"); +} + +@Inject +@ConfigProperty(name="my.string.value", defaultValue = "nothing") +private String myString; +} http://git-wip-us.apache.org/repos/asf/tomee/blob/f39497fe/microprofile/microprofile-config/src/test/resources/arquillian.xml --
[09/32] tomee git commit: upgrating amq from 5.14.5 to 5.15.2
upgrating amq from 5.14.5 to 5.15.2 Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/a049ad48 Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/a049ad48 Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/a049ad48 Branch: refs/heads/fb_tomee8 Commit: a049ad484eb061884d0c4a0c85bbe4b250a390ff Parents: 0a0ddab Author: Thiago Veronezi Authored: Wed Feb 14 09:14:49 2018 -0200 Committer: Thiago Veronezi Committed: Wed Feb 14 09:14:49 2018 -0200 -- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/tomee/blob/a049ad48/pom.xml -- diff --git a/pom.xml b/pom.xml index 6fc6360..0670dd2 100644 --- a/pom.xml +++ b/pom.xml @@ -169,7 +169,7 @@ 3.3 1.1.2 -5.14.5 +5.15.2 3.1.4.RELEASE 4.12 1.4.1
[jira] [Created] (TOMEE-2179) tomcat 9.0.6
Romain Manni-Bucau created TOMEE-2179: - Summary: tomcat 9.0.6 Key: TOMEE-2179 URL: https://issues.apache.org/jira/browse/TOMEE-2179 Project: TomEE Issue Type: Dependency upgrade Reporter: Romain Manni-Bucau Assignee: Romain Manni-Bucau Fix For: 8.0.0 -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Created] (TOMEE-2180) johnzon 1.1.7
Romain Manni-Bucau created TOMEE-2180: - Summary: johnzon 1.1.7 Key: TOMEE-2180 URL: https://issues.apache.org/jira/browse/TOMEE-2180 Project: TomEE Issue Type: Dependency upgrade Reporter: Romain Manni-Bucau Assignee: Romain Manni-Bucau Fix For: 8.0.0 -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Assigned] (TOMEE-2178) TomEE8: Update to MyFaces 2.3.0 release
[ https://issues.apache.org/jira/browse/TOMEE-2178?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Romain Manni-Bucau reassigned TOMEE-2178: - Assignee: Romain Manni-Bucau > TomEE8: Update to MyFaces 2.3.0 release > --- > > Key: TOMEE-2178 > URL: https://issues.apache.org/jira/browse/TOMEE-2178 > Project: TomEE > Issue Type: Dependency upgrade > Components: TomEE Core Server >Affects Versions: 8.0.0 >Reporter: Thomas Andraschko >Assignee: Romain Manni-Bucau >Priority: Major > Fix For: 8.0.0 > > > MyFaces was releases last week, we should update. -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Created] (TOMEE-2178) TomEE8: Update to MyFaces 2.3.0 release
Thomas Andraschko created TOMEE-2178: Summary: TomEE8: Update to MyFaces 2.3.0 release Key: TOMEE-2178 URL: https://issues.apache.org/jira/browse/TOMEE-2178 Project: TomEE Issue Type: Dependency upgrade Components: TomEE Core Server Affects Versions: 8.0.0 Reporter: Thomas Andraschko Fix For: 8.0.0 MyFaces was releases last week, we should update. -- This message was sent by Atlassian JIRA (v7.6.3#76005)