[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.exclusions
+++ b/container/openejb-core/src/main/resources/default.
[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.exclusions
+++ b/container/openejb-core/src/main/resources/default.
[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.exclusions
+++ b/container/openejb-core/src/main/resources/default.
[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%)
[jira] [Resolved] (TOMEE-2463) MyFaces 2.3.3
[ https://issues.apache.org/jira/browse/TOMEE-2463?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Jonathan Gallimore resolved TOMEE-2463. --- Resolution: Fixed > MyFaces 2.3.3 > - > > Key: TOMEE-2463 > URL: https://issues.apache.org/jira/browse/TOMEE-2463 > Project: TomEE > Issue Type: Task >Affects Versions: 8.0.0-M2 >Reporter: Thomas Andraschko >Assignee: Jonathan Gallimore >Priority: Major > Fix For: 8.0.0-M3 > > > MyFaces 2.3.3 is available: > https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=10600&version=12344007 -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Assigned] (TOMEE-2463) MyFaces 2.3.3
[ https://issues.apache.org/jira/browse/TOMEE-2463?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Jonathan Gallimore reassigned TOMEE-2463: - Assignee: Jonathan Gallimore > MyFaces 2.3.3 > - > > Key: TOMEE-2463 > URL: https://issues.apache.org/jira/browse/TOMEE-2463 > Project: TomEE > Issue Type: Task >Affects Versions: 8.0.0-M2 >Reporter: Thomas Andraschko >Assignee: Jonathan Gallimore >Priority: Major > Fix For: 8.0.0-M3 > > > MyFaces 2.3.3 is available: > https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=10600&version=12344007 -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Work started] (TOMEE-2463) MyFaces 2.3.3
[ https://issues.apache.org/jira/browse/TOMEE-2463?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Work on TOMEE-2463 started by Jonathan Gallimore. - > MyFaces 2.3.3 > - > > Key: TOMEE-2463 > URL: https://issues.apache.org/jira/browse/TOMEE-2463 > Project: TomEE > Issue Type: Task >Affects Versions: 8.0.0-M2 >Reporter: Thomas Andraschko >Assignee: Jonathan Gallimore >Priority: Major > Fix For: 8.0.0-M3 > > > MyFaces 2.3.3 is available: > https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=10600&version=12344007 -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[tomee] branch master updated: TOMEE-2463 - MyFaces 2.3.3
This is an automated email from the ASF dual-hosted git repository. jgallimore 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 c91d4e2 TOMEE-2463 - MyFaces 2.3.3 new bfb9f81 Merge pull request #385 from tandraschko/master c91d4e2 is described below commit c91d4e2862f9d443b46a83bd5f0b856acfe8f220 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 05f49d9..036de9e 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
[jira] [Created] (TOMEE-2463) MyFaces 2.3.3
Thomas Andraschko created TOMEE-2463: Summary: MyFaces 2.3.3 Key: TOMEE-2463 URL: https://issues.apache.org/jira/browse/TOMEE-2463 Project: TomEE Issue Type: Task Affects Versions: 8.0.0-M2 Reporter: Thomas Andraschko Fix For: 8.0.0-M3 MyFaces 2.3.3 is available: https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=10600&version=12344007 -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[tomee-tck] 01/02: Update to Jakarta EE 8
This is an automated email from the ASF dual-hosted git repository.
jlmonteiro pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomee-tck.git
commit 029a51691bcd0cf388480ece52e9fd7f7a48f4a1
Author: Jean-Louis Monteiro
AuthorDate: Sat Feb 2 00:09:26 2019 +0100
Update to Jakarta EE 8
---
pom.xml| 8
profiles/web/webprofile.now.properties | 12 +++-
2 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/pom.xml b/pom.xml
index b3d5006..65301ef 100644
--- a/pom.xml
+++ b/pom.xml
@@ -38,8 +38,8 @@
org.apache.tomee
-8.0.0-SNAPSHOT
-8.0.0-SNAPSHOT
+8.0.0.M2
+8.0.0.M2
9.0.12
@@ -48,8 +48,8 @@
-${javaee7.cts.home}
-${javaee7.ri.home}
+${javaee8.cts.home}
+${javaee8.ri.home}
8.0a
${settings.localRepository}
diff --git a/profiles/web/webprofile.now.properties
b/profiles/web/webprofile.now.properties
index 680de9b..fa51295 100644
--- a/profiles/web/webprofile.now.properties
+++ b/profiles/web/webprofile.now.properties
@@ -1,10 +1,12 @@
-project.name= webprofile-7.x
-project.version = 7.0.4-SNAPSHOT
-project.id = 71
-project.jdk = jdk7
+project.name= webprofile-8.x
+project.version = 8.0.0.M2
+project.id = 800
+project.jdk = jdk8
+project.container= tomee
+fire.on.submit = true
#project.cron = * 23 45
#This is the TCK repo URL
-project.scmUrl = scm:svn:https://svn.apache.org/repos/tck/tomee-tck/trunk
+project.scmUrl = scm:git:g...@github.com:apache/tomee-tck.git
project.buildFile= runtests
include.f.javatest.log= target/logs/javatest.log
include.d.logs=.*target/(apache|openejb).*/logs/.*
[tomee-tck] branch master updated (19b1879 -> 796a4f5)
This is an automated email from the ASF dual-hosted git repository. jlmonteiro pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/tomee-tck.git. from 19b1879 Move to Java EE 7 new 029a516 Update to Jakarta EE 8 new 796a4f5 Type in milestone evrsion 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: pom.xml| 8 profiles/web/webprofile.now.properties | 12 +++- 2 files changed, 11 insertions(+), 9 deletions(-)
[tomee-tck] 02/02: Type in milestone evrsion
This is an automated email from the ASF dual-hosted git repository. jlmonteiro pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/tomee-tck.git commit 796a4f583f31562c50b3365dd4d36bf85e46c035 Author: Jean-Louis Monteiro AuthorDate: Mon Feb 4 10:10:28 2019 +0100 Type in milestone evrsion --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 65301ef..9849e8c 100644 --- a/pom.xml +++ b/pom.xml @@ -38,8 +38,8 @@ org.apache.tomee -8.0.0.M2 -8.0.0.M2 +8.0.0-M2 +8.0.0-M2 9.0.12
