[tomee-tck] branch javaee6-tck created (now 6ccb20e)
This is an automated email from the ASF dual-hosted git repository. jlmonteiro pushed a change to branch javaee6-tck in repository https://gitbox.apache.org/repos/asf/tomee-tck.git. at 6ccb20e Merging openejb and tomee tck history No new revisions were added by this update.
[tomee-tck] branch javaee6-tck updated: Fix before creating a branch for Java EE 6 TCK
This is an automated email from the ASF dual-hosted git repository.
jlmonteiro pushed a commit to branch javaee6-tck
in repository https://gitbox.apache.org/repos/asf/tomee-tck.git
The following commit(s) were added to refs/heads/javaee6-tck by this push:
new 22fa502 Fix before creating a branch for Java EE 6 TCK
22fa502 is described below
commit 22fa502dd39ef45fda6600a35738538871c31c2c
Author: Jean-Louis Monteiro
AuthorDate: Fri Feb 1 10:45:19 2019 +0100
Fix before creating a branch for Java EE 6 TCK
---
.gitignore | 2 +
pom.xml| 112 +++--
runtests | 10 +-
.../openejb/tck/commands/CommandSupport.groovy | 33 --
4 files changed, 66 insertions(+), 91 deletions(-)
diff --git a/.gitignore b/.gitignore
index 9b38c42..b2c24ce 100644
--- a/.gitignore
+++ b/.gitignore
@@ -409,3 +409,5 @@ quick.bat
/tomee/tomee-plus-webapp/overlays/
/arquillian/arquillian-tomee-remote/temp
report.txt
+
+derbydb/
diff --git a/pom.xml b/pom.xml
index 40276e3..2f6029f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -38,8 +38,8 @@
org.apache.tomee
-7.0.4-SNAPSHOT
-7.0.4-SNAPSHOT
+7.0.4
+7.0.4
8.5.20
@@ -89,6 +89,9 @@
true
UTF-8
+2.9
+5.15.8
+1.5
@@ -101,7 +104,7 @@
org.apache.activemq
activemq-client
- 5.14.5
+ ${version.activemq}
slf4j-api
@@ -114,34 +117,40 @@
com.sun.javaee.tck
tsharness
${javaee.tck.version}
+ system
+ ${javaee.cts.home}/lib/tsharness.jar
com.sun.javaee.tck
javatest
${javaee.tck.version}
+ system
+ ${javaee.cts.home}/lib/javatest.jar
com.sun.javaee.tck
cts
${javaee.tck.version}
+ system
+ ${javaee.cts.home}/lib/cts.jar
com.sun.javaee.tck
whitebox
${javaee.tck.version}
+ system
+
${javaee.cts.home}/dist/com/sun/ts/tests/common/connector/whitebox/whitebox.jar
com.sun.javaee.tck
dbprocedures
${javaee.tck.version}
-
+ ${javaee.cts.home}/lib/dbprocedures.jar
@@ -297,6 +306,7 @@
org.apache.maven.plugins
maven-dependency-plugin
+${version.maven-dependency-plugin}
@@ -773,76 +783,28 @@
copy-dependencies
pre-integration-test
- copy
+ copy-dependencies
-
-
- ${openejb.groupId}
- openejb-lite
-
${project.build.directory}/lib
-
-
- org.apache.activemq
- activemq-client
-
${project.build.directory}/lib
-
-
- backport-util-concurrent
- backport-util-concurrent
-
${project.build.directory}/lib
-
-
- com.sun.javaee.tck
- tsharness
- ${openejb.home}/lib
-
-
- com.sun.javaee.tck
- cts
- ${openejb.home}/lib
-
-
- com.sun.javaee.tck
- whitebox
- ${openejb.home}/lib
-
-
- com.sun.javaee.tck
- dbprocedures
- ${openejb.home}/lib
-
-
- org.apache.geronimo.modules
- geronimo-mail
- ${openejb.home}/lib
-
-
- ${openejb.groupId}
- openejb-derbynet
- ${openejb.home}/lib
-
-
- org.apache.derby
- derby
- ${openejb.home}/lib
-
-
- org.apache.derby
- derbynet
- ${openejb.home}/lib
-
-
- org.apache.derby
- derbyclient
- ${openejb.home}/lib
-
-
- ${openejb.groupId}
- webdeployer
- ${openejb.home}/lib
-
-
+ ${project.build.directory}/lib
+ false
+ true
+ true
+
openejb-lite,activemq-client,activemq-client,tsharness,cts,whitebox,dbprocedures,geronimo-mail,openejb-derbynet,derby,derbynet,derbyclient,webdeployer
+
+
+
+copy-dependencies-tomee-lib
+pre-integr
[tomee] 11/16: TOMEE-2408 - ApplicationComposer in Arquillian Remote with MP not supported yet.
This is an automated email from the ASF dual-hosted git repository.
radcortez pushed a commit to branch TOMEE-2408
in repository https://gitbox.apache.org/repos/asf/tomee.git
commit fb130458f39e078043c351887f469a8e67704d4a
Author: Roberto Cortez
AuthorDate: Wed Jan 23 15:50:13 2019 +
TOMEE-2408 - ApplicationComposer in Arquillian Remote with MP not supported
yet.
---
.../apache/openejb/arquillian/tests/appcomposer/AppComposerTest.java| 2 ++
1 file changed, 2 insertions(+)
diff --git
a/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/appcomposer/AppComposerTest.java
b/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/appcomposer/AppComposerTest.java
index 31434ea..956164c 100644
---
a/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/appcomposer/AppComposerTest.java
+++
b/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/appcomposer/AppComposerTest.java
@@ -23,6 +23,7 @@ import org.jboss.arquillian.test.api.ArquillianResource;
import org.jboss.shrinkwrap.api.Archive;
import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -31,6 +32,7 @@ import java.net.URL;
import static org.junit.Assert.assertEquals;
+@Ignore
@RunWith(Arquillian.class)
public class AppComposerTest {
@Deployment(testable = false)
[tomee] 10/16: TOMEE-2408 - Enable CDI for Tomcat TomEE webapp deployment.
This is an automated email from the ASF dual-hosted git repository.
radcortez pushed a commit to branch TOMEE-2408
in repository https://gitbox.apache.org/repos/asf/tomee.git
commit 19d2f26d39fafbb86ffb7c1962bfabff211f6add
Author: Roberto Cortez
AuthorDate: Wed Jan 23 01:26:53 2019 +
TOMEE-2408 - Enable CDI for Tomcat TomEE webapp deployment.
---
.../src/main/java/org/apache/openejb/config/ConfigurationFactory.java | 4
tomee/tomee-webapp/src/main/webapp/WEB-INF/web.xml| 2 +-
2 files changed, 1 insertion(+), 5 deletions(-)
diff --git
a/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java
b/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java
index 6fd01d2..ab50cdd 100644
---
a/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java
+++
b/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java
@@ -567,10 +567,6 @@ public class ConfigurationFactory implements
OpenEjbConfigurationFactory {
} else {
appInfo = configureApplication(new
AppModule(SystemApps.getSystemModule()));
}
-// they doesn't use CDI so no need to activate it
-// 1) will be faster
-// 2) will let embedded containers (tomee-embedded mainly) not
be noised by it in our singleton service
-appInfo.properties.put("openejb.cdi.activated", "false");
sys.containerSystem.applications.add(appInfo);
} catch (final OpenEJBException e) {
logger.error("Unable to load the system applications.", e);
diff --git a/tomee/tomee-webapp/src/main/webapp/WEB-INF/web.xml
b/tomee/tomee-webapp/src/main/webapp/WEB-INF/web.xml
index 8a01385..c8e3120 100644
--- a/tomee/tomee-webapp/src/main/webapp/WEB-INF/web.xml
+++ b/tomee/tomee-webapp/src/main/webapp/WEB-INF/web.xml
@@ -19,7 +19,7 @@
http://java.sun.com/xml/ns/javaee";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd";
- version="3.0" metadata-complete="true">
+ version="3.0">
Apache TomEE
[tomee] 09/16: TOMEE-2408 - Exclude some libraries from scanning.
This is an automated email from the ASF dual-hosted git repository. radcortez pushed a commit to branch TOMEE-2408 in repository https://gitbox.apache.org/repos/asf/tomee.git commit 173ffecb263e063dab0c34e9434606cccf4fb4db Author: Roberto Cortez AuthorDate: Tue Jan 22 22:56:30 2019 + TOMEE-2408 - Exclude some libraries from scanning. --- container/openejb-core/src/main/resources/default.exclusions | 6 ++ 1 file changed, 6 insertions(+) diff --git a/container/openejb-core/src/main/resources/default.exclusions b/container/openejb-core/src/main/resources/default.exclusions index d795634..aaac83e 100644 --- a/container/openejb-core/src/main/resources/default.exclusions +++ b/container/openejb-core/src/main/resources/default.exclusions @@ -109,6 +109,7 @@ istack-commons-runtime- jackson-annotations- jackson-core- jackson-databind- +jackson-dataformat jackson-mapper-asl- jackson-module-jaxb-annotations- janino- @@ -138,6 +139,7 @@ jline jmdns- joda-time- johnzon- +jose4j- jsoup- jsp-api jsr299- @@ -156,6 +158,7 @@ lucene-core- management-agent.jar maven- mbean-annotation-api- +microprofile- mimepull- mina- mqtt-client- @@ -191,11 +194,13 @@ openejb-webservices openjpa- openmdx- opensaml- +opentracing- openwebbeans- openws- ops4j- org.eclipse. org.junit. +org.osgi.annotation.versioning- org.osgi.core- oro- pax-url @@ -222,6 +227,7 @@ shrinkwrap- slf4j- smack- smackx- +snakeyaml- snappy-java- spring- sshd-
[tomee] 12/16: TOMEE-2408 - Workaround for OpenAPI issue (GERONIMO-6690).
This is an automated email from the ASF dual-hosted git repository.
radcortez pushed a commit to branch TOMEE-2408
in repository https://gitbox.apache.org/repos/asf/tomee.git
commit ccc326f0e406571e78c734e04e09ece070358a6c
Author: Roberto Cortez
AuthorDate: Wed Jan 23 15:50:51 2019 +
TOMEE-2408 - Workaround for OpenAPI issue (GERONIMO-6690).
---
.../openejb/arquillian/tests/jaxrs/staticresources/TheResource.java | 2 +-
.../openejb/arquillian/tests/jaxrs/webxmloverride/TheResource.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git
a/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxrs-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxrs/staticresources/TheResource.java
b/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxrs-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxrs/staticresources/TheResource.java
index 95051fd..1219bfa 100644
---
a/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxrs-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxrs/staticresources/TheResource.java
+++
b/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxrs-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxrs/staticresources/TheResource.java
@@ -21,7 +21,7 @@ import javax.ws.rs.GET;
import javax.ws.rs.Path;
import javax.ws.rs.core.Context;
-@Path("/")
+@Path("")
public class TheResource {
@GET
@Path("the")
diff --git
a/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxrs-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxrs/webxmloverride/TheResource.java
b/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxrs-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxrs/webxmloverride/TheResource.java
index c15814a..542dde5 100644
---
a/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxrs-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxrs/webxmloverride/TheResource.java
+++
b/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxrs-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxrs/webxmloverride/TheResource.java
@@ -19,7 +19,7 @@ package
org.apache.openejb.arquillian.tests.jaxrs.webxmloverride;
import javax.ws.rs.GET;
import javax.ws.rs.Path;
-@Path("/")
+@Path("")
public class TheResource {
@GET
@Path("touch")
[tomee] 07/16: TOMEE-2408 - MicroProfileListener to removed duplicated endpoints and prevent servlet mapping clash.
This is an automated email from the ASF dual-hosted git repository.
radcortez pushed a commit to branch TOMEE-2408
in repository https://gitbox.apache.org/repos/asf/tomee.git
commit ba02c9470fcd0440eff367538509b1ea735177fa
Author: Roberto Cortez
AuthorDate: Mon Jan 21 23:36:15 2019 +
TOMEE-2408 - MicroProfileListener to removed duplicated endpoints and
prevent servlet mapping clash.
---
.../apache/tomee/catalina/TomcatWebAppBuilder.java | 5 +-
.../catalina/event/AfterApplicationCreated.java| 11 +++-
tomee/tomee-microprofile/mp-common/pom.xml | 7 +++
.../microprofile/TomEEMicroProfileListener.java| 58 ++
.../META-INF/org.apache.openejb.extension | 1 +
5 files changed, 80 insertions(+), 2 deletions(-)
diff --git
a/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java
b/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java
index 0a79755..493cb90 100644
---
a/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java
+++
b/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java
@@ -1780,7 +1780,10 @@ public class TomcatWebAppBuilder implements
WebAppBuilder, ContextListener, Pare
for (final WebAppInfo webAppInfo :
contextInfo.appInfo.webApps) {
final String wId = getId(webAppInfo.host,
webAppInfo.contextRoot, contextInfo.version);
if (id.equals(wId)) {
-SystemInstance.get().fireEvent(new
AfterApplicationCreated(contextInfo.appInfo, webAppInfo));
+SystemInstance.get().fireEvent(
+new
AfterApplicationCreated(contextInfo.appInfo,
+webAppInfo,
+
standardContext.getServletContext()));
break;
}
}
diff --git
a/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/event/AfterApplicationCreated.java
b/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/event/AfterApplicationCreated.java
index ced0c15..2c06fe3 100644
---
a/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/event/AfterApplicationCreated.java
+++
b/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/event/AfterApplicationCreated.java
@@ -20,14 +20,20 @@ import org.apache.openejb.assembler.classic.AppInfo;
import org.apache.openejb.assembler.classic.WebAppInfo;
import org.apache.openejb.observer.Event;
+import javax.servlet.ServletContext;
+
@Event
public class AfterApplicationCreated {
private final AppInfo app;
private final WebAppInfo web;
+private final ServletContext context;
-public AfterApplicationCreated(final AppInfo appInfo, final WebAppInfo
webApp) {
+public AfterApplicationCreated(final AppInfo appInfo,
+ final WebAppInfo webApp,
+ final ServletContext servletContext) {
app = appInfo;
web = webApp;
+context = servletContext;
}
public AppInfo getApp() {
@@ -38,6 +44,9 @@ public class AfterApplicationCreated {
return web;
}
+public ServletContext getContext() {
+return context;
+}
@Override
public String toString() {
diff --git a/tomee/tomee-microprofile/mp-common/pom.xml
b/tomee/tomee-microprofile/mp-common/pom.xml
index da9f024..582741a 100644
--- a/tomee/tomee-microprofile/mp-common/pom.xml
+++ b/tomee/tomee-microprofile/mp-common/pom.xml
@@ -36,6 +36,13 @@
provided
+
+ ${project.groupId}
+ tomee-catalina
+ ${project.version}
+ provided
+
+
org.eclipse.microprofile.config
diff --git
a/tomee/tomee-microprofile/mp-common/src/main/java/org/apache/tomee/microprofile/TomEEMicroProfileListener.java
b/tomee/tomee-microprofile/mp-common/src/main/java/org/apache/tomee/microprofile/TomEEMicroProfileListener.java
new file mode 100644
index 000..353ac8e
--- /dev/null
+++
b/tomee/tomee-microprofile/mp-common/src/main/java/org/apache/tomee/microprofile/TomEEMicroProfileListener.java
@@ -0,0 +1,58 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY
[tomee] 01/16: TOMEE-2408 - Initial work to make MicroProfile deployment only when required.
This is an automated email from the ASF dual-hosted git repository.
radcortez pushed a commit to branch TOMEE-2408
in repository https://gitbox.apache.org/repos/asf/tomee.git
commit 8af6ae2bb4e1b1d362a21586c6bb648767eb2a5b
Author: Roberto Cortez
AuthorDate: Fri Dec 21 16:58:06 2018 +
TOMEE-2408 - Initial work to make MicroProfile deployment only when
required.
---
.../apache/openejb/server/rest/RESTService.java| 7 +-
tomee/tomee-microprofile/mp-common/pom.xml | 177
.../cdi/TomEEMicroProfileExtension.java| 179 +
.../services/javax.enterprise.inject.spi.Extension | 17 ++
.../tomee-microprofile-webapp/pom.xml | 131 +--
5 files changed, 345 insertions(+), 166 deletions(-)
diff --git
a/server/openejb-rest/src/main/java/org/apache/openejb/server/rest/RESTService.java
b/server/openejb-rest/src/main/java/org/apache/openejb/server/rest/RESTService.java
index 9da7fd1..43d65b4 100644
---
a/server/openejb-rest/src/main/java/org/apache/openejb/server/rest/RESTService.java
+++
b/server/openejb-rest/src/main/java/org/apache/openejb/server/rest/RESTService.java
@@ -256,12 +256,7 @@ public abstract class RESTService implements
ServerService, SelfManaging {
}
}
-/*
-boolean isMicroProfileOnlyEndpoints =
-webApp.restClass.stream().allMatch(name ->
name.startsWith("org.apache.geronimo.microprofile"));
-*/
-
-if (webApp.restApplications.isEmpty() /*&&
!isMicroProfileOnlyEndpoints*/) {
+if (webApp.restApplications.isEmpty()) {
final Application application = new
InternalApplication(null);
for (final String clazz : webApp.restClass) {
try {
diff --git a/tomee/tomee-microprofile/mp-common/pom.xml
b/tomee/tomee-microprofile/mp-common/pom.xml
index 263af46..da9f024 100644
--- a/tomee/tomee-microprofile/mp-common/pom.xml
+++ b/tomee/tomee-microprofile/mp-common/pom.xml
@@ -19,34 +19,149 @@
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";>
-
-tomee-microprofile
-org.apache.tomee
-8.0.0-SNAPSHOT
-
-4.0.0
-
-mp-common
-OpenEJB :: TomEE :: MicroProfile Common
-
-
-
-${project.groupId}
-javaee-api
-provided
-
-
-org.eclipse.microprofile.fault-tolerance
-microprofile-fault-tolerance-api
-${microprofile.fault-tolerance.version}
-provided
-
-
-
-org.apache.geronimo.safeguard
-safeguard-impl
-${microprofile.fault-tolerance.impl.version}
-provided
-
-
-
\ No newline at end of file
+
+tomee-microprofile
+org.apache.tomee
+8.0.0-SNAPSHOT
+
+ 4.0.0
+
+ mp-common
+ OpenEJB :: TomEE :: MicroProfile Common
+
+
+
+ ${project.groupId}
+ javaee-api
+ provided
+
+
+
+
+ org.eclipse.microprofile.config
+ microprofile-config-api
+ ${microprofile.config.version}
+
+
+
+ org.apache.geronimo.config
+ geronimo-config-impl
+ ${microprofile.config.impl.version}
+
+
+
+ org.eclipse.microprofile.jwt
+ microprofile-jwt-auth-api
+ ${microprofile.jwt.version}
+
+
+
+ ${project.groupId}
+ mp-jwt
+ ${microprofile.jwt.impl.version}
+
+
+
+ org.eclipse.microprofile.fault-tolerance
+ microprofile-fault-tolerance-api
+ ${microprofile.fault-tolerance.version}
+
+
+
+ org.apache.geronimo.safeguard
+ safeguard-impl
+ ${microprofile.fault-tolerance.impl.version}
+
+
+
+ org.eclipse.microprofile.health
+ microprofile-health-api
+ ${microprofile.health.version}
+
+
+
+ org.apache.geronimo
+ geronimo-health
+ ${microprofile.health.impl.version}
+
+
+
+ org.eclipse.microprofile.metrics
+ microprofile-metrics-api
+ ${microprofile.metrics.version}
+
+
+
+ org.apache.geronimo
+ geronimo-metrics
+ ${microprofile.metrics.impl.version}
+
+
+
+ org.eclipse.microprofile.rest.client
+ microprofile-rest-client-api
+ ${microprofile.rest-client.version}
+
+
+
+ org.apache.cxf
+ cxf-rt-rs-mp-client
+ ${microprofile.rest-client.impl.version}
+
+
+ javax.json
+ javax.json-api
+
+
+
+
+
+ org.eclipse.microprofile.openapi
+ microprofile-openapi-api
+ ${microprofile.openapi.version}
+
+
+
+ org.apache.geronimo
+ geronimo-openapi-impl
+ ${microprofile.openapi.impl.version}
+
[tomee] branch TOMEE-2408 created (now 58674b8)
This is an automated email from the ASF dual-hosted git repository. radcortez pushed a change to branch TOMEE-2408 in repository https://gitbox.apache.org/repos/asf/tomee.git. at 58674b8 TOMEE-2408 - Fixed issue with ClassNotFound due to web.xml change to metadata-complete. Tomcat performs scanning on classes to find webapp annotations and this happened before adding the TomEE lib jars into the classloader. This branch includes the following new commits: new 8af6ae2 TOMEE-2408 - Initial work to make MicroProfile deployment only when required. new 1a4e4ad TOMEE-2408 - Removed all MP deployable endpoints. Rules required to activate them. new b86e492 TOMEE-2408 - Initial rules to figure out if MP Health is required. new 76f9140 TOMEE-2408 - Fixed CDI Scanning for MP in EAR deployments. new 766a662 TOMEE-2408 - Added MicroProfile to Plus and Plume. new fc9fa5d TOMEE-2408 - Removed the MicroProfileExtension. Is not needed. new ba02c94 TOMEE-2408 - MicroProfileListener to removed duplicated endpoints and prevent servlet mapping clash. new de5a2ee TOMEE-2408 - CDI scanning for additional libraries, skipping if to deploy only the related ejb module. new 173ffec TOMEE-2408 - Exclude some libraries from scanning. new 19d2f26 TOMEE-2408 - Enable CDI for Tomcat TomEE webapp deployment. new fb13045 TOMEE-2408 - ApplicationComposer in Arquillian Remote with MP not supported yet. new ccc326f TOMEE-2408 - Workaround for OpenAPI issue (GERONIMO-6690). new 8f0dacd TOMEE-2408 - Readded MP libraries. Apparently they are needed in some cases. new 26d5b4e TOMEE-2408 - Fixed NPE. new 3f59d38 TOMEE-2462 - Added test to verify servlets, default servlet and rest endpoints execution. new 58674b8 TOMEE-2408 - Fixed issue with ClassNotFound due to web.xml change to metadata-complete. Tomcat performs scanning on classes to find webapp annotations and this happened before adding the TomEE lib jars into the classloader. The 16 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[tomee] 16/16: TOMEE-2408 - Fixed issue with ClassNotFound due to web.xml change to metadata-complete. Tomcat performs scanning on classes to find webapp annotations and this happened before adding th
This is an automated email from the ASF dual-hosted git repository. radcortez pushed a commit to branch TOMEE-2408 in repository https://gitbox.apache.org/repos/asf/tomee.git commit 58674b8bbae159cc44b61645486240a01c405cf2 Author: Roberto Cortez AuthorDate: Fri Feb 1 01:24:59 2019 + TOMEE-2408 - Fixed issue with ClassNotFound due to web.xml change to metadata-complete. Tomcat performs scanning on classes to find webapp annotations and this happened before adding the TomEE lib jars into the classloader. --- tomee/tomee-webapp/src/main/assembly/war.xml | 7 +++ 1 file changed, 7 insertions(+) diff --git a/tomee/tomee-webapp/src/main/assembly/war.xml b/tomee/tomee-webapp/src/main/assembly/war.xml index 077b584..a00d820 100644 --- a/tomee/tomee-webapp/src/main/assembly/war.xml +++ b/tomee/tomee-webapp/src/main/assembly/war.xml @@ -95,6 +95,13 @@ org.codehaus.swizzle:swizzle-stream + + WEB-INF/lib + compile + +org.apache.tomee:tomee-common + +
[tomee] 15/16: TOMEE-2462 - Added test to verify servlets, default servlet and rest endpoints execution.
This is an automated email from the ASF dual-hosted git repository.
radcortez pushed a commit to branch TOMEE-2408
in repository https://gitbox.apache.org/repos/asf/tomee.git
commit 3f59d382b12ebc17b2d1fc9e587486d55fc4a749
Author: Roberto Cortez
AuthorDate: Thu Jan 31 18:35:02 2019 +
TOMEE-2462 - Added test to verify servlets, default servlet and rest
endpoints execution.
---
.../arquillian/tests/jaxrs/servlets/Echo.java | 28 +
.../tests/jaxrs/servlets/RestWithServletsTest.java | 49 ++
.../tests/jaxrs/servlets/RootServlet.java | 33 +++
.../arquillian/tests/jaxrs/servlets/Servlet.java | 33 +++
.../arquillian/tests/jaxrs/servlets/ok.html| 1 +
5 files changed, 144 insertions(+)
diff --git
a/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxrs-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxrs/servlets/Echo.java
b/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxrs-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxrs/servlets/Echo.java
new file mode 100644
index 000..eba9000
--- /dev/null
+++
b/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxrs-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxrs/servlets/Echo.java
@@ -0,0 +1,28 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.openejb.arquillian.tests.jaxrs.servlets;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+
+@Path("/echo")
+public class Echo {
+@GET
+public String ok() {
+return "ok!";
+}
+}
diff --git
a/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxrs-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxrs/servlets/RestWithServletsTest.java
b/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxrs-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxrs/servlets/RestWithServletsTest.java
new file mode 100644
index 000..8b4e214
--- /dev/null
+++
b/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxrs-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxrs/servlets/RestWithServletsTest.java
@@ -0,0 +1,49 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.openejb.arquillian.tests.jaxrs.servlets;
+
+import org.apache.openejb.arquillian.tests.jaxrs.JaxrsTest;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.junit.Arquillian;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+@RunWith(Arquillian.class)
+public class RestWithServletsTest extends JaxrsTest {
+@Deployment(testable = false)
+public static WebArchive archive() {
+final WebArchive webArchive =
+ShrinkWrap.create(WebArchive.class)
+ .addClass(Echo.class)
+ .addClass(Servlet.class)
+
.addAsWebResource("org/apache/openejb/arquillian/tests/jaxrs/servlets/ok.html",
"ok.html");
+System.out.println(webArchive.toString(true));
+return webArchive;
+}
+
+@Test
+public void servlets() throws Exception {
+assertTrue(get("/ok.html").contains("ok!"));
+assertEquals("ok!", get("/servlet"));
+assertEquals("ok!", get("/echo"));
+}
+}
diff --git
a/arquilli
[tomee] 13/16: TOMEE-2408 - Readded MP libraries. Apparently they are needed in some cases.
This is an automated email from the ASF dual-hosted git repository. radcortez pushed a commit to branch TOMEE-2408 in repository https://gitbox.apache.org/repos/asf/tomee.git commit 8f0dacdf5df497c3e3239eb0a926a64226809ddd Author: Roberto Cortez AuthorDate: Wed Jan 23 17:14:34 2019 + TOMEE-2408 - Readded MP libraries. Apparently they are needed in some cases. --- container/openejb-core/src/main/resources/default.exclusions | 1 - 1 file changed, 1 deletion(-) diff --git a/container/openejb-core/src/main/resources/default.exclusions b/container/openejb-core/src/main/resources/default.exclusions index aaac83e..624509b 100644 --- a/container/openejb-core/src/main/resources/default.exclusions +++ b/container/openejb-core/src/main/resources/default.exclusions @@ -158,7 +158,6 @@ lucene-core- management-agent.jar maven- mbean-annotation-api- -microprofile- mimepull- mina- mqtt-client-
[tomee] 03/16: TOMEE-2408 - Initial rules to figure out if MP Health is required.
This is an automated email from the ASF dual-hosted git repository.
radcortez pushed a commit to branch TOMEE-2408
in repository https://gitbox.apache.org/repos/asf/tomee.git
commit b86e49266b179b49ecea0d746e4bc3f7c5aa7822
Author: Roberto Cortez
AuthorDate: Fri Jan 18 23:14:07 2019 +
TOMEE-2408 - Initial rules to figure out if MP Health is required.
---
.../cdi/TomEEMicroProfileExtension.java| 113 +++--
1 file changed, 37 insertions(+), 76 deletions(-)
diff --git
a/tomee/tomee-microprofile/mp-common/src/main/java/org/apache/tomee/microprofile/cdi/TomEEMicroProfileExtension.java
b/tomee/tomee-microprofile/mp-common/src/main/java/org/apache/tomee/microprofile/cdi/TomEEMicroProfileExtension.java
index 2765395..3881cfb 100644
---
a/tomee/tomee-microprofile/mp-common/src/main/java/org/apache/tomee/microprofile/cdi/TomEEMicroProfileExtension.java
+++
b/tomee/tomee-microprofile/mp-common/src/main/java/org/apache/tomee/microprofile/cdi/TomEEMicroProfileExtension.java
@@ -18,6 +18,7 @@ package org.apache.tomee.microprofile.cdi;
import org.apache.geronimo.microprofile.common.jaxrs.HealthChecksEndpoint;
import
org.apache.geronimo.microprofile.impl.health.cdi.CdiHealthChecksEndpoint;
+import
org.apache.geronimo.microprofile.impl.health.cdi.GeronimoHealthExtension;
import org.apache.geronimo.microprofile.metrics.common.jaxrs.MetricsEndpoints;
import org.apache.geronimo.microprofile.metrics.jaxrs.CdiMetricsEndpoints;
import org.apache.geronimo.microprofile.openapi.jaxrs.OpenAPIEndpoint;
@@ -26,30 +27,19 @@ import org.apache.openejb.assembler.classic.WebAppInfo;
import
org.apache.openejb.assembler.classic.event.AssemblerAfterApplicationCreated;
import org.apache.openejb.loader.SystemInstance;
import org.apache.openejb.observer.event.BeforeEvent;
-import org.eclipse.microprofile.metrics.annotation.Counted;
-import org.eclipse.microprofile.metrics.annotation.Gauge;
-import org.eclipse.microprofile.metrics.annotation.Metered;
-import org.eclipse.microprofile.metrics.annotation.Metric;
-import org.eclipse.microprofile.metrics.annotation.Timed;
import javax.annotation.Priority;
import javax.enterprise.event.Observes;
-import javax.enterprise.inject.spi.AfterBeanDiscovery;
-import javax.enterprise.inject.spi.Annotated;
-import javax.enterprise.inject.spi.AnnotatedType;
+import javax.enterprise.inject.spi.AfterDeploymentValidation;
import javax.enterprise.inject.spi.BeanManager;
-import javax.enterprise.inject.spi.BeforeBeanDiscovery;
import javax.enterprise.inject.spi.CDI;
import javax.enterprise.inject.spi.Extension;
-import javax.enterprise.inject.spi.ProcessAnnotatedType;
-import javax.enterprise.inject.spi.ProcessInjectionPoint;
-import javax.enterprise.inject.spi.WithAnnotations;
+import java.util.Collection;
+import java.util.Optional;
-import static javax.interceptor.Interceptor.Priority.LIBRARY_BEFORE;
+import static javax.interceptor.Interceptor.Priority.PLATFORM_AFTER;
public class TomEEMicroProfileExtension implements Extension {
-private static final int BEFORE_MICROPROFILE_EXTENSIONS = LIBRARY_BEFORE -
10;
-
private boolean requiresConfig;
private boolean requiresJwt;
private boolean requiresFaultTolerance;
@@ -59,52 +49,27 @@ public class TomEEMicroProfileExtension implements
Extension {
private boolean requiresOpenTracing;
private boolean requiresRestClient;
-void beforeBeanDiscovery(@Observes
- @Priority(BEFORE_MICROPROFILE_EXTENSIONS) final
BeforeBeanDiscovery beforeBeanDiscovery) {
-this.requiresConfig = true;
-this.requiresJwt = true;
-this.requiresFaultTolerance = true;
-// MP Metrics is not required unless specific annotations are found
(or additional REST enpoints are deployed)
-this.requiresMetrics = false;
-this.requiresHealth = true;
-this.requiresOpenApi = true;
-this.requiresOpenTracing = true;
-this.requiresRestClient = true;
-}
+void afterDeploymentValidation(
+@Observes
+@Priority(PLATFORM_AFTER + 10)
+final AfterDeploymentValidation afterDeploymentValidation,
+final BeanManager beanManager) {
+requiresConfig = true;
-void processMPAnnotatedTypes(@Observes
- @Priority(BEFORE_MICROPROFILE_EXTENSIONS)
- @WithAnnotations({
- Metric.class,
- Counted.class,
- Gauge.class,
- Metered.class,
- Timed.class
- }) final ProcessAnnotatedType
processAnnotatedType) {
-
-final AnnotatedType annotatedType =
processAnnotatedType.getAnnotatedType();
-if
(annotatedType.getJavaClass().getName().startsWith("org.apache.geronimo.microp
[tomee] 04/16: TOMEE-2408 - Fixed CDI Scanning for MP in EAR deployments.
This is an automated email from the ASF dual-hosted git repository.
radcortez pushed a commit to branch TOMEE-2408
in repository https://gitbox.apache.org/repos/asf/tomee.git
commit 76f91408a2ddd5d05ede0d3be93df4c3d5a96079
Author: Roberto Cortez
AuthorDate: Mon Jan 21 21:41:15 2019 +
TOMEE-2408 - Fixed CDI Scanning for MP in EAR deployments.
---
.../openejb-core/src/main/java/org/apache/openejb/cdi/CdiScanner.java | 2 --
1 file changed, 2 deletions(-)
diff --git
a/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiScanner.java
b/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiScanner.java
index e6947b0..b98987a 100644
---
a/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiScanner.java
+++
b/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiScanner.java
@@ -133,8 +133,6 @@ public class CdiScanner implements BdaScannerService {
if
(!ejbJar.moduleId.equals(startupObject.getWebContext().getId())) {
continue;
}
-} else if (ejbJar.webapp && !appInfo.webAppAlone) {
-continue;
}
if (appInfo.webAppAlone || !ejbJar.webapp) {
[tomee] 05/16: TOMEE-2408 - Added MicroProfile to Plus and Plume.
This is an automated email from the ASF dual-hosted git repository. radcortez pushed a commit to branch TOMEE-2408 in repository https://gitbox.apache.org/repos/asf/tomee.git commit 766a662dadc1ddcef609c7c78545cec79c6425bb Author: Roberto Cortez AuthorDate: Mon Jan 21 23:32:12 2019 + TOMEE-2408 - Added MicroProfile to Plus and Plume. --- tomee/tomee-plume-webapp/pom.xml | 128 --- tomee/tomee-plus-webapp/pom.xml | 128 --- 2 files changed, 256 deletions(-) diff --git a/tomee/tomee-plume-webapp/pom.xml b/tomee/tomee-plume-webapp/pom.xml index 3954191..d69405b 100644 --- a/tomee/tomee-plume-webapp/pom.xml +++ b/tomee/tomee-plume-webapp/pom.xml @@ -166,139 +166,11 @@ --> - diff --git a/tomee/tomee-plus-webapp/pom.xml b/tomee/tomee-plus-webapp/pom.xml index b73db1a..8471101 100644 --- a/tomee/tomee-plus-webapp/pom.xml +++ b/tomee/tomee-plus-webapp/pom.xml @@ -165,139 +165,11 @@ --> -
[tomee] 06/16: TOMEE-2408 - Removed the MicroProfileExtension. Is not needed.
This is an automated email from the ASF dual-hosted git repository.
radcortez pushed a commit to branch TOMEE-2408
in repository https://gitbox.apache.org/repos/asf/tomee.git
commit fc9fa5d4ba13b051dd920c58d8c9802fab60254e
Author: Roberto Cortez
AuthorDate: Mon Jan 21 23:33:24 2019 +
TOMEE-2408 - Removed the MicroProfileExtension. Is not needed.
---
.../cdi/TomEEMicroProfileExtension.java| 140 -
.../services/javax.enterprise.inject.spi.Extension | 17 ---
2 files changed, 157 deletions(-)
diff --git
a/tomee/tomee-microprofile/mp-common/src/main/java/org/apache/tomee/microprofile/cdi/TomEEMicroProfileExtension.java
b/tomee/tomee-microprofile/mp-common/src/main/java/org/apache/tomee/microprofile/cdi/TomEEMicroProfileExtension.java
deleted file mode 100644
index 3881cfb..000
---
a/tomee/tomee-microprofile/mp-common/src/main/java/org/apache/tomee/microprofile/cdi/TomEEMicroProfileExtension.java
+++ /dev/null
@@ -1,140 +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.cdi;
-
-import org.apache.geronimo.microprofile.common.jaxrs.HealthChecksEndpoint;
-import
org.apache.geronimo.microprofile.impl.health.cdi.CdiHealthChecksEndpoint;
-import
org.apache.geronimo.microprofile.impl.health.cdi.GeronimoHealthExtension;
-import org.apache.geronimo.microprofile.metrics.common.jaxrs.MetricsEndpoints;
-import org.apache.geronimo.microprofile.metrics.jaxrs.CdiMetricsEndpoints;
-import org.apache.geronimo.microprofile.openapi.jaxrs.OpenAPIEndpoint;
-import org.apache.openejb.assembler.classic.AppInfo;
-import org.apache.openejb.assembler.classic.WebAppInfo;
-import
org.apache.openejb.assembler.classic.event.AssemblerAfterApplicationCreated;
-import org.apache.openejb.loader.SystemInstance;
-import org.apache.openejb.observer.event.BeforeEvent;
-
-import javax.annotation.Priority;
-import javax.enterprise.event.Observes;
-import javax.enterprise.inject.spi.AfterDeploymentValidation;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.enterprise.inject.spi.CDI;
-import javax.enterprise.inject.spi.Extension;
-import java.util.Collection;
-import java.util.Optional;
-
-import static javax.interceptor.Interceptor.Priority.PLATFORM_AFTER;
-
-public class TomEEMicroProfileExtension implements Extension {
-private boolean requiresConfig;
-private boolean requiresJwt;
-private boolean requiresFaultTolerance;
-private boolean requiresMetrics;
-private boolean requiresHealth;
-private boolean requiresOpenApi;
-private boolean requiresOpenTracing;
-private boolean requiresRestClient;
-
-void afterDeploymentValidation(
-@Observes
-@Priority(PLATFORM_AFTER + 10)
-final AfterDeploymentValidation afterDeploymentValidation,
-final BeanManager beanManager) {
-requiresConfig = true;
-
-requiresJwt = true;
-
-requiresFaultTolerance = true;
-
-requiresMetrics = false;
-
-final GeronimoHealthExtension healthExtension =
beanManager.getExtension(GeronimoHealthExtension.class);
-requiresHealth =
!Optional.ofNullable(healthExtension.getChecks()).map(Collection::isEmpty).orElse(true);
-
-requiresOpenApi = false;
-
-requiresOpenTracing = false;
-
-requiresRestClient = false;
-}
-
-public boolean requiresConfig() {
-return requiresConfig;
-}
-
-public boolean requiresJwt() {
-return requiresJwt;
-}
-
-public boolean requiresFaultTolerance() {
-return requiresFaultTolerance;
-}
-
-public boolean requiresMetrics() {
-return requiresMetrics;
-}
-
-public boolean requiresHealth() {
-return requiresHealth;
-}
-
-public boolean requiresOpenApi() {
-return requiresOpenApi;
-}
-
-public boolean requiresOpenTrakcing() {
-return requiresOpenTracing;
-}
-
-public boolean requiresRestClient() {
-return requiresRestClient;
-}
-
-static {
-SystemInstance.get().addObserver(new
TomEEMicroProfileAfterApplicationCreated());
-}
-
-public static class TomEEMicroProfileAfterApplicationCreated {
-
[tomee] 08/16: TOMEE-2408 - CDI scanning for additional libraries, skipping if to deploy only the related ejb module.
This is an automated email from the ASF dual-hosted git repository.
radcortez pushed a commit to branch TOMEE-2408
in repository https://gitbox.apache.org/repos/asf/tomee.git
commit de5a2ee7aafe08c4caf20c8ae322cabde5f1cbcf
Author: Roberto Cortez
AuthorDate: Tue Jan 22 18:50:46 2019 +
TOMEE-2408 - CDI scanning for additional libraries, skipping if to deploy
only the related ejb module.
---
.../src/main/java/org/apache/openejb/cdi/CdiScanner.java | 12
1 file changed, 12 insertions(+)
diff --git
a/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiScanner.java
b/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiScanner.java
index b98987a..7b9804b 100644
---
a/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiScanner.java
+++
b/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiScanner.java
@@ -154,6 +154,13 @@ public class CdiScanner implements BdaScannerService {
final Map infoByBda = new HashMap<>();
for (final BeansInfo.BDAInfo bda : beans.bdas) {
+if (!startupObject.isFromWebApp() &&
+ejbJar.webapp &&
+!appInfo.webAppAlone &&
+bda.uri.toString().contains(ejbJar.path)) {
+continue;
+}
+
if (bda.uri != null) {
try {
beansXml.add(bda.uri.toURL());
@@ -163,6 +170,11 @@ public class CdiScanner implements BdaScannerService {
}
infoByBda.put(bda, handleBda(startupObject, classLoader,
comparator, beans, scl, filterByClassLoader, beanArchiveService, openejb, bda));
}
+
+if (!startupObject.isFromWebApp() && ejbJar.webapp &&
!appInfo.webAppAlone) {
+continue;
+}
+
for (final BeansInfo.BDAInfo bda : beans.noDescriptorBdas) {
// infoByBda.put() not needed since we know it means annotated
handleBda(startupObject, classLoader, comparator, beans, scl,
filterByClassLoader, beanArchiveService, openejb, bda);
[tomee] 02/16: TOMEE-2408 - Removed all MP deployable endpoints. Rules required to activate them.
This is an automated email from the ASF dual-hosted git repository.
radcortez pushed a commit to branch TOMEE-2408
in repository https://gitbox.apache.org/repos/asf/tomee.git
commit 1a4e4adc5d6b0785409592f8ae79548cc1bded91
Author: Roberto Cortez
AuthorDate: Fri Jan 18 17:19:40 2019 +
TOMEE-2408 - Removed all MP deployable endpoints. Rules required to
activate them.
---
.../cdi/TomEEMicroProfileExtension.java| 24 +++---
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git
a/tomee/tomee-microprofile/mp-common/src/main/java/org/apache/tomee/microprofile/cdi/TomEEMicroProfileExtension.java
b/tomee/tomee-microprofile/mp-common/src/main/java/org/apache/tomee/microprofile/cdi/TomEEMicroProfileExtension.java
index c3e094c..2765395 100644
---
a/tomee/tomee-microprofile/mp-common/src/main/java/org/apache/tomee/microprofile/cdi/TomEEMicroProfileExtension.java
+++
b/tomee/tomee-microprofile/mp-common/src/main/java/org/apache/tomee/microprofile/cdi/TomEEMicroProfileExtension.java
@@ -16,8 +16,10 @@
*/
package org.apache.tomee.microprofile.cdi;
-import org.apache.geronimo.microprofile.impl.health.jaxrs.HealthChecksEndpoint;
-import org.apache.geronimo.microprofile.metrics.jaxrs.MetricsEndpoints;
+import org.apache.geronimo.microprofile.common.jaxrs.HealthChecksEndpoint;
+import
org.apache.geronimo.microprofile.impl.health.cdi.CdiHealthChecksEndpoint;
+import org.apache.geronimo.microprofile.metrics.common.jaxrs.MetricsEndpoints;
+import org.apache.geronimo.microprofile.metrics.jaxrs.CdiMetricsEndpoints;
import org.apache.geronimo.microprofile.openapi.jaxrs.OpenAPIEndpoint;
import org.apache.openejb.assembler.classic.AppInfo;
import org.apache.openejb.assembler.classic.WebAppInfo;
@@ -39,15 +41,10 @@ import javax.enterprise.inject.spi.BeanManager;
import javax.enterprise.inject.spi.BeforeBeanDiscovery;
import javax.enterprise.inject.spi.CDI;
import javax.enterprise.inject.spi.Extension;
-import javax.enterprise.inject.spi.Interceptor;
import javax.enterprise.inject.spi.ProcessAnnotatedType;
import javax.enterprise.inject.spi.ProcessInjectionPoint;
import javax.enterprise.inject.spi.WithAnnotations;
-import javax.enterprise.util.AnnotationLiteral;
-import java.util.List;
-
-import static javax.enterprise.inject.spi.InterceptionType.AROUND_INVOKE;
import static javax.interceptor.Interceptor.Priority.LIBRARY_BEFORE;
public class TomEEMicroProfileExtension implements Extension {
@@ -103,9 +100,11 @@ public class TomEEMicroProfileExtension implements
Extension {
@Priority(BEFORE_MICROPROFILE_EXTENSIONS)
final AfterBeanDiscovery afterBeanDiscovery,
final BeanManager beanManager) {
+/*
final List> interceptors =
beanManager.resolveInterceptors(AROUND_INVOKE, new
AnnotationLiteral() {});
interceptors.isEmpty();
+*/
}
public boolean requiresConfig() {
@@ -156,7 +155,7 @@ public class TomEEMicroProfileExtension implements
Extension {
SystemInstance.get().addObserver(new
TomEEMicroProfileAfterApplicationCreated());
}
-static class TomEEMicroProfileAfterApplicationCreated {
+public static class TomEEMicroProfileAfterApplicationCreated {
public void processApplication(
@org.apache.openejb.observer.Observes
final BeforeEvent
afterApplicationCreated) {
@@ -166,11 +165,12 @@ public class TomEEMicroProfileExtension implements
Extension {
final AppInfo app = afterApplicationCreated.getEvent().getApp();
for (final WebAppInfo webApp : app.webApps) {
if (webApp.restApplications.isEmpty()) {
-if (!microProfileExtension.requiresMetrics) {
-webApp.restClass.removeIf(className ->
className.equals(MetricsEndpoints.class.getName()));
-}
-
webApp.restClass.removeIf(className ->
className.equals(HealthChecksEndpoint.class.getName()));
+webApp.restClass.removeIf(className ->
className.equals(CdiHealthChecksEndpoint.class.getName()));
+
+webApp.restClass.removeIf(className ->
className.equals(MetricsEndpoints.class.getName()));
+webApp.restClass.removeIf(className ->
className.equals(CdiMetricsEndpoints.class.getName()));
+
webApp.restClass.removeIf(className ->
className.equals(OpenAPIEndpoint.class.getName()));
}
}
[tomee] 14/16: TOMEE-2408 - Fixed NPE.
This is an automated email from the ASF dual-hosted git repository.
radcortez pushed a commit to branch TOMEE-2408
in repository https://gitbox.apache.org/repos/asf/tomee.git
commit 26d5b4e51c1aec9af27e484dc72b454fb097e607
Author: Roberto Cortez
AuthorDate: Thu Jan 24 17:02:41 2019 +
TOMEE-2408 - Fixed NPE.
---
.../openejb-core/src/main/java/org/apache/openejb/cdi/CdiScanner.java| 1 +
1 file changed, 1 insertion(+)
diff --git
a/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiScanner.java
b/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiScanner.java
index 7b9804b..f081703 100644
---
a/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiScanner.java
+++
b/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiScanner.java
@@ -157,6 +157,7 @@ public class CdiScanner implements BdaScannerService {
if (!startupObject.isFromWebApp() &&
ejbJar.webapp &&
!appInfo.webAppAlone &&
+ejbJar.path != null &&
bda.uri.toString().contains(ejbJar.path)) {
continue;
}
[tomee-tck] branch javaee6-tck created (now f72d739)
This is an automated email from the ASF dual-hosted git repository. jlmonteiro pushed a change to branch javaee6-tck in repository https://gitbox.apache.org/repos/asf/tomee-tck.git. at f72d739 Add JDK definition and fix some issues from master This branch includes the following new commits: new 22fa502 Fix before creating a branch for Java EE 6 TCK new f72d739 Add JDK definition and fix some issues from master The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[tomee-tck] 02/02: Add JDK definition and fix some issues from master
This is an automated email from the ASF dual-hosted git repository.
jlmonteiro pushed a commit to branch javaee6-tck
in repository https://gitbox.apache.org/repos/asf/tomee-tck.git
commit f72d73954268d10b7221c091d249c23ae27921db
Author: Jean-Louis Monteiro
AuthorDate: Fri Feb 1 17:57:04 2019 +0100
Add JDK definition and fix some issues from master
---
ec2jdk10 | 7 +++
ec2jdk11 | 7 +++
ec2jdk6 | 4
ec2jdk7 | 4
ec2jdk8 | 4
ec2jdk9 | 7 +++
profiles/web/webprofile.now.properties| 9 ++---
.../java/org/apache/openejb/cts/DeploymentImpl.java | 1 +
.../repo/com/sun/javaee/tck/cts/6.0a/cts-6.0a.jar | Bin 263563 -> 0 bytes
.../repo/com/sun/javaee/tck/cts/6.0a/cts-6.0a.pom | 8
.../tck/dbprocedures/6.0a/dbprocedures-6.0a.jar | Bin 10253 -> 0 bytes
.../tck/dbprocedures/6.0a/dbprocedures-6.0a.pom | 8
.../sun/javaee/tck/javatest/6.0a/javatest-6.0a.jar| Bin 3529415 -> 0 bytes
.../sun/javaee/tck/javatest/6.0a/javatest-6.0a.pom| 8
.../sun/javaee/tck/tsharness/6.0a/tsharness-6.0a.jar | Bin 173253 -> 0 bytes
.../sun/javaee/tck/tsharness/6.0a/tsharness-6.0a.pom | 8
.../sun/javaee/tck/whitebox/6.0a/whitebox-6.0a.jar| Bin 143051 -> 0 bytes
.../sun/javaee/tck/whitebox/6.0a/whitebox-6.0a.pom| 8
18 files changed, 40 insertions(+), 43 deletions(-)
diff --git a/ec2jdk10 b/ec2jdk10
new file mode 100644
index 000..40aa5d4
--- /dev/null
+++ b/ec2jdk10
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+# for the runner
+source "$(dirname $(readlink -f $0))/ec2jdk7"
+
+# for the standalone tomee
+export MAVEN_OPTS="-Dtck.java.home=$HOME/jdk10 -Dtck.java.version=10
$MAVEN_OPTS"
diff --git a/ec2jdk11 b/ec2jdk11
new file mode 100644
index 000..f9f8948
--- /dev/null
+++ b/ec2jdk11
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+# for the runner
+source "$(dirname $(readlink -f $0))/ec2jdk7"
+
+# for the standalone tomee
+export MAVEN_OPTS="-Dtck.java.home=$HOME/jdk11 -Dtck.java.version=11
$MAVEN_OPTS"
diff --git a/ec2jdk6 b/ec2jdk6
new file mode 100644
index 000..f12a118
--- /dev/null
+++ b/ec2jdk6
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+export JAVA_HOME=$HOME/jdk6
+export PATH=$JAVA_HOME/bin:$PATH
diff --git a/ec2jdk7 b/ec2jdk7
new file mode 100644
index 000..2f4405e
--- /dev/null
+++ b/ec2jdk7
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+export JAVA_HOME=$HOME/jdk7
+export PATH=$JAVA_HOME/bin:$PATH
diff --git a/ec2jdk8 b/ec2jdk8
new file mode 100644
index 000..ea629f0
--- /dev/null
+++ b/ec2jdk8
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+export JAVA_HOME=$HOME/jdk8
+export PATH=$JAVA_HOME/bin:$PATH
diff --git a/ec2jdk9 b/ec2jdk9
new file mode 100644
index 000..a8437b3
--- /dev/null
+++ b/ec2jdk9
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+# for the runner
+source "$(dirname $(readlink -f $0))/ec2jdk7"
+
+# for the standalone tomee
+export MAVEN_OPTS="-Dtck.java.home=$HOME/jdk9 -Dtck.java.version=1.9
$MAVEN_OPTS"
diff --git a/profiles/web/webprofile.now.properties
b/profiles/web/webprofile.now.properties
index 680de9b..48eefd1 100644
--- a/profiles/web/webprofile.now.properties
+++ b/profiles/web/webprofile.now.properties
@@ -1,10 +1,13 @@
project.name= webprofile-7.x
-project.version = 7.0.4-SNAPSHOT
-project.id = 71
+project.version = 7.0.4
+project.id = 704
project.jdk = jdk7
+project.container= tomee
+fire.on.submit = true
#project.cron = * 23 45
#This is the TCK repo URL
-project.scmUrl = scm:svn:https://svn.apache.org/repos/tck/tomee-tck/trunk
+project.scmUrl = scm:git:g...@github.com:apache/tomee-tck.git
+project.gitBranch = javaee6-tck
project.buildFile= runtests
include.f.javatest.log= target/logs/javatest.log
include.d.logs=.*target/(apache|openejb).*/logs/.*
diff --git a/src/main/java/org/apache/openejb/cts/DeploymentImpl.java
b/src/main/java/org/apache/openejb/cts/DeploymentImpl.java
index 0ef72e0..ec118a4 100644
--- a/src/main/java/org/apache/openejb/cts/DeploymentImpl.java
+++ b/src/main/java/org/apache/openejb/cts/DeploymentImpl.java
@@ -42,6 +42,7 @@ import java.util.Properties;
import java.util.Set;
import java.util.TreeSet;
+@SuppressWarnings("unchecked")
public class DeploymentImpl implements TSDeploymentInterface2 {
private static final String HEAD = "OpenEJB - ";
private static final String FILENAME = "filename";
diff --git a/src/test/repo/com/sun/javaee/tck/cts/6.0a/cts-6.0a.jar
b/src/test/repo/com/sun/javaee/tck/cts/6.0a/cts-6.0a.jar
deleted file mode 100644
index f92c22f..000
Binary files a/src/test/repo/com/sun/javaee/tck/cts/6.0a/cts-6.0a.jar and
/dev/null differ
diff --git a/src/test/repo/com/sun/javaee/tck/cts/6.0a/cts-6.0a.pom
b/src/test/repo/com/sun/javaee/tck/cts/6.0a/cts-6.0a.pom
[tomee-tck] 01/02: Fix before creating a branch for Java EE 6 TCK
This is an automated email from the ASF dual-hosted git repository.
jlmonteiro pushed a commit to branch javaee6-tck
in repository https://gitbox.apache.org/repos/asf/tomee-tck.git
commit 22fa502dd39ef45fda6600a35738538871c31c2c
Author: Jean-Louis Monteiro
AuthorDate: Fri Feb 1 10:45:19 2019 +0100
Fix before creating a branch for Java EE 6 TCK
---
.gitignore | 2 +
pom.xml| 112 +++--
runtests | 10 +-
.../openejb/tck/commands/CommandSupport.groovy | 33 --
4 files changed, 66 insertions(+), 91 deletions(-)
diff --git a/.gitignore b/.gitignore
index 9b38c42..b2c24ce 100644
--- a/.gitignore
+++ b/.gitignore
@@ -409,3 +409,5 @@ quick.bat
/tomee/tomee-plus-webapp/overlays/
/arquillian/arquillian-tomee-remote/temp
report.txt
+
+derbydb/
diff --git a/pom.xml b/pom.xml
index 40276e3..2f6029f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -38,8 +38,8 @@
org.apache.tomee
-7.0.4-SNAPSHOT
-7.0.4-SNAPSHOT
+7.0.4
+7.0.4
8.5.20
@@ -89,6 +89,9 @@
true
UTF-8
+2.9
+5.15.8
+1.5
@@ -101,7 +104,7 @@
org.apache.activemq
activemq-client
- 5.14.5
+ ${version.activemq}
slf4j-api
@@ -114,34 +117,40 @@
com.sun.javaee.tck
tsharness
${javaee.tck.version}
+ system
+ ${javaee.cts.home}/lib/tsharness.jar
com.sun.javaee.tck
javatest
${javaee.tck.version}
+ system
+ ${javaee.cts.home}/lib/javatest.jar
com.sun.javaee.tck
cts
${javaee.tck.version}
+ system
+ ${javaee.cts.home}/lib/cts.jar
com.sun.javaee.tck
whitebox
${javaee.tck.version}
+ system
+
${javaee.cts.home}/dist/com/sun/ts/tests/common/connector/whitebox/whitebox.jar
com.sun.javaee.tck
dbprocedures
${javaee.tck.version}
-
+ ${javaee.cts.home}/lib/dbprocedures.jar
@@ -297,6 +306,7 @@
org.apache.maven.plugins
maven-dependency-plugin
+${version.maven-dependency-plugin}
@@ -773,76 +783,28 @@
copy-dependencies
pre-integration-test
- copy
+ copy-dependencies
-
-
- ${openejb.groupId}
- openejb-lite
-
${project.build.directory}/lib
-
-
- org.apache.activemq
- activemq-client
-
${project.build.directory}/lib
-
-
- backport-util-concurrent
- backport-util-concurrent
-
${project.build.directory}/lib
-
-
- com.sun.javaee.tck
- tsharness
- ${openejb.home}/lib
-
-
- com.sun.javaee.tck
- cts
- ${openejb.home}/lib
-
-
- com.sun.javaee.tck
- whitebox
- ${openejb.home}/lib
-
-
- com.sun.javaee.tck
- dbprocedures
- ${openejb.home}/lib
-
-
- org.apache.geronimo.modules
- geronimo-mail
- ${openejb.home}/lib
-
-
- ${openejb.groupId}
- openejb-derbynet
- ${openejb.home}/lib
-
-
- org.apache.derby
- derby
- ${openejb.home}/lib
-
-
- org.apache.derby
- derbynet
- ${openejb.home}/lib
-
-
- org.apache.derby
- derbyclient
- ${openejb.home}/lib
-
-
- ${openejb.groupId}
- webdeployer
- ${openejb.home}/lib
-
-
+ ${project.build.directory}/lib
+ false
+ true
+ true
+
openejb-lite,activemq-client,activemq-client,tsharness,cts,whitebox,dbprocedures,geronimo-mail,openejb-derbynet,derby,derbynet,derbyclient,webdeployer
+
+
+
+copy-dependencies-tomee-lib
+pre-integration-test
+
+ copy-dependencies
+
+
+ ${openejb.home}/lib
+ false
+ true
+
[tomee-tck] branch javaee6-tck deleted (was 22fa502)
This is an automated email from the ASF dual-hosted git repository. jlmonteiro pushed a change to branch javaee6-tck in repository https://gitbox.apache.org/repos/asf/tomee-tck.git. was 22fa502 Fix before creating a branch for Java EE 6 TCK This change permanently discards the following revisions: discard 22fa502 Fix before creating a branch for Java EE 6 TCK
[jira] [Commented] (TOMEE-2263) Copy a war in the webapps folder is not taken into account using Java 11
[ https://issues.apache.org/jira/browse/TOMEE-2263?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16758542#comment-16758542 ] François Courtault commented on TOMEE-2263: --- I have tried with TomEE 8.0.0-M2 and Java 11.0.2 and it works. > Copy a war in the webapps folder is not taken into account using Java 11 > > > Key: TOMEE-2263 > URL: https://issues.apache.org/jira/browse/TOMEE-2263 > Project: TomEE > Issue Type: Bug > Components: TomEE Core Server >Affects Versions: 8.0.0-M1 >Reporter: François Courtault >Priority: Critical > Attachments: JAXRSSkeleton.war > > > Hello, > Start TomEE 8.0.0-M1 micro-profile. > Copy [^JAXRSSkeleton.war] > in the webapps folder: no deployment occurs ! -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Commented] (TOMEE-2150) Tomee 7.0.4 issue with CDI interceptor and WebServiceContext resource injection
[
https://issues.apache.org/jira/browse/TOMEE-2150?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16758552#comment-16758552
]
François Courtault commented on TOMEE-2150:
---
Redo the test using TomEE Plus 8.0.0-M2 (cxf 3.2.7 embedded): still have the
same issue !
So the issue is still there :(
> Tomee 7.0.4 issue with CDI interceptor and WebServiceContext resource
> injection
>
>
> Key: TOMEE-2150
> URL: https://issues.apache.org/jira/browse/TOMEE-2150
> Project: TomEE
> Issue Type: Bug
> Components: TomEE Core Server
>Affects Versions: 7.0.4, 7.0.5, 7.1.0, 8.0.0-M1
>Reporter: François Courtault
>Priority: Critical
> Attachments: WebServiceWithAnCdiInterceptorTest.java,
> reproduction_problem.zip, webservicecontext.war
>
>
> I have defined an annotation like below:
> @Inherited
> @InterceptorBinding
> @Target({ElementType.METHOD, ElementType.TYPE})
> @Retention(RetentionPolicy.RUNTIME)
> public @interface MyInterceptor {
> @NonBinding
> String level() default "INFO";
> }
> Then, I have written a class like this:
> @MyInterceptor
> @Interceptor
> public class MyInterceptor {
> private Class intercepted;
> @AroundInvoke
> public Object myMethod(final InvocationContext ctx) throws Exception {
> .
> }
> }
> In my POJO, webservice endpoint, I have:
> @WebService(name = "MyManager", targetNamespace ="http://com.test/wsdl";,
> serviceName = "MyManagerService")
> @MyInterceptor
> public class MyManager implements IMyManager {
> @resource
> private WebServiceContext wsc; //=>=> ALWAYS null on TomEE 7.0.4!!!
>
> }
> }
> That's the test case I built which doesn't work on TomEE 7.0.4 but works on
> Glassfish 4.1.2/5.0, Weblogic Server 12.2.1.3 and Wildfly 10.0.1/11.0.0.
--
This message was sent by Atlassian JIRA
(v7.6.3#76005)
[tomee-tck] branch javaee6-tck updated: Revert ActiveMQ upgrade
This is an automated email from the ASF dual-hosted git repository. jlmonteiro pushed a commit to branch javaee6-tck in repository https://gitbox.apache.org/repos/asf/tomee-tck.git The following commit(s) were added to refs/heads/javaee6-tck by this push: new 22f90f9 Revert ActiveMQ upgrade 22f90f9 is described below commit 22f90f9b508e1c5afded2b3be45ba015a34f3bc5 Author: Jean-Louis Monteiro AuthorDate: Fri Feb 1 19:21:38 2019 +0100 Revert ActiveMQ upgrade --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 2f6029f..fdb971b 100644 --- a/pom.xml +++ b/pom.xml @@ -90,7 +90,7 @@ UTF-8 2.9 -5.15.8 +5.14.5 1.5
[jira] [Comment Edited] (TOMEE-2150) Tomee 7.0.4 issue with CDI interceptor and WebServiceContext resource injection
[
https://issues.apache.org/jira/browse/TOMEE-2150?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16758552#comment-16758552
]
François Courtault edited comment on TOMEE-2150 at 2/1/19 6:21 PM:
---
Redo the test using TomEE Plus 8.0.0-M2 (cxf 3.2.7 embedded): still have the
same issue !
So the issue is still there :(
When this issue will be fixed?
was (Author: fcourtau):
Redo the test using TomEE Plus 8.0.0-M2 (cxf 3.2.7 embedded): still have the
same issue !
So the issue is still there :(
> Tomee 7.0.4 issue with CDI interceptor and WebServiceContext resource
> injection
>
>
> Key: TOMEE-2150
> URL: https://issues.apache.org/jira/browse/TOMEE-2150
> Project: TomEE
> Issue Type: Bug
> Components: TomEE Core Server
>Affects Versions: 7.0.4, 7.0.5, 7.1.0, 8.0.0-M1
>Reporter: François Courtault
>Priority: Critical
> Attachments: WebServiceWithAnCdiInterceptorTest.java,
> reproduction_problem.zip, webservicecontext.war
>
>
> I have defined an annotation like below:
> @Inherited
> @InterceptorBinding
> @Target({ElementType.METHOD, ElementType.TYPE})
> @Retention(RetentionPolicy.RUNTIME)
> public @interface MyInterceptor {
> @NonBinding
> String level() default "INFO";
> }
> Then, I have written a class like this:
> @MyInterceptor
> @Interceptor
> public class MyInterceptor {
> private Class intercepted;
> @AroundInvoke
> public Object myMethod(final InvocationContext ctx) throws Exception {
> .
> }
> }
> In my POJO, webservice endpoint, I have:
> @WebService(name = "MyManager", targetNamespace ="http://com.test/wsdl";,
> serviceName = "MyManagerService")
> @MyInterceptor
> public class MyManager implements IMyManager {
> @resource
> private WebServiceContext wsc; //=>=> ALWAYS null on TomEE 7.0.4!!!
>
> }
> }
> That's the test case I built which doesn't work on TomEE 7.0.4 but works on
> Glassfish 4.1.2/5.0, Weblogic Server 12.2.1.3 and Wildfly 10.0.1/11.0.0.
--
This message was sent by Atlassian JIRA
(v7.6.3#76005)
[tomee] branch TOMEE-2408 updated: TOMEE-2408 - Refactored the way to add MP libraries in the container scanner. Added an event to allow to decouple the code and register the required libraries when n
This is an automated email from the ASF dual-hosted git repository.
radcortez pushed a commit to branch TOMEE-2408
in repository https://gitbox.apache.org/repos/asf/tomee.git
The following commit(s) were added to refs/heads/TOMEE-2408 by this push:
new 2ffed70 TOMEE-2408 - Refactored the way to add MP libraries in the
container scanner. Added an event to allow to decouple the code and register
the required libraries when needed.
2ffed70 is described below
commit 2ffed7081e627b2d65dbf0d5c9c33b307567fc5c
Author: Roberto Cortez
AuthorDate: Fri Feb 1 19:17:11 2019 +
TOMEE-2408 - Refactored the way to add MP libraries in the container
scanner. Added an event to allow to decouple the code and register the required
libraries when needed.
---
.../apache/openejb/config/DeploymentLoader.java| 6 +++-
.../config/event/AfterContainerUrlScanEvent.java | 42 ++
.../org/apache/tomee/catalina/TomcatLoader.java| 2 --
.../java/org/apache/tomee/installer/Installer.java | 2 --
.../microprofile/TomEEMicroProfileListener.java| 34 ++
5 files changed, 81 insertions(+), 5 deletions(-)
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 9b56bdb..9a09802 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
@@ -25,6 +25,8 @@ import org.apache.openejb.api.RemoteClient;
import org.apache.openejb.cdi.CompositeBeans;
import org.apache.openejb.classloader.ClassLoaderConfigurer;
import org.apache.openejb.classloader.WebAppEnricher;
+import org.apache.openejb.config.event.AfterContainerUrlScanEvent;
+import org.apache.openejb.config.event.BeforeAppInfoBuilderEvent;
import org.apache.openejb.config.event.BeforeDeploymentEvent;
import org.apache.openejb.config.sys.Resources;
import org.apache.openejb.core.EmptyResourcesClassLoader;
@@ -1106,7 +1108,7 @@ public class DeploymentLoader implements
DeploymentFilterable {
try {
UrlSet urlSet = new
UrlSet(ParentClassLoaderFinder.Helper.get());
urlSet = URLs.cullSystemJars(urlSet);
-final PatternFilter containerIncludes = new
PatternFilter(SystemInstance.get().getProperty(OPENEJB_CONTAINER_INCLUDES,
".*(geronimo|mp-jwt|mp-common|failsafe).*"));
+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();
@@ -1136,6 +1138,8 @@ public class DeploymentLoader implements
DeploymentFilterable {
containerUrls = Collections.emptyList();
}
}
+
+SystemInstance.get().fireEvent(new
AfterContainerUrlScanEvent(containerUrls));
}
public static List filterWebappUrls(final URL[] webUrls, final Filter
filter, final URL exclusions) {
diff --git
a/container/openejb-core/src/main/java/org/apache/openejb/config/event/AfterContainerUrlScanEvent.java
b/container/openejb-core/src/main/java/org/apache/openejb/config/event/AfterContainerUrlScanEvent.java
new file mode 100644
index 000..2594e06
--- /dev/null
+++
b/container/openejb-core/src/main/java/org/apache/openejb/config/event/AfterContainerUrlScanEvent.java
@@ -0,0 +1,42 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.openejb.config.event;
+
+import org.apache.openejb.observer.Event;
+
+import java.net.URL;
+import java.util.List;
+
+@Event
+public class AfterContainerUrlScanEvent {
+private List containerUrls;
+
+public AfterContainerUrlScanEvent(final List containerUrls) {
+this.containerUrls = containerUrls
[tomee-tck] branch javaee7-tck created (now 5e0c842)
This is an automated email from the ASF dual-hosted git repository. jlmonteiro pushed a change to branch javaee7-tck in repository https://gitbox.apache.org/repos/asf/tomee-tck.git. at 5e0c842 Update to Java EE 7 TCK This branch includes the following new commits: new 5e0c842 Update to Java EE 7 TCK The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[tomee-tck] 01/01: Update to Java EE 7 TCK
This is an automated email from the ASF dual-hosted git repository.
jlmonteiro pushed a commit to branch javaee7-tck
in repository https://gitbox.apache.org/repos/asf/tomee-tck.git
commit 5e0c842559c7112a6d24150099b58d87b5224be8
Author: Jean-Louis Monteiro
AuthorDate: Sat Feb 2 00:12:41 2019 +0100
Update to Java EE 7 TCK
---
pom.xml| 6 +++---
profiles/web/webprofile.now.properties | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index fdb971b..b8e1a5e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -53,9 +53,9 @@
-${javaee6.cts.home}
-${javaee6.ri.home}
-6.0a
+${javaee7.cts.home}
+${javaee7.ri.home}
+7.0a
${settings.localRepository}
1.1.0-SNAPSHOT
diff --git a/profiles/web/webprofile.now.properties
b/profiles/web/webprofile.now.properties
index 48eefd1..98c09fc 100644
--- a/profiles/web/webprofile.now.properties
+++ b/profiles/web/webprofile.now.properties
@@ -7,7 +7,7 @@ fire.on.submit = true
#project.cron = * 23 45
#This is the TCK repo URL
project.scmUrl = scm:git:g...@github.com:apache/tomee-tck.git
-project.gitBranch = javaee6-tck
+project.gitBranch = javaee7-tck
project.buildFile= runtests
include.f.javatest.log= target/logs/javatest.log
include.d.logs=.*target/(apache|openejb).*/logs/.*
[tomee-tck] branch javaee6-tck updated: fix some versions for Java EE 6 TCK
This is an automated email from the ASF dual-hosted git repository. jlmonteiro pushed a commit to branch javaee6-tck in repository https://gitbox.apache.org/repos/asf/tomee-tck.git The following commit(s) were added to refs/heads/javaee6-tck by this push: new 1f4949f fix some versions for Java EE 6 TCK 1f4949f is described below commit 1f4949f2a0f5641e0235b9bce9f75c996040da4b Author: Jean-Louis Monteiro AuthorDate: Sat Feb 2 00:14:08 2019 +0100 fix some versions for Java EE 6 TCK --- pom.xml| 6 +++--- profiles/web/webprofile.now.properties | 8 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pom.xml b/pom.xml index fdb971b..4f12d4e 100644 --- a/pom.xml +++ b/pom.xml @@ -29,7 +29,7 @@ openejb-tck OpenEJB TCK Harness - 7.0.4-SNAPSHOT + 1.7.6-SNAPSHOT OpenEJB TCK Harness @@ -38,8 +38,8 @@ org.apache.tomee -7.0.4 -7.0.4 +4.7.5 +1.7.5 8.5.20 diff --git a/profiles/web/webprofile.now.properties b/profiles/web/webprofile.now.properties index 48eefd1..f2f3857 100644 --- a/profiles/web/webprofile.now.properties +++ b/profiles/web/webprofile.now.properties @@ -1,7 +1,7 @@ -project.name= webprofile-7.x -project.version = 7.0.4 -project.id = 704 -project.jdk = jdk7 +project.name= webprofile-1.7.x +project.version = 1.7.5 +project.id = 175 +project.jdk = jdk6 project.container= tomee fire.on.submit = true #project.cron = * 23 45
[jira] [Commented] (TOMEE-2459) Translate examples/access-timeout-meta to Spanish
[ https://issues.apache.org/jira/browse/TOMEE-2459?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16758766#comment-16758766 ] Cesar Hernandez commented on TOMEE-2459: This ticket can be moved forward: https://github.com/apache/tomee/pull/381 > Translate examples/access-timeout-meta to Spanish > - > > Key: TOMEE-2459 > URL: https://issues.apache.org/jira/browse/TOMEE-2459 > Project: TomEE > Issue Type: Sub-task > Components: Examples and Documentation >Affects Versions: 8.0.0-M2, 8.0.0-Final >Reporter: Cesar Hernandez >Assignee: Cesar Hernandez >Priority: Major > > Translate into Spanish the README file using a suffix `_es` to allow the > Tomee Website to pick up and configure this version and corresponding language -- This message was sent by Atlassian JIRA (v7.6.3#76005)
