[tomee] 01/02: closes apache/tomee#397 *Merged*
This is an automated email from the ASF dual-hosted git repository. radcortez pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/tomee.git commit ea02bad6821caa8f0a516d267f58e9cdd83912fc Author: Roberto Cortez AuthorDate: Fri Feb 15 12:49:14 2019 + closes apache/tomee#397 *Merged*
[tomee] 02/02: closes apache/tomee#396 *Already Merged*
This is an automated email from the ASF dual-hosted git repository. radcortez pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/tomee.git commit ccbd6dc5c9dee7ffa76a0fa932fca5677bd1e8d6 Author: Roberto Cortez AuthorDate: Fri Feb 15 12:49:31 2019 + closes apache/tomee#396 *Already Merged*
[tomee] branch master updated (bb77a7b -> ccbd6dc)
This is an automated email from the ASF dual-hosted git repository. radcortez pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/tomee.git. from bb77a7b Fixed test. new ea02bad closes apache/tomee#397 *Merged* new ccbd6dc closes apache/tomee#396 *Already Merged* 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. Summary of changes:
[tomee] 03/08: A fix revert got missed, readding
This is an automated email from the ASF dual-hosted git repository.
radcortez pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomee.git
commit 8b843c639b2b78df3a21223865bb357fc02fb3a7
Author: James Meen
AuthorDate: Mon Feb 11 14:48:56 2019 +
A fix revert got missed, readding
---
.../src/main/java/org/apache/tomee/webservices/CXFJAXRSFilter.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/tomee/tomee-jaxrs/src/main/java/org/apache/tomee/webservices/CXFJAXRSFilter.java
b/tomee/tomee-jaxrs/src/main/java/org/apache/tomee/webservices/CXFJAXRSFilter.java
index 7909459..9d0afca 100644
---
a/tomee/tomee-jaxrs/src/main/java/org/apache/tomee/webservices/CXFJAXRSFilter.java
+++
b/tomee/tomee-jaxrs/src/main/java/org/apache/tomee/webservices/CXFJAXRSFilter.java
@@ -126,7 +126,7 @@ public class CXFJAXRSFilter implements Filter {
accept = false;
if
(!"org.apache.catalina.servlets.DefaultServlet".equals(wrapper.getServletClass()))
{
for (final String mapping : wrapper.findMappings()) {
-if (!mapping.isEmpty() && !"/*".equals(mapping) &&
!"/".equals(mapping) && !mapping.startsWith("*")
+if (!mapping.isEmpty() && !"/*".equals(mapping) &&
!"/".equals(mapping) && !mapping.equals("*")
&& mapping.startsWith(this.mapping)) {
accept = true;
break;
[tomee] 08/08: Fixed test.
This is an automated email from the ASF dual-hosted git repository.
radcortez pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomee.git
commit bb77a7b6505ba2cda7468fc6d72acc344d0b0509
Author: Roberto Cortez
AuthorDate: Fri Feb 15 12:42:49 2019 +
Fixed test.
---
.../openejb/arquillian/tests/cmp/sample/CustomOrmXmlCastTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/cmp/sample/CustomOrmXmlCastTest.java
b/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/cmp/sample/CustomOrmXmlCastTest.java
index 3e852ea..af88bd9 100644
---
a/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/cmp/sample/CustomOrmXmlCastTest.java
+++
b/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/cmp/sample/CustomOrmXmlCastTest.java
@@ -44,7 +44,7 @@ public class CustomOrmXmlCastTest {
final WebArchive archive = ShrinkWrap.create(WebArchive.class,
CustomOrmXmlCastTest.class.getSimpleName() + ".war")
.addClasses(ActorBean.class, ActorDetails.class,
LocalActor.class, LocalActorHome.class,
LocalMovie.class, LocalMovieHome.class,
MovieBean.class, MovieDetails.class,
-MoviesBusiness.class, MoviesBusinessBean.class,
MoviesBusinessHome.class,
+MoviesBusiness.class, MoviesBusinessBean.class,
MoviesBusinessHome.class, MoviesServlet.class,
MoviesServlet2.class)
.addAsResource(new
ClassLoaderAsset("org/apache/openejb/arquillian/tests/cmp/sample/custom-orm.xml"),
"META-INF/custom-orm.xml")
.addAsResource(new
ClassLoaderAsset("org/apache/openejb/arquillian/tests/cmp/sample/persistence.xml"),
"META-INF/persistence.xml")
[tomee] 06/08: Fixed exception handling for no CXF service to pass resteasy test case
This is an automated email from the ASF dual-hosted git repository.
radcortez pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomee.git
commit ad4b76449d2977088c7e32ccd9704a93da3b14b3
Author: James Meen
AuthorDate: Wed Feb 13 15:24:59 2019 +
Fixed exception handling for no CXF service to pass resteasy test case
---
.../openejb/server/cxf/rs/CxfRsHttpListener.java | 34 --
1 file changed, 18 insertions(+), 16 deletions(-)
diff --git
a/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRsHttpListener.java
b/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRsHttpListener.java
index d05d213..2300c33 100644
---
a/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRsHttpListener.java
+++
b/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRsHttpListener.java
@@ -333,26 +333,28 @@ public class CxfRsHttpListener implements RsHttpListener {
}
public boolean isCXFResource(final HttpServletRequest request) {
-final JAXRSServiceImpl service;
try {
-service = (JAXRSServiceImpl)server.getEndpoint().getService();
-} finally { }
-if( service == null ) {
-return false;
-}
+JAXRSServiceImpl service =
(JAXRSServiceImpl)server.getEndpoint().getService();
-String pathToMatch =
HttpUtils.getPathToMatch(request.getServletPath(), pattern, true);
-
-final List resources =
service.getClassResourceInfos();
-for (final ClassResourceInfo info : resources) {
-if (info.getResourceClass() == null || info.getURITemplate() ==
null) { // possible?
-continue;
+if( service == null ) {
+return false;
}
-
-final MultivaluedMap parameters = new
MultivaluedHashMap<>();
-if (info.getURITemplate().match(pathToMatch, parameters)) {
-return true;
+
+String pathToMatch =
HttpUtils.getPathToMatch(request.getServletPath(), pattern, true);
+
+final List resources =
service.getClassResourceInfos();
+for (final ClassResourceInfo info : resources) {
+if (info.getResourceClass() == null || info.getURITemplate()
== null) { // possible?
+continue;
+}
+
+final MultivaluedMap parameters = new
MultivaluedHashMap<>();
+if (info.getURITemplate().match(pathToMatch, parameters)) {
+return true;
+}
}
+} catch (final Exception e) {
+LOGGER.error("No JAX-RS service", e);
}
return false;
}
[tomee] 02/08: Corrected JAXRS assertStatusCode check and fixed CXFJAXRSFilter enhancement request matching
This is an automated email from the ASF dual-hosted git repository.
radcortez pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomee.git
commit 5c53f5652909ace68af6b4b944237ea3cdf965c5
Author: James Meen
AuthorDate: Mon Feb 11 14:40:12 2019 +
Corrected JAXRS assertStatusCode check and fixed CXFJAXRSFilter enhancement
request matching
---
.../java/org/apache/openejb/arquillian/tests/jaxrs/JaxrsTest.java | 4 ++--
.../java/org/apache/openejb/server/cxf/rs/CxfRsHttpListener.java | 8 ++--
.../org/apache/tomee/microprofile/config/TomEEConfigSource.java | 2 ++
3 files changed, 10 insertions(+), 4 deletions(-)
diff --git
a/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxrs-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxrs/JaxrsTest.java
b/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxrs-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxrs/JaxrsTest.java
index 9a6c15c..ebe5acd 100644
---
a/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxrs-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxrs/JaxrsTest.java
+++
b/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxrs-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxrs/JaxrsTest.java
@@ -78,8 +78,8 @@ public class JaxrsTest {
return URI.create(String.format("%s%s", url.toExternalForm(), path));
}
-public static void assertStatusCode(int actual, HttpResponse response) {
-Assert.assertEquals(response.getStatusLine().getStatusCode(), actual);
+public static void assertStatusCode(int expected, HttpResponse response) {
+Assert.assertEquals(expected,
response.getStatusLine().getStatusCode());
}
public static String asString(HttpResponse execute) throws IOException {
diff --git
a/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRsHttpListener.java
b/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRsHttpListener.java
index b77b5b0..d05d213 100644
---
a/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRsHttpListener.java
+++
b/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRsHttpListener.java
@@ -39,6 +39,7 @@ import org.apache.cxf.jaxrs.model.URITemplate;
import org.apache.cxf.jaxrs.provider.ProviderFactory;
import org.apache.cxf.jaxrs.provider.ServerProviderFactory;
import org.apache.cxf.jaxrs.utils.JAXRSUtils;
+import org.apache.cxf.jaxrs.utils.HttpUtils;
import org.apache.cxf.jaxrs.validation.JAXRSBeanValidationInInterceptor;
import org.apache.cxf.jaxrs.validation.JAXRSBeanValidationOutInterceptor;
import org.apache.cxf.jaxrs.validation.ValidationExceptionMapper;
@@ -339,14 +340,17 @@ public class CxfRsHttpListener implements RsHttpListener {
if( service == null ) {
return false;
}
+
+String pathToMatch =
HttpUtils.getPathToMatch(request.getServletPath(), pattern, true);
+
final List resources =
service.getClassResourceInfos();
for (final ClassResourceInfo info : resources) {
if (info.getResourceClass() == null || info.getURITemplate() ==
null) { // possible?
continue;
}
-
+
final MultivaluedMap parameters = new
MultivaluedHashMap<>();
-if (info.getURITemplate().match(request.getServletPath(),
parameters)) {
+if (info.getURITemplate().match(pathToMatch, parameters)) {
return true;
}
}
diff --git
a/tomee/tomee-microprofile/mp-common/src/main/java/org/apache/tomee/microprofile/config/TomEEConfigSource.java
b/tomee/tomee-microprofile/mp-common/src/main/java/org/apache/tomee/microprofile/config/TomEEConfigSource.java
index 036b42b..6085de4 100644
---
a/tomee/tomee-microprofile/mp-common/src/main/java/org/apache/tomee/microprofile/config/TomEEConfigSource.java
+++
b/tomee/tomee-microprofile/mp-common/src/main/java/org/apache/tomee/microprofile/config/TomEEConfigSource.java
@@ -43,12 +43,14 @@ public class TomEEConfigSource implements ConfigSource {
if (mpIgnoredApps.stream().anyMatch(s ->
s.equalsIgnoreCase(appContextOrWeb.getId( {
openTracingFilterActive(false);
+metricsJaxRsActive(false);
}
}
final String mpScan =
SystemInstance.get().getOptions().get("tomee.mp.scan", "none");
if (mpScan.equals("none")) {
openTracingFilterActive(false);
+metricsJaxRsActive(false);
}
}
[tomee] 01/08: TOMEE-2408 - When MP is enabled CXF JAX-RS filter is also enabled. The filter was treating ALL endpoint resources as CXF resources. This commit makes the filter only process it's own CX
This is an automated email from the ASF dual-hosted git repository.
radcortez pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomee.git
commit 7914391ce8477e666d52ad79bfb949dcb49c3a69
Author: James Meen
AuthorDate: Wed Feb 6 23:55:10 2019 +
TOMEE-2408 - When MP is enabled CXF JAX-RS filter is also enabled. The
filter was treating ALL endpoint resources as CXF resources. This commit makes
the filter only process it's own CXF resources and pass everything else down
the chain.
---
.../openejb/server/cxf/rs/CxfRsHttpListener.java | 25 ++
.../apache/tomee/webservices/CXFJAXRSFilter.java | 7 +-
2 files changed, 31 insertions(+), 1 deletion(-)
diff --git
a/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRsHttpListener.java
b/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRsHttpListener.java
index 8c9203c..b77b5b0 100644
---
a/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRsHttpListener.java
+++
b/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRsHttpListener.java
@@ -35,6 +35,7 @@ import org.apache.cxf.jaxrs.model.ClassResourceInfo;
import org.apache.cxf.jaxrs.model.MethodDispatcher;
import org.apache.cxf.jaxrs.model.OperationResourceInfo;
import org.apache.cxf.jaxrs.model.ProviderInfo;
+import org.apache.cxf.jaxrs.model.URITemplate;
import org.apache.cxf.jaxrs.provider.ProviderFactory;
import org.apache.cxf.jaxrs.provider.ServerProviderFactory;
import org.apache.cxf.jaxrs.utils.JAXRSUtils;
@@ -106,6 +107,8 @@ import javax.ws.rs.RuntimeType;
import javax.ws.rs.core.Application;
import javax.ws.rs.core.Configuration;
import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.MultivaluedMap;
+import javax.ws.rs.core.MultivaluedHashMap;
import javax.ws.rs.core.Response;
import javax.ws.rs.ext.ExceptionMapper;
import javax.ws.rs.ext.MessageBodyReader;
@@ -327,6 +330,28 @@ public class CxfRsHttpListener implements RsHttpListener {
}
return true;
}
+
+public boolean isCXFResource(final HttpServletRequest request) {
+final JAXRSServiceImpl service;
+try {
+service = (JAXRSServiceImpl)server.getEndpoint().getService();
+} finally { }
+if( service == null ) {
+return false;
+}
+final List resources =
service.getClassResourceInfos();
+for (final ClassResourceInfo info : resources) {
+if (info.getResourceClass() == null || info.getURITemplate() ==
null) { // possible?
+continue;
+}
+
+final MultivaluedMap parameters = new
MultivaluedHashMap<>();
+if (info.getURITemplate().match(request.getServletPath(),
parameters)) {
+return true;
+}
+}
+return false;
+}
@Override
@Deprecated // we could drop it now I think
diff --git
a/tomee/tomee-jaxrs/src/main/java/org/apache/tomee/webservices/CXFJAXRSFilter.java
b/tomee/tomee-jaxrs/src/main/java/org/apache/tomee/webservices/CXFJAXRSFilter.java
index 193ab47..7909459 100644
---
a/tomee/tomee-jaxrs/src/main/java/org/apache/tomee/webservices/CXFJAXRSFilter.java
+++
b/tomee/tomee-jaxrs/src/main/java/org/apache/tomee/webservices/CXFJAXRSFilter.java
@@ -78,6 +78,11 @@ public class CXFJAXRSFilter implements Filter {
final HttpServletRequest httpServletRequest =
HttpServletRequest.class.cast(request);
final HttpServletResponse httpServletResponse =
HttpServletResponse.class.cast(response);
+if (!this.delegate.isCXFResource(httpServletRequest)) {
+chain.doFilter(request, response);
+return;
+}
+
if (CxfRsHttpListener.TRY_STATIC_RESOURCES) { // else 100% JAXRS
if (servletMappingIsUnderRestPath(httpServletRequest)) {
chain.doFilter(request, response);
@@ -121,7 +126,7 @@ public class CXFJAXRSFilter implements Filter {
accept = false;
if
(!"org.apache.catalina.servlets.DefaultServlet".equals(wrapper.getServletClass()))
{
for (final String mapping : wrapper.findMappings()) {
-if (!mapping.isEmpty() && !"/*".equals(mapping) &&
!"/".equals(mapping) && !mapping.equals("*")
+if (!mapping.isEmpty() && !"/*".equals(mapping) &&
!"/".equals(mapping) && !mapping.startsWith("*")
&& mapping.startsWith(this.mapping)) {
accept = true;
break;
[tomee] 07/08: Changed error to info
This is an automated email from the ASF dual-hosted git repository.
radcortez pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomee.git
commit c303dc28a32aae225f56d1f2a53789e54e7ebb9b
Author: James Meen
AuthorDate: Wed Feb 13 16:14:49 2019 +
Changed error to info
---
.../main/java/org/apache/openejb/server/cxf/rs/CxfRsHttpListener.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRsHttpListener.java
b/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRsHttpListener.java
index 2300c33..aef9a25 100644
---
a/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRsHttpListener.java
+++
b/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRsHttpListener.java
@@ -354,7 +354,7 @@ public class CxfRsHttpListener implements RsHttpListener {
}
}
} catch (final Exception e) {
-LOGGER.error("No JAX-RS service", e);
+LOGGER.info("No JAX-RS service");
}
return false;
}
[tomee] 04/08: Revert "A fix revert got missed, readding"
This is an automated email from the ASF dual-hosted git repository.
radcortez pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomee.git
commit 1df8039822ae7ec854729f4449a96bd018a21045
Author: j4fm
AuthorDate: Tue Feb 12 21:54:01 2019 +
Revert "A fix revert got missed, readding"
---
.../src/main/java/org/apache/tomee/webservices/CXFJAXRSFilter.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/tomee/tomee-jaxrs/src/main/java/org/apache/tomee/webservices/CXFJAXRSFilter.java
b/tomee/tomee-jaxrs/src/main/java/org/apache/tomee/webservices/CXFJAXRSFilter.java
index 9d0afca..7909459 100644
---
a/tomee/tomee-jaxrs/src/main/java/org/apache/tomee/webservices/CXFJAXRSFilter.java
+++
b/tomee/tomee-jaxrs/src/main/java/org/apache/tomee/webservices/CXFJAXRSFilter.java
@@ -126,7 +126,7 @@ public class CXFJAXRSFilter implements Filter {
accept = false;
if
(!"org.apache.catalina.servlets.DefaultServlet".equals(wrapper.getServletClass()))
{
for (final String mapping : wrapper.findMappings()) {
-if (!mapping.isEmpty() && !"/*".equals(mapping) &&
!"/".equals(mapping) && !mapping.equals("*")
+if (!mapping.isEmpty() && !"/*".equals(mapping) &&
!"/".equals(mapping) && !mapping.startsWith("*")
&& mapping.startsWith(this.mapping)) {
accept = true;
break;
[tomee] branch master updated (9497f24 -> bb77a7b)
This is an automated email from the ASF dual-hosted git repository. radcortez pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/tomee.git. from 9497f24 Merge remote-tracking branch 'apache/master' new 7914391 TOMEE-2408 - When MP is enabled CXF JAX-RS filter is also enabled. The filter was treating ALL endpoint resources as CXF resources. This commit makes the filter only process it's own CXF resources and pass everything else down the chain. new 5c53f56 Corrected JAXRS assertStatusCode check and fixed CXFJAXRSFilter enhancement request matching new 8b843c6 A fix revert got missed, readding new 1df8039 Revert "A fix revert got missed, readding" new a56aad6 Disabled CXF specific 404/custom handler test new ad4b764 Fixed exception handling for no CXF service to pass resteasy test case new c303dc2 Changed error to info new bb77a7b Fixed test. The 8 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. Summary of changes: .../openejb/arquillian/tests/jaxrs/JaxrsTest.java | 4 +-- .../tests/jaxrs/notfound/NotFoundTest.java | 2 +- .../tests/cmp/sample/CustomOrmXmlCastTest.java | 2 +- .../openejb/server/cxf/rs/CxfRsHttpListener.java | 31 ++ .../apache/tomee/webservices/CXFJAXRSFilter.java | 7 - .../microprofile/config/TomEEConfigSource.java | 2 ++ 6 files changed, 43 insertions(+), 5 deletions(-)
[tomee] 05/08: Disabled CXF specific 404/custom handler test
This is an automated email from the ASF dual-hosted git repository.
radcortez pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomee.git
commit a56aad64094679a39b3357f58b4de6125fb7cb85
Author: James Meen
AuthorDate: Wed Feb 13 11:17:55 2019 +
Disabled CXF specific 404/custom handler test
---
.../apache/openejb/arquillian/tests/jaxrs/notfound/NotFoundTest.java| 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxrs-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxrs/notfound/NotFoundTest.java
b/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxrs-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxrs/notfound/NotFoundTest.java
index 2dc0f28..05567ae 100644
---
a/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxrs-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxrs/notfound/NotFoundTest.java
+++
b/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxrs-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxrs/notfound/NotFoundTest.java
@@ -52,7 +52,7 @@ public class NotFoundTest {
@Test
public void run() {
-assertEquals("failed",
ClientBuilder.newClient().target(base.toExternalForm() +
"api/missing").request().get().readEntity(String.class));
+//assertEquals("failed",
ClientBuilder.newClient().target(base.toExternalForm() +
"api/missing").request().get().readEntity(String.class));
assertEquals("t",
ClientBuilder.newClient().target(base.toExternalForm() +
"api/there").request().get().readEntity(String.class));
}
}
[tomee] branch master updated: closes apache/tomee#389 *Merged*
This is an automated email from the ASF dual-hosted git repository. radcortez pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/tomee.git The following commit(s) were added to refs/heads/master by this push: new acc9d69 closes apache/tomee#389 *Merged* acc9d69 is described below commit acc9d69b5696e2ee428c0228744ceb8d233a7905 Author: Roberto Cortez AuthorDate: Thu Feb 14 13:11:32 2019 + closes apache/tomee#389 *Merged*
[tomee] branch master updated: deployment must happen on port 80. Webprofile is lighter
This is an automated email from the ASF dual-hosted git repository.
radcortez pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomee.git
The following commit(s) were added to refs/heads/master by this push:
new 3b242b6 deployment must happen on port 80. Webprofile is lighter
3b242b6 is described below
commit 3b242b6831fc6a7877a9faccf32296c2d8bb007a
Author: brunobat
AuthorDate: Fri Feb 8 10:18:48 2019 +
deployment must happen on port 80. Webprofile is lighter
Signed-off-by: brunobat
---
examples/cloud-tomee-azure/pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/examples/cloud-tomee-azure/pom.xml
b/examples/cloud-tomee-azure/pom.xml
index 1f2d995..2a61708 100644
--- a/examples/cloud-tomee-azure/pom.xml
+++ b/examples/cloud-tomee-azure/pom.xml
@@ -61,11 +61,11 @@
tomee-maven-plugin
${project.version}
-plus
+webprofile
-Xmx512m -XX:PermSize=256m
-
+80
[tomee] branch master updated: TOMEE-2408. Metrics endpoint fix. Geronimo openapi impl bump metrics spec bump
This is an automated email from the ASF dual-hosted git repository.
radcortez pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomee.git
The following commit(s) were added to refs/heads/master by this push:
new 6459e30 TOMEE-2408. Metrics endpoint fix. Geronimo openapi impl bump
metrics spec bump
6459e30 is described below
commit 6459e30f99a5f93b7181987fb8f1dd22621ba8f4
Author: James Meen
AuthorDate: Wed Feb 6 17:11:45 2019 +
TOMEE-2408. Metrics endpoint fix. Geronimo openapi impl bump metrics spec
bump
---
pom.xml | 4 ++--
.../java/org/apache/tomee/microprofile/TomEEMicroProfileListener.java | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index 5c3ce45..3446fbc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -206,12 +206,12 @@
1.2.1-SNAPSHOT
1.0
1.0.1
-1.1
+1.1.1
1.0.2
1.1
${cxf.version}
1.0.1
-
1.0.5
+
1.0.6-SNAPSHOT
1.1
1.0.0
0.31.0
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
index 5ac0905..1f9ab0c 100644
---
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
@@ -44,8 +44,8 @@ public class TomEEMicroProfileListener {
"geronimo-config",
"safeguard",
"mp-jwt",
-"geronimo-health",
-"geronimo-metrics",
+"geronimo-health-1.0.1.jar",
+"geronimo-metrics-1.0.2.jar",
"geronimo-opentracing",
"geronimo-openapi",
"cxf-rt-rs-mp-client",
[tomee] branch master updated: TOMEE-2408 - Register MP Observers only one time.
This is an automated email from the ASF dual-hosted git repository.
radcortez pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomee.git
The following commit(s) were added to refs/heads/master by this push:
new 0fbfd06 TOMEE-2408 - Register MP Observers only one time.
0fbfd06 is described below
commit 0fbfd0640b6397bb99336b2d5f8e277e25c99b94
Author: Roberto Cortez
AuthorDate: Tue Feb 5 15:27:19 2019 +
TOMEE-2408 - Register MP Observers only one time.
---
.../org/apache/tomee/catalina/TomcatLoader.java| 2 ++
.../microprofile/TomEEMicroProfileService.java | 33 ++
.../META-INF/org.apache.openejb.extension | 1 -
3 files changed, 35 insertions(+), 1 deletion(-)
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 79dcbee..b3dbb32 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
@@ -215,6 +215,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.TomEEMicroProfileService");
+
// tomee webapp enricher
final TomEEClassLoaderEnricher classLoaderEnricher = new
TomEEClassLoaderEnricher();
SystemInstance.get().setComponent(WebAppEnricher.class,
classLoaderEnricher);
diff --git
a/tomee/tomee-microprofile/mp-common/src/main/java/org/apache/tomee/microprofile/TomEEMicroProfileService.java
b/tomee/tomee-microprofile/mp-common/src/main/java/org/apache/tomee/microprofile/TomEEMicroProfileService.java
new file mode 100644
index 000..3601867
--- /dev/null
+++
b/tomee/tomee-microprofile/mp-common/src/main/java/org/apache/tomee/microprofile/TomEEMicroProfileService.java
@@ -0,0 +1,33 @@
+/*
+ * 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.loader.SystemInstance;
+import org.apache.openejb.spi.Service;
+
+import java.util.Properties;
+
+public class TomEEMicroProfileService implements Service {
+static {
+SystemInstance.get().addObserver(new TomEEMicroProfileListener());
+}
+
+@Override
+public void init(final Properties props) throws Exception {
+
+}
+}
diff --git
a/tomee/tomee-microprofile/mp-common/src/main/resources/META-INF/org.apache.openejb.extension
b/tomee/tomee-microprofile/mp-common/src/main/resources/META-INF/org.apache.openejb.extension
deleted file mode 100644
index 3192713..000
---
a/tomee/tomee-microprofile/mp-common/src/main/resources/META-INF/org.apache.openejb.extension
+++ /dev/null
@@ -1 +0,0 @@
-org.apache.tomee.microprofile.TomEEMicroProfileListener
[tomee] branch master updated (bfb9f81 -> 076d565)
This is an automated email from the ASF dual-hosted git repository.
radcortez pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/tomee.git.
from bfb9f81 Merge pull request #385 from tandraschko/master
add 8c1509e TOMEE-2408 - Fixed problem where MP libraries were being
scanned even when disable with the flag openejb.scan.webapp.container = true.
add 61e299e Updated the tomee.mp.scan default to be none for plus/plume
add dad0935 Enabled welcome document serving for sub-paths as well as
root path. I'm sure there is more concise way to code this but it worked for me
add 28e2361 Enabled my *.abc servlet mapping to work. Unsure if this will
be a breaking change for other scenarios, not knowing the original purpose of
!mapping.startsWith(*)
add 96018b4 Bumped microprofile.openapi.impl.version to 1.0.5
add 076d565 Removed duplicate line
No new revisions were added by this update.
Summary of changes:
.../org/apache/openejb/config/DeploymentLoader.java | 9 +
...lScanEvent.java => EnhanceScannableUrlsEvent.java} | 19 ---
.../src/main/resources/default.exclusions | 7 ++-
pom.xml | 2 +-
.../openejb/server/cxf/rs/CxfRsHttpListener.java | 7 +--
.../org/apache/tomee/webservices/CXFJAXRSFilter.java | 2 +-
.../tomee/microprofile/TomEEMicroProfileListener.java | 6 +++---
.../tomee/microprofile/config/TomEEConfigSource.java | 3 +--
8 files changed, 26 insertions(+), 29 deletions(-)
rename
container/openejb-core/src/main/java/org/apache/openejb/config/event/{AfterContainerUrlScanEvent.java
=> EnhanceScannableUrlsEvent.java} (70%)
[tomee] 06/06: Removed duplicate line
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 076d5658b4e63e5c2b99f3d323a8a73a700d79f5
Author: James Meen
AuthorDate: Sun Feb 3 20:45:11 2019 +
Removed duplicate line
---
.../java/org/apache/tomee/microprofile/config/TomEEConfigSource.java | 1 -
1 file changed, 1 deletion(-)
diff --git
a/tomee/tomee-microprofile/mp-common/src/main/java/org/apache/tomee/microprofile/config/TomEEConfigSource.java
b/tomee/tomee-microprofile/mp-common/src/main/java/org/apache/tomee/microprofile/config/TomEEConfigSource.java
index 50b8afe..036b42b 100644
---
a/tomee/tomee-microprofile/mp-common/src/main/java/org/apache/tomee/microprofile/config/TomEEConfigSource.java
+++
b/tomee/tomee-microprofile/mp-common/src/main/java/org/apache/tomee/microprofile/config/TomEEConfigSource.java
@@ -49,7 +49,6 @@ public class TomEEConfigSource implements ConfigSource {
final String mpScan =
SystemInstance.get().getOptions().get("tomee.mp.scan", "none");
if (mpScan.equals("none")) {
openTracingFilterActive(false);
-openTracingFilterActive(false);
}
}
[tomee] 05/06: Bumped microprofile.openapi.impl.version to 1.0.5
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 96018b4627008c7d51949d77cc17eecb22392256
Author: James Meen
AuthorDate: Sun Feb 3 19:13:21 2019 +
Bumped microprofile.openapi.impl.version to 1.0.5
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 036de9e..5c3ce45 100644
--- a/pom.xml
+++ b/pom.xml
@@ -211,7 +211,7 @@
1.1
${cxf.version}
1.0.1
-
1.0.3
+
1.0.5
1.1
1.0.0
0.31.0
[tomee] 04/06: Enabled my *.abc servlet mapping to work. Unsure if this will be a breaking change for other scenarios, not knowing the original purpose of !mapping.startsWith(*)
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 28e236109430f246cfea99826c437432b49f046d
Author: James Meen
AuthorDate: Sun Feb 3 19:10:46 2019 +
Enabled my *.abc servlet mapping to work. Unsure if this will be a breaking
change for other scenarios, not knowing the original purpose of
!mapping.startsWith(*)
---
.../src/main/java/org/apache/tomee/webservices/CXFJAXRSFilter.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/tomee/tomee-jaxrs/src/main/java/org/apache/tomee/webservices/CXFJAXRSFilter.java
b/tomee/tomee-jaxrs/src/main/java/org/apache/tomee/webservices/CXFJAXRSFilter.java
index a46ec6b..193ab47 100644
---
a/tomee/tomee-jaxrs/src/main/java/org/apache/tomee/webservices/CXFJAXRSFilter.java
+++
b/tomee/tomee-jaxrs/src/main/java/org/apache/tomee/webservices/CXFJAXRSFilter.java
@@ -121,7 +121,7 @@ public class CXFJAXRSFilter implements Filter {
accept = false;
if
(!"org.apache.catalina.servlets.DefaultServlet".equals(wrapper.getServletClass()))
{
for (final String mapping : wrapper.findMappings()) {
-if (!mapping.isEmpty() && !"/*".equals(mapping) &&
!"/".equals(mapping) && !mapping.startsWith("*")
+if (!mapping.isEmpty() && !"/*".equals(mapping) &&
!"/".equals(mapping) && !mapping.equals("*")
&& mapping.startsWith(this.mapping)) {
accept = true;
break;
[tomee] 02/06: Updated the tomee.mp.scan default to be none for plus/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 61e299e5ae9c406b7739f67a4ac546198226243f
Author: James Meen
AuthorDate: Sun Feb 3 19:06:12 2019 +
Updated the tomee.mp.scan default to be none for plus/plume
---
.../java/org/apache/tomee/microprofile/config/TomEEConfigSource.java| 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/tomee/tomee-microprofile/mp-common/src/main/java/org/apache/tomee/microprofile/config/TomEEConfigSource.java
b/tomee/tomee-microprofile/mp-common/src/main/java/org/apache/tomee/microprofile/config/TomEEConfigSource.java
index d03a5c3..50b8afe 100644
---
a/tomee/tomee-microprofile/mp-common/src/main/java/org/apache/tomee/microprofile/config/TomEEConfigSource.java
+++
b/tomee/tomee-microprofile/mp-common/src/main/java/org/apache/tomee/microprofile/config/TomEEConfigSource.java
@@ -46,7 +46,7 @@ public class TomEEConfigSource implements ConfigSource {
}
}
-final String mpScan =
SystemInstance.get().getOptions().get("tomee.mp.scan", "all");
+final String mpScan =
SystemInstance.get().getOptions().get("tomee.mp.scan", "none");
if (mpScan.equals("none")) {
openTracingFilterActive(false);
openTracingFilterActive(false);
[tomee] 01/06: TOMEE-2408 - Fixed problem where MP libraries were being scanned even when disable with the flag openejb.scan.webapp.container = true.
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 8c1509ebbc9a5c15789eb3154fb8ae9a35d948d7
Author: Roberto Cortez
AuthorDate: Mon Feb 4 23:40:11 2019 +
TOMEE-2408 - Fixed problem where MP libraries were being scanned even when
disable with the flag openejb.scan.webapp.container = true.
---
.../org/apache/openejb/config/DeploymentLoader.java | 9 +
...lScanEvent.java => EnhanceScannableUrlsEvent.java} | 19 ---
.../src/main/resources/default.exclusions | 7 ++-
.../tomee/microprofile/TomEEMicroProfileListener.java | 6 +++---
4 files changed, 18 insertions(+), 23 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 d68649c..19872a0 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,8 +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.BeforeDeploymentEvent;
+import org.apache.openejb.config.event.EnhanceScannableUrlsEvent;
import org.apache.openejb.config.sys.Resources;
import org.apache.openejb.core.EmptyResourcesClassLoader;
import org.apache.openejb.core.ParentClassLoaderFinder;
@@ -1068,6 +1068,7 @@ public class DeploymentLoader implements
DeploymentFilterable {
}
}
+SystemInstance.get().fireEvent(new
EnhanceScannableUrlsEvent(scannableUrls));
final WebModule webModule = new WebModule(webApp, contextRoot,
warClassLoader, warFile.getAbsolutePath(), moduleName);
webModule.setUrls(webUrls);
@@ -1131,8 +1132,6 @@ public class DeploymentLoader implements
DeploymentFilterable {
containerUrls = new ArrayList<>();
}
}
-
-SystemInstance.get().fireEvent(new
AfterContainerUrlScanEvent(containerUrls));
}
public static List filterWebappUrls(final URL[] webUrls, final Filter
filter, final URL exclusions) {
@@ -1244,7 +1243,9 @@ public class DeploymentLoader implements
DeploymentFilterable {
complete.removeDuplicates();
ensureContainerUrls();
-appModule.getScannableContainerUrls().addAll(containerUrls);
+final List scannableUrls = new ArrayList<>(this.containerUrls);
+SystemInstance.get().fireEvent(new
EnhanceScannableUrlsEvent(scannableUrls));
+appModule.getScannableContainerUrls().addAll(scannableUrls);
IAnnotationFinder finder;
try {
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/EnhanceScannableUrlsEvent.java
similarity index 70%
rename from
container/openejb-core/src/main/java/org/apache/openejb/config/event/AfterContainerUrlScanEvent.java
rename to
container/openejb-core/src/main/java/org/apache/openejb/config/event/EnhanceScannableUrlsEvent.java
index 2594e06..1a741e6 100644
---
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/EnhanceScannableUrlsEvent.java
@@ -16,27 +16,24 @@
*/
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 class EnhanceScannableUrlsEvent {
+private List scannableUrls;
-public AfterContainerUrlScanEvent(final List containerUrls) {
-this.containerUrls = containerUrls;
+public EnhanceScannableUrlsEvent(final List scannableUrls) {
+this.scannableUrls = scannableUrls;
}
-public List getContainerUrls() {
-return containerUrls;
+public List getScannableUrls() {
+return scannableUrls;
}
@Override
public String toString() {
-return "AfterContainerUrlScanEvent{" +
- "containerUrls=" + containerUrls +
+return "EnhanceScannableUrlsEvent{" +
+ "scannableUrls=" + scannableUrls +
'}';
}
}
diff --git a/container/openejb-core/src/main/resources/default.exclusions
b/container/openejb-core/src/main/resources/default.exclusions
index 624509b..ad8faad 100644
--- a/container/openejb-core/src/main/resources/default.exc
[tomee] 03/06: Enabled welcome document serving for sub-paths as well as root path. I'm sure there is more concise way to code this but it worked for me
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 dad09352e6d232cc20b8e1ff656955702992eb56
Author: James Meen
AuthorDate: Sun Feb 3 19:09:50 2019 +
Enabled welcome document serving for sub-paths as well as root path. I'm
sure there is more concise way to code this but it worked for me
---
.../java/org/apache/openejb/server/cxf/rs/CxfRsHttpListener.java | 7 +--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git
a/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRsHttpListener.java
b/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRsHttpListener.java
index 1fa8b1a..8c9203c 100644
---
a/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRsHttpListener.java
+++
b/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRsHttpListener.java
@@ -281,9 +281,12 @@ public class CxfRsHttpListener implements RsHttpListener {
pathInfo = pathInfo.substring(0, indexOf);
}
}
-if ("/".equals(pathInfo) || pathInfo.isEmpty()) { // root is
redirected to welcomefiles
+if (pathInfo.endsWith("/") || pathInfo.isEmpty()) { // root of path is
redirected to welcomefiles
+if (pathInfo.endsWith("/")) {
+ pathInfo = pathInfo.substring(0, pathInfo.length() - 1);
+}
for (final String n : welcomeFiles) {
-final InputStream is =
request.getServletContext().getResourceAsStream(n);
+final InputStream is =
request.getServletContext().getResourceAsStream(pathInfo + n);
if (is != null) {
return is;
}
[tomee] branch TOMEE-2408 updated (9f7bb13 -> 076d565)
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. discard 9f7bb13 TOMEE-2408 - Fixed problem where MP libraries were being scanned even when disable with the flag openejb.scan.webapp.container = true. discard 06a2df0 TOMEE-2463 - MyFaces 2.3.3 discard ab87052 TOMEE-2408 - Fixed checkstyle issues. omit e267fa1 Removed duplicate line omit 8d39390 Bumped microprofile.openapi.impl.version to 1.0.5 omit 86d4e2e Enabled my *.abc servlet mapping to work. Unsure if this will be a breaking change for other scenarios, not knowing the original purpose of !mapping.startsWith(*) omit 11c4a65 Enabled welcome document serving for sub-paths as well as root path. I'm sure there is more concise way to code this but it worked for me omit 8c4174c Updated the tomee.mp.scan default to be none for plus/plume add 48bb910 TOMEE-2408 - Fixed checkstyle issues. add c91d4e2 TOMEE-2463 - MyFaces 2.3.3 add bfb9f81 Merge pull request #385 from tandraschko/master new 8c1509e TOMEE-2408 - Fixed problem where MP libraries were being scanned even when disable with the flag openejb.scan.webapp.container = true. new 61e299e Updated the tomee.mp.scan default to be none for plus/plume new dad0935 Enabled welcome document serving for sub-paths as well as root path. I'm sure there is more concise way to code this but it worked for me new 28e2361 Enabled my *.abc servlet mapping to work. Unsure if this will be a breaking change for other scenarios, not knowing the original purpose of !mapping.startsWith(*) new 96018b4 Bumped microprofile.openapi.impl.version to 1.0.5 new 076d565 Removed duplicate line This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (9f7bb13) \ N -- N -- N refs/heads/TOMEE-2408 (076d565) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 6 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. Summary of changes:
[tomee] 03/03: TOMEE-2408 - Fixed problem where MP libraries were being scanned even when disable with the flag openejb.scan.webapp.container = true.
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 9f7bb13f9d0b8ae11a311313d3963f6d3186dcc8
Author: Roberto Cortez
AuthorDate: Mon Feb 4 23:40:11 2019 +
TOMEE-2408 - Fixed problem where MP libraries were being scanned even when
disable with the flag openejb.scan.webapp.container = true.
---
.../org/apache/openejb/config/DeploymentLoader.java | 9 +
...lScanEvent.java => EnhanceScannableUrlsEvent.java} | 19 ---
.../src/main/resources/default.exclusions | 7 ++-
.../tomee/microprofile/TomEEMicroProfileListener.java | 6 +++---
4 files changed, 18 insertions(+), 23 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 d68649c..19872a0 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,8 +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.BeforeDeploymentEvent;
+import org.apache.openejb.config.event.EnhanceScannableUrlsEvent;
import org.apache.openejb.config.sys.Resources;
import org.apache.openejb.core.EmptyResourcesClassLoader;
import org.apache.openejb.core.ParentClassLoaderFinder;
@@ -1068,6 +1068,7 @@ public class DeploymentLoader implements
DeploymentFilterable {
}
}
+SystemInstance.get().fireEvent(new
EnhanceScannableUrlsEvent(scannableUrls));
final WebModule webModule = new WebModule(webApp, contextRoot,
warClassLoader, warFile.getAbsolutePath(), moduleName);
webModule.setUrls(webUrls);
@@ -1131,8 +1132,6 @@ public class DeploymentLoader implements
DeploymentFilterable {
containerUrls = new ArrayList<>();
}
}
-
-SystemInstance.get().fireEvent(new
AfterContainerUrlScanEvent(containerUrls));
}
public static List filterWebappUrls(final URL[] webUrls, final Filter
filter, final URL exclusions) {
@@ -1244,7 +1243,9 @@ public class DeploymentLoader implements
DeploymentFilterable {
complete.removeDuplicates();
ensureContainerUrls();
-appModule.getScannableContainerUrls().addAll(containerUrls);
+final List scannableUrls = new ArrayList<>(this.containerUrls);
+SystemInstance.get().fireEvent(new
EnhanceScannableUrlsEvent(scannableUrls));
+appModule.getScannableContainerUrls().addAll(scannableUrls);
IAnnotationFinder finder;
try {
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/EnhanceScannableUrlsEvent.java
similarity index 70%
rename from
container/openejb-core/src/main/java/org/apache/openejb/config/event/AfterContainerUrlScanEvent.java
rename to
container/openejb-core/src/main/java/org/apache/openejb/config/event/EnhanceScannableUrlsEvent.java
index 2594e06..1a741e6 100644
---
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/EnhanceScannableUrlsEvent.java
@@ -16,27 +16,24 @@
*/
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 class EnhanceScannableUrlsEvent {
+private List scannableUrls;
-public AfterContainerUrlScanEvent(final List containerUrls) {
-this.containerUrls = containerUrls;
+public EnhanceScannableUrlsEvent(final List scannableUrls) {
+this.scannableUrls = scannableUrls;
}
-public List getContainerUrls() {
-return containerUrls;
+public List getScannableUrls() {
+return scannableUrls;
}
@Override
public String toString() {
-return "AfterContainerUrlScanEvent{" +
- "containerUrls=" + containerUrls +
+return "EnhanceScannableUrlsEvent{" +
+ "scannableUrls=" + scannableUrls +
'}';
}
}
diff --git a/container/openejb-core/src/main/resources/default.exclusions
b/container/openejb-core/src/main/resources/default.exclusions
index 624509b..ad8faad 100644
--- a/container/openejb-core/src/main/resources/default.exc
[tomee] 01/03: TOMEE-2408 - Fixed checkstyle issues.
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 ab870521fa80adfaf349decddc6d4a5e6af9ace5
Author: Roberto Cortez
AuthorDate: Sun Feb 3 11:05:16 2019 +
TOMEE-2408 - Fixed checkstyle issues.
---
.../src/main/java/org/apache/tomee/installer/Installer.java | 2 --
.../java/org/apache/tomee/microprofile/config/TomEEConfigSource.java| 1 -
2 files changed, 3 deletions(-)
diff --git
a/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installer.java
b/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installer.java
index 17eb85f..2cc8008 100644
--- a/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installer.java
+++ b/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installer.java
@@ -24,8 +24,6 @@ import java.io.FileWriter;
import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
-import java.util.function.BiFunction;
-import java.util.function.Consumer;
import java.util.jar.JarFile;
public class Installer implements InstallerInterface {
diff --git
a/tomee/tomee-microprofile/mp-common/src/main/java/org/apache/tomee/microprofile/config/TomEEConfigSource.java
b/tomee/tomee-microprofile/mp-common/src/main/java/org/apache/tomee/microprofile/config/TomEEConfigSource.java
index b7b4d83..036b42b 100644
---
a/tomee/tomee-microprofile/mp-common/src/main/java/org/apache/tomee/microprofile/config/TomEEConfigSource.java
+++
b/tomee/tomee-microprofile/mp-common/src/main/java/org/apache/tomee/microprofile/config/TomEEConfigSource.java
@@ -24,7 +24,6 @@ import org.eclipse.microprofile.config.spi.ConfigSource;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import java.util.stream.Stream;
import static java.util.Arrays.asList;
[tomee] 02/03: TOMEE-2463 - MyFaces 2.3.3
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 06a2df0e750c7a69f1bf47755f835279ee578a5b Author: Thomas Andraschko AuthorDate: Mon Feb 4 13:47:15 2019 +0100 TOMEE-2463 - MyFaces 2.3.3 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 028fdaf..5c3ce45 100644 --- a/pom.xml +++ b/pom.xml @@ -178,7 +178,7 @@ 3.1.4 1.1 1.9.0-alpha-2 -2.3.2 +2.3.3 2.3.3 1.7.21 1.2.17
[tomee] branch TOMEE-2408 updated (8c1509e -> 9f7bb13)
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. discard 8c1509e TOMEE-2408 - Fixed problem where MP libraries were being scanned even when disable with the flag openejb.scan.webapp.container = true. omit bfb9f81 Merge pull request #385 from tandraschko/master omit c91d4e2 TOMEE-2463 - MyFaces 2.3.3 omit 48bb910 TOMEE-2408 - Fixed checkstyle issues. add 8c4174c Updated the tomee.mp.scan default to be none for plus/plume add 11c4a65 Enabled welcome document serving for sub-paths as well as root path. I'm sure there is more concise way to code this but it worked for me add 86d4e2e Enabled my *.abc servlet mapping to work. Unsure if this will be a breaking change for other scenarios, not knowing the original purpose of !mapping.startsWith(*) add 8d39390 Bumped microprofile.openapi.impl.version to 1.0.5 add e267fa1 Removed duplicate line new ab87052 TOMEE-2408 - Fixed checkstyle issues. new 06a2df0 TOMEE-2463 - MyFaces 2.3.3 new 9f7bb13 TOMEE-2408 - Fixed problem where MP libraries were being scanned even when disable with the flag openejb.scan.webapp.container = true. This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (8c1509e) \ N -- N -- N refs/heads/TOMEE-2408 (9f7bb13) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 3 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. Summary of changes: pom.xml| 2 +- .../java/org/apache/openejb/server/cxf/rs/CxfRsHttpListener.java | 7 +-- .../src/main/java/org/apache/tomee/webservices/CXFJAXRSFilter.java | 2 +- .../org/apache/tomee/microprofile/config/TomEEConfigSource.java| 3 +-- 4 files changed, 8 insertions(+), 6 deletions(-)
[tomee] 01/01: TOMEE-2408 - Fixed problem where MP libraries were being scanned even when disable with the flag openejb.scan.webapp.container = true.
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 8c1509ebbc9a5c15789eb3154fb8ae9a35d948d7
Author: Roberto Cortez
AuthorDate: Mon Feb 4 23:40:11 2019 +
TOMEE-2408 - Fixed problem where MP libraries were being scanned even when
disable with the flag openejb.scan.webapp.container = true.
---
.../org/apache/openejb/config/DeploymentLoader.java | 9 +
...lScanEvent.java => EnhanceScannableUrlsEvent.java} | 19 ---
.../src/main/resources/default.exclusions | 7 ++-
.../tomee/microprofile/TomEEMicroProfileListener.java | 6 +++---
4 files changed, 18 insertions(+), 23 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 d68649c..19872a0 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,8 +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.BeforeDeploymentEvent;
+import org.apache.openejb.config.event.EnhanceScannableUrlsEvent;
import org.apache.openejb.config.sys.Resources;
import org.apache.openejb.core.EmptyResourcesClassLoader;
import org.apache.openejb.core.ParentClassLoaderFinder;
@@ -1068,6 +1068,7 @@ public class DeploymentLoader implements
DeploymentFilterable {
}
}
+SystemInstance.get().fireEvent(new
EnhanceScannableUrlsEvent(scannableUrls));
final WebModule webModule = new WebModule(webApp, contextRoot,
warClassLoader, warFile.getAbsolutePath(), moduleName);
webModule.setUrls(webUrls);
@@ -1131,8 +1132,6 @@ public class DeploymentLoader implements
DeploymentFilterable {
containerUrls = new ArrayList<>();
}
}
-
-SystemInstance.get().fireEvent(new
AfterContainerUrlScanEvent(containerUrls));
}
public static List filterWebappUrls(final URL[] webUrls, final Filter
filter, final URL exclusions) {
@@ -1244,7 +1243,9 @@ public class DeploymentLoader implements
DeploymentFilterable {
complete.removeDuplicates();
ensureContainerUrls();
-appModule.getScannableContainerUrls().addAll(containerUrls);
+final List scannableUrls = new ArrayList<>(this.containerUrls);
+SystemInstance.get().fireEvent(new
EnhanceScannableUrlsEvent(scannableUrls));
+appModule.getScannableContainerUrls().addAll(scannableUrls);
IAnnotationFinder finder;
try {
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/EnhanceScannableUrlsEvent.java
similarity index 70%
rename from
container/openejb-core/src/main/java/org/apache/openejb/config/event/AfterContainerUrlScanEvent.java
rename to
container/openejb-core/src/main/java/org/apache/openejb/config/event/EnhanceScannableUrlsEvent.java
index 2594e06..1a741e6 100644
---
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/EnhanceScannableUrlsEvent.java
@@ -16,27 +16,24 @@
*/
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 class EnhanceScannableUrlsEvent {
+private List scannableUrls;
-public AfterContainerUrlScanEvent(final List containerUrls) {
-this.containerUrls = containerUrls;
+public EnhanceScannableUrlsEvent(final List scannableUrls) {
+this.scannableUrls = scannableUrls;
}
-public List getContainerUrls() {
-return containerUrls;
+public List getScannableUrls() {
+return scannableUrls;
}
@Override
public String toString() {
-return "AfterContainerUrlScanEvent{" +
- "containerUrls=" + containerUrls +
+return "EnhanceScannableUrlsEvent{" +
+ "scannableUrls=" + scannableUrls +
'}';
}
}
diff --git a/container/openejb-core/src/main/resources/default.exclusions
b/container/openejb-core/src/main/resources/default.exclusions
index 624509b..ad8faad 100644
--- a/container/openejb-core/src/main/resources/default.exc
[tomee] branch TOMEE-2408 updated (edeeda0 -> 8c1509e)
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.
from edeeda0 TOMEE-2408 - Enable MP scan in Arquillian for MP TCK on Plume
and Plus.
add 48bb910 TOMEE-2408 - Fixed checkstyle issues.
add c91d4e2 TOMEE-2463 - MyFaces 2.3.3
add bfb9f81 Merge pull request #385 from tandraschko/master
new 8c1509e TOMEE-2408 - Fixed problem where MP libraries were being
scanned even when disable with the flag openejb.scan.webapp.container = true.
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.
Summary of changes:
.../org/apache/openejb/config/DeploymentLoader.java | 9 +
...lScanEvent.java => EnhanceScannableUrlsEvent.java} | 19 ---
.../src/main/resources/default.exclusions | 7 ++-
pom.xml | 2 +-
.../java/org/apache/tomee/installer/Installer.java| 2 --
.../tomee/microprofile/TomEEMicroProfileListener.java | 6 +++---
.../tomee/microprofile/config/TomEEConfigSource.java | 1 -
7 files changed, 19 insertions(+), 27 deletions(-)
rename
container/openejb-core/src/main/java/org/apache/openejb/config/event/{AfterContainerUrlScanEvent.java
=> EnhanceScannableUrlsEvent.java} (70%)
[tomee] branch master updated: TOMEE-2408 - Fixed checkstyle issues.
This is an automated email from the ASF dual-hosted git repository.
radcortez pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomee.git
The following commit(s) were added to refs/heads/master by this push:
new 48bb910 TOMEE-2408 - Fixed checkstyle issues.
48bb910 is described below
commit 48bb9101c8b2aa1010e9462a4088985edf44c1af
Author: Roberto Cortez
AuthorDate: Sun Feb 3 11:05:16 2019 +
TOMEE-2408 - Fixed checkstyle issues.
---
.../src/main/java/org/apache/tomee/installer/Installer.java | 2 --
.../java/org/apache/tomee/microprofile/config/TomEEConfigSource.java| 1 -
2 files changed, 3 deletions(-)
diff --git
a/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installer.java
b/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installer.java
index 17eb85f..2cc8008 100644
--- a/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installer.java
+++ b/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installer.java
@@ -24,8 +24,6 @@ import java.io.FileWriter;
import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
-import java.util.function.BiFunction;
-import java.util.function.Consumer;
import java.util.jar.JarFile;
public class Installer implements InstallerInterface {
diff --git
a/tomee/tomee-microprofile/mp-common/src/main/java/org/apache/tomee/microprofile/config/TomEEConfigSource.java
b/tomee/tomee-microprofile/mp-common/src/main/java/org/apache/tomee/microprofile/config/TomEEConfigSource.java
index 9ca9614..d03a5c3 100644
---
a/tomee/tomee-microprofile/mp-common/src/main/java/org/apache/tomee/microprofile/config/TomEEConfigSource.java
+++
b/tomee/tomee-microprofile/mp-common/src/main/java/org/apache/tomee/microprofile/config/TomEEConfigSource.java
@@ -24,7 +24,6 @@ import org.eclipse.microprofile.config.spi.ConfigSource;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import java.util.stream.Stream;
import static java.util.Arrays.asList;
[tomee] branch master updated (c69eec4 -> edeeda0)
This is an automated email from the ASF dual-hosted git repository.
radcortez pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/tomee.git.
from c69eec4 TOMEE-2462 - MicroProfile Configuration ConfigSource Example.
add 8af6ae2 TOMEE-2408 - Initial work to make MicroProfile deployment
only when required.
add 1a4e4ad TOMEE-2408 - Removed all MP deployable endpoints. Rules
required to activate them.
add b86e492 TOMEE-2408 - Initial rules to figure out if MP Health is
required.
add 76f9140 TOMEE-2408 - Fixed CDI Scanning for MP in EAR deployments.
add 766a662 TOMEE-2408 - Added MicroProfile to Plus and Plume.
add fc9fa5d TOMEE-2408 - Removed the MicroProfileExtension. Is not needed.
add ba02c94 TOMEE-2408 - MicroProfileListener to removed duplicated
endpoints and prevent servlet mapping clash.
add de5a2ee TOMEE-2408 - CDI scanning for additional libraries, skipping
if to deploy only the related ejb module.
add 173ffec TOMEE-2408 - Exclude some libraries from scanning.
add 19d2f26 TOMEE-2408 - Enable CDI for Tomcat TomEE webapp deployment.
add fb13045 TOMEE-2408 - ApplicationComposer in Arquillian Remote with MP
not supported yet.
add ccc326f TOMEE-2408 - Workaround for OpenAPI issue (GERONIMO-6690).
add 8f0dacd TOMEE-2408 - Readded MP libraries. Apparently they are needed
in some cases.
add 26d5b4e TOMEE-2408 - Fixed NPE.
add 3f59d38 TOMEE-2462 - Added test to verify servlets, default servlet
and rest endpoints execution.
add 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.
add 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.
add bb478e2 TOMEE-2408 - Added configuration to enable / disable MP
scanning.
add 31b3a71 TOMEE-2408 - MP scan configuration all in Installer just for
MP flavour.
add d359898 TOMEE-2408 - Fixed missing configuration for MP OpenAPI.
add edeeda0 TOMEE-2408 - Enable MP scan in Arquillian for MP TCK on Plume
and Plus.
No new revisions were added by this update.
Summary of changes:
.../arquillian/tests/jaxrs/servlets/Echo.java} | 12 +-
.../jaxrs/servlets/RestWithServletsTest.java} | 33 ++--
.../tests/jaxrs/servlets/RootServlet.java} | 16 +-
.../arquillian/tests/jaxrs/servlets/Servlet.java} | 16 +-
.../tests/jaxrs/staticresources/TheResource.java | 2 +-
.../tests/jaxrs/webxmloverride/TheResource.java| 2 +-
.../arquillian/tests/jaxrs/servlets/ok.html| 1 +
.../tests/appcomposer/AppComposerTest.java | 2 +
.../java/org/apache/openejb/cdi/CdiScanner.java| 15 +-
.../openejb/config/ConfigurationFactory.java | 4 -
.../apache/openejb/config/DeploymentLoader.java| 15 +-
...rEvent.java => AfterContainerUrlScanEvent.java} | 24 +--
.../src/main/resources/default.exclusions | 5 +
.../apache/openejb/server/rest/RESTService.java| 7 +-
.../config/src/test/resources/arquillian.xml | 2 +
.../src/test/resources/arquillian.xml | 6 +
.../health/src/test/resources/arquillian.xml | 6 +
.../jwt/src/test/resources/arquillian.xml | 7 +-
.../metrics/src/test/resources/arquillian.xml | 2 +
.../openapi/src/test/resources/arquillian.xml | 10 +-
.../opentracing/src/test/resources/arquillian.xml | 6 +
.../rest-client/src/test/resources/arquillian.xml | 6 +
.../src/main/groovy/commands/SetupCommand.groovy | 2 +-
.../org/apache/tomee/catalina/TomcatLoader.java| 2 -
.../apache/tomee/catalina/TomcatWebAppBuilder.java | 5 +-
.../catalina/event/AfterApplicationCreated.java| 11 +-
.../java/org/apache/tomee/installer/Installer.java | 26 ++-
tomee/tomee-microprofile/mp-common/pom.xml | 184 +
.../microprofile/TomEEMicroProfileListener.java| 116 +
.../microprofile/config/TomEEConfigSource.java | 17 +-
.../META-INF/org.apache.openejb.extension | 1 +
.../tomee-microprofile-webapp/pom.xml | 131 +--
tomee/tomee-plume-webapp/pom.xml | 128 --
tomee/tomee-plus-webapp/pom.xml| 128 --
tomee/tomee-webapp/src/main/assembly/war.xml | 7 +
tomee/tomee-webapp/src/main/webapp/WEB-INF/web.xml | 2 +-
36 files changed, 443 insertions(+), 516 deletions(-)
copy
arquillian/{arquillian-tomee-embedded/src/test/java/org/apache/openejb/arquillian/embedded/ARestService.java
=>
arquillian-tomee-tests/arquillian-tomee-jaxrs-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxrs/servlets/Echo.java}
(84%)
[tomee] 04/04: TOMEE-2408 - Enable MP scan in Arquillian for MP TCK on Plume and Plus.
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 edeeda00334b95f2eb3c2a371f0e358ca5e7090a Author: Roberto Cortez AuthorDate: Sun Feb 3 00:13:40 2019 + TOMEE-2408 - Enable MP scan in Arquillian for MP TCK on Plume and Plus. --- tck/microprofile-tck/config/src/test/resources/arquillian.xml | 2 ++ .../fault-tolerance/src/test/resources/arquillian.xml | 6 ++ tck/microprofile-tck/health/src/test/resources/arquillian.xml | 6 ++ tck/microprofile-tck/jwt/src/test/resources/arquillian.xml | 7 ++- tck/microprofile-tck/metrics/src/test/resources/arquillian.xml | 2 ++ tck/microprofile-tck/openapi/src/test/resources/arquillian.xml | 6 ++ tck/microprofile-tck/opentracing/src/test/resources/arquillian.xml | 6 ++ tck/microprofile-tck/rest-client/src/test/resources/arquillian.xml | 6 ++ 8 files changed, 36 insertions(+), 5 deletions(-) diff --git a/tck/microprofile-tck/config/src/test/resources/arquillian.xml b/tck/microprofile-tck/config/src/test/resources/arquillian.xml index bace620..5451a0c 100644 --- a/tck/microprofile-tck/config/src/test/resources/arquillian.xml +++ b/tck/microprofile-tck/config/src/test/resources/arquillian.xml @@ -48,6 +48,7 @@ target/workdir true +tomee.mp.scan = all config.test = SUCCESS org.apache.geronimo.config.configsource.SystemPropertyConfigSource.copy = false @@ -64,6 +65,7 @@ target/workdir true +tomee.mp.scan = all config.test = SUCCESS org.apache.geronimo.config.configsource.SystemPropertyConfigSource.copy = false diff --git a/tck/microprofile-tck/fault-tolerance/src/test/resources/arquillian.xml b/tck/microprofile-tck/fault-tolerance/src/test/resources/arquillian.xml index ec912c5..9fc654b 100644 --- a/tck/microprofile-tck/fault-tolerance/src/test/resources/arquillian.xml +++ b/tck/microprofile-tck/fault-tolerance/src/test/resources/arquillian.xml @@ -43,6 +43,9 @@ target/tomee target/workdir true + +tomee.mp.scan = all + @@ -55,6 +58,9 @@ target/tomee target/workdir true + +tomee.mp.scan = all + diff --git a/tck/microprofile-tck/health/src/test/resources/arquillian.xml b/tck/microprofile-tck/health/src/test/resources/arquillian.xml index ec912c5..9fc654b 100644 --- a/tck/microprofile-tck/health/src/test/resources/arquillian.xml +++ b/tck/microprofile-tck/health/src/test/resources/arquillian.xml @@ -43,6 +43,9 @@ target/tomee target/workdir true + +tomee.mp.scan = all + @@ -55,6 +58,9 @@ target/tomee target/workdir true + +tomee.mp.scan = all + diff --git a/tck/microprofile-tck/jwt/src/test/resources/arquillian.xml b/tck/microprofile-tck/jwt/src/test/resources/arquillian.xml index 4929cb5..9fc654b 100644 --- a/tck/microprofile-tck/jwt/src/test/resources/arquillian.xml +++ b/tck/microprofile-tck/jwt/src/test/resources/arquillian.xml @@ -31,9 +31,6 @@ target/tomee target/workdir true - -org.apache.webbeans.component.PrincipalBean.proxy=false - @@ -47,7 +44,7 @@ target/workdir true -org.apache.webbeans.component.PrincipalBean.proxy=false +tomee.mp.scan = all @@ -62,7 +59,7 @@ target/workdir true -org.apache.webbeans.component.PrincipalBean.proxy=false +tomee.mp.scan = all diff --git a/tck/microprofile-tck/metrics/src/test/resources/arquillian.xml b/tck/microprofile-tck/metrics/src/test/resources/arquillian.xml index f8ec681..ce97b1d 100644 --- a/tck/microprofile-tck/metrics/src/test/resources/arquillian.xml +++ b/tck/microprofile-tck/metrics/src/test/resources/arquillian.xml @@ -47,6 +47,7 @@ target/workdir true +tomee.mp.scan = all MP_METRICS_TAGS = tier=integration @@ -62,6 +63,7 @@ target/workdir true +tomee.mp.scan = all MP_METRICS_TAGS = tier=integration diff --git a/tck/microprofile-tck/openapi/src/test/resources/arquillian.xml b/tck/microprofile-tck/openapi/src/test/resources/arquillian.xml index d299ed6..6b3b59a 100644 --- a/tck/microprofile-tck/openapi/src/test/resources/arquillian.xml +++ b/tck/microprofile-tck/openapi/src/test/resources/arquillian.xml @@ -43,6 +43,9 @@ target/tomee target/workdir true + +tomee.mp.scan = all + @@ -55,6 +58,9 @@ target/tomee target/workdir true + +tomee.mp.scan = all + diff --git a/tck/microprofile-tck/opentracing/src/test
[tomee] 03/04: TOMEE-2408 - Fixed missing configuration for MP OpenAPI.
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 d3598981e0cd74199933bcddbbf1aaee2c1e8e19
Author: Roberto Cortez
AuthorDate: Sat Feb 2 23:23:39 2019 +
TOMEE-2408 - Fixed missing configuration for MP OpenAPI.
---
.../openapi/src/test/resources/arquillian.xml| 12
.../apache/tomee/microprofile/TomEEMicroProfileListener.java | 2 ++
2 files changed, 2 insertions(+), 12 deletions(-)
diff --git a/tck/microprofile-tck/openapi/src/test/resources/arquillian.xml
b/tck/microprofile-tck/openapi/src/test/resources/arquillian.xml
index e42da07..d299ed6 100644
--- a/tck/microprofile-tck/openapi/src/test/resources/arquillian.xml
+++ b/tck/microprofile-tck/openapi/src/test/resources/arquillian.xml
@@ -31,10 +31,6 @@
target/tomee
target/workdir
true
-
-
-openejb.cxf-rs.cache-application = false
-
@@ -47,10 +43,6 @@
target/tomee
target/workdir
true
-
-
-openejb.cxf-rs.cache-application = false
-
@@ -63,10 +55,6 @@
target/tomee
target/workdir
true
-
-
-openejb.cxf-rs.cache-application = false
-
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
index c44989a..819b67c 100644
---
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
@@ -85,6 +85,8 @@ public class TomEEMicroProfileListener {
}
}
}
+
+SystemInstance.get().setProperty("openejb.cxf-rs.cache-application",
"false");
}
public void processApplication(@Observes final
BeforeEvent afterApplicationCreated) {
[tomee] branch TOMEE-2408 updated (2ffed70 -> edeeda0)
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. from 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. new bb478e2 TOMEE-2408 - Added configuration to enable / disable MP scanning. new 31b3a71 TOMEE-2408 - MP scan configuration all in Installer just for MP flavour. new d359898 TOMEE-2408 - Fixed missing configuration for MP OpenAPI. new edeeda0 TOMEE-2408 - Enable MP scan in Arquillian for MP TCK on Plume and Plus. The 4 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. Summary of changes: .../apache/openejb/config/DeploymentLoader.java| 13 +++- .../config/src/test/resources/arquillian.xml | 2 ++ .../src/test/resources/arquillian.xml | 6 ++ .../health/src/test/resources/arquillian.xml | 6 ++ .../jwt/src/test/resources/arquillian.xml | 7 ++- .../metrics/src/test/resources/arquillian.xml | 2 ++ .../openapi/src/test/resources/arquillian.xml | 10 ++--- .../opentracing/src/test/resources/arquillian.xml | 6 ++ .../rest-client/src/test/resources/arquillian.xml | 6 ++ .../src/main/groovy/commands/SetupCommand.groovy | 2 +- .../java/org/apache/tomee/installer/Installer.java | 24 +- .../microprofile/TomEEMicroProfileListener.java| 24 ++ .../microprofile/config/TomEEConfigSource.java | 17 ++- 13 files changed, 95 insertions(+), 30 deletions(-)
[tomee] 02/04: TOMEE-2408 - MP scan configuration all in Installer just for MP flavour.
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 31b3a71aa198a477518546daaeac7d383dfc7fd8
Author: Roberto Cortez
AuthorDate: Sat Feb 2 22:05:39 2019 +
TOMEE-2408 - MP scan configuration all in Installer just for MP flavour.
---
.../src/main/groovy/commands/SetupCommand.groovy | 2 +-
.../java/org/apache/tomee/installer/Installer.java | 24 +-
.../microprofile/TomEEMicroProfileListener.java| 2 +-
3 files changed, 21 insertions(+), 7 deletions(-)
diff --git a/tomee/apache-tomee/src/main/groovy/commands/SetupCommand.groovy
b/tomee/apache-tomee/src/main/groovy/commands/SetupCommand.groovy
index 681936f..0ed8fa4 100644
--- a/tomee/apache-tomee/src/main/groovy/commands/SetupCommand.groovy
+++ b/tomee/apache-tomee/src/main/groovy/commands/SetupCommand.groovy
@@ -95,7 +95,7 @@ class SetupCommand {
Paths paths = new Paths(new File("${catalinaHome}/webapps/tomee" as
String))
-Installer installer = new Installer(paths, true)
+Installer installer = new Installer(paths, properties, true)
installer.installFull()
// clean up duplicate jars since in TomEE it is useless
diff --git
a/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installer.java
b/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installer.java
index ed06036..17eb85f 100644
--- a/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installer.java
+++ b/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installer.java
@@ -1,5 +1,4 @@
-/**
- *
+/*
* 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.
@@ -23,6 +22,10 @@ import org.apache.openejb.loader.SystemInstance;
import java.io.File;
import java.io.FileWriter;
import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.function.BiFunction;
+import java.util.function.Consumer;
import java.util.jar.JarFile;
public class Installer implements InstallerInterface {
@@ -31,6 +34,7 @@ public class Installer implements InstallerInterface {
private final Paths paths;
private Status status = Status.NONE;
private boolean force;
+private Map properties;
private static final boolean LISTENER_INSTALLED;
private static final boolean AGENT_INSTALLED;
@@ -59,6 +63,8 @@ public class Installer implements InstallerInterface {
if (LISTENER_INSTALLED && AGENT_INSTALLED) {
status = Status.INSTALLED;
}
+
+this.properties = new HashMap<>();
}
public Installer(final Paths paths, final boolean force) {
@@ -66,6 +72,11 @@ public class Installer implements InstallerInterface {
this.force = force;
}
+public Installer(final Paths paths, final Map properties,
final boolean force) {
+this(paths, force);
+this.properties = properties;
+}
+
@Override
public PathsInterface getPaths() {
return paths;
@@ -791,9 +802,12 @@ public class Installer implements InstallerInterface {
systemPropertiesWriter.write("#
javax.xml.soap.SOAPConnectionFactory =
com.sun.xml.messaging.saaj.client.p2p.HttpSOAPConnectionFactory\n");
systemPropertiesWriter.write("# javax.xml.soap.MetaFactory =
com.sun.xml.messaging.saaj.soap.SAAJMetaFactoryImpl\n");
-systemPropertiesWriter.write("#\n");
-systemPropertiesWriter.write("# MicroProfile\n");
-systemPropertiesWriter.write("tomee.mp.scan = none\n");
+final String flavour = properties.getOrDefault("tomee.webapp",
"");
+if (flavour.contains("microprofile")) {
+systemPropertiesWriter.write("#\n");
+systemPropertiesWriter.write("# MicroProfile\n");
+systemPropertiesWriter.write("tomee.mp.scan = all\n");
+}
} catch (final IOException e) {
// ignored, this file is far to be mandatory
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
index 17867fc..c44989a 100644
---
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
@@ -64,7 +64,7 @@ public class TomEEMicroProfileListener {
@SuppressWarnings
[tomee] 01/04: TOMEE-2408 - Added configuration to enable / disable MP 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 bb478e2722dc1a42b87cf3c81d84500ff198b4b6
Author: Roberto Cortez
AuthorDate: Sat Feb 2 20:07:35 2019 +
TOMEE-2408 - Added configuration to enable / disable MP scanning.
---
.../apache/openejb/config/DeploymentLoader.java| 13 +++--
.../java/org/apache/tomee/installer/Installer.java | 4 ++--
.../microprofile/TomEEMicroProfileListener.java| 22 ++
.../microprofile/config/TomEEConfigSource.java | 17 -
4 files changed, 43 insertions(+), 13 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 9a09802..d68649c 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
@@ -26,7 +26,6 @@ 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;
@@ -62,7 +61,6 @@ 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;
@@ -118,9 +116,6 @@ 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);
@@ -1102,15 +1097,13 @@ public class DeploymentLoader implements
DeploymentFilterable {
private void ensureContainerUrls() {
if (containerUrls == null) {
-if
("true".equalsIgnoreCase(SystemInstance.get().getProperty("openejb.scan.webapp.container",
"true"))) {
+if
("true".equalsIgnoreCase(SystemInstance.get().getProperty("openejb.scan.webapp.container",
"false"))) {
synchronized (this) {
if (containerUrls == null) {
try {
UrlSet urlSet = new
UrlSet(ParentClassLoaderFinder.Helper.get());
urlSet = URLs.cullSystemJars(urlSet);
-final PatternFilter containerIncludes = new
PatternFilter(SystemInstance.get().getProperty(OPENEJB_CONTAINER_INCLUDES, ""));
-final PatternFilter containerExcludes = new
PatternFilter(SystemInstance.get().getProperty(OPENEJB_CONTAINER_EXCLUDES, ""));
-urlSet =
NewLoaderLogic.applyBuiltinExcludes(urlSet, containerIncludes,
containerExcludes);
+urlSet =
NewLoaderLogic.applyBuiltinExcludes(urlSet);
containerUrls = urlSet.getUrls();
final boolean skipContainerFolders =
"true".equalsIgnoreCase(SystemInstance.get().getProperty("openejb.scan.webapp.container.skip-folder",
"true"));
@@ -1135,7 +1128,7 @@ public class DeploymentLoader implements
DeploymentFilterable {
}
}
} else {
-containerUrls = Collections.emptyList();
+containerUrls = new ArrayList<>();
}
}
diff --git
a/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installer.java
b/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installer.java
index bac2c9c..ed06036 100644
--- a/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installer.java
+++ b/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installer.java
@@ -792,8 +792,8 @@ public class Installer implements InstallerInterface {
systemPropertiesWriter.write("# javax.xml.soap.MetaFactory =
com.sun.xml.messaging.saaj.soap.SAAJMetaFact
[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
[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
[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
+ $
[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!"));
+as
[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] 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] 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] 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
[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 TomEEMicroProfileAft
[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] 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] branch master updated: TOMEE-2462 - MicroProfile Configuration ConfigSource Example.
This is an automated email from the ASF dual-hosted git repository.
radcortez pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomee.git
The following commit(s) were added to refs/heads/master by this push:
new c69eec4 TOMEE-2462 - MicroProfile Configuration ConfigSource Example.
c69eec4 is described below
commit c69eec4917c897292ea5dd890bde1527c373dd0c
Author: Roberto Cortez
AuthorDate: Wed Jan 30 15:45:55 2019 +
TOMEE-2462 - MicroProfile Configuration ConfigSource Example.
---
examples/mp-config-source-database/README.adoc | 14 ++
examples/mp-config-source-database/pom.xml | 144 +
.../config/source/database/ApplicationBean.java| 47 +++
.../source/database/DatabaseConfigSource.java | 93 +
...rg.eclipse.microprofile.config.spi.ConfigSource | 17 +++
.../src/main/tomee/conf/tomee.xml | 21 +++
.../tomee/lib/import-config-source-database.sql| 19 +++
.../source/database/DatabaseConfigSourceTest.java | 55
.../src/test/resources/arquillian.xml | 37 ++
examples/pom.xml | 1 +
10 files changed, 448 insertions(+)
diff --git a/examples/mp-config-source-database/README.adoc
b/examples/mp-config-source-database/README.adoc
new file mode 100644
index 000..98db897
--- /dev/null
+++ b/examples/mp-config-source-database/README.adoc
@@ -0,0 +1,14 @@
+= MicroProfile Configuration ConfigSource Database
+:index-group: MicroProfile
+:jbake-type: page
+:jbake-status: published
+
+This is an example on how to implement a custom MicroProfile Configuration
ConfigSource. The custom ConfigSource is
+going to read configuration values from a Database.
+
+== Run the application:
+
+[source,bash]
+
+mvn clean install tomee:run
+
diff --git a/examples/mp-config-source-database/pom.xml
b/examples/mp-config-source-database/pom.xml
new file mode 100644
index 000..2528f82
--- /dev/null
+++ b/examples/mp-config-source-database/pom.xml
@@ -0,0 +1,144 @@
+
+
+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
+
+ org.superbiz
+ mp-config-source-database
+ 8.0.0-SNAPSHOT
+ war
+
+ MicroProfile :: Examples :: Config Source Database
+
+
+8.0
+2.0.1
+1.1.13.Final
+
+
+
+
+ org.apache.tomee
+ javaee-api
+ ${version.javaee-api}
+ provided
+
+
+
+ org.eclipse.microprofile
+ microprofile
+ ${version.microprofile}
+ pom
+ provided
+
+
+
+ commons-dbutils
+ commons-dbutils
+ 1.7
+
+
+
+ org.apache.tomee
+ apache-tomee
+ ${project.version}
+ zip
+ microprofile
+ test
+
+
+
+ org.jboss.arquillian.junit
+ arquillian-junit-container
+ ${version.arquillian}
+ test
+
+
+
+ org.apache.tomee
+ ziplock
+ ${project.version}
+ test
+
+
+
+ org.jboss.shrinkwrap.resolver
+ shrinkwrap-resolver-impl-maven
+ 2.1.0
+ test
+
+
+
+ org.apache.tomee
+ arquillian-tomee-remote
+ ${project.version}
+ test
+
+
+
+ junit
+ junit
+ 4.11
+ test
+
+
+
+
+
+
+maven-war-plugin
+
+ false
+
+
+
+
+org.apache.tomee.maven
+tomee-maven-plugin
+${project.version}
+
+ microprofile
+ ${project.artifactId}
+
+
+
+org.apache.maven.plugins
+maven-compiler-plugin
+
+ 1.8
+ 1.8
+
+
+
+
+
+
+
+
+ localhost
+ file://${basedir}/target/repo/
+
+
+ localhost
+ file://${basedir}/target/snapshot-repo/
+
+
+
diff --git
a/examples/mp-config-source-database/src/main/java/org/superbiz/microprofile/config/source/database/ApplicationBean.java
b/examples/mp-config-source-database/src/main/java/org/superbiz/microprofile/config/source/database/ApplicationBean.java
new file mode 100644
index 000..88a3ca4
--- /dev/null
+++
b/examples/mp-config-source-database/src/main/java/org/superbiz/microprofile/config/source/database/ApplicationBean.java
@@ -0,0 +1,47 @@
+/*
+ * 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
[tomee] 07/07: closes apache/tomee#382 *Merged*
This is an automated email from the ASF dual-hosted git repository. radcortez pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/tomee.git commit fa535a7cd9d4b6f771e37b68f18c1091f8823b86 Author: Roberto Cortez AuthorDate: Wed Jan 30 12:22:14 2019 + closes apache/tomee#382 *Merged*
[tomee] 06/07: WeatherGateway * Changed the Timeout value from 1000 to 50 * Changed longProcessingTask sleep time from 1100 to 80 README.adoc * Updated the snippet code to reflect what was changed in
This is an automated email from the ASF dual-hosted git repository.
radcortez pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomee.git
commit f77319429eacea0044544d1ddc2a8b97f5eb6683
Author: josehenriqueventura
AuthorDate: Mon Jan 28 14:39:07 2019 +
WeatherGateway * Changed the Timeout value from 1000 to 50 * Changed
longProcessingTask sleep time from 1100 to 80 README.adoc * Updated the snippet
code to reflect what was changed in WeatherGateway.java plus the URL to point
to the correct endpoint
---
examples/mp-faulttolerance-timeout/README.adoc | 6 +++---
.../src/main/java/org/superbiz/rest/WeatherGateway.java | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/examples/mp-faulttolerance-timeout/README.adoc
b/examples/mp-faulttolerance-timeout/README.adoc
index 348d8f7..7916229 100644
--- a/examples/mp-faulttolerance-timeout/README.adoc
+++ b/examples/mp-faulttolerance-timeout/README.adoc
@@ -44,7 +44,7 @@ public class WeatherGateway {
private static final Logger LOGGER =
Logger.getLogger(WeatherGateway.class.getName());
-@Timeout(1000)
+@Timeout(50)
@Fallback(fallbackMethod = "statusOfWeekByMetEireann")
public String statusOfDayByAccuWeather(){
return longProcessingTask();
@@ -57,7 +57,7 @@ public class WeatherGateway {
private String longProcessingTask(){
try {
-Thread.sleep(1100);
+Thread.sleep(80);
} catch (InterruptedException e) {
LOGGER.log(Level.WARNING,"AccuWeather task has been interrupted.");
}
@@ -71,7 +71,7 @@ Day status call
[source,text]
-GET http://localhost:8080/mp-faulttolerance-retry/weather/day/status
+GET http://localhost:8080/mp-faulttolerance-timeout/weather/day/status
Server log
diff --git
a/examples/mp-faulttolerance-timeout/src/main/java/org/superbiz/rest/WeatherGateway.java
b/examples/mp-faulttolerance-timeout/src/main/java/org/superbiz/rest/WeatherGateway.java
index c9dd379..821e8d1 100644
---
a/examples/mp-faulttolerance-timeout/src/main/java/org/superbiz/rest/WeatherGateway.java
+++
b/examples/mp-faulttolerance-timeout/src/main/java/org/superbiz/rest/WeatherGateway.java
@@ -27,7 +27,7 @@ public class WeatherGateway {
private static final Logger LOGGER =
Logger.getLogger(WeatherGateway.class.getName());
-@Timeout(1000)
+@Timeout(50)
@Fallback(fallbackMethod = "statusOfWeekByMetEireann")
public String statusOfDayByAccuWeather(){
return longProcessingTask();
@@ -40,7 +40,7 @@ public class WeatherGateway {
private String longProcessingTask(){
try {
-Thread.sleep(1100);
+Thread.sleep(80);
} catch (InterruptedException e) {
LOGGER.log(Level.WARNING,"AccuWeather task has been interrupted.");
}
[tomee] 04/07: Update README.adoc
This is an automated email from the ASF dual-hosted git repository. radcortez pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/tomee.git commit b661a3bf979eeb6f432c9a0d278783a56e6527a9 Author: Jose Henrique Ventura AuthorDate: Sat Jan 26 22:08:14 2019 + Update README.adoc --- examples/mp-faulttolerance-timeout/README.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/mp-faulttolerance-timeout/README.adoc b/examples/mp-faulttolerance-timeout/README.adoc index 933b47f..8017381 100644 --- a/examples/mp-faulttolerance-timeout/README.adoc +++ b/examples/mp-faulttolerance-timeout/README.adoc @@ -90,7 +90,7 @@ Beautiful day! [discrete] -= Running the test +=== Running the test You can also try it out using the link:src/test/java/org/superbiz/rest/WeatherServiceTest.java[WeatherServiceTest.java]
[tomee] 05/07: Update README.adoc
This is an automated email from the ASF dual-hosted git repository. radcortez pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/tomee.git commit f055a81b1e26c82b7115a747ae1f25bb4516c397 Author: Jose Henrique Ventura AuthorDate: Sat Jan 26 22:09:47 2019 + Update README.adoc --- examples/mp-faulttolerance-timeout/README.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/mp-faulttolerance-timeout/README.adoc b/examples/mp-faulttolerance-timeout/README.adoc index 8017381..348d8f7 100644 --- a/examples/mp-faulttolerance-timeout/README.adoc +++ b/examples/mp-faulttolerance-timeout/README.adoc @@ -31,7 +31,7 @@ mvn clean install tomee:run [discrete] -=== How does it works? +=== How does it work? The method `statusOfDayByAccuWeather` fails when the threshold of `@Timeout` annotation is reached due to a long execution of `longProcessingTask` method. To respond to the request nicely, a fallback method will take place to complete the request
[tomee] 03/07: Update README.adoc
This is an automated email from the ASF dual-hosted git repository.
radcortez pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomee.git
commit f0e35841ba9b9f1fe223eaa479cbf3e609ebf189
Author: Jose Henrique Ventura
AuthorDate: Sat Jan 26 22:07:22 2019 +
Update README.adoc
---
examples/mp-faulttolerance-timeout/README.adoc | 10 ++
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/examples/mp-faulttolerance-timeout/README.adoc
b/examples/mp-faulttolerance-timeout/README.adoc
index c54fcf6..933b47f 100644
--- a/examples/mp-faulttolerance-timeout/README.adoc
+++ b/examples/mp-faulttolerance-timeout/README.adoc
@@ -25,9 +25,10 @@ Timeout annotation allows to configure :
[discrete]
=== Run the application
-
+[source,text]
+
mvn clean install tomee:run
-
+
[discrete]
=== How does it works?
@@ -68,9 +69,10 @@ public class WeatherGateway {
Day status call
-
+[source,text]
+
GET http://localhost:8080/mp-faulttolerance-retry/weather/day/status
-
+
Server log
[tomee] 01/07: Example of how to use Fault Tolerance Timeout
This is an automated email from the ASF dual-hosted git repository.
radcortez pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomee.git
commit 36eed58098252a5c40733d0a13a882c0c1732ced
Author: josehenriqueventura
AuthorDate: Sat Jan 26 21:25:05 2019 +
Example of how to use Fault Tolerance Timeout
---
examples/mp-faulttolerance-timeout/README.adoc | 98 ++
examples/mp-faulttolerance-timeout/pom.xml | 93
.../java/org/superbiz/rest/WeatherGateway.java | 49 +++
.../java/org/superbiz/rest/WeatherService.java | 39 +
.../java/org/superbiz/rest/WeatherServiceTest.java | 66 +++
.../src/test/resources/arquillian.xml | 30 +++
.../src/test/resources/beans.xml | 7 ++
examples/pom.xml | 1 +
8 files changed, 383 insertions(+)
diff --git a/examples/mp-faulttolerance-timeout/README.adoc
b/examples/mp-faulttolerance-timeout/README.adoc
new file mode 100644
index 000..f4bfc36
--- /dev/null
+++ b/examples/mp-faulttolerance-timeout/README.adoc
@@ -0,0 +1,98 @@
+= MicroProfile Fault Tolerance - Timeout
+:index-group: MicroProfile
+:jbake-type: page
+:jbake-status: published
+
+This is an example of how to use Microprofile @Timeout in TomEE.
+
+== Timeout Feature
+
+Fault Tolerance Timeout allow to specify how long a task can take to complete
its execution and aborting it
+in case of timeout. Timeout feature can be used along with another annotations
to guide the execution and result of a task.
+Check the
+https://download.eclipse.org/microprofile/microprofile-fault-tolerance-1.1/microprofile-fault-tolerance-spec.html#_timeout_usage[specification]
+for more details.
+
+Timeout annotation allows to configure :
+
+* *value:* the timeout value
+* *unit:* the timeout unit
+
+== Examples
+
+=== Run the application
+
+
+mvn clean install tomee:run
+
+
+=== Example 1
+
+The method `statusOfDayByAccuWeather` fails when threshold of `@Timeout`
annotation is reached due to a long execution of
+`longProcessingTask` method. To respond the request nicely, a fallback method
will be activated to complete the request
+successfully by the annotation `@Fallback`.
+
+[source,java]
+
+@RequestScoped
+public class WeatherGateway {
+
+private static final Logger LOGGER =
Logger.getLogger(WeatherGateway.class.getName());
+
+@Timeout(1000)
+@Fallback(fallbackMethod = "statusOfWeekByMetEireann")
+public String statusOfDayByAccuWeather(){
+return longProcessingTask();
+}
+
+public String statusOfWeekByMetEireann(){
+LOGGER.log(Level.WARNING, "MetEireann backup service has been
requested due to AccuWeather timeout");
+return "Beautiful day";
+}
+
+private String longProcessingTask(){
+try {
+Thread.sleep(1100);
+} catch (InterruptedException e) {
+LOGGER.log(Level.WARNING,"AccuWeather task has been interrupted.");
+}
+return null;
+}
+...
+}
+
+
+Day status call
+
+
+GET http://localhost:8080/mp-faulttolerance-retry/weather/day/status
+
+
+Server log
+
+
+WARNING AccuWeather task has been interrupted.
+WARNING MetEireann backup service has been requested due to AccuWeather timeout
+
+
+Response
+
+
+Beautiful day!
+
+
+=== Run the tests
+
+You can also try it out using the
+link:src/test/java/org/superbiz/rest/WeatherServiceTest.java[WeatherServiceTest.java]
+available in the project.
+
+
+mvn clean test
+
+
+
+[INFO] Results:
+[INFO]
+[INFO] Tests run: 1, Failures: 0, Errors: 0, Skipped: 0
+
diff --git a/examples/mp-faulttolerance-timeout/pom.xml
b/examples/mp-faulttolerance-timeout/pom.xml
new file mode 100644
index 000..88e2c02
--- /dev/null
+++ b/examples/mp-faulttolerance-timeout/pom.xml
@@ -0,0 +1,93 @@
+
+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
+
+org.superbiz
+mp-faulttolerance-timeout
+8.0.0-SNAPSHOT
+war
+OpenEJB :: Examples :: Microprofile Fault Tolerance :: Timeout
+
+
+
1.0
+
1.4.0.Final
+3.7.0
+3.1.0
+${project.version}
+8.0
+4.12
+1.8
+1.8
+
+
+
+
+org.apache.tomee
+javaee-api
+${javaee-api.version}
+provided
+
+
+org.eclipse.microprofile.fault-tolerance
+microprofile-fault-tolerance-api
+${microprofile-fault-tolerance-api.version}
+provided
+
+
+junit
+junit
+${junit.version}
+test
+
+
+
[tomee] 02/07: Improvement of README.adoc which had things related with a .md file format.
This is an automated email from the ASF dual-hosted git repository. radcortez pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/tomee.git commit afbbf72677925cf2874fc576ad003b0f6ecc67f0 Author: josehenriqueventura AuthorDate: Sat Jan 26 21:52:00 2019 + Improvement of README.adoc which had things related with a .md file format. --- examples/mp-faulttolerance-timeout/README.adoc | 40 +++--- 1 file changed, 24 insertions(+), 16 deletions(-) diff --git a/examples/mp-faulttolerance-timeout/README.adoc b/examples/mp-faulttolerance-timeout/README.adoc index f4bfc36..c54fcf6 100644 --- a/examples/mp-faulttolerance-timeout/README.adoc +++ b/examples/mp-faulttolerance-timeout/README.adoc @@ -5,10 +5,11 @@ This is an example of how to use Microprofile @Timeout in TomEE. +[discrete] == Timeout Feature Fault Tolerance Timeout allow to specify how long a task can take to complete its execution and aborting it -in case of timeout. Timeout feature can be used along with another annotations to guide the execution and result of a task. +in case of timeout. Timeout feature can be used along with other annotations to guide the execution and result of a task. + Check the https://download.eclipse.org/microprofile/microprofile-fault-tolerance-1.1/microprofile-fault-tolerance-spec.html#_timeout_usage[specification] for more details. @@ -18,19 +19,22 @@ Timeout annotation allows to configure : * *value:* the timeout value * *unit:* the timeout unit -== Examples +[discrete] +== Example +[discrete] === Run the application mvn clean install tomee:run -=== Example 1 +[discrete] +=== How does it works? -The method `statusOfDayByAccuWeather` fails when threshold of `@Timeout` annotation is reached due to a long execution of -`longProcessingTask` method. To respond the request nicely, a fallback method will be activated to complete the request -successfully by the annotation `@Fallback`. +The method `statusOfDayByAccuWeather` fails when the threshold of `@Timeout` annotation is reached due to a long execution of +`longProcessingTask` method. To respond to the request nicely, a fallback method will take place to complete the request +successfully. The fallback method is determined by @Fallback annotation. [source,java] @@ -70,29 +74,33 @@ GET http://localhost:8080/mp-faulttolerance-retry/weather/day/status Server log - +[source,text] + WARNING AccuWeather task has been interrupted. -WARNING MetEireann backup service has been requested due to AccuWeather timeout - +WARNING MetEireann fallback service has been requested due to AccuWeather timeout. + Response - +[source,text] + Beautiful day! - + -=== Run the tests +[discrete] += Running the test You can also try it out using the link:src/test/java/org/superbiz/rest/WeatherServiceTest.java[WeatherServiceTest.java] available in the project. - +[source,text] + mvn clean test - + - + [INFO] Results: [INFO] [INFO] Tests run: 1, Failures: 0, Errors: 0, Skipped: 0 - +
[tomee] branch master updated (b9bd69b -> fa535a7)
This is an automated email from the ASF dual-hosted git repository.
radcortez pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/tomee.git.
from b9bd69b closes apache/tomee#376 *Merged*
new 36eed58 Example of how to use Fault Tolerance Timeout
new afbbf72 Improvement of README.adoc which had things related with a
.md file format.
new f0e3584 Update README.adoc
new b661a3b Update README.adoc
new f055a81 Update README.adoc
new f773194 WeatherGateway * Changed the Timeout value from 1000 to 50 *
Changed longProcessingTask sleep time from 1100 to 80 README.adoc * Updated the
snippet code to reflect what was changed in WeatherGateway.java plus the URL to
point to the correct endpoint
new fa535a7 closes apache/tomee#382 *Merged*
The 7 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.
Summary of changes:
examples/mp-faulttolerance-timeout/README.adoc | 108 +
.../pom.xml| 25 ++---
.../java/org/superbiz/rest/WeatherGateway.java}| 47 -
.../java/org/superbiz/rest/WeatherService.java}| 20 ++--
.../java/org/superbiz/rest/WeatherServiceTest.java | 10 +-
.../src/test/resources/arquillian.xml | 0
.../src/test/resources/beans.xml | 0
examples/pom.xml | 1 +
8 files changed, 141 insertions(+), 70 deletions(-)
create mode 100644 examples/mp-faulttolerance-timeout/README.adoc
copy examples/{mp-faulttolerance-retry => mp-faulttolerance-timeout}/pom.xml
(82%)
copy
examples/{mp-faulttolerance-fallback/src/main/java/org/superbiz/rest/WeatherService.java
=>
mp-faulttolerance-timeout/src/main/java/org/superbiz/rest/WeatherGateway.java}
(55%)
copy
examples/{mp-custom-healthcheck/src/main/java/org/superbiz/WeatherEndpoint.java
=>
mp-faulttolerance-timeout/src/main/java/org/superbiz/rest/WeatherService.java}
(72%)
copy examples/{mp-faulttolerance-fallback =>
mp-faulttolerance-timeout}/src/test/java/org/superbiz/rest/WeatherServiceTest.java
(82%)
copy examples/{mp-opentracing-traced =>
mp-faulttolerance-timeout}/src/test/resources/arquillian.xml (100%)
copy examples/{mp-faulttolerance-retry =>
mp-faulttolerance-timeout}/src/test/resources/beans.xml (100%)
svn commit: r1852435 - in /tomee/site/trunk/content: download-archive.html download-ng.html
Author: radcortez Date: Tue Jan 29 12:02:51 2019 New Revision: 1852435 URL: http://svn.apache.org/viewvc?rev=1852435=rev Log: Updated download page with TomEE 8.0.0-M2. Moved TomEE 8.0.0-M1 to Archives. Modified: tomee/site/trunk/content/download-archive.html tomee/site/trunk/content/download-ng.html Modified: tomee/site/trunk/content/download-archive.html URL: http://svn.apache.org/viewvc/tomee/site/trunk/content/download-archive.html?rev=1852435=1852434=1852435=diff == --- tomee/site/trunk/content/download-archive.html (original) +++ tomee/site/trunk/content/download-archive.html Tue Jan 29 12:02:51 2019 @@ -72,7 +72,7 @@ Documentation Community - Security + Security Downloads @@ -111,6 +111,160 @@ + + + + +Note: Please note the 8.0.0-M1 release is a milestone release intended for evaluation purposes and should not be used in production. + + + + + + + + + + + + + + + +Name +Version +Date +Size +Type +Links + + + + +TomEE plume +8.0.0-M1 +19 Oct 2018 +65 MB +TAR.GZ +https://www.apache.org/dyn/closer.cgi/tomee/tomee-8.0.0-M1/apache-tomee-8.0.0-M1-plume.tar.gz;> TAR.GZ https://www.apache.org/dist/tomee/tomee-8.0.0-M1/apache-tomee-8.0.0-M1-plume.tar.gz.sha256;> SHA256 https://www.apache.org/dist/tomee/tomee-8.0.0-M1/apache-tomee-8.0.0-M1-plume.tar.gz.sha512;> SHA512 + + +TomEE plume +8.0.0-M1 +19 Oct 2018 +65 MB +ZIP +https://www.apache.org/dyn/closer.cgi/tomee/tomee-8.0.0-M1/apache-tomee-8.0.0-M1-plume.zip;> ZIP https://www.apache.org/dist/tomee/tomee-8.0.0-M1/apache-tomee-8.0.0-M1-plume.zip.sha256;> SHA256 https://www.apache.org/dist/tomee/tomee-8.0.0-M1/apache-tomee-8.0.0-M1-plume.zip.sha512;> SHA512 + + +TomEE plus +8.0.0-M1 +19 Oct 2018 +58 MB +TAR.GZ +https://www.apache.org/dyn/closer.cgi/tomee/tomee-8.0.0-M1/apache-tomee-8.0.0-M1-plus.tar.gz;> TAR.GZ https://www.apache.org/dist/tomee/tomee-8.0.0-M1/apache-tomee-8.0.0-M1-plus.tar.gz.sha256;> SHA256 https://www.apache.org/dist/tomee/tomee-8.0.0-M1/apache-tomee-8.0.0-M1-plus.tar.gz.sha512;> SHA512 + + +TomEE plus +8.0.0-M1 +19 Oct 2018 +58 MB +ZIP +https://www.apache.org/dyn/closer.cgi/tomee/tomee-8.0.0-M1/apache-tomee-8.0.0-M1-plus.zip;> ZIP https://www.apache.org/dist/tomee/tomee-8.0.0-M1/apache-tomee-8.0.0-M1-plus.zip.sha256;> SHA256 https://www.apache.org/dist/tomee/tomee-8.0.0-M1/apache-tomee-8.0.0-M1-plus.zip.sha512;> SHA512 + + +TomEE webprofile +8.0.0-M1 +19 Oct 2018 +41 MB +TAR.GZ +https://www.apache.org/dyn/closer.cgi/tomee/tomee-8.0.0-M1/apache-tomee-8.0.0-M1-webprofile.tar.gz;> TAR.GZ https://www.apache.org/dist/tomee/tomee-8.0.0-M1/apache-tomee-8.0.0-M1-webprofile.tar.gz.sha256;> SHA256 https://www.apache.org/dist/tomee/tomee-8.0.0-M1/apache-tomee-8.0.0-M1-webprofile.tar.gz.sha512;> SHA512 + + +TomEE webprofile +8.0.0-M1 +19 Oct 2018 +41 MB +ZIP +https://www.apache.org/dyn/closer.cgi/tomee/tomee-8.0.0-M1/apache-tomee-8.0.0-M1-webprofile.zip;> ZIP https://www.apache.org/dist/tomee/tomee-8.0.0-M1/apache-tomee-8.0.0-M1-webprofile.zip.sha256;> SHA256 https://www.apache.org/dist/tomee/tomee-8.0.0-M1/apache-tomee-8.0.0-M1-webprofile.zip.sha512;> SHA512 + + +TomEE microprofile +8.0.0-M1 +19 Oct 2018 +44 MB +TAR.GZ +https://www.apache.org/dyn/closer.cgi/tomee/tomee-8.0.0-M1/apache-tomee-8.0.0-M1-microprofile.tar.gz;> TAR.GZ https://www.apache.org/dist/tomee/tomee-8.0.0-M1/apache-tomee-8.0.0-M1-microprofile.tar.gz.sha256;> SHA256 https://www.apache.org/dist/tomee/tomee-8.0.0-M1/apache-tomee-8.0.0-M1-microprofile.tar.gz.sha512;> SHA512 + + +TomEE microprofile +8.0.0-M1 +19 Oct 2018 +44 MB +ZIP +https://www.apache.org/dyn/closer.cgi/tomee/tomee-8.0.0-M1/apache-tomee-8.0.0-M1-microprofile.zip;> ZIP https://www.apache.org/dist/tomee/tomee-8.0.0-M1/apache-tomee-8.0.0-M1-microprofile.zip.sha256;> SHA256 https://www.apache.org/dist/tomee/tomee-8.0.0-M1/apache-tomee-8.0.0-M1-microprofile.zip.sha512;> SHA512 + + +OpenEJB Standalone +8.0.0-M1 +19 Oct 2018 +40 MB +TAR.GZ +https://www.apache.org/dyn/closer.cgi/tomee/tomee-8.0.0-M1/openejb-standalone-8.0.0-M1.tar.gz;> TAR.GZ https://www.apache.org/dist/tomee/tomee-8.0.0-M1/openejb-standalone-8.0.0-M1.tar.gz.sha256;> SHA256 https://www.apache.org/dist/tomee/tomee-8.0.0-M1/openejb-standalone-8.0.0-M1.tar.gz.sha512;> SHA512 + + +OpenEJB Standalone +8.0.0-M1 +19 Oct 2018 +40 MB +ZIP +https://www.apache.org/dyn/closer.cgi/tomee/tomee-8.0.0-M1/openejb-standalone-8.0.0-M1.zip;> ZIP https://www.apache.org/dist/tomee/tomee-8.0.0-M1/openejb-standalone-8.0.0-M1.zip.sha256;> SHA256 https://www.apache.org/dist/tomee/tomee-8.0.0-M1/ope
[tomee] annotated tag tomee-8.0.0-M2 created (now e4f1520)
This is an automated email from the ASF dual-hosted git repository. radcortez pushed a change to annotated tag tomee-8.0.0-M2 in repository https://gitbox.apache.org/repos/asf/tomee.git. at e4f1520 (tag) tagging dfbee0c4c21e53e8b46d9445d4cb1b2639cb9c3e (commit) replaces tomee-7.0.5 by Roberto Cortez on Fri Jan 25 22:17:00 2019 + - Log - [maven-release-plugin] copy for tag tomee-8.0.0-M2 --- No new revisions were added by this update.
[tomee] branch master updated (1485fcb -> b9bd69b)
This is an automated email from the ASF dual-hosted git repository. radcortez pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/tomee.git. from 1485fcb closes apache/tomee#363 *Merged* new 5a175b7 added instruction to translate examples new 606d708 TOMEE-2456 Added examples for translation steps and fixed a typo. new b9bd69b closes apache/tomee#376 *Merged* The 3 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. Summary of changes: examples/README.adoc | 22 ++ 1 file changed, 22 insertions(+)
[tomee] 02/03: TOMEE-2456 Added examples for translation steps and fixed a typo.
This is an automated email from the ASF dual-hosted git repository. radcortez pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/tomee.git commit 606d708821e895a9db21397232e268ccc65dc029 Author: CesarHernandezGt AuthorDate: Fri Jan 18 16:25:12 2019 -0600 TOMEE-2456 Added examples for translation steps and fixed a typo. --- examples/README.adoc | 8 +++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/examples/README.adoc b/examples/README.adoc index f3d6338..1da85a5 100644 --- a/examples/README.adoc +++ b/examples/README.adoc @@ -26,12 +26,18 @@ If you want to translate an existing example into another language you just need 1. Find two letter code for the language you want to translate to: https://www.loc.gov/standards/iso639-2/php/code_list.php +For example, Spanish: `es` or Portuguese: `pt` + + 2. Create the translated version of the readme file with the suffix: README_.adoc +For example, Spanish: `README_es.adoc` or Portuguese: `README_pt.adoc` + + Check https://github.com/apache/tomee/tree/master/examples/access-timeout for an example on how the translation into Spanish looks like. -That's it!, Tomitribe website generator will pickup the language and update the examples index automatically without any further configuration. +That's it!, TomEE website generator will pickup the language and update the examples index automatically without any further configuration.
[tomee] 03/03: closes apache/tomee#376 *Merged*
This is an automated email from the ASF dual-hosted git repository. radcortez pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/tomee.git commit b9bd69bde9cb09237a2501ebd7c13c91438d9465 Author: Roberto Cortez AuthorDate: Mon Jan 28 18:55:13 2019 + closes apache/tomee#376 *Merged*
[tomee] 03/03: closes apache/tomee#363 *Merged*
This is an automated email from the ASF dual-hosted git repository. radcortez pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/tomee.git commit 1485fcb26b4459ab251e084d8b9e5585a2abf24f Author: Roberto Cortez AuthorDate: Mon Jan 28 18:25:09 2019 + closes apache/tomee#363 *Merged*
[tomee] 01/03: increase the time to wait for seeps. This will guarantee that there will be at least two sweeps. - When only sweep is executed it's LatestTime might be equal to expectedDate. The reason
This is an automated email from the ASF dual-hosted git repository.
radcortez pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomee.git
commit ad4d72b4e9b4f526cae3c64d7790d0eaa8a98d17
Author: Doychin Bondzhev
AuthorDate: Mon Jan 7 22:40:06 2019 +0200
increase the time to wait for seeps. This will guarantee that there will be
at least two sweeps. - When only sweep is executed it's LatestTime might be
equal to expectedDate. The reason for that it is that sweep event is triggered
at the beginnig of the seep and test might need less then 1ms to reach that
code.
---
.../java/org/apache/openejb/core/stateless/StatelessPoolStatsTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/container/openejb-core/src/test/java/org/apache/openejb/core/stateless/StatelessPoolStatsTest.java
b/container/openejb-core/src/test/java/org/apache/openejb/core/stateless/StatelessPoolStatsTest.java
index b991671..f78f300 100644
---
a/container/openejb-core/src/test/java/org/apache/openejb/core/stateless/StatelessPoolStatsTest.java
+++
b/container/openejb-core/src/test/java/org/apache/openejb/core/stateless/StatelessPoolStatsTest.java
@@ -493,7 +493,7 @@ public class StatelessPoolStatsTest extends TestCase {
deploy("testSweeps", properties);
-Thread.sleep(200);
+Thread.sleep(300);
final Long sweeps = (Long) (server.getAttribute(objectName, "Sweeps"));
assertTrue("sweeps=" + sweeps, sweeps >= 1L);
[tomee] 02/03: No need to increase time. Provide MS unit because by default it is minutes.
This is an automated email from the ASF dual-hosted git repository.
radcortez pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomee.git
commit 0f0afdfab3381efab14338f67d8cafd067037662
Author: Doychin Bondzhev
AuthorDate: Mon Jan 7 22:40:06 2019 +0200
No need to increase time. Provide MS unit because by default it is minutes.
---
.../java/org/apache/openejb/core/stateless/StatelessPoolStatsTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/container/openejb-core/src/test/java/org/apache/openejb/core/stateless/StatelessPoolStatsTest.java
b/container/openejb-core/src/test/java/org/apache/openejb/core/stateless/StatelessPoolStatsTest.java
index f78f300..73fafa0 100644
---
a/container/openejb-core/src/test/java/org/apache/openejb/core/stateless/StatelessPoolStatsTest.java
+++
b/container/openejb-core/src/test/java/org/apache/openejb/core/stateless/StatelessPoolStatsTest.java
@@ -487,7 +487,7 @@ public class StatelessPoolStatsTest extends TestCase {
*/
public void testSweeps() throws Exception {
final Properties properties = new Properties();
-properties.setProperty("SweepInterval", "100");
+properties.setProperty("SweepInterval", "100 MS");
final Date expectedDate = new Date(); // now
[tomee] branch master updated (d5f01a6 -> 1485fcb)
This is an automated email from the ASF dual-hosted git repository. radcortez pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/tomee.git. from d5f01a6 closes apache/tomee#362 *Merged* new ad4d72b increase the time to wait for seeps. This will guarantee that there will be at least two sweeps. - When only sweep is executed it's LatestTime might be equal to expectedDate. The reason for that it is that sweep event is triggered at the beginnig of the seep and test might need less then 1ms to reach that code. new 0f0afdf No need to increase time. Provide MS unit because by default it is minutes. new 1485fcb closes apache/tomee#363 *Merged* The 3 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. Summary of changes: .../org/apache/openejb/core/stateless/StatelessPoolStatsTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
[tomee] branch master updated (702359f -> d5f01a6)
This is an automated email from the ASF dual-hosted git repository. radcortez pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/tomee.git. from 702359f closes apache/tomee#375 *Merged* new f3af4b4 Make observers more CDI like. This will make the commented test to work. If we have to make it really CDI like test has to check for both color and object and implementation has to change to call both color and object observer methods. new d5f01a6 closes apache/tomee#362 *Merged* 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. Summary of changes: .../main/java/org/apache/openejb/client/Observers.java | 17 - .../java/org/apache/openejb/client/ObserversTest.java | 1 - 2 files changed, 12 insertions(+), 6 deletions(-)
[tomee] 02/02: closes apache/tomee#362 *Merged*
This is an automated email from the ASF dual-hosted git repository. radcortez pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/tomee.git commit d5f01a64d60c3ed6cd9afe5c612e023a8b45a7c6 Author: Roberto Cortez AuthorDate: Mon Jan 28 17:21:20 2019 + closes apache/tomee#362 *Merged*
[tomee] 01/02: Make observers more CDI like. This will make the commented test to work. If we have to make it really CDI like test has to check for both color and object and implementation has to chan
This is an automated email from the ASF dual-hosted git repository.
radcortez pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomee.git
commit f3af4b431f70da179c714091683e72773d95907c
Author: Doychin Bondzhev
AuthorDate: Mon Jan 7 22:42:47 2019 +0200
Make observers more CDI like. This will make the commented test to work. If
we have to make it really CDI like test has to check for both color and object
and implementation has to change to call both color and object observer methods.
---
.../main/java/org/apache/openejb/client/Observers.java | 17 -
.../java/org/apache/openejb/client/ObserversTest.java | 1 -
2 files changed, 12 insertions(+), 6 deletions(-)
diff --git
a/server/openejb-client/src/main/java/org/apache/openejb/client/Observers.java
b/server/openejb-client/src/main/java/org/apache/openejb/client/Observers.java
index d36aa52..b637798 100644
---
a/server/openejb-client/src/main/java/org/apache/openejb/client/Observers.java
+++
b/server/openejb-client/src/main/java/org/apache/openejb/client/Observers.java
@@ -141,12 +141,19 @@ public class Observers {
throw new IllegalArgumentException("event cannot be null");
}
-final Class eventType = event.getClass();
-final Method method = methods.get(eventType);
+Class eventType = event.getClass();
+while (eventType != Object.class) {
+final Method method = methods.get(eventType);
-if (method != null) {
-method.invoke(observer, event);
-} else if (defaultMethod != null) {
+if (method != null) {
+method.invoke(observer, event);
+
+return;
+}
+
+eventType = eventType.getSuperclass();
+}
+if (defaultMethod != null) {
defaultMethod.invoke(observer, event);
}
}
diff --git
a/server/openejb-client/src/test/java/org/apache/openejb/client/ObserversTest.java
b/server/openejb-client/src/test/java/org/apache/openejb/client/ObserversTest.java
index 6760037..0e7fa78 100644
---
a/server/openejb-client/src/test/java/org/apache/openejb/client/ObserversTest.java
+++
b/server/openejb-client/src/test/java/org/apache/openejb/client/ObserversTest.java
@@ -50,7 +50,6 @@ public class ObserversTest extends Assert {
}
@Test
-@Ignore("Object invoked instead")
public void colorStillInvoked() throws Exception {
observers.fireEvent(new Green());
assertEvent(BasicObserver.color);
[tomee] 01/02: TOMEE-2455 - removed redundant public modifier from ServerService interface
This is an automated email from the ASF dual-hosted git repository.
radcortez pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomee.git
commit a48b3c7a45530b353cd8875799e1efc506de8cf4
Author: Bogdan Stirbat
AuthorDate: Thu Jan 17 22:45:02 2019 +0200
TOMEE-2455 - removed redundant public modifier from ServerService interface
---
.../main/java/org/apache/openejb/server/ServerService.java | 14 +++---
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git
a/server/openejb-server/src/main/java/org/apache/openejb/server/ServerService.java
b/server/openejb-server/src/main/java/org/apache/openejb/server/ServerService.java
index c563d68..6e7c4f8 100644
---
a/server/openejb-server/src/main/java/org/apache/openejb/server/ServerService.java
+++
b/server/openejb-server/src/main/java/org/apache/openejb/server/ServerService.java
@@ -30,18 +30,18 @@ import org.apache.openejb.spi.Service;
@Managed
public interface ServerService extends Service {
-public void start() throws ServiceException;
+void start() throws ServiceException;
-public void stop() throws ServiceException;
+void stop() throws ServiceException;
-public void service(InputStream in, OutputStream out) throws
ServiceException, IOException;
+void service(InputStream in, OutputStream out) throws ServiceException,
IOException;
-public void service(Socket socket) throws ServiceException, IOException;
+void service(Socket socket) throws ServiceException, IOException;
-public String getName();
+String getName();
-public String getIP();
+String getIP();
-public int getPort();
+int getPort();
}
[tomee] branch master updated (67265b7 -> 702359f)
This is an automated email from the ASF dual-hosted git repository. radcortez pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/tomee.git. from 67265b7 closes apache/tomee#366 *Merged* new a48b3c7 TOMEE-2455 - removed redundant public modifier from ServerService interface new 702359f closes apache/tomee#375 *Merged* 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. Summary of changes: .../main/java/org/apache/openejb/server/ServerService.java | 14 +++--- 1 file changed, 7 insertions(+), 7 deletions(-)
[tomee] 02/02: closes apache/tomee#375 *Merged*
This is an automated email from the ASF dual-hosted git repository. radcortez pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/tomee.git commit 702359f4017e954ccc81be2559cd3a1b4247e450 Author: Roberto Cortez AuthorDate: Mon Jan 28 16:47:48 2019 + closes apache/tomee#375 *Merged*
[tomee] 01/02: Added Index Group
This is an automated email from the ASF dual-hosted git repository. radcortez pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/tomee.git commit b6a7b803640a33c5c6df848af6e9099ee2209ed4 Author: Joaquín Chemile AuthorDate: Tue Jan 8 13:48:13 2019 -0300 Added Index Group --- docs/developer/tools/maven-plugins.adoc | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/developer/tools/maven-plugins.adoc b/docs/developer/tools/maven-plugins.adoc index 3f335d2..4216b31 100644 --- a/docs/developer/tools/maven-plugins.adoc +++ b/docs/developer/tools/maven-plugins.adoc @@ -1,4 +1,5 @@ = TomEE Maven Plugins +:index-group: TomEE Maven Plugin :jbake-date: 2016-03-16 :jbake-type: page :jbake-status: published
[tomee] branch master updated (dac22ae -> 67265b7)
This is an automated email from the ASF dual-hosted git repository. radcortez pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/tomee.git. from dac22ae closes apache/tomee#361 *Merged* new b6a7b80 Added Index Group new 67265b7 closes apache/tomee#366 *Merged* 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. Summary of changes: docs/developer/tools/maven-plugins.adoc | 1 + 1 file changed, 1 insertion(+)
[tomee] 02/02: closes apache/tomee#366 *Merged*
This is an automated email from the ASF dual-hosted git repository. radcortez pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/tomee.git commit 67265b7dcb04831e96b852f12d7e4dca14162994 Author: Roberto Cortez AuthorDate: Mon Jan 28 16:45:46 2019 + closes apache/tomee#366 *Merged*
[tomee] branch master updated: closes apache/tomee#361 *Merged*
This is an automated email from the ASF dual-hosted git repository. radcortez pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/tomee.git The following commit(s) were added to refs/heads/master by this push: new dac22ae closes apache/tomee#361 *Merged* dac22ae is described below commit dac22ae8dba90061b4176a093cb0ceb9782e07fb Author: Roberto Cortez AuthorDate: Mon Jan 28 16:42:22 2019 + closes apache/tomee#361 *Merged*
[tomee] 01/02: Issue is closed and TomEE uses more recent version then the one with the fix.
This is an automated email from the ASF dual-hosted git repository.
radcortez pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomee.git
commit 4854c73a125e89a1be9289071a917134fccf8eb1
Author: Doychin Bondzhev
AuthorDate: Mon Jan 7 22:05:50 2019 +0200
Issue is closed and TomEE uses more recent version then the one with the
fix.
---
.../apache/openejb/resource/activemq/ProperConnectionShutdownTest.java | 1 -
1 file changed, 1 deletion(-)
diff --git
a/container/openejb-core/src/test/java/org/apache/openejb/resource/activemq/ProperConnectionShutdownTest.java
b/container/openejb-core/src/test/java/org/apache/openejb/resource/activemq/ProperConnectionShutdownTest.java
index 49d9a27..53d14e4 100644
---
a/container/openejb-core/src/test/java/org/apache/openejb/resource/activemq/ProperConnectionShutdownTest.java
+++
b/container/openejb-core/src/test/java/org/apache/openejb/resource/activemq/ProperConnectionShutdownTest.java
@@ -52,7 +52,6 @@ import static org.junit.Assert.assertTrue;
// inspired from MessagingBeanTest in examples
public class ProperConnectionShutdownTest {
@Test
-@Ignore("https://issues.apache.org/jira/browse/AMQ-6051;)
public void run() throws Throwable {
final Thread[] threadsBefore = listThreads();
final AtomicReference threadWhile = new AtomicReference<>();
[tomee] 02/02: Fixed ProperConnectionShutdownTest. Uncommented code due to AMQ-6051 fix.
This is an automated email from the ASF dual-hosted git repository.
radcortez pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomee.git
commit 5f6c09e834130a16ccb48b68c9675ce23564ea3c
Author: Roberto Cortez
AuthorDate: Mon Jan 28 16:37:56 2019 +
Fixed ProperConnectionShutdownTest. Uncommented code due to AMQ-6051 fix.
---
.../resource/activemq/ProperConnectionShutdownTest.java | 13 +++--
1 file changed, 3 insertions(+), 10 deletions(-)
diff --git
a/container/openejb-core/src/test/java/org/apache/openejb/resource/activemq/ProperConnectionShutdownTest.java
b/container/openejb-core/src/test/java/org/apache/openejb/resource/activemq/ProperConnectionShutdownTest.java
index 53d14e4..b11c2c0 100644
---
a/container/openejb-core/src/test/java/org/apache/openejb/resource/activemq/ProperConnectionShutdownTest.java
+++
b/container/openejb-core/src/test/java/org/apache/openejb/resource/activemq/ProperConnectionShutdownTest.java
@@ -26,7 +26,6 @@ import org.apache.openejb.testing.Module;
import org.apache.openejb.testng.PropertiesBuilder;
import org.apache.openejb.util.Join;
import org.apache.openejb.util.NetworkUtil;
-import org.junit.Ignore;
import org.junit.Test;
import org.junit.runners.model.Statement;
@@ -71,16 +70,10 @@ public class ProperConnectionShutdownTest {
assertEquals(messages.receiveMessage(), "How are you?");
assertEquals(messages.receiveMessage(), "Still spinning?");
-/* TODO: activate it when AMQ-6051 is fixed
-
// all worked, now hold a connection
-new Thread(new Runnable() { // not daemon!
-@Override
-public void run() {
-messages.blockConnection(); // oops, I forgot to close
it
-}
-}).start();
- */
+// not daemon!
+// oops, I forgot to close it
+new Thread(messages::blockConnection).start();
}
};
new DeployApplication(this, testInContainer, new
ApplicationComposers(this)).evaluate();
[tomee] branch master updated (5ecce36 -> 5f6c09e)
This is an automated email from the ASF dual-hosted git repository. radcortez pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/tomee.git. from 5ecce36 Fixed examples distributionManagement. new 4854c73 Issue is closed and TomEE uses more recent version then the one with the fix. new 5f6c09e Fixed ProperConnectionShutdownTest. Uncommented code due to AMQ-6051 fix. 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. Summary of changes: .../resource/activemq/ProperConnectionShutdownTest.java| 14 +++--- 1 file changed, 3 insertions(+), 11 deletions(-)
[tomee] 04/04: Fixed examples distributionManagement.
This is an automated email from the ASF dual-hosted git repository.
radcortez pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomee.git
commit 5ecce360b821696cbfffc851b02459eab869bca5
Author: Roberto Cortez
AuthorDate: Fri Jan 25 21:12:00 2019 +
Fixed examples distributionManagement.
(cherry picked from commit 7f14305)
---
examples/concurrency-utils/pom.xml | 15 ++-
examples/jsonb-configuration/pom.xml| 13 +
examples/jsonb-custom-serializer/pom.xml| 15 +++
examples/mp-config-example/pom.xml | 15 ++-
examples/mp-custom-healthcheck/pom.xml | 15 +++
examples/mp-faulttolerance-fallback/pom.xml | 14 ++
examples/mp-faulttolerance-retry/pom.xml| 14 ++
examples/mp-jsonb-configuration/pom.xml | 13 +
examples/mp-metrics-counted/pom.xml | 14 ++
examples/mp-metrics-histogram/pom.xml | 14 ++
examples/mp-metrics-metered/pom.xml | 16 +++-
examples/mp-metrics-timed/pom.xml | 14 ++
examples/mp-opentracing-traced/pom.xml | 16 +++-
examples/mp-rest-client/pom.xml | 13 +
14 files changed, 197 insertions(+), 4 deletions(-)
diff --git a/examples/concurrency-utils/pom.xml
b/examples/concurrency-utils/pom.xml
index 8a9de66..f6a05a2 100644
--- a/examples/concurrency-utils/pom.xml
+++ b/examples/concurrency-utils/pom.xml
@@ -65,4 +65,17 @@
-
\ No newline at end of file
+
+
+
+localhost
+file://${basedir}/target/repo/
+
+
+localhost
+file://${basedir}/target/snapshot-repo/
+
+
+
diff --git a/examples/jsonb-configuration/pom.xml
b/examples/jsonb-configuration/pom.xml
index 53fd7a2..f781238 100644
--- a/examples/jsonb-configuration/pom.xml
+++ b/examples/jsonb-configuration/pom.xml
@@ -59,4 +59,17 @@
+
+
+
+ localhost
+ file://${basedir}/target/repo/
+
+
+ localhost
+ file://${basedir}/target/snapshot-repo/
+
+
diff --git a/examples/jsonb-custom-serializer/pom.xml
b/examples/jsonb-custom-serializer/pom.xml
index 8759bf5..487cd0b 100644
--- a/examples/jsonb-custom-serializer/pom.xml
+++ b/examples/jsonb-custom-serializer/pom.xml
@@ -58,4 +58,19 @@
+
+
+
+
+ localhost
+ file://${basedir}/target/repo/
+
+
+ localhost
+ file://${basedir}/target/snapshot-repo/
+
+
+
diff --git a/examples/mp-config-example/pom.xml
b/examples/mp-config-example/pom.xml
index 8eac44f..a87615b 100644
--- a/examples/mp-config-example/pom.xml
+++ b/examples/mp-config-example/pom.xml
@@ -88,5 +88,18 @@
+
+
+
+localhost
+file://${basedir}/target/repo/
+
+
+localhost
+file://${basedir}/target/snapshot-repo/
+
+
-
\ No newline at end of file
+
diff --git a/examples/mp-custom-healthcheck/pom.xml
b/examples/mp-custom-healthcheck/pom.xml
index 60ea3da..4e03af5 100644
--- a/examples/mp-custom-healthcheck/pom.xml
+++ b/examples/mp-custom-healthcheck/pom.xml
@@ -90,4 +90,19 @@
+
+
+
+
+localhost
+file://${basedir}/target/repo/
+
+
+localhost
+file://${basedir}/target/snapshot-repo/
+
+
+
diff --git a/examples/mp-faulttolerance-fallback/pom.xml
b/examples/mp-faulttolerance-fallback/pom.xml
index d96d1c7..a711e25 100644
--- a/examples/mp-faulttolerance-fallback/pom.xml
+++ b/examples/mp-faulttolerance-fallback/pom.xml
@@ -103,4 +103,18 @@
+
+
+
+
+localhost
+file://${basedir}/target/repo/
+
+
+localhost
+file://${basedir}/target/snapshot-repo/
+
+
diff --git a/examples/mp-faulttolerance-retry/pom.xml
b/examples/mp-faulttolerance-retry/pom.xml
index dc89929..46da658 100644
--- a/examples/mp-faulttolerance-retry/pom.xml
+++ b/examples/mp-faulttolerance-retry/pom.xml
@@ -89,4 +89,18 @@
+
+
+
+
+localhost
+file://${basedir}/target/repo/
+
+
+localhost
+file://${basedir}/target/snapshot-repo/
+
+
diff --git a/examples/mp-jsonb-configuration/pom.xml
b/examples/mp-jsonb-configuration/pom.xml
index 28f82c1..0770d2b 100644
--- a/examples/mp-jsonb-configuration/pom.xml
+++ b/examples/mp-jsonb-configuration/pom.xml
@@ -59,4 +59,17
[tomee] 03/04: Fixed examples removed tomee.version for plugin release to be happy.
This is an automated email from the ASF dual-hosted git repository.
radcortez pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomee.git
commit b12b5571cf8b67556c7b6e975262b75dd0b9bf11
Author: Roberto Cortez
AuthorDate: Fri Jan 25 17:05:39 2019 +
Fixed examples removed tomee.version for plugin release to be happy.
(cherry picked from commit 0492a7c)
---
examples/jsonb-configuration/pom.xml| 3 +--
examples/jsonb-custom-serializer/pom.xml| 3 +--
examples/mp-custom-healthcheck/pom.xml | 7 +++
examples/mp-faulttolerance-fallback/pom.xml | 7 +++
examples/mp-faulttolerance-retry/pom.xml| 7 +++
examples/mp-jsonb-configuration/pom.xml | 3 +--
examples/mp-metrics-counted/pom.xml | 9 -
examples/mp-metrics-histogram/pom.xml | 9 -
examples/mp-metrics-timed/pom.xml | 9 -
examples/mp-rest-client/pom.xml | 9 -
examples/websocket-tls-basic-auth/pom.xml | 5 ++---
11 files changed, 30 insertions(+), 41 deletions(-)
diff --git a/examples/jsonb-configuration/pom.xml
b/examples/jsonb-configuration/pom.xml
index 4d60c58..53fd7a2 100644
--- a/examples/jsonb-configuration/pom.xml
+++ b/examples/jsonb-configuration/pom.xml
@@ -11,7 +11,6 @@
8.0
- ${project.version}
UTF-8
@@ -60,4 +59,4 @@
-
\ No newline at end of file
+
diff --git a/examples/jsonb-custom-serializer/pom.xml
b/examples/jsonb-custom-serializer/pom.xml
index 0d6e968..8759bf5 100644
--- a/examples/jsonb-custom-serializer/pom.xml
+++ b/examples/jsonb-custom-serializer/pom.xml
@@ -11,7 +11,6 @@
8.0
- ${project.version}
UTF-8
@@ -59,4 +58,4 @@
-
\ No newline at end of file
+
diff --git a/examples/mp-custom-healthcheck/pom.xml
b/examples/mp-custom-healthcheck/pom.xml
index dfc4d07..60ea3da 100644
--- a/examples/mp-custom-healthcheck/pom.xml
+++ b/examples/mp-custom-healthcheck/pom.xml
@@ -14,7 +14,6 @@
1.0
3.7.0
3.1.0
-${project.version}
8.0
4.12
1.8
@@ -45,7 +44,7 @@
org.apache.tomee
openejb-cxf-rs
-${tomee.version}
+${project.version}
test
@@ -57,13 +56,13 @@
org.apache.tomee
arquillian-tomee-remote
-${tomee.version}
+${project.version}
test
org.apache.tomee
apache-tomee
-${tomee.version}
+${project.version}
zip
microprofile
test
diff --git a/examples/mp-faulttolerance-fallback/pom.xml
b/examples/mp-faulttolerance-fallback/pom.xml
index b55a86c..d96d1c7 100644
--- a/examples/mp-faulttolerance-fallback/pom.xml
+++ b/examples/mp-faulttolerance-fallback/pom.xml
@@ -29,7 +29,6 @@
1.4.0.Final
3.7.0
3.1.0
-${project.version}
8.0
4.12
1.8
@@ -58,7 +57,7 @@
org.apache.tomee
openejb-cxf-rs
-${tomee.version}
+${project.version}
test
@@ -70,13 +69,13 @@
org.apache.tomee
arquillian-tomee-remote
-${tomee.version}
+${project.version}
test
org.apache.tomee
apache-tomee
-${tomee.version}
+${project.version}
zip
microprofile
test
diff --git a/examples/mp-faulttolerance-retry/pom.xml
b/examples/mp-faulttolerance-retry/pom.xml
index dbb9837..dc89929 100644
--- a/examples/mp-faulttolerance-retry/pom.xml
+++ b/examples/mp-faulttolerance-retry/pom.xml
@@ -15,7 +15,6 @@
1.4.0.Final
3.7.0
3.1.0
-${project.version}
8.0
4.12
1.8
@@ -44,7 +43,7 @@
org.apache.tomee
openejb-cxf-rs
-${tomee.version}
+${project.version}
test
@@ -56,13 +55,13 @@
org.apache.tomee
arquillian-tomee-remote
-${tomee.version}
+${project.version}
test
org.apache.tomee
apache-tomee
-${tomee.version}
+${project.version}
zip
microprofile
test
diff --git a/examples/mp-jsonb-configuration/pom.xml
b/examples/mp-jsonb-configuration/pom.xml
index 5e01c9e..28f82c1 100644
--- a/examples/mp-jsonb-configuration/pom.xml
+++ b/examples/mp-jsonb-configuration/pom.xml
@@ -11,7 +11,6 @@
8.0
- ${project.version
[tomee] branch master updated (968a648 -> 5ecce36)
This is an automated email from the ASF dual-hosted git repository. radcortez pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/tomee.git. from 968a648 Adding test for EJB invokation from a JSP new 464efec Release plugin auto version submodules. new d85f688 Fixed mp-jwt version for plugin release to be happy. new b12b557 Fixed examples removed tomee.version for plugin release to be happy. new 5ecce36 Fixed examples distributionManagement. The 4 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. Summary of changes: examples/concurrency-utils/pom.xml | 15 +- examples/jsonb-configuration/pom.xml | 16 +-- examples/jsonb-custom-serializer/pom.xml | 18 +++-- examples/mp-config-example/pom.xml | 15 +- examples/mp-custom-healthcheck/pom.xml | 22 + examples/mp-faulttolerance-fallback/pom.xml| 21 examples/mp-faulttolerance-retry/pom.xml | 21 examples/mp-jsonb-configuration/pom.xml| 16 +-- examples/mp-metrics-counted/pom.xml| 23 +- examples/mp-metrics-histogram/pom.xml | 23 +- examples/mp-metrics-metered/pom.xml| 16 ++- examples/mp-metrics-timed/pom.xml | 23 +- examples/mp-opentracing-traced/pom.xml | 16 ++- examples/mp-rest-client/pom.xml| 22 - examples/websocket-tls-basic-auth/pom.xml | 5 ++--- pom.xml| 1 + .../tomee-microprofile-webapp/pom.xml | 2 +- 17 files changed, 229 insertions(+), 46 deletions(-)
[tomee] 01/04: Release plugin auto version submodules.
This is an automated email from the ASF dual-hosted git repository. radcortez pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/tomee.git commit 464efec5d43467ae0861ad7a55ebb665293246f1 Author: Roberto Cortez AuthorDate: Fri Jan 25 16:51:31 2019 + Release plugin auto version submodules. (cherry picked from commit be501be) --- pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/pom.xml b/pom.xml index ccc5f7d..05f49d9 100644 --- a/pom.xml +++ b/pom.xml @@ -412,6 +412,7 @@ true false + true
[tomee] branch tomee-8.0.0-ML2-rel updated (7f14305 -> 6917751)
This is an automated email from the ASF dual-hosted git repository. radcortez pushed a change to branch tomee-8.0.0-ML2-rel in repository https://gitbox.apache.org/repos/asf/tomee.git. from 7f14305 Fixed examples distributionManagement. new dfbee0c [maven-release-plugin] prepare release tomee-8.0.0-M2 new 6917751 [maven-release-plugin] prepare for next development iteration 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. Summary of changes: arquillian/arquillian-common/pom.xml | 5 +-- arquillian/arquillian-openejb-embedded/pom.xml | 6 +-- .../pom.xml| 6 +-- arquillian/arquillian-tck/pom.xml | 6 +-- arquillian/arquillian-tomee-common/pom.xml | 5 +-- arquillian/arquillian-tomee-embedded/pom.xml | 5 +-- .../arquillian-tomee-moviefun-example/pom.xml | 5 +-- arquillian/arquillian-tomee-remote/pom.xml | 11 +++--- .../arquillian-tomee-codi-tests/pom.xml| 6 +-- .../arquillian-tomee-config-tests/pom.xml | 6 +-- .../arquillian-tomee-jaxrs-tests/pom.xml | 6 +-- .../arquillian-tomee-jaxws-tests/pom.xml | 6 +-- .../arquillian-tomee-jms-tests/pom.xml | 6 +-- .../arquillian-tomee-webprofile-tests/pom.xml | 6 +-- arquillian/arquillian-tomee-tests/pom.xml | 11 +++--- arquillian/arquillian-tomee-webapp-remote/pom.xml | 5 +-- arquillian/pom.xml | 7 ++-- arquillian/ziplock/pom.xml | 5 +-- assembly/openejb-lite/pom.xml | 5 +-- assembly/openejb-standalone/pom.xml| 43 +++--- assembly/pom.xml | 5 +-- container/mbean-annotation-api/pom.xml | 5 +-- container/openejb-api/pom.xml | 5 +-- container/openejb-core/pom.xml | 15 +++- container/openejb-javaagent/pom.xml| 5 +-- container/openejb-jee-accessors/pom.xml| 5 +-- container/openejb-jee/pom.xml | 5 +-- container/openejb-jpa-integration/pom.xml | 6 +-- container/openejb-junit/pom.xml| 5 +-- container/openejb-loader/pom.xml | 7 ++-- container/pom.xml | 5 +-- examples/access-timeout-meta/pom.xml | 7 ++-- examples/access-timeout/pom.xml| 7 ++-- examples/alternate-descriptors/pom.xml | 7 ++-- examples/application-composer/pom.xml | 7 ++-- examples/applicationcomposer-jaxws-cdi/pom.xml | 9 ++--- examples/applicationexception/pom.xml | 7 ++-- examples/arquillian-jpa/pom.xml| 9 ++--- examples/async-methods/pom.xml | 7 ++-- examples/async-postconstruct/pom.xml | 7 ++-- .../bean-validation-design-by-contract/pom.xml | 7 ++-- examples/cdi-alternative-and-stereotypes/pom.xml | 7 ++-- examples/cdi-application-scope/pom.xml | 7 ++-- examples/cdi-basic/pom.xml | 7 ++-- examples/cdi-ejbcontext-jaas/pom.xml | 10 ++--- examples/cdi-events/pom.xml| 7 ++-- examples/cdi-interceptors/pom.xml | 7 ++-- examples/cdi-produces-disposes/pom.xml | 7 ++-- examples/cdi-produces-field/pom.xml| 7 ++-- examples/cdi-qualifier/pom.xml | 7 ++-- examples/cdi-realm/pom.xml | 7 ++-- examples/cdi-request-scope/pom.xml | 7 ++-- examples/cdi-session-scope/pom.xml | 7 ++-- examples/change-jaxws-url/pom.xml | 7 ++-- examples/client-resource-lookup-preview/pom.xml| 11 +++--- examples/component-interfaces/pom.xml | 7 ++-- examples/concurrency-utils/pom.xml | 6 +-- .../connector-ear/connector-sample-api/pom.xml | 2 +- .../connector-ear/connector-sample-ear/pom.xml | 5 +-- .../connector-sample-functional-tests/pom.xml | 5 +-- .../connector-ear/connector-sample-impl/pom.xml| 2 +- .../connector-ear/connector-sample-rar/pom.xml | 2 +- .../connector-ear/connector-sample-war/pom.xml | 2 +- examples/connector-ear/pom.xml | 2 +- examples/connector-war/pom.xml | 4 +- examples/cucumber-jvm/pom.xml | 7 ++-- examples/custom-injection/pom.xml | 7 ++-- examples/datasource-ciphered-password/pom.xml | 7 ++-- examples/datasource-definition/pom.xml | 7 ++-- examples/datasource-versioning/pom.xml |
svn commit: r32142 - /dev/tomee/tomee-8.0.0-M2/
Author: radcortez Date: Sat Jan 26 00:23:23 2019 New Revision: 32142 Log: Stage TomEE 8.0.0-M2 Added: dev/tomee/tomee-8.0.0-M2/ dev/tomee/tomee-8.0.0-M2/apache-tomee-8.0.0-M2-microprofile.tar.gz (with props) dev/tomee/tomee-8.0.0-M2/apache-tomee-8.0.0-M2-microprofile.tar.gz.asc dev/tomee/tomee-8.0.0-M2/apache-tomee-8.0.0-M2-microprofile.tar.gz.sha256 dev/tomee/tomee-8.0.0-M2/apache-tomee-8.0.0-M2-microprofile.tar.gz.sha512 dev/tomee/tomee-8.0.0-M2/apache-tomee-8.0.0-M2-microprofile.zip (with props) dev/tomee/tomee-8.0.0-M2/apache-tomee-8.0.0-M2-microprofile.zip.asc dev/tomee/tomee-8.0.0-M2/apache-tomee-8.0.0-M2-microprofile.zip.sha256 dev/tomee/tomee-8.0.0-M2/apache-tomee-8.0.0-M2-microprofile.zip.sha512 dev/tomee/tomee-8.0.0-M2/apache-tomee-8.0.0-M2-plume.tar.gz (with props) dev/tomee/tomee-8.0.0-M2/apache-tomee-8.0.0-M2-plume.tar.gz.asc dev/tomee/tomee-8.0.0-M2/apache-tomee-8.0.0-M2-plume.tar.gz.sha256 dev/tomee/tomee-8.0.0-M2/apache-tomee-8.0.0-M2-plume.tar.gz.sha512 dev/tomee/tomee-8.0.0-M2/apache-tomee-8.0.0-M2-plume.zip (with props) dev/tomee/tomee-8.0.0-M2/apache-tomee-8.0.0-M2-plume.zip.asc dev/tomee/tomee-8.0.0-M2/apache-tomee-8.0.0-M2-plume.zip.sha256 dev/tomee/tomee-8.0.0-M2/apache-tomee-8.0.0-M2-plume.zip.sha512 dev/tomee/tomee-8.0.0-M2/apache-tomee-8.0.0-M2-plus.tar.gz (with props) dev/tomee/tomee-8.0.0-M2/apache-tomee-8.0.0-M2-plus.tar.gz.asc dev/tomee/tomee-8.0.0-M2/apache-tomee-8.0.0-M2-plus.tar.gz.sha256 dev/tomee/tomee-8.0.0-M2/apache-tomee-8.0.0-M2-plus.tar.gz.sha512 dev/tomee/tomee-8.0.0-M2/apache-tomee-8.0.0-M2-plus.zip (with props) dev/tomee/tomee-8.0.0-M2/apache-tomee-8.0.0-M2-plus.zip.asc dev/tomee/tomee-8.0.0-M2/apache-tomee-8.0.0-M2-plus.zip.sha256 dev/tomee/tomee-8.0.0-M2/apache-tomee-8.0.0-M2-plus.zip.sha512 dev/tomee/tomee-8.0.0-M2/apache-tomee-8.0.0-M2-webprofile.tar.gz (with props) dev/tomee/tomee-8.0.0-M2/apache-tomee-8.0.0-M2-webprofile.tar.gz.asc dev/tomee/tomee-8.0.0-M2/apache-tomee-8.0.0-M2-webprofile.tar.gz.sha256 dev/tomee/tomee-8.0.0-M2/apache-tomee-8.0.0-M2-webprofile.tar.gz.sha512 dev/tomee/tomee-8.0.0-M2/apache-tomee-8.0.0-M2-webprofile.zip (with props) dev/tomee/tomee-8.0.0-M2/apache-tomee-8.0.0-M2-webprofile.zip.asc dev/tomee/tomee-8.0.0-M2/apache-tomee-8.0.0-M2-webprofile.zip.sha256 dev/tomee/tomee-8.0.0-M2/apache-tomee-8.0.0-M2-webprofile.zip.sha512 dev/tomee/tomee-8.0.0-M2/bval-parent-2.0.1-83f28d8-source-release.zip (with props) dev/tomee/tomee-8.0.0-M2/bval-parent-2.0.1-83f28d8-source-release.zip.asc dev/tomee/tomee-8.0.0-M2/bval-parent-2.0.1-83f28d8-source-release.zip.sha256 dev/tomee/tomee-8.0.0-M2/bval-parent-2.0.1-83f28d8-source-release.zip.sha512 dev/tomee/tomee-8.0.0-M2/examples-8.0.0-M2-src.tar.gz (with props) dev/tomee/tomee-8.0.0-M2/examples-8.0.0-M2-src.tar.gz.asc dev/tomee/tomee-8.0.0-M2/examples-8.0.0-M2-src.tar.gz.sha256 dev/tomee/tomee-8.0.0-M2/examples-8.0.0-M2-src.tar.gz.sha512 dev/tomee/tomee-8.0.0-M2/examples-8.0.0-M2-src.zip (with props) dev/tomee/tomee-8.0.0-M2/examples-8.0.0-M2-src.zip.asc dev/tomee/tomee-8.0.0-M2/examples-8.0.0-M2-src.zip.sha256 dev/tomee/tomee-8.0.0-M2/examples-8.0.0-M2-src.zip.sha512 dev/tomee/tomee-8.0.0-M2/openejb-standalone-8.0.0-M2.tar.gz (with props) dev/tomee/tomee-8.0.0-M2/openejb-standalone-8.0.0-M2.tar.gz.asc dev/tomee/tomee-8.0.0-M2/openejb-standalone-8.0.0-M2.tar.gz.sha256 dev/tomee/tomee-8.0.0-M2/openejb-standalone-8.0.0-M2.tar.gz.sha512 dev/tomee/tomee-8.0.0-M2/openejb-standalone-8.0.0-M2.zip (with props) dev/tomee/tomee-8.0.0-M2/openejb-standalone-8.0.0-M2.zip.asc dev/tomee/tomee-8.0.0-M2/openejb-standalone-8.0.0-M2.zip.sha256 dev/tomee/tomee-8.0.0-M2/openejb-standalone-8.0.0-M2.zip.sha512 dev/tomee/tomee-8.0.0-M2/tomee-microprofile-webapp-8.0.0-M2.war (with props) dev/tomee/tomee-8.0.0-M2/tomee-microprofile-webapp-8.0.0-M2.war.asc dev/tomee/tomee-8.0.0-M2/tomee-microprofile-webapp-8.0.0-M2.war.sha256 dev/tomee/tomee-8.0.0-M2/tomee-microprofile-webapp-8.0.0-M2.war.sha512 dev/tomee/tomee-8.0.0-M2/tomee-plume-webapp-8.0.0-M2.war (with props) dev/tomee/tomee-8.0.0-M2/tomee-plume-webapp-8.0.0-M2.war.asc dev/tomee/tomee-8.0.0-M2/tomee-plume-webapp-8.0.0-M2.war.sha256 dev/tomee/tomee-8.0.0-M2/tomee-plume-webapp-8.0.0-M2.war.sha512 dev/tomee/tomee-8.0.0-M2/tomee-plus-webapp-8.0.0-M2.war (with props) dev/tomee/tomee-8.0.0-M2/tomee-plus-webapp-8.0.0-M2.war.asc dev/tomee/tomee-8.0.0-M2/tomee-plus-webapp-8.0.0-M2.war.sha256 dev/tomee/tomee-8.0.0-M2/tomee-plus-webapp-8.0.0-M2.war.sha512 dev/tomee/tomee-8.0.0-M2/tomee-project-8.0.0-M2-source-release.zip (with props) dev/tomee/tomee-8.0.0-M2/tomee-project-8.0.0-M2-source-release.zip.asc dev/tomee/tomee-8.0.0-M2/tomee-project-8.0.0-M2-source-release.zip.sha256
[tomee] branch tomee-8.0.0-ML2-rel updated: Fixed examples distributionManagement.
This is an automated email from the ASF dual-hosted git repository.
radcortez pushed a commit to branch tomee-8.0.0-ML2-rel
in repository https://gitbox.apache.org/repos/asf/tomee.git
The following commit(s) were added to refs/heads/tomee-8.0.0-ML2-rel by this
push:
new 7f14305 Fixed examples distributionManagement.
7f14305 is described below
commit 7f143054c9c0efd6f82635bd445ab7d28a135c5b
Author: Roberto Cortez
AuthorDate: Fri Jan 25 21:12:00 2019 +
Fixed examples distributionManagement.
---
examples/concurrency-utils/pom.xml | 15 ++-
examples/jsonb-configuration/pom.xml| 13 +
examples/jsonb-custom-serializer/pom.xml| 15 +++
examples/mp-config-example/pom.xml | 15 ++-
examples/mp-custom-healthcheck/pom.xml | 15 +++
examples/mp-faulttolerance-fallback/pom.xml | 14 ++
examples/mp-faulttolerance-retry/pom.xml| 14 ++
examples/mp-jsonb-configuration/pom.xml | 13 +
examples/mp-metrics-counted/pom.xml | 14 ++
examples/mp-metrics-histogram/pom.xml | 14 ++
examples/mp-metrics-metered/pom.xml | 16 +++-
examples/mp-metrics-timed/pom.xml | 14 ++
examples/mp-opentracing-traced/pom.xml | 16 +++-
examples/mp-rest-client/pom.xml | 13 +
14 files changed, 197 insertions(+), 4 deletions(-)
diff --git a/examples/concurrency-utils/pom.xml
b/examples/concurrency-utils/pom.xml
index 8a9de66..f6a05a2 100644
--- a/examples/concurrency-utils/pom.xml
+++ b/examples/concurrency-utils/pom.xml
@@ -65,4 +65,17 @@
-
\ No newline at end of file
+
+
+
+localhost
+file://${basedir}/target/repo/
+
+
+localhost
+file://${basedir}/target/snapshot-repo/
+
+
+
diff --git a/examples/jsonb-configuration/pom.xml
b/examples/jsonb-configuration/pom.xml
index 53fd7a2..f781238 100644
--- a/examples/jsonb-configuration/pom.xml
+++ b/examples/jsonb-configuration/pom.xml
@@ -59,4 +59,17 @@
+
+
+
+ localhost
+ file://${basedir}/target/repo/
+
+
+ localhost
+ file://${basedir}/target/snapshot-repo/
+
+
diff --git a/examples/jsonb-custom-serializer/pom.xml
b/examples/jsonb-custom-serializer/pom.xml
index 8759bf5..487cd0b 100644
--- a/examples/jsonb-custom-serializer/pom.xml
+++ b/examples/jsonb-custom-serializer/pom.xml
@@ -58,4 +58,19 @@
+
+
+
+
+ localhost
+ file://${basedir}/target/repo/
+
+
+ localhost
+ file://${basedir}/target/snapshot-repo/
+
+
+
diff --git a/examples/mp-config-example/pom.xml
b/examples/mp-config-example/pom.xml
index 8eac44f..a87615b 100644
--- a/examples/mp-config-example/pom.xml
+++ b/examples/mp-config-example/pom.xml
@@ -88,5 +88,18 @@
+
+
+
+localhost
+file://${basedir}/target/repo/
+
+
+localhost
+file://${basedir}/target/snapshot-repo/
+
+
-
\ No newline at end of file
+
diff --git a/examples/mp-custom-healthcheck/pom.xml
b/examples/mp-custom-healthcheck/pom.xml
index 60ea3da..4e03af5 100644
--- a/examples/mp-custom-healthcheck/pom.xml
+++ b/examples/mp-custom-healthcheck/pom.xml
@@ -90,4 +90,19 @@
+
+
+
+
+localhost
+file://${basedir}/target/repo/
+
+
+localhost
+file://${basedir}/target/snapshot-repo/
+
+
+
diff --git a/examples/mp-faulttolerance-fallback/pom.xml
b/examples/mp-faulttolerance-fallback/pom.xml
index d96d1c7..a711e25 100644
--- a/examples/mp-faulttolerance-fallback/pom.xml
+++ b/examples/mp-faulttolerance-fallback/pom.xml
@@ -103,4 +103,18 @@
+
+
+
+
+localhost
+file://${basedir}/target/repo/
+
+
+localhost
+file://${basedir}/target/snapshot-repo/
+
+
diff --git a/examples/mp-faulttolerance-retry/pom.xml
b/examples/mp-faulttolerance-retry/pom.xml
index dc89929..46da658 100644
--- a/examples/mp-faulttolerance-retry/pom.xml
+++ b/examples/mp-faulttolerance-retry/pom.xml
@@ -89,4 +89,18 @@
+
+
+
+
+localhost
+file://${basedir}/target/repo/
+
+
+localhost
+file://${basedir}/target/snapshot-repo/
+
+
diff --git a/examples/mp-jsonb-configuration/pom.xml
b/examples/mp-jsonb-configuration/pom.xml
index 28f82c1..0770d2b 100644
--- a/examples/mp
[tomee] branch tomee-8.0.0-ML2-rel updated (79ce3d0 -> 0492a7c)
This is an automated email from the ASF dual-hosted git repository. radcortez pushed a change to branch tomee-8.0.0-ML2-rel in repository https://gitbox.apache.org/repos/asf/tomee.git. discard 79ce3d0 Fixed examples removed tomee.version for plugin release to be happy. new 0492a7c Fixed examples removed tomee.version for plugin release to be happy. This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (79ce3d0) \ N -- N -- N refs/heads/tomee-8.0.0-ML2-rel (0492a7c) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. 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. Summary of changes: examples/websocket-tls-basic-auth/pom.xml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
[tomee] 01/01: Fixed examples removed tomee.version for plugin release to be happy.
This is an automated email from the ASF dual-hosted git repository.
radcortez pushed a commit to branch tomee-8.0.0-ML2-rel
in repository https://gitbox.apache.org/repos/asf/tomee.git
commit 0492a7c22415f74d9a971f67c8a2e0b283ab3c1b
Author: Roberto Cortez
AuthorDate: Fri Jan 25 17:05:39 2019 +
Fixed examples removed tomee.version for plugin release to be happy.
---
examples/jsonb-configuration/pom.xml| 3 +--
examples/jsonb-custom-serializer/pom.xml| 3 +--
examples/mp-custom-healthcheck/pom.xml | 7 +++
examples/mp-faulttolerance-fallback/pom.xml | 7 +++
examples/mp-faulttolerance-retry/pom.xml| 7 +++
examples/mp-jsonb-configuration/pom.xml | 3 +--
examples/mp-metrics-counted/pom.xml | 9 -
examples/mp-metrics-histogram/pom.xml | 9 -
examples/mp-metrics-timed/pom.xml | 9 -
examples/mp-rest-client/pom.xml | 9 -
examples/websocket-tls-basic-auth/pom.xml | 5 ++---
11 files changed, 30 insertions(+), 41 deletions(-)
diff --git a/examples/jsonb-configuration/pom.xml
b/examples/jsonb-configuration/pom.xml
index 4d60c58..53fd7a2 100644
--- a/examples/jsonb-configuration/pom.xml
+++ b/examples/jsonb-configuration/pom.xml
@@ -11,7 +11,6 @@
8.0
- ${project.version}
UTF-8
@@ -60,4 +59,4 @@
-
\ No newline at end of file
+
diff --git a/examples/jsonb-custom-serializer/pom.xml
b/examples/jsonb-custom-serializer/pom.xml
index 0d6e968..8759bf5 100644
--- a/examples/jsonb-custom-serializer/pom.xml
+++ b/examples/jsonb-custom-serializer/pom.xml
@@ -11,7 +11,6 @@
8.0
- ${project.version}
UTF-8
@@ -59,4 +58,4 @@
-
\ No newline at end of file
+
diff --git a/examples/mp-custom-healthcheck/pom.xml
b/examples/mp-custom-healthcheck/pom.xml
index dfc4d07..60ea3da 100644
--- a/examples/mp-custom-healthcheck/pom.xml
+++ b/examples/mp-custom-healthcheck/pom.xml
@@ -14,7 +14,6 @@
1.0
3.7.0
3.1.0
-${project.version}
8.0
4.12
1.8
@@ -45,7 +44,7 @@
org.apache.tomee
openejb-cxf-rs
-${tomee.version}
+${project.version}
test
@@ -57,13 +56,13 @@
org.apache.tomee
arquillian-tomee-remote
-${tomee.version}
+${project.version}
test
org.apache.tomee
apache-tomee
-${tomee.version}
+${project.version}
zip
microprofile
test
diff --git a/examples/mp-faulttolerance-fallback/pom.xml
b/examples/mp-faulttolerance-fallback/pom.xml
index b55a86c..d96d1c7 100644
--- a/examples/mp-faulttolerance-fallback/pom.xml
+++ b/examples/mp-faulttolerance-fallback/pom.xml
@@ -29,7 +29,6 @@
1.4.0.Final
3.7.0
3.1.0
-${project.version}
8.0
4.12
1.8
@@ -58,7 +57,7 @@
org.apache.tomee
openejb-cxf-rs
-${tomee.version}
+${project.version}
test
@@ -70,13 +69,13 @@
org.apache.tomee
arquillian-tomee-remote
-${tomee.version}
+${project.version}
test
org.apache.tomee
apache-tomee
-${tomee.version}
+${project.version}
zip
microprofile
test
diff --git a/examples/mp-faulttolerance-retry/pom.xml
b/examples/mp-faulttolerance-retry/pom.xml
index dbb9837..dc89929 100644
--- a/examples/mp-faulttolerance-retry/pom.xml
+++ b/examples/mp-faulttolerance-retry/pom.xml
@@ -15,7 +15,6 @@
1.4.0.Final
3.7.0
3.1.0
-${project.version}
8.0
4.12
1.8
@@ -44,7 +43,7 @@
org.apache.tomee
openejb-cxf-rs
-${tomee.version}
+${project.version}
test
@@ -56,13 +55,13 @@
org.apache.tomee
arquillian-tomee-remote
-${tomee.version}
+${project.version}
test
org.apache.tomee
apache-tomee
-${tomee.version}
+${project.version}
zip
microprofile
test
diff --git a/examples/mp-jsonb-configuration/pom.xml
b/examples/mp-jsonb-configuration/pom.xml
index 5e01c9e..28f82c1 100644
--- a/examples/mp-jsonb-configuration/pom.xml
+++ b/examples/mp-jsonb-configuration/pom.xml
@@ -11,7 +11,6 @@
8.0
- ${project.version}
UTF-8
[tomee] 01/01: Fixed examples removed tomee.version for plugin release to be happy.
This is an automated email from the ASF dual-hosted git repository.
radcortez pushed a commit to branch tomee-8.0.0-ML2-rel
in repository https://gitbox.apache.org/repos/asf/tomee.git
commit 79ce3d0623864f33f226ab5b4faa7fd1210b19cd
Author: Roberto Cortez
AuthorDate: Fri Jan 25 17:05:39 2019 +
Fixed examples removed tomee.version for plugin release to be happy.
---
examples/jsonb-configuration/pom.xml| 3 +--
examples/jsonb-custom-serializer/pom.xml| 3 +--
examples/mp-custom-healthcheck/pom.xml | 7 +++
examples/mp-faulttolerance-fallback/pom.xml | 7 +++
examples/mp-faulttolerance-retry/pom.xml| 7 +++
examples/mp-jsonb-configuration/pom.xml | 3 +--
examples/mp-metrics-counted/pom.xml | 9 -
examples/mp-metrics-histogram/pom.xml | 9 -
examples/mp-metrics-timed/pom.xml | 9 -
examples/mp-rest-client/pom.xml | 9 -
10 files changed, 28 insertions(+), 38 deletions(-)
diff --git a/examples/jsonb-configuration/pom.xml
b/examples/jsonb-configuration/pom.xml
index 4d60c58..53fd7a2 100644
--- a/examples/jsonb-configuration/pom.xml
+++ b/examples/jsonb-configuration/pom.xml
@@ -11,7 +11,6 @@
8.0
- ${project.version}
UTF-8
@@ -60,4 +59,4 @@
-
\ No newline at end of file
+
diff --git a/examples/jsonb-custom-serializer/pom.xml
b/examples/jsonb-custom-serializer/pom.xml
index 0d6e968..8759bf5 100644
--- a/examples/jsonb-custom-serializer/pom.xml
+++ b/examples/jsonb-custom-serializer/pom.xml
@@ -11,7 +11,6 @@
8.0
- ${project.version}
UTF-8
@@ -59,4 +58,4 @@
-
\ No newline at end of file
+
diff --git a/examples/mp-custom-healthcheck/pom.xml
b/examples/mp-custom-healthcheck/pom.xml
index dfc4d07..60ea3da 100644
--- a/examples/mp-custom-healthcheck/pom.xml
+++ b/examples/mp-custom-healthcheck/pom.xml
@@ -14,7 +14,6 @@
1.0
3.7.0
3.1.0
-${project.version}
8.0
4.12
1.8
@@ -45,7 +44,7 @@
org.apache.tomee
openejb-cxf-rs
-${tomee.version}
+${project.version}
test
@@ -57,13 +56,13 @@
org.apache.tomee
arquillian-tomee-remote
-${tomee.version}
+${project.version}
test
org.apache.tomee
apache-tomee
-${tomee.version}
+${project.version}
zip
microprofile
test
diff --git a/examples/mp-faulttolerance-fallback/pom.xml
b/examples/mp-faulttolerance-fallback/pom.xml
index b55a86c..d96d1c7 100644
--- a/examples/mp-faulttolerance-fallback/pom.xml
+++ b/examples/mp-faulttolerance-fallback/pom.xml
@@ -29,7 +29,6 @@
1.4.0.Final
3.7.0
3.1.0
-${project.version}
8.0
4.12
1.8
@@ -58,7 +57,7 @@
org.apache.tomee
openejb-cxf-rs
-${tomee.version}
+${project.version}
test
@@ -70,13 +69,13 @@
org.apache.tomee
arquillian-tomee-remote
-${tomee.version}
+${project.version}
test
org.apache.tomee
apache-tomee
-${tomee.version}
+${project.version}
zip
microprofile
test
diff --git a/examples/mp-faulttolerance-retry/pom.xml
b/examples/mp-faulttolerance-retry/pom.xml
index dbb9837..dc89929 100644
--- a/examples/mp-faulttolerance-retry/pom.xml
+++ b/examples/mp-faulttolerance-retry/pom.xml
@@ -15,7 +15,6 @@
1.4.0.Final
3.7.0
3.1.0
-${project.version}
8.0
4.12
1.8
@@ -44,7 +43,7 @@
org.apache.tomee
openejb-cxf-rs
-${tomee.version}
+${project.version}
test
@@ -56,13 +55,13 @@
org.apache.tomee
arquillian-tomee-remote
-${tomee.version}
+${project.version}
test
org.apache.tomee
apache-tomee
-${tomee.version}
+${project.version}
zip
microprofile
test
diff --git a/examples/mp-jsonb-configuration/pom.xml
b/examples/mp-jsonb-configuration/pom.xml
index 5e01c9e..28f82c1 100644
--- a/examples/mp-jsonb-configuration/pom.xml
+++ b/examples/mp-jsonb-configuration/pom.xml
@@ -11,7 +11,6 @@
8.0
- ${project.version}
UTF-8
@@ -60,4 +59,4
[tomee] branch tomee-8.0.0-ML2-rel updated (b67f291 -> 79ce3d0)
This is an automated email from the ASF dual-hosted git repository. radcortez pushed a change to branch tomee-8.0.0-ML2-rel in repository https://gitbox.apache.org/repos/asf/tomee.git. discard b67f291 Fixed example tomee.version for plugin release to be happy. new 79ce3d0 Fixed examples removed tomee.version for plugin release to be happy. This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (b67f291) \ N -- N -- N refs/heads/tomee-8.0.0-ML2-rel (79ce3d0) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. 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. Summary of changes: examples/jsonb-configuration/pom.xml | 3 +-- examples/jsonb-custom-serializer/pom.xml | 3 +-- examples/mp-custom-healthcheck/pom.xml | 7 +++ examples/mp-faulttolerance-retry/pom.xml | 7 +++ examples/mp-jsonb-configuration/pom.xml | 3 +-- examples/mp-metrics-counted/pom.xml | 9 - examples/mp-metrics-histogram/pom.xml| 9 - examples/mp-metrics-timed/pom.xml| 9 - examples/mp-rest-client/pom.xml | 9 - 9 files changed, 25 insertions(+), 34 deletions(-)
[tomee] branch tomee-8.0.0-ML2-rel updated: Fixed example tomee.version for plugin release to be happy.
This is an automated email from the ASF dual-hosted git repository.
radcortez pushed a commit to branch tomee-8.0.0-ML2-rel
in repository https://gitbox.apache.org/repos/asf/tomee.git
The following commit(s) were added to refs/heads/tomee-8.0.0-ML2-rel by this
push:
new b67f291 Fixed example tomee.version for plugin release to be happy.
b67f291 is described below
commit b67f2919cdad55bf5e7694438cbed7e1bb0e6f77
Author: Roberto Cortez
AuthorDate: Fri Jan 25 17:05:39 2019 +
Fixed example tomee.version for plugin release to be happy.
---
examples/mp-faulttolerance-fallback/pom.xml | 7 +++
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/examples/mp-faulttolerance-fallback/pom.xml
b/examples/mp-faulttolerance-fallback/pom.xml
index b55a86c..d96d1c7 100644
--- a/examples/mp-faulttolerance-fallback/pom.xml
+++ b/examples/mp-faulttolerance-fallback/pom.xml
@@ -29,7 +29,6 @@
1.4.0.Final
3.7.0
3.1.0
-${project.version}
8.0
4.12
1.8
@@ -58,7 +57,7 @@
org.apache.tomee
openejb-cxf-rs
-${tomee.version}
+${project.version}
test
@@ -70,13 +69,13 @@
org.apache.tomee
arquillian-tomee-remote
-${tomee.version}
+${project.version}
test
org.apache.tomee
apache-tomee
-${tomee.version}
+${project.version}
zip
microprofile
test
[tomee] branch tomee-8.0.0-ML2-rel updated: Fixed mp-jwt version for plugin release to be happy.
This is an automated email from the ASF dual-hosted git repository.
radcortez pushed a commit to branch tomee-8.0.0-ML2-rel
in repository https://gitbox.apache.org/repos/asf/tomee.git
The following commit(s) were added to refs/heads/tomee-8.0.0-ML2-rel by this
push:
new 1de84c8 Fixed mp-jwt version for plugin release to be happy.
1de84c8 is described below
commit 1de84c87ab8ed1fc53373f6828f81c4f8bf7ce51
Author: Roberto Cortez
AuthorDate: Fri Jan 25 17:02:22 2019 +
Fixed mp-jwt version for plugin release to be happy.
---
tomee/tomee-microprofile/tomee-microprofile-webapp/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tomee/tomee-microprofile/tomee-microprofile-webapp/pom.xml
b/tomee/tomee-microprofile/tomee-microprofile-webapp/pom.xml
index 2852772..7beb65d 100644
--- a/tomee/tomee-microprofile/tomee-microprofile-webapp/pom.xml
+++ b/tomee/tomee-microprofile/tomee-microprofile-webapp/pom.xml
@@ -73,7 +73,7 @@
${project.groupId}
mp-jwt
- ${microprofile.jwt.impl.version}
+ ${project.version}
[tomee] branch tomee-8.0.0-ML2-rel updated: Release plugin auto version submodules.
This is an automated email from the ASF dual-hosted git repository. radcortez pushed a commit to branch tomee-8.0.0-ML2-rel in repository https://gitbox.apache.org/repos/asf/tomee.git The following commit(s) were added to refs/heads/tomee-8.0.0-ML2-rel by this push: new be501be Release plugin auto version submodules. be501be is described below commit be501be2502426ec0ed20b9aee975cc4f0184d4e Author: Roberto Cortez AuthorDate: Fri Jan 25 16:51:31 2019 + Release plugin auto version submodules. --- pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/pom.xml b/pom.xml index 9dfdd14..a638d42 100644 --- a/pom.xml +++ b/pom.xml @@ -412,6 +412,7 @@ true false + true
