(tomee) branch main updated: Fixed version and build
This is an automated email from the ASF dual-hosted git repository. jgallimore pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomee.git The following commit(s) were added to refs/heads/main by this push: new 76e2be8aea Fixed version and build new d1d36b631d Merge pull request #1091 from tandraschko/master 76e2be8aea is described below commit 76e2be8aea8531749af1cb05ca89eeba3486c07c Author: Thomas Andraschko AuthorDate: Mon Jan 15 17:59:03 2024 +0100 Fixed version and build --- itests/ejb/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/itests/ejb/pom.xml b/itests/ejb/pom.xml index cd7602c2f9..c3fa3fd254 100644 --- a/itests/ejb/pom.xml +++ b/itests/ejb/pom.xml @@ -23,7 +23,7 @@ itests org.apache.tomee -9.1.3-SNAPSHOT +10.0.0-M1-SNAPSHOT org.apache.tomee.itests
(tomee) 01/02: TOMEE-3902: Allow properties to be injected into any activation properties
This is an automated email from the ASF dual-hosted git repository.
jgallimore pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomee.git
commit 26a079e7a42dfdf16305c935c8f6fcbe4397071f
Author: Jonathan Gallimore
AuthorDate: Wed Apr 13 11:37:11 2022 +0100
TOMEE-3902: Allow properties to be injected into any activation properties
---
.../org/apache/openejb/core/mdb/MdbContainer.java | 45 --
.../openejb/core/mdb/ActivationConfigTest.java | 131 +
.../mdb/MdbContainerClientIdActivationTest.java| 159 +
.../apache/tomee/itests/ejb/MessageCounter.java| 37 +
.../apache/tomee/itests/ejb/MessageReceiver.java | 38 +
.../apache/tomee/itests/ejb/MessageResource.java | 53 +++
.../org/apache/tomee/itests/ejb/MessageSender.java | 54 +++
.../itests/ejb/MultiTomEETopicSubscriberTest.java | 115 +++
itests/itest-common/pom.xml| 1 -
itests/pom.xml | 1 +
10 files changed, 624 insertions(+), 10 deletions(-)
diff --git
a/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/MdbContainer.java
b/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/MdbContainer.java
index 898e7858d0..bda66db61d 100644
---
a/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/MdbContainer.java
+++
b/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/MdbContainer.java
@@ -38,6 +38,7 @@ import org.apache.openejb.resource.XAResourceWrapper;
import org.apache.openejb.spi.SecurityService;
import org.apache.openejb.util.LogCategory;
import org.apache.openejb.util.Logger;
+import org.apache.openejb.util.StringTemplate;
import org.apache.xbean.recipe.ObjectRecipe;
import org.apache.xbean.recipe.Option;
@@ -67,12 +68,9 @@ import jakarta.validation.ConstraintViolationException;
import jakarta.validation.Validator;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-import java.util.Set;
-import java.util.TreeSet;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+import java.util.*;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.atomic.AtomicBoolean;
@@ -274,17 +272,46 @@ public class MdbContainer implements RpcContainer,
BaseMdbContainer {
}
}
-private ActivationSpec createActivationSpec(final BeanContext beanContext)
throws OpenEJBException {
+// visibility to allow unit testing
+public ActivationSpec createActivationSpec(final BeanContext beanContext)
throws OpenEJBException {
try {
// initialize the object recipe
final ObjectRecipe objectRecipe = new
ObjectRecipe(activationSpecClass);
objectRecipe.allow(Option.IGNORE_MISSING_PROPERTIES);
objectRecipe.disallow(Option.FIELD_INJECTION);
-
final Map activationProperties =
beanContext.getActivationProperties();
+
+final Map context = new HashMap<>();
+context.put("ejbJarId", beanContext.getModuleContext().getId());
+context.put("ejbName", beanContext.getEjbName());
+context.put("appId",
beanContext.getModuleContext().getAppContext().getId());
+
+String hostname;
+try {
+hostname = InetAddress.getLocalHost().getHostName();
+} catch (UnknownHostException e) {
+hostname = "hostname-unknown";
+}
+
+context.put("hostName", hostname);
+
+String uniqueId = Long.toString(System.currentTimeMillis());
+try {
+Class idGen =
Class.forName("org.apache.activemq.util.IdGenerator");
+final Object generator = idGen.getConstructor().newInstance();
+final Method generateId =
idGen.getDeclaredMethod("generateId");
+final Object ID = generateId.invoke(generator);
+
+uniqueId = ID.toString();
+} catch (Exception e) {
+// ignore and use the timestamp
+}
+
+context.put("uniqueId", uniqueId);
+
for (final Map.Entry entry :
activationProperties.entrySet()) {
-objectRecipe.setMethodProperty(entry.getKey(),
entry.getValue());
+objectRecipe.setMethodProperty(entry.getKey(), new
StringTemplate(entry.getValue()).apply(context));
}
objectRecipe.setMethodProperty("beanClass",
beanContext.getBeanClass());
diff --git
a/container/openejb-core/src/test/java/org/apache/openejb/core/mdb/ActivationConfigTest.java
b/container/openejb-core/src/test/java/org/apache/openejb/core/mdb/
(tomee) 02/02: TOMEE-3902 missed on last commit
This is an automated email from the ASF dual-hosted git repository.
jgallimore pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomee.git
commit a7ebec3cfb589ad948a646a1c739317eb2321f72
Author: Jonathan Gallimore
AuthorDate: Wed Jan 10 23:01:18 2024 +
TOMEE-3902 missed on last commit
---
itests/ejb/pom.xml | 90 ++
1 file changed, 90 insertions(+)
diff --git a/itests/ejb/pom.xml b/itests/ejb/pom.xml
new file mode 100644
index 00..cd7602c2f9
--- /dev/null
+++ b/itests/ejb/pom.xml
@@ -0,0 +1,90 @@
+
+
+http://maven.apache.org/POM/4.0.0;
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd;>
+
+ 4.0.0
+
+
+itests
+org.apache.tomee
+9.1.3-SNAPSHOT
+
+
+ org.apache.tomee.itests
+ ejb
+ jar
+ TomEE :: iTests :: EJB
+
+
+
+
+org.apache.maven.plugins
+maven-surefire-plugin
+
+
+${project.version}
+
+
+
+
+
+
+
+
+ org.apache.tomee
+ tomee-server-composer
+ ${project.version}
+
+
+ org.apache.tomee
+ apache-tomee
+ ${project.version}
+ tar.gz
+ microprofile
+
+
+ *
+ *
+
+
+
+
+ org.apache.tomee.bom
+ tomee-webprofile-api
+ ${project.version}
+ provided
+
+
+ org.apache.tomee
+ openejb-client
+ ${project.version}
+ provided
+
+
+ org.apache.activemq
+ activemq-broker
+ ${version.activemq}
+ test
+
+
+ junit
+ junit
+
+
+
(tomee) branch main updated (e29bfd7765 -> a7ebec3cfb)
This is an automated email from the ASF dual-hosted git repository.
jgallimore pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/tomee.git
from e29bfd7765 TOMEE-4294 exclude CDI 4 as a transitive dependency from
SmallRye Fault Tolerance
new 26a079e7a4 TOMEE-3902: Allow properties to be injected into any
activation properties
new a7ebec3cfb TOMEE-3902 missed on last commit
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:
.../org/apache/openejb/core/mdb/MdbContainer.java | 45 --
.../openejb/core/mdb/ActivationConfigTest.java | 131 +
.../mdb/MdbContainerClientIdActivationTest.java| 159 +
itests/{jaxrs => ejb}/pom.xml | 22 ++-
.../apache/tomee/itests/ejb/MessageCounter.java| 24 ++--
.../apache/tomee/itests/ejb/MessageReceiver.java | 19 +--
.../apache/tomee/itests/ejb/MessageResource.java | 42 +++---
.../apache/tomee/itests/ejb}/MessageSender.java| 34 ++---
.../itests/ejb/MultiTomEETopicSubscriberTest.java | 115 +++
itests/itest-common/pom.xml| 1 -
itests/pom.xml | 1 +
11 files changed, 514 insertions(+), 79 deletions(-)
create mode 100644
container/openejb-core/src/test/java/org/apache/openejb/core/mdb/ActivationConfigTest.java
create mode 100644
container/openejb-core/src/test/java/org/apache/openejb/core/mdb/MdbContainerClientIdActivationTest.java
copy itests/{jaxrs => ejb}/pom.xml (82%)
copy
examples/async-servlet/src/main/java/org/superbiz/asyncservlet/CalcBean.java =>
itests/ejb/src/test/java/org/apache/tomee/itests/ejb/MessageCounter.java (74%)
copy
arquillian/arquillian-tomee-tests/arquillian-tomee-jms-tests/src/test/java/org/apache/openejb/arquillian/tests/jms/JMSReceiverBean.java
=> itests/ejb/src/test/java/org/apache/tomee/itests/ejb/MessageReceiver.java
(79%)
copy
utils/openejb-mockito/src/test/java/org/apache/openejb/mockito/Facade.java =>
itests/ejb/src/test/java/org/apache/tomee/itests/ejb/MessageResource.java (62%)
copy {examples/websocket-jms/src/main/java/org/superbiz/websockets =>
itests/ejb/src/test/java/org/apache/tomee/itests/ejb}/MessageSender.java (63%)
create mode 100644
itests/ejb/src/test/java/org/apache/tomee/itests/ejb/MultiTomEETopicSubscriberTest.java
(tomee) 01/02: TOMEE-3902: Allow properties to be injected into any activation properties
This is an automated email from the ASF dual-hosted git repository.
jgallimore pushed a commit to branch tomee-9.x
in repository https://gitbox.apache.org/repos/asf/tomee.git
commit 856ec24335d6e974e4f4870559107fa33370a931
Author: Jonathan Gallimore
AuthorDate: Wed Apr 13 11:37:11 2022 +0100
TOMEE-3902: Allow properties to be injected into any activation properties
---
.../org/apache/openejb/core/mdb/MdbContainer.java | 45 --
.../openejb/core/mdb/ActivationConfigTest.java | 131 +
.../mdb/MdbContainerClientIdActivationTest.java| 159 +
.../apache/tomee/itests/ejb/MessageCounter.java| 37 +
.../apache/tomee/itests/ejb/MessageReceiver.java | 38 +
.../apache/tomee/itests/ejb/MessageResource.java | 53 +++
.../org/apache/tomee/itests/ejb/MessageSender.java | 54 +++
.../itests/ejb/MultiTomEETopicSubscriberTest.java | 115 +++
itests/itest-common/pom.xml| 1 -
itests/pom.xml | 1 +
10 files changed, 624 insertions(+), 10 deletions(-)
diff --git
a/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/MdbContainer.java
b/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/MdbContainer.java
index 898e7858d0..bda66db61d 100644
---
a/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/MdbContainer.java
+++
b/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/MdbContainer.java
@@ -38,6 +38,7 @@ import org.apache.openejb.resource.XAResourceWrapper;
import org.apache.openejb.spi.SecurityService;
import org.apache.openejb.util.LogCategory;
import org.apache.openejb.util.Logger;
+import org.apache.openejb.util.StringTemplate;
import org.apache.xbean.recipe.ObjectRecipe;
import org.apache.xbean.recipe.Option;
@@ -67,12 +68,9 @@ import jakarta.validation.ConstraintViolationException;
import jakarta.validation.Validator;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-import java.util.Set;
-import java.util.TreeSet;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+import java.util.*;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.atomic.AtomicBoolean;
@@ -274,17 +272,46 @@ public class MdbContainer implements RpcContainer,
BaseMdbContainer {
}
}
-private ActivationSpec createActivationSpec(final BeanContext beanContext)
throws OpenEJBException {
+// visibility to allow unit testing
+public ActivationSpec createActivationSpec(final BeanContext beanContext)
throws OpenEJBException {
try {
// initialize the object recipe
final ObjectRecipe objectRecipe = new
ObjectRecipe(activationSpecClass);
objectRecipe.allow(Option.IGNORE_MISSING_PROPERTIES);
objectRecipe.disallow(Option.FIELD_INJECTION);
-
final Map activationProperties =
beanContext.getActivationProperties();
+
+final Map context = new HashMap<>();
+context.put("ejbJarId", beanContext.getModuleContext().getId());
+context.put("ejbName", beanContext.getEjbName());
+context.put("appId",
beanContext.getModuleContext().getAppContext().getId());
+
+String hostname;
+try {
+hostname = InetAddress.getLocalHost().getHostName();
+} catch (UnknownHostException e) {
+hostname = "hostname-unknown";
+}
+
+context.put("hostName", hostname);
+
+String uniqueId = Long.toString(System.currentTimeMillis());
+try {
+Class idGen =
Class.forName("org.apache.activemq.util.IdGenerator");
+final Object generator = idGen.getConstructor().newInstance();
+final Method generateId =
idGen.getDeclaredMethod("generateId");
+final Object ID = generateId.invoke(generator);
+
+uniqueId = ID.toString();
+} catch (Exception e) {
+// ignore and use the timestamp
+}
+
+context.put("uniqueId", uniqueId);
+
for (final Map.Entry entry :
activationProperties.entrySet()) {
-objectRecipe.setMethodProperty(entry.getKey(),
entry.getValue());
+objectRecipe.setMethodProperty(entry.getKey(), new
StringTemplate(entry.getValue()).apply(context));
}
objectRecipe.setMethodProperty("beanClass",
beanContext.getBeanClass());
diff --git
a/container/openejb-core/src/test/java/org/apache/openejb/core/mdb/ActivationConfigTest.java
b/container/openejb-core/src/test/java/org/apache/openejb/core/mdb/
(tomee) 02/02: TOMEE-3902 missed on last commit
This is an automated email from the ASF dual-hosted git repository.
jgallimore pushed a commit to branch tomee-9.x
in repository https://gitbox.apache.org/repos/asf/tomee.git
commit 6ceaf06881655893672acef73cc2f1f7e878b8e7
Author: Jonathan Gallimore
AuthorDate: Wed Jan 10 23:01:18 2024 +
TOMEE-3902 missed on last commit
---
itests/ejb/pom.xml | 90 ++
1 file changed, 90 insertions(+)
diff --git a/itests/ejb/pom.xml b/itests/ejb/pom.xml
new file mode 100644
index 00..cd7602c2f9
--- /dev/null
+++ b/itests/ejb/pom.xml
@@ -0,0 +1,90 @@
+
+
+http://maven.apache.org/POM/4.0.0;
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd;>
+
+ 4.0.0
+
+
+itests
+org.apache.tomee
+9.1.3-SNAPSHOT
+
+
+ org.apache.tomee.itests
+ ejb
+ jar
+ TomEE :: iTests :: EJB
+
+
+
+
+org.apache.maven.plugins
+maven-surefire-plugin
+
+
+${project.version}
+
+
+
+
+
+
+
+
+ org.apache.tomee
+ tomee-server-composer
+ ${project.version}
+
+
+ org.apache.tomee
+ apache-tomee
+ ${project.version}
+ tar.gz
+ microprofile
+
+
+ *
+ *
+
+
+
+
+ org.apache.tomee.bom
+ tomee-webprofile-api
+ ${project.version}
+ provided
+
+
+ org.apache.tomee
+ openejb-client
+ ${project.version}
+ provided
+
+
+ org.apache.activemq
+ activemq-broker
+ ${version.activemq}
+ test
+
+
+ junit
+ junit
+
+
+
(tomee) branch tomee-9.x updated (5e5ab5f54b -> 6ceaf06881)
This is an automated email from the ASF dual-hosted git repository.
jgallimore pushed a change to branch tomee-9.x
in repository https://gitbox.apache.org/repos/asf/tomee.git
from 5e5ab5f54b TOMEE-4294 exclude CDI 4 as a transitive dependency from
SmallRye Fault Tolerance
new 856ec24335 TOMEE-3902: Allow properties to be injected into any
activation properties
new 6ceaf06881 TOMEE-3902 missed on last commit
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:
.../org/apache/openejb/core/mdb/MdbContainer.java | 45 --
.../openejb/core/mdb/ActivationConfigTest.java | 131 +
.../mdb/MdbContainerClientIdActivationTest.java| 159 +
itests/{jaxrs => ejb}/pom.xml | 20 ++-
.../apache/tomee/itests/ejb/MessageCounter.java| 24 ++--
.../apache/tomee/itests/ejb/MessageReceiver.java | 19 +--
.../apache/tomee/itests/ejb/MessageResource.java | 42 +++---
.../apache/tomee/itests/ejb}/MessageSender.java| 34 ++---
.../itests/ejb/MultiTomEETopicSubscriberTest.java | 115 +++
itests/itest-common/pom.xml| 1 -
itests/pom.xml | 1 +
11 files changed, 513 insertions(+), 78 deletions(-)
create mode 100644
container/openejb-core/src/test/java/org/apache/openejb/core/mdb/ActivationConfigTest.java
create mode 100644
container/openejb-core/src/test/java/org/apache/openejb/core/mdb/MdbContainerClientIdActivationTest.java
copy itests/{jaxrs => ejb}/pom.xml (83%)
copy
examples/async-servlet/src/main/java/org/superbiz/asyncservlet/CalcBean.java =>
itests/ejb/src/test/java/org/apache/tomee/itests/ejb/MessageCounter.java (74%)
copy
arquillian/arquillian-tomee-tests/arquillian-tomee-jms-tests/src/test/java/org/apache/openejb/arquillian/tests/jms/JMSReceiverBean.java
=> itests/ejb/src/test/java/org/apache/tomee/itests/ejb/MessageReceiver.java
(79%)
copy
utils/openejb-mockito/src/test/java/org/apache/openejb/mockito/Facade.java =>
itests/ejb/src/test/java/org/apache/tomee/itests/ejb/MessageResource.java (62%)
copy {examples/websocket-jms/src/main/java/org/superbiz/websockets =>
itests/ejb/src/test/java/org/apache/tomee/itests/ejb}/MessageSender.java (63%)
create mode 100644
itests/ejb/src/test/java/org/apache/tomee/itests/ejb/MultiTomEETopicSubscriberTest.java
(tomee) branch main updated: TOMEE-4294 exclude CDI 4 as a transitive dependency from SmallRye Fault Tolerance
This is an automated email from the ASF dual-hosted git repository. jgallimore pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomee.git The following commit(s) were added to refs/heads/main by this push: new e29bfd7765 TOMEE-4294 exclude CDI 4 as a transitive dependency from SmallRye Fault Tolerance e29bfd7765 is described below commit e29bfd7765257bb954c93edb7ca3320a0f378220 Author: Jonathan Gallimore AuthorDate: Fri Jan 5 16:47:27 2024 + TOMEE-4294 exclude CDI 4 as a transitive dependency from SmallRye Fault Tolerance --- tomee/tomee-microprofile/mp-common/pom.xml | 4 1 file changed, 4 insertions(+) diff --git a/tomee/tomee-microprofile/mp-common/pom.xml b/tomee/tomee-microprofile/mp-common/pom.xml index 2341854ef5..e818ccc998 100644 --- a/tomee/tomee-microprofile/mp-common/pom.xml +++ b/tomee/tomee-microprofile/mp-common/pom.xml @@ -220,6 +220,10 @@ io.smallrye smallrye-fault-tolerance + + jakarta.enterprise + jakarta.enterprise.cdi-api + * microprofile-fault-tolerance-api
(tomee) branch tomee-9.x updated: TOMEE-4294 exclude CDI 4 as a transitive dependency from SmallRye Fault Tolerance
This is an automated email from the ASF dual-hosted git repository. jgallimore pushed a commit to branch tomee-9.x in repository https://gitbox.apache.org/repos/asf/tomee.git The following commit(s) were added to refs/heads/tomee-9.x by this push: new 5e5ab5f54b TOMEE-4294 exclude CDI 4 as a transitive dependency from SmallRye Fault Tolerance 5e5ab5f54b is described below commit 5e5ab5f54ba43448e2fbf048d4488bdd629f8060 Author: Jonathan Gallimore AuthorDate: Fri Jan 5 16:47:27 2024 + TOMEE-4294 exclude CDI 4 as a transitive dependency from SmallRye Fault Tolerance --- tomee/tomee-microprofile/mp-common/pom.xml | 4 1 file changed, 4 insertions(+) diff --git a/tomee/tomee-microprofile/mp-common/pom.xml b/tomee/tomee-microprofile/mp-common/pom.xml index 7ff61f6127..97977793e1 100644 --- a/tomee/tomee-microprofile/mp-common/pom.xml +++ b/tomee/tomee-microprofile/mp-common/pom.xml @@ -220,6 +220,10 @@ io.smallrye smallrye-fault-tolerance + + jakarta.enterprise + jakarta.enterprise.cdi-api + * microprofile-fault-tolerance-api
(tomee-site-generator) branch main updated: Fix TCK link
This is an automated email from the ASF dual-hosted git repository. jgallimore pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomee-site-generator.git The following commit(s) were added to refs/heads/main by this push: new 639021e Fix TCK link new 5cec1f7 Merge branch 'main' of github.com:apache/tomee-site-generator 639021e is described below commit 639021ebff0a1e1ba85aa7c9cfd452c7494fcf8c Author: Jonathan Gallimore AuthorDate: Wed Dec 20 18:07:36 2023 + Fix TCK link --- src/main/jbake/content/download-archive.adoc | 3 +++ src/main/jbake/content/download.adoc | 1 - 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/jbake/content/download-archive.adoc b/src/main/jbake/content/download-archive.adoc index 3926171..c19b209 100644 --- a/src/main/jbake/content/download-archive.adoc +++ b/src/main/jbake/content/download-archive.adoc @@ -17,6 +17,9 @@ and appreciated. === TCK Results + TomEE 9.1.1 +- link:9.1.1/plume/webprofile-9.1.html[Jakarta EE 9.1 Web Profile TCK Results for Java 11] + TomEE 9.1.0 - link:9.1.0/plume/webprofile-9.1.html[Jakarta EE 9.1 Web Profile TCK Results for Java 11] diff --git a/src/main/jbake/content/download.adoc b/src/main/jbake/content/download.adoc index b82b423..8ba5fd3 100755 --- a/src/main/jbake/content/download.adoc +++ b/src/main/jbake/content/download.adoc @@ -15,7 +15,6 @@ You **must** link:https://www.apache.org/info/verification.html[verify] the inte - MicroProfile 5.0 - Java 11 or higher - link:9.1.2/release-notes.html[Release Notes] -- link:9.1.2/plume/webprofile-9.1.html[Jakarta EE 9.1 Web Profile TCK Results for Java 11] - link:9.1.2/microprofile-5.0.html[MicroProfile 5.0 TCK Results] [cols="2,4*^1",options="header"]
(tomee-site-generator) branch main updated: Release 9.1.2
This is an automated email from the ASF dual-hosted git repository. jgallimore pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomee-site-generator.git The following commit(s) were added to refs/heads/main by this push: new 9cdd94a Release 9.1.2 9cdd94a is described below commit 9cdd94acc3a4b63d3fb8f655d7c046fe656caa95 Author: Jonathan Gallimore AuthorDate: Tue Dec 19 21:19:32 2023 + Release 9.1.2 --- src/main/jbake/content/9.1.2/release-notes.adoc | 42 + src/main/jbake/content/download-archive.adoc| 10 ++ src/main/jbake/content/download.adoc| 24 +++--- 3 files changed, 64 insertions(+), 12 deletions(-) diff --git a/src/main/jbake/content/9.1.2/release-notes.adoc b/src/main/jbake/content/9.1.2/release-notes.adoc new file mode 100644 index 000..38061ae --- /dev/null +++ b/src/main/jbake/content/9.1.2/release-notes.adoc @@ -0,0 +1,42 @@ += Apache TomEE 9.1.2 Release Notes +:index-group: Release Notes +:jbake-type: page +:jbake-status: published + +== Dependency upgrade + +[.compact] + - link:https://issues.apache.org/jira/browse/TOMEE-4266[TOMEE-4266] ActiveMQ 5.16.7 / 5.18.3 + - link:https://issues.apache.org/jira/browse/TOMEE-4278[TOMEE-4278] Commons CLI 1.6.0 + - link:https://issues.apache.org/jira/browse/TOMEE-4277[TOMEE-4277] Commons Codec 1.16.0 + - link:https://issues.apache.org/jira/browse/TOMEE-4274[TOMEE-4274] Commons DBCP 2.11.0 + - link:https://issues.apache.org/jira/browse/TOMEE-4275[TOMEE-4275] Commons Lang3 3.13.0 + - link:https://issues.apache.org/jira/browse/TOMEE-4276[TOMEE-4276] Jackson 2.15.3 + - link:https://issues.apache.org/jira/browse/TOMEE-4279[TOMEE-4279] Log4J2 2.21.1 + - link:https://issues.apache.org/jira/browse/TOMEE-4280[TOMEE-4280] WSS4J 3.0.2 + +== New Feature + +[.compact] + - link:https://issues.apache.org/jira/browse/TOMEE-4281[TOMEE-4281] Improve logging when failing to load a class + - link:https://issues.apache.org/jira/browse/TOMEE-4268[TOMEE-4268] Create MicroProfile OpenAPI Reader exemple + +== Bug + +[.compact] + - link:https://issues.apache.org/jira/browse/TOMEE-4267[TOMEE-4267] MicroProfile Metrics JMX Registrar must be initialized once + +== Improvement + +[.compact] + - link:https://issues.apache.org/jira/browse/TOMEE-4285[TOMEE-4285] Port fix for CVE-2023-46589 for TomEE 9.x + - link:https://issues.apache.org/jira/browse/TOMEE-4286[TOMEE-4286] Namespace error when processing web-fragment.xml + - link:https://issues.apache.org/jira/browse/TOMEE-4287[TOMEE-4287] Better information when XBean Finder fails to read a class/jar file + - link:https://issues.apache.org/jira/browse/TOMEE-4289[TOMEE-4289] java.util.NoSuchElementException in SystemLogHandler + - link:https://issues.apache.org/jira/browse/TOMEE-4269[TOMEE-4269] Enable SLF4J 2.x webapps to include bindings in their WEB-INF/lib + +== Task + +[.compact] + - link:https://issues.apache.org/jira/browse/TOMEE-4284[TOMEE-4284] Implement tomee.mp.jwt.allow.no-exp property over mp.jwt.tomee.allow.no-exp + diff --git a/src/main/jbake/content/download-archive.adoc b/src/main/jbake/content/download-archive.adoc index 6e4bacd..3926171 100644 --- a/src/main/jbake/content/download-archive.adoc +++ b/src/main/jbake/content/download-archive.adoc @@ -33,6 +33,16 @@ and appreciated. [cols="2,3*^1,2",options="header"] |=== |Name|Version|Date|Size|Signatures & Hashes +| https://archive.apache.org/disttomee/tomee-9.1.1/apache-tomee-9.1.1-microprofile.zip[icon:download[] TomEE Microprofile ZIP] |9.1.1|12 Oct 2023|69 MB |https://downloads.apache.org/tomee/tomee-9.1.1/apache-tomee-9.1.1-microprofile.zip.asc[icon:download[] PGP] https://downloads.apache.org/tomee/tomee-9.1.1/apache-tomee-9.1.1-microprofile.zip.sha512[icon:download[] SHA512] +| https://archive.apache.org/disttomee/tomee-9.1.1/apache-tomee-9.1.1-microprofile.tar.gz[icon:download[] TomEE Microprofile TAR.GZ] |9.1.1|12 Oct 2023|69 MB |https://downloads.apache.org/tomee/tomee-9.1.1/apache-tomee-9.1.1-microprofile.tar.gz.asc[icon:download[] PGP] https://downloads.apache.org/tomee/tomee-9.1.1/apache-tomee-9.1.1-microprofile.tar.gz.sha512[icon:download[] SHA512] +| https://archive.apache.org/disttomee/tomee-9.1.1/apache-tomee-9.1.1-plume.zip[icon:download[] TomEE Plume ZIP] |9.1.1|12 Oct 2023|82 MB |https://downloads.apache.org/tomee/tomee-9.1.1/apache-tomee-9.1.1-plume.zip.asc[icon:download[] PGP] https://downloads.apache.org/tomee/tomee-9.1.1/apache-tomee-9.1.1-plume.zip.sha512[icon:download[] SHA512] +| https://archive.apache.org/disttomee/tomee-9.1.1/apache-tomee-9.1.1-plume.tar.gz[icon:download[] TomEE Plume TAR.GZ] |9.1.1|12 Oct 2023|82 MB |https://downloads.apache.org/tomee/tomee-9.1.1/apache-tomee-9.1.1-plume.tar.gz.asc[icon:download[] PGP] https://downloads.apache.org/tomee/tomee-9.1.1/apache-tomee-9.1.1-plume.tar.gz.sha512[icon:download[] SHA512] +| https://archive.apache.org/dist
svn commit: r66197 - /release/tomee/tomee-9.1.1/
Author: jgallimore Date: Tue Dec 19 20:48:33 2023 New Revision: 66197 Log: Removing 9.1.1 release Removed: release/tomee/tomee-9.1.1/
svn commit: r66196 - /release/tomee/tomee-9.1.2/
Author: jgallimore Date: Tue Dec 19 20:45:10 2023 New Revision: 66196 Log: Adding TomEE 9.1.2 release Added: release/tomee/tomee-9.1.2/ release/tomee/tomee-9.1.2/apache-tomee-9.1.2-microprofile.tar.gz.asc release/tomee/tomee-9.1.2/apache-tomee-9.1.2-microprofile.tar.gz.sha256 release/tomee/tomee-9.1.2/apache-tomee-9.1.2-microprofile.tar.gz.sha512 release/tomee/tomee-9.1.2/apache-tomee-9.1.2-microprofile.zip (with props) release/tomee/tomee-9.1.2/apache-tomee-9.1.2-microprofile.zip.asc release/tomee/tomee-9.1.2/apache-tomee-9.1.2-microprofile.zip.sha256 release/tomee/tomee-9.1.2/apache-tomee-9.1.2-microprofile.zip.sha512 release/tomee/tomee-9.1.2/apache-tomee-9.1.2-plume.tar.gz (with props) release/tomee/tomee-9.1.2/apache-tomee-9.1.2-plume.tar.gz.asc release/tomee/tomee-9.1.2/apache-tomee-9.1.2-plume.tar.gz.sha256 release/tomee/tomee-9.1.2/apache-tomee-9.1.2-plume.tar.gz.sha512 release/tomee/tomee-9.1.2/apache-tomee-9.1.2-plume.zip (with props) release/tomee/tomee-9.1.2/apache-tomee-9.1.2-plume.zip.asc release/tomee/tomee-9.1.2/apache-tomee-9.1.2-plume.zip.sha256 release/tomee/tomee-9.1.2/apache-tomee-9.1.2-plume.zip.sha512 release/tomee/tomee-9.1.2/apache-tomee-9.1.2-plus.tar.gz (with props) release/tomee/tomee-9.1.2/apache-tomee-9.1.2-plus.tar.gz.asc release/tomee/tomee-9.1.2/apache-tomee-9.1.2-plus.tar.gz.sha256 release/tomee/tomee-9.1.2/apache-tomee-9.1.2-plus.tar.gz.sha512 release/tomee/tomee-9.1.2/apache-tomee-9.1.2-plus.zip (with props) release/tomee/tomee-9.1.2/apache-tomee-9.1.2-plus.zip.asc release/tomee/tomee-9.1.2/apache-tomee-9.1.2-plus.zip.sha256 release/tomee/tomee-9.1.2/apache-tomee-9.1.2-plus.zip.sha512 release/tomee/tomee-9.1.2/apache-tomee-9.1.2-webprofile.tar.gz (with props) release/tomee/tomee-9.1.2/apache-tomee-9.1.2-webprofile.tar.gz.asc release/tomee/tomee-9.1.2/apache-tomee-9.1.2-webprofile.tar.gz.sha256 release/tomee/tomee-9.1.2/apache-tomee-9.1.2-webprofile.tar.gz.sha512 release/tomee/tomee-9.1.2/apache-tomee-9.1.2-webprofile.zip (with props) release/tomee/tomee-9.1.2/apache-tomee-9.1.2-webprofile.zip.asc release/tomee/tomee-9.1.2/apache-tomee-9.1.2-webprofile.zip.sha256 release/tomee/tomee-9.1.2/apache-tomee-9.1.2-webprofile.zip.sha512 release/tomee/tomee-9.1.2/tomee-project-9.1.2-source-release.zip (with props) release/tomee/tomee-9.1.2/tomee-project-9.1.2-source-release.zip.asc release/tomee/tomee-9.1.2/tomee-project-9.1.2-source-release.zip.sha256 release/tomee/tomee-9.1.2/tomee-project-9.1.2-source-release.zip.sha512 Added: release/tomee/tomee-9.1.2/apache-tomee-9.1.2-microprofile.tar.gz.asc == --- release/tomee/tomee-9.1.2/apache-tomee-9.1.2-microprofile.tar.gz.asc (added) +++ release/tomee/tomee-9.1.2/apache-tomee-9.1.2-microprofile.tar.gz.asc Tue Dec 19 20:45:10 2023 @@ -0,0 +1,6 @@ +-BEGIN PGP SIGNATURE- + +iF0EABEKAB0WIQTbzNEDuLJPhv+qsCXIu0cs0pfUKAUCZXiGugAKCRDIu0cs0pfU +KIltAKC/6DcrIdJNuKq2B69u9X3JMHrZtwCaA2C/HxTF3mQTrC1DtC6pQGlQStU= +=LhFo +-END PGP SIGNATURE- Added: release/tomee/tomee-9.1.2/apache-tomee-9.1.2-microprofile.tar.gz.sha256 == --- release/tomee/tomee-9.1.2/apache-tomee-9.1.2-microprofile.tar.gz.sha256 (added) +++ release/tomee/tomee-9.1.2/apache-tomee-9.1.2-microprofile.tar.gz.sha256 Tue Dec 19 20:45:10 2023 @@ -0,0 +1 @@ +127fe70f12a6df54440b5f3f6465a1698fb41928bf92f612bc97b16f2ee111df apache-tomee-9.1.2-microprofile.tar.gz \ No newline at end of file Added: release/tomee/tomee-9.1.2/apache-tomee-9.1.2-microprofile.tar.gz.sha512 == --- release/tomee/tomee-9.1.2/apache-tomee-9.1.2-microprofile.tar.gz.sha512 (added) +++ release/tomee/tomee-9.1.2/apache-tomee-9.1.2-microprofile.tar.gz.sha512 Tue Dec 19 20:45:10 2023 @@ -0,0 +1 @@ +2439db4082f7f0a8f4c2ef111dbf4434cb48b5f25882796a3d1672857edb3a08fd0f7a8e911a03d9a3424b082fa4e0b44e8cc8b3954bf17fae8f50ed329c9547 apache-tomee-9.1.2-microprofile.tar.gz \ No newline at end of file Added: release/tomee/tomee-9.1.2/apache-tomee-9.1.2-microprofile.zip == Binary file - no diff available. Propchange: release/tomee/tomee-9.1.2/apache-tomee-9.1.2-microprofile.zip -- svn:mime-type = application/octet-stream Added: release/tomee/tomee-9.1.2/apache-tomee-9.1.2-microprofile.zip.asc == --- release/tomee/tomee-9.1.2/apache-tomee-9.1.2-microprofile.zip.asc (added) +++ release/tomee/tomee-9.1.2/apache-tomee-9.1.2-microprofile.zip.asc Tue Dec 19 20:45:10 2023 @@ -0,0 +1,6
svn commit: r66195 - /release/tomee/tomee-9.1.2
Author: jgallimore Date: Tue Dec 19 20:43:26 2023 New Revision: 66195 Log: Remove tomee-9.1.2 incorrectly added Removed: release/tomee/tomee-9.1.2
svn commit: r66191 - /dev/tomee/staging-1225/tomee-9.1.2/
Author: jgallimore Date: Tue Dec 19 16:04:47 2023 New Revision: 66191 Log: [release-tools] remove staged directory tomee-9.1.2 Removed: dev/tomee/staging-1225/tomee-9.1.2/
svn commit: r66190 - /dev/tomee/staging-1225/tomee-9.1.2/apache-tomee-9.1.2-microprofile.tar.gz /release/tomee/tomee-9.1.2
Author: jgallimore Date: Tue Dec 19 16:03:33 2023 New Revision: 66190 Log: [release-tools] promote staged binaries for apache-tomee-9.1.2-microprofile.tar.gz Added: release/tomee/tomee-9.1.2 - copied unchanged from r66189, dev/tomee/staging-1225/tomee-9.1.2/apache-tomee-9.1.2-microprofile.tar.gz Removed: dev/tomee/staging-1225/tomee-9.1.2/apache-tomee-9.1.2-microprofile.tar.gz
(tomee) annotated tag tomee-9.1.2 updated (ca00996f27 -> 72d35e600d)
This is an automated email from the ASF dual-hosted git repository. jgallimore pushed a change to annotated tag tomee-9.1.2 in repository https://gitbox.apache.org/repos/asf/tomee.git *** WARNING: tag tomee-9.1.2 was modified! *** from ca00996f27 (commit) to 72d35e600d (tag) tagging ca00996f27b578c9bc4efc4330b44c86d32d5323 (commit) replaces tomee-project-9.1.1 by Jonathan Gallimore on Tue Dec 12 16:05:08 2023 + - Log - [maven-release-plugin] copy for tag tomee-9.1.2 --- No new revisions were added by this update. Summary of changes:
(tomee) branch tomee-9.x updated (c5b7df987a -> 7f17155ca5)
This is an automated email from the ASF dual-hosted git repository. jgallimore pushed a change to branch tomee-9.x in repository https://gitbox.apache.org/repos/asf/tomee.git from c5b7df987a Revert "[maven-release-plugin] prepare release tomee-9.1.2" new 32e84e2ad7 [maven-release-plugin] prepare release tomee-9.1.2 new 6dc5d31888 [maven-release-plugin] prepare for next development iteration new fac9d33a7d [maven-release-plugin] rollback the release of tomee-9.1.2 new ca00996f27 [maven-release-plugin] prepare release tomee-9.1.2 new 7f17155ca5 [maven-release-plugin] prepare for next development iteration The 5 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 | 2 +- arquillian/arquillian-openejb-embedded/pom.xml | 2 +- .../arquillian-openejb-transaction-provider/pom.xml| 2 +- arquillian/arquillian-tck/pom.xml | 2 +- arquillian/arquillian-tomee-common/pom.xml | 2 +- arquillian/arquillian-tomee-embedded/pom.xml | 2 +- arquillian/arquillian-tomee-moviefun-example/pom.xml | 4 ++-- arquillian/arquillian-tomee-remote/pom.xml | 8 .../arquillian-tomee-config-tests/pom.xml | 2 +- .../arquillian-tomee-jaxrs-tests/pom.xml | 2 +- .../arquillian-tomee-jaxws-tests/pom.xml | 2 +- .../arquillian-tomee-jms-tests/pom.xml | 2 +- .../arquillian-tomee-webprofile-tests/pom.xml | 2 +- arquillian/arquillian-tomee-tests/pom.xml | 2 +- arquillian/arquillian-tomee-webapp-remote/pom.xml | 2 +- arquillian/pom.xml | 4 ++-- arquillian/ziplock/pom.xml | 2 +- assembly/openejb-lite/pom.xml | 2 +- assembly/openejb-standalone/pom.xml| 2 +- assembly/pom.xml | 2 +- boms/jaxb-runtime/pom.xml | 2 +- boms/pom.xml | 2 +- boms/tomee-microprofile-api/pom.xml| 2 +- boms/tomee-microprofile/pom.xml| 12 ++-- boms/tomee-plume-api/pom.xml | 2 +- boms/tomee-plume/pom.xml | 18 +- boms/tomee-plus-api/pom.xml| 2 +- boms/tomee-plus/pom.xml| 18 +- boms/tomee-webprofile-api/pom.xml | 2 +- boms/tomee-webprofile/pom.xml | 12 ++-- container/mbean-annotation-api/pom.xml | 2 +- container/openejb-api/pom.xml | 2 +- container/openejb-core/pom.xml | 2 +- container/openejb-javaagent/pom.xml| 2 +- container/openejb-jee-accessors/pom.xml| 2 +- container/openejb-jee/pom.xml | 2 +- container/openejb-jpa-integration/pom.xml | 2 +- container/openejb-junit/pom.xml| 2 +- container/openejb-junit5-backward/pom.xml | 2 +- container/openejb-junit5/pom.xml | 2 +- container/openejb-loader/pom.xml | 2 +- container/pom.xml | 2 +- deps/activemq-broker-shade/pom.xml | 2 +- deps/activemq-kahadb-store-shade/pom.xml | 2 +- deps/activemq-ra-shade/pom.xml | 2 +- deps/commons-dbcp2-shade/pom.xml | 2 +- deps/commons-fileupload-shade/pom.xml | 2 +- deps/pom.xml | 2 +- deps/servicemix-bcel-shade/pom.xml | 2 +- deps/sxc-shade/pom.xml | 2 +- deps/taglibs-shade/pom.xml | 2 +- examples/access-timeout-meta/pom.xml | 4 ++-- examples/access-timeout/pom.xml| 6 +++--- examples/alternate-descriptors/pom.xml | 4 ++-- examples/application-composer/pom.xml | 4 ++-- examples/applicationcomposer-jaxws-cdi/pom.xml | 8 examples/applicationexception/pom.xml | 4 ++-- examples/arquillian-jpa/pom.xml| 6 +++--- examples/async-methods/pom.xml | 4 ++-- examples/async-postconstruct/pom.xml | 4 ++-- examples/async-servlet/pom.xml | 8 examples/bean-validation-design-by-contract/pom.xml| 4
svn commit: r66010 - /dev/tomee/staging-1225/tomee-9.1.2/
Author: jgallimore Date: Tue Dec 12 16:34:00 2023 New Revision: 66010 Log: [release-tools] staged binaries for tomee-9.1.2 Added: dev/tomee/staging-1225/tomee-9.1.2/apache-tomee-9.1.2-microprofile.tar.gz (with props) dev/tomee/staging-1225/tomee-9.1.2/apache-tomee-9.1.2-microprofile.tar.gz.asc dev/tomee/staging-1225/tomee-9.1.2/apache-tomee-9.1.2-microprofile.tar.gz.sha256 dev/tomee/staging-1225/tomee-9.1.2/apache-tomee-9.1.2-microprofile.tar.gz.sha512 dev/tomee/staging-1225/tomee-9.1.2/apache-tomee-9.1.2-microprofile.zip (with props) dev/tomee/staging-1225/tomee-9.1.2/apache-tomee-9.1.2-microprofile.zip.asc dev/tomee/staging-1225/tomee-9.1.2/apache-tomee-9.1.2-microprofile.zip.sha256 dev/tomee/staging-1225/tomee-9.1.2/apache-tomee-9.1.2-microprofile.zip.sha512 dev/tomee/staging-1225/tomee-9.1.2/apache-tomee-9.1.2-plume.tar.gz (with props) dev/tomee/staging-1225/tomee-9.1.2/apache-tomee-9.1.2-plume.tar.gz.asc dev/tomee/staging-1225/tomee-9.1.2/apache-tomee-9.1.2-plume.tar.gz.sha256 dev/tomee/staging-1225/tomee-9.1.2/apache-tomee-9.1.2-plume.tar.gz.sha512 dev/tomee/staging-1225/tomee-9.1.2/apache-tomee-9.1.2-plume.zip (with props) dev/tomee/staging-1225/tomee-9.1.2/apache-tomee-9.1.2-plume.zip.asc dev/tomee/staging-1225/tomee-9.1.2/apache-tomee-9.1.2-plume.zip.sha256 dev/tomee/staging-1225/tomee-9.1.2/apache-tomee-9.1.2-plume.zip.sha512 dev/tomee/staging-1225/tomee-9.1.2/apache-tomee-9.1.2-plus.tar.gz (with props) dev/tomee/staging-1225/tomee-9.1.2/apache-tomee-9.1.2-plus.tar.gz.asc dev/tomee/staging-1225/tomee-9.1.2/apache-tomee-9.1.2-plus.tar.gz.sha256 dev/tomee/staging-1225/tomee-9.1.2/apache-tomee-9.1.2-plus.tar.gz.sha512 dev/tomee/staging-1225/tomee-9.1.2/apache-tomee-9.1.2-plus.zip (with props) dev/tomee/staging-1225/tomee-9.1.2/apache-tomee-9.1.2-plus.zip.asc dev/tomee/staging-1225/tomee-9.1.2/apache-tomee-9.1.2-plus.zip.sha256 dev/tomee/staging-1225/tomee-9.1.2/apache-tomee-9.1.2-plus.zip.sha512 dev/tomee/staging-1225/tomee-9.1.2/apache-tomee-9.1.2-webprofile.tar.gz (with props) dev/tomee/staging-1225/tomee-9.1.2/apache-tomee-9.1.2-webprofile.tar.gz.asc dev/tomee/staging-1225/tomee-9.1.2/apache-tomee-9.1.2-webprofile.tar.gz.sha256 dev/tomee/staging-1225/tomee-9.1.2/apache-tomee-9.1.2-webprofile.tar.gz.sha512 dev/tomee/staging-1225/tomee-9.1.2/apache-tomee-9.1.2-webprofile.zip (with props) dev/tomee/staging-1225/tomee-9.1.2/apache-tomee-9.1.2-webprofile.zip.asc dev/tomee/staging-1225/tomee-9.1.2/apache-tomee-9.1.2-webprofile.zip.sha256 dev/tomee/staging-1225/tomee-9.1.2/apache-tomee-9.1.2-webprofile.zip.sha512 dev/tomee/staging-1225/tomee-9.1.2/tomee-project-9.1.2-source-release.zip (with props) dev/tomee/staging-1225/tomee-9.1.2/tomee-project-9.1.2-source-release.zip.asc dev/tomee/staging-1225/tomee-9.1.2/tomee-project-9.1.2-source-release.zip.sha256 dev/tomee/staging-1225/tomee-9.1.2/tomee-project-9.1.2-source-release.zip.sha512 Added: dev/tomee/staging-1225/tomee-9.1.2/apache-tomee-9.1.2-microprofile.tar.gz == Binary file - no diff available. Propchange: dev/tomee/staging-1225/tomee-9.1.2/apache-tomee-9.1.2-microprofile.tar.gz -- svn:mime-type = application/octet-stream Added: dev/tomee/staging-1225/tomee-9.1.2/apache-tomee-9.1.2-microprofile.tar.gz.asc == --- dev/tomee/staging-1225/tomee-9.1.2/apache-tomee-9.1.2-microprofile.tar.gz.asc (added) +++ dev/tomee/staging-1225/tomee-9.1.2/apache-tomee-9.1.2-microprofile.tar.gz.asc Tue Dec 12 16:34:00 2023 @@ -0,0 +1,6 @@ +-BEGIN PGP SIGNATURE- + +iF0EABEKAB0WIQTbzNEDuLJPhv+qsCXIu0cs0pfUKAUCZXiGugAKCRDIu0cs0pfU +KIltAKC/6DcrIdJNuKq2B69u9X3JMHrZtwCaA2C/HxTF3mQTrC1DtC6pQGlQStU= +=LhFo +-END PGP SIGNATURE- Added: dev/tomee/staging-1225/tomee-9.1.2/apache-tomee-9.1.2-microprofile.tar.gz.sha256 == --- dev/tomee/staging-1225/tomee-9.1.2/apache-tomee-9.1.2-microprofile.tar.gz.sha256 (added) +++ dev/tomee/staging-1225/tomee-9.1.2/apache-tomee-9.1.2-microprofile.tar.gz.sha256 Tue Dec 12 16:34:00 2023 @@ -0,0 +1 @@ +127fe70f12a6df54440b5f3f6465a1698fb41928bf92f612bc97b16f2ee111df apache-tomee-9.1.2-microprofile.tar.gz \ No newline at end of file Added: dev/tomee/staging-1225/tomee-9.1.2/apache-tomee-9.1.2-microprofile.tar.gz.sha512 == --- dev/tomee/staging-1225/tomee-9.1.2/apache-tomee-9.1.2-microprofile.tar.gz.sha512 (added) +++ dev/tomee/staging-1225/tomee-9.1.2/apache-tomee-9.1.2-microprofile.tar.gz.sha512 Tue Dec 12 16:34:00 2023 @@ -0,0 +1
svn commit: r66009 - in /dev/tomee/staging-1225: ./ tomee-9.1.2/
Author: jgallimore Date: Tue Dec 12 16:32:35 2023 New Revision: 66009 Log: [release-tools] staged binary dir for tomee-9.1.2 Added: dev/tomee/staging-1225/ dev/tomee/staging-1225/tomee-9.1.2/
svn commit: r66003 - /dev/tomee/staging-1224/
Author: jgallimore Date: Tue Dec 12 14:10:59 2023 New Revision: 66003 Log: Removing vote directory Removed: dev/tomee/staging-1224/
(tomee) annotated tag tomee-9.1.2 deleted (was d7dcfd2d3d)
This is an automated email from the ASF dual-hosted git repository. jgallimore pushed a change to annotated tag tomee-9.1.2 in repository https://gitbox.apache.org/repos/asf/tomee.git *** WARNING: tag tomee-9.1.2 was deleted! *** tag was d7dcfd2d3d The revisions that were on this annotated tag are still contained in other references; therefore, this change does not discard any commits from the repository.
(tomee) branch tomee-9.x updated (cae9d2f18a -> c5b7df987a)
This is an automated email from the ASF dual-hosted git repository. jgallimore pushed a change to branch tomee-9.x in repository https://gitbox.apache.org/repos/asf/tomee.git from cae9d2f18a Merge pull request #1088 from jgallimore/TOMEE-4289 new e2de136423 Revert "[maven-release-plugin] prepare for next development iteration" new c5b7df987a Revert "[maven-release-plugin] prepare release tomee-9.1.2" 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 | 2 +- arquillian/arquillian-openejb-embedded/pom.xml | 2 +- .../arquillian-openejb-transaction-provider/pom.xml| 2 +- arquillian/arquillian-tck/pom.xml | 2 +- arquillian/arquillian-tomee-common/pom.xml | 2 +- arquillian/arquillian-tomee-embedded/pom.xml | 2 +- arquillian/arquillian-tomee-moviefun-example/pom.xml | 4 ++-- arquillian/arquillian-tomee-remote/pom.xml | 8 .../arquillian-tomee-config-tests/pom.xml | 2 +- .../arquillian-tomee-jaxrs-tests/pom.xml | 2 +- .../arquillian-tomee-jaxws-tests/pom.xml | 2 +- .../arquillian-tomee-jms-tests/pom.xml | 2 +- .../arquillian-tomee-webprofile-tests/pom.xml | 2 +- arquillian/arquillian-tomee-tests/pom.xml | 2 +- arquillian/arquillian-tomee-webapp-remote/pom.xml | 2 +- arquillian/pom.xml | 4 ++-- arquillian/ziplock/pom.xml | 2 +- assembly/openejb-lite/pom.xml | 2 +- assembly/openejb-standalone/pom.xml| 2 +- assembly/pom.xml | 2 +- boms/jaxb-runtime/pom.xml | 2 +- boms/pom.xml | 2 +- boms/tomee-microprofile-api/pom.xml| 2 +- boms/tomee-microprofile/pom.xml| 12 ++-- boms/tomee-plume-api/pom.xml | 2 +- boms/tomee-plume/pom.xml | 18 +- boms/tomee-plus-api/pom.xml| 2 +- boms/tomee-plus/pom.xml| 18 +- boms/tomee-webprofile-api/pom.xml | 2 +- boms/tomee-webprofile/pom.xml | 12 ++-- container/mbean-annotation-api/pom.xml | 2 +- container/openejb-api/pom.xml | 2 +- container/openejb-core/pom.xml | 2 +- container/openejb-javaagent/pom.xml| 2 +- container/openejb-jee-accessors/pom.xml| 2 +- container/openejb-jee/pom.xml | 2 +- container/openejb-jpa-integration/pom.xml | 2 +- container/openejb-junit/pom.xml| 2 +- container/openejb-junit5-backward/pom.xml | 2 +- container/openejb-junit5/pom.xml | 2 +- container/openejb-loader/pom.xml | 2 +- container/pom.xml | 2 +- deps/activemq-broker-shade/pom.xml | 2 +- deps/activemq-kahadb-store-shade/pom.xml | 2 +- deps/activemq-ra-shade/pom.xml | 2 +- deps/commons-dbcp2-shade/pom.xml | 2 +- deps/commons-fileupload-shade/pom.xml | 2 +- deps/pom.xml | 2 +- deps/servicemix-bcel-shade/pom.xml | 2 +- deps/sxc-shade/pom.xml | 2 +- deps/taglibs-shade/pom.xml | 2 +- examples/access-timeout-meta/pom.xml | 4 ++-- examples/access-timeout/pom.xml| 6 +++--- examples/alternate-descriptors/pom.xml | 4 ++-- examples/application-composer/pom.xml | 4 ++-- examples/applicationcomposer-jaxws-cdi/pom.xml | 8 examples/applicationexception/pom.xml | 4 ++-- examples/arquillian-jpa/pom.xml| 6 +++--- examples/async-methods/pom.xml | 4 ++-- examples/async-postconstruct/pom.xml | 4 ++-- examples/async-servlet/pom.xml | 8 examples/bean-validation-design-by-contract/pom.xml| 4 ++-- examples/bval-evaluation-redeployment/WebApp1/pom.xml | 2 +- examples/bval-evaluation-redeployment/WebApp2/pom.xml | 2 +- examples/bval-evaluation-redeployment/pom.xml | 8 examples/bval-evalu
(tomee) branch tomee-9.x updated: TOMEE-4289 Patch SystemLogHandler
This is an automated email from the ASF dual-hosted git repository.
jgallimore pushed a commit to branch tomee-9.x
in repository https://gitbox.apache.org/repos/asf/tomee.git
The following commit(s) were added to refs/heads/tomee-9.x by this push:
new 8f7e496047 TOMEE-4289 Patch SystemLogHandler
new cae9d2f18a Merge pull request #1088 from jgallimore/TOMEE-4289
8f7e496047 is described below
commit 8f7e49604729b3f727644db9f4932a87f8cc40d4
Author: Jonathan Gallimore
AuthorDate: Tue Dec 12 11:07:16 2023 +
TOMEE-4289 Patch SystemLogHandler
---
.../apache/tomcat/util/log/SystemLogHandler.java | 278 +
1 file changed, 278 insertions(+)
diff --git
a/tomee/apache-tomee/src/patch/java/org/apache/tomcat/util/log/SystemLogHandler.java
b/tomee/apache-tomee/src/patch/java/org/apache/tomcat/util/log/SystemLogHandler.java
new file mode 100644
index 00..2a3a6cd5a1
--- /dev/null
+++
b/tomee/apache-tomee/src/patch/java/org/apache/tomcat/util/log/SystemLogHandler.java
@@ -0,0 +1,278 @@
+/*
+ * 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.tomcat.util.log;
+
+import java.io.IOException;
+import java.io.PrintStream;
+import java.util.ArrayDeque;
+import java.util.Deque;
+import java.util.NoSuchElementException;
+import java.util.Queue;
+import java.util.concurrent.ConcurrentLinkedQueue;
+
+/**
+ * This helper class may be used to do sophisticated redirection of
+ * System.out and System.err on a per Thread basis.
+ *
+ * A stack is implemented per Thread so that nested startCapture
+ * and stopCapture can be used.
+ *
+ * @author Remy Maucherat
+ * @author Glenn L. Nielsen
+ */
+public class SystemLogHandler extends PrintStream {
+
+
+// --- Constructors
+
+
+/**
+ * Construct the handler to capture the output of the given steam.
+ *
+ * @param wrapped The stream to capture
+ */
+public SystemLogHandler(PrintStream wrapped) {
+super(wrapped);
+out = wrapped;
+}
+
+
+// - Instance Variables
+
+
+/**
+ * Wrapped PrintStream.
+ */
+private final PrintStream out;
+
+
+/**
+ * Thread - CaptureLog associations.
+ */
+private static final ThreadLocal> logs = new
ThreadLocal<>();
+
+
+/**
+ * Spare CaptureLog ready for reuse.
+ */
+private static final Queue reuse = new
ConcurrentLinkedQueue<>();
+
+
+// - Public Methods
+
+
+/**
+ * Start capturing thread's output.
+ */
+public static void startCapture() {
+CaptureLog log = null;
+if (!reuse.isEmpty()) {
+try {
+log = reuse.remove();
+} catch (NoSuchElementException e) {
+log = new CaptureLog();
+}
+} else {
+log = new CaptureLog();
+}
+Deque stack = logs.get();
+if (stack == null) {
+stack = new ArrayDeque<>();
+logs.set(stack);
+}
+stack.addFirst(log);
+}
+
+
+/**
+ * Stop capturing thread's output.
+ *
+ * @return The captured data
+ */
+public static String stopCapture() {
+Queue stack = logs.get();
+if (stack == null || stack.isEmpty()) {
+return null;
+}
+CaptureLog log = stack.remove();
+if (log == null) {
+return null;
+}
+String capture = log.getCapture();
+log.reset();
+reuse.add(log);
+return capture;
+}
+
+
+// -- Protected Methods
+
+
+/**
+ * Find PrintStream to which the output must be written to.
+ * @return the print stream
+ */
+protected PrintStream findStream() {
+Queue stack = logs.get();
+if (stack != null && !stack.isEmpty()) {
+CaptureLog log = stack.peek();
+if (log != null) {
+PrintStream ps = log.getStream();
+
(tomee) branch tomee-9.x updated (48929c5b34 -> 65ff77ed7e)
This is an automated email from the ASF dual-hosted git repository. jgallimore pushed a change to branch tomee-9.x in repository https://gitbox.apache.org/repos/asf/tomee.git from 48929c5b34 TOMEE-4284 slight refactor to fix two failing unit tests new f6a3ef4e4d [maven-release-plugin] prepare release tomee-9.1.2 new 65ff77ed7e [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 | 2 +- arquillian/arquillian-openejb-embedded/pom.xml | 2 +- .../arquillian-openejb-transaction-provider/pom.xml| 2 +- arquillian/arquillian-tck/pom.xml | 2 +- arquillian/arquillian-tomee-common/pom.xml | 2 +- arquillian/arquillian-tomee-embedded/pom.xml | 2 +- arquillian/arquillian-tomee-moviefun-example/pom.xml | 4 ++-- arquillian/arquillian-tomee-remote/pom.xml | 8 .../arquillian-tomee-config-tests/pom.xml | 2 +- .../arquillian-tomee-jaxrs-tests/pom.xml | 2 +- .../arquillian-tomee-jaxws-tests/pom.xml | 2 +- .../arquillian-tomee-jms-tests/pom.xml | 2 +- .../arquillian-tomee-webprofile-tests/pom.xml | 2 +- arquillian/arquillian-tomee-tests/pom.xml | 2 +- arquillian/arquillian-tomee-webapp-remote/pom.xml | 2 +- arquillian/pom.xml | 4 ++-- arquillian/ziplock/pom.xml | 2 +- assembly/openejb-lite/pom.xml | 2 +- assembly/openejb-standalone/pom.xml| 2 +- assembly/pom.xml | 2 +- boms/jaxb-runtime/pom.xml | 2 +- boms/pom.xml | 2 +- boms/tomee-microprofile-api/pom.xml| 2 +- boms/tomee-microprofile/pom.xml| 12 ++-- boms/tomee-plume-api/pom.xml | 2 +- boms/tomee-plume/pom.xml | 18 +- boms/tomee-plus-api/pom.xml| 2 +- boms/tomee-plus/pom.xml| 18 +- boms/tomee-webprofile-api/pom.xml | 2 +- boms/tomee-webprofile/pom.xml | 12 ++-- container/mbean-annotation-api/pom.xml | 2 +- container/openejb-api/pom.xml | 2 +- container/openejb-core/pom.xml | 2 +- container/openejb-javaagent/pom.xml| 2 +- container/openejb-jee-accessors/pom.xml| 2 +- container/openejb-jee/pom.xml | 2 +- container/openejb-jpa-integration/pom.xml | 2 +- container/openejb-junit/pom.xml| 2 +- container/openejb-junit5-backward/pom.xml | 2 +- container/openejb-junit5/pom.xml | 2 +- container/openejb-loader/pom.xml | 2 +- container/pom.xml | 2 +- deps/activemq-broker-shade/pom.xml | 2 +- deps/activemq-kahadb-store-shade/pom.xml | 2 +- deps/activemq-ra-shade/pom.xml | 2 +- deps/commons-dbcp2-shade/pom.xml | 2 +- deps/commons-fileupload-shade/pom.xml | 2 +- deps/pom.xml | 2 +- deps/servicemix-bcel-shade/pom.xml | 2 +- deps/sxc-shade/pom.xml | 2 +- deps/taglibs-shade/pom.xml | 2 +- examples/access-timeout-meta/pom.xml | 4 ++-- examples/access-timeout/pom.xml| 6 +++--- examples/alternate-descriptors/pom.xml | 4 ++-- examples/application-composer/pom.xml | 4 ++-- examples/applicationcomposer-jaxws-cdi/pom.xml | 8 examples/applicationexception/pom.xml | 4 ++-- examples/arquillian-jpa/pom.xml| 6 +++--- examples/async-methods/pom.xml | 4 ++-- examples/async-postconstruct/pom.xml | 4 ++-- examples/async-servlet/pom.xml | 8 examples/bean-validation-design-by-contract/pom.xml| 4 ++-- examples/bval-evaluation-redeployment/WebApp1/pom.xml | 2 +- examples/bval-evaluation-redeployment/WebApp2/pom.xml | 2 +- examples/bval-evaluation-redeployment/pom.xml | 8 examples/bval-evaluation-redeployment/r
(tomee) annotated tag tomee-9.1.2 updated (f6a3ef4e4d -> d7dcfd2d3d)
This is an automated email from the ASF dual-hosted git repository. jgallimore pushed a change to annotated tag tomee-9.1.2 in repository https://gitbox.apache.org/repos/asf/tomee.git *** WARNING: tag tomee-9.1.2 was modified! *** from f6a3ef4e4d (commit) to d7dcfd2d3d (tag) tagging f6a3ef4e4de1e7d9264ca8934493bbc6b14cb5e7 (commit) replaces tomee-project-9.1.1 by Jonathan Gallimore on Thu Dec 7 10:19:29 2023 + - Log - [maven-release-plugin] copy for tag tomee-9.1.2 --- No new revisions were added by this update. Summary of changes:
svn commit: r65879 - /dev/tomee/staging-1224/tomee-9.1.2/
Author: jgallimore Date: Thu Dec 7 11:11:16 2023 New Revision: 65879 Log: [release-tools] staged binaries for tomee-9.1.2 Added: dev/tomee/staging-1224/tomee-9.1.2/apache-tomee-9.1.2-microprofile.tar.gz (with props) dev/tomee/staging-1224/tomee-9.1.2/apache-tomee-9.1.2-microprofile.tar.gz.asc dev/tomee/staging-1224/tomee-9.1.2/apache-tomee-9.1.2-microprofile.tar.gz.sha256 dev/tomee/staging-1224/tomee-9.1.2/apache-tomee-9.1.2-microprofile.tar.gz.sha512 dev/tomee/staging-1224/tomee-9.1.2/apache-tomee-9.1.2-microprofile.zip (with props) dev/tomee/staging-1224/tomee-9.1.2/apache-tomee-9.1.2-microprofile.zip.asc dev/tomee/staging-1224/tomee-9.1.2/apache-tomee-9.1.2-microprofile.zip.sha256 dev/tomee/staging-1224/tomee-9.1.2/apache-tomee-9.1.2-microprofile.zip.sha512 dev/tomee/staging-1224/tomee-9.1.2/apache-tomee-9.1.2-plume.tar.gz (with props) dev/tomee/staging-1224/tomee-9.1.2/apache-tomee-9.1.2-plume.tar.gz.asc dev/tomee/staging-1224/tomee-9.1.2/apache-tomee-9.1.2-plume.tar.gz.sha256 dev/tomee/staging-1224/tomee-9.1.2/apache-tomee-9.1.2-plume.tar.gz.sha512 dev/tomee/staging-1224/tomee-9.1.2/apache-tomee-9.1.2-plume.zip (with props) dev/tomee/staging-1224/tomee-9.1.2/apache-tomee-9.1.2-plume.zip.asc dev/tomee/staging-1224/tomee-9.1.2/apache-tomee-9.1.2-plume.zip.sha256 dev/tomee/staging-1224/tomee-9.1.2/apache-tomee-9.1.2-plume.zip.sha512 dev/tomee/staging-1224/tomee-9.1.2/apache-tomee-9.1.2-plus.tar.gz (with props) dev/tomee/staging-1224/tomee-9.1.2/apache-tomee-9.1.2-plus.tar.gz.asc dev/tomee/staging-1224/tomee-9.1.2/apache-tomee-9.1.2-plus.tar.gz.sha256 dev/tomee/staging-1224/tomee-9.1.2/apache-tomee-9.1.2-plus.tar.gz.sha512 dev/tomee/staging-1224/tomee-9.1.2/apache-tomee-9.1.2-plus.zip (with props) dev/tomee/staging-1224/tomee-9.1.2/apache-tomee-9.1.2-plus.zip.asc dev/tomee/staging-1224/tomee-9.1.2/apache-tomee-9.1.2-plus.zip.sha256 dev/tomee/staging-1224/tomee-9.1.2/apache-tomee-9.1.2-plus.zip.sha512 dev/tomee/staging-1224/tomee-9.1.2/apache-tomee-9.1.2-webprofile.tar.gz (with props) dev/tomee/staging-1224/tomee-9.1.2/apache-tomee-9.1.2-webprofile.tar.gz.asc dev/tomee/staging-1224/tomee-9.1.2/apache-tomee-9.1.2-webprofile.tar.gz.sha256 dev/tomee/staging-1224/tomee-9.1.2/apache-tomee-9.1.2-webprofile.tar.gz.sha512 dev/tomee/staging-1224/tomee-9.1.2/apache-tomee-9.1.2-webprofile.zip (with props) dev/tomee/staging-1224/tomee-9.1.2/apache-tomee-9.1.2-webprofile.zip.asc dev/tomee/staging-1224/tomee-9.1.2/apache-tomee-9.1.2-webprofile.zip.sha256 dev/tomee/staging-1224/tomee-9.1.2/apache-tomee-9.1.2-webprofile.zip.sha512 dev/tomee/staging-1224/tomee-9.1.2/tomee-project-9.1.2-source-release.zip (with props) dev/tomee/staging-1224/tomee-9.1.2/tomee-project-9.1.2-source-release.zip.asc dev/tomee/staging-1224/tomee-9.1.2/tomee-project-9.1.2-source-release.zip.sha256 dev/tomee/staging-1224/tomee-9.1.2/tomee-project-9.1.2-source-release.zip.sha512 Added: dev/tomee/staging-1224/tomee-9.1.2/apache-tomee-9.1.2-microprofile.tar.gz == Binary file - no diff available. Propchange: dev/tomee/staging-1224/tomee-9.1.2/apache-tomee-9.1.2-microprofile.tar.gz -- svn:mime-type = application/octet-stream Added: dev/tomee/staging-1224/tomee-9.1.2/apache-tomee-9.1.2-microprofile.tar.gz.asc == --- dev/tomee/staging-1224/tomee-9.1.2/apache-tomee-9.1.2-microprofile.tar.gz.asc (added) +++ dev/tomee/staging-1224/tomee-9.1.2/apache-tomee-9.1.2-microprofile.tar.gz.asc Thu Dec 7 11:11:16 2023 @@ -0,0 +1,6 @@ +-BEGIN PGP SIGNATURE- + +iF0EABEKAB0WIQSSeurEua1zDew7sjGZaemFsaOQqQUCZXGeBwAKCRCZaemFsaOQ +qcqoAJwOm4yU9sIbhWM6dvWiWRwPf7sNugCeJJitr0iFoN3P7gSLfgMp2dbf6+Y= +=d2AS +-END PGP SIGNATURE- Added: dev/tomee/staging-1224/tomee-9.1.2/apache-tomee-9.1.2-microprofile.tar.gz.sha256 == --- dev/tomee/staging-1224/tomee-9.1.2/apache-tomee-9.1.2-microprofile.tar.gz.sha256 (added) +++ dev/tomee/staging-1224/tomee-9.1.2/apache-tomee-9.1.2-microprofile.tar.gz.sha256 Thu Dec 7 11:11:16 2023 @@ -0,0 +1 @@ +4ed7cf3d42fd545d5485adf957f55ea1e648880f05c9419c7892f7338bed7f48 apache-tomee-9.1.2-microprofile.tar.gz \ No newline at end of file Added: dev/tomee/staging-1224/tomee-9.1.2/apache-tomee-9.1.2-microprofile.tar.gz.sha512 == --- dev/tomee/staging-1224/tomee-9.1.2/apache-tomee-9.1.2-microprofile.tar.gz.sha512 (added) +++ dev/tomee/staging-1224/tomee-9.1.2/apache-tomee-9.1.2-microprofile.tar.gz.sha512 Thu Dec 7 11:11:16 2023 @@ -0,0 +1
svn commit: r65878 - /dev/tomee/staging-1224/tomee-9.1.2/
Author: jgallimore Date: Thu Dec 7 11:10:29 2023 New Revision: 65878 Log: [release-tools] staged binary dir for tomee-9.1.2 Added: dev/tomee/staging-1224/tomee-9.1.2/
svn commit: r65877 - /dev/tomee/staging-1224/
Author: jgallimore Date: Thu Dec 7 11:10:20 2023 New Revision: 65877 Log: Create staging folder Added: dev/tomee/staging-1224/
(tomee) branch tomee-9.x updated: TOMEE-4284 slight refactor to fix two failing unit tests
This is an automated email from the ASF dual-hosted git repository.
jgallimore pushed a commit to branch tomee-9.x
in repository https://gitbox.apache.org/repos/asf/tomee.git
The following commit(s) were added to refs/heads/tomee-9.x by this push:
new 48929c5b34 TOMEE-4284 slight refactor to fix two failing unit tests
48929c5b34 is described below
commit 48929c5b3400a1e799cd98e4420a18f9bf7b5757
Author: Jonathan Gallimore
AuthorDate: Wed Dec 6 17:03:06 2023 +
TOMEE-4284 slight refactor to fix two failing unit tests
---
.../jwt/config/JWTAuthConfigurationProperties.java| 15 +--
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git
a/mp-jwt/src/main/java/org/apache/tomee/microprofile/jwt/config/JWTAuthConfigurationProperties.java
b/mp-jwt/src/main/java/org/apache/tomee/microprofile/jwt/config/JWTAuthConfigurationProperties.java
index f258d8f4ca..3094dd7841 100644
---
a/mp-jwt/src/main/java/org/apache/tomee/microprofile/jwt/config/JWTAuthConfigurationProperties.java
+++
b/mp-jwt/src/main/java/org/apache/tomee/microprofile/jwt/config/JWTAuthConfigurationProperties.java
@@ -121,12 +121,15 @@ public class JWTAuthConfigurationProperties {
}
private Boolean queryAllowExp(){
-return config.getOptionalValue("tomee.mp.jwt.allow.no-exp",
Boolean.class)
-.or(() -> config.getOptionalValue("mp.jwt.tomee.allow.no-exp",
Boolean.class)
-.map(value -> {
-CONFIGURATION.warning("mp.jwt.tomee.allow.no-exp
property is deprecated, use tomee.mp.jwt.allow.no-exp propert instead.");
-return value;
-}))
+final Optional allowExp =
config.getOptionalValue("tomee.mp.jwt.allow.no-exp", Boolean.class);
+final Optional allowExpDeprecatedValue =
config.getOptionalValue("mp.jwt.tomee.allow.no-exp", Boolean.class);
+
+if (allowExpDeprecatedValue.isPresent()) {
+CONFIGURATION.warning("mp.jwt.tomee.allow.no-exp property is
deprecated, use tomee.mp.jwt.allow.no-exp property instead.");
+}
+
+return allowExp
+.or(() -> allowExpDeprecatedValue)
.orElse(false);
}
(tomee) 02/02: Implement tomee.mp.jwt.allow.no-exp property over mp.jwt.tomee.allow.no-exp
This is an automated email from the ASF dual-hosted git repository.
jgallimore pushed a commit to branch tomee-9.x
in repository https://gitbox.apache.org/repos/asf/tomee.git
commit a67e4034184479b5f4d0f2d0922ca43051b5278a
Author: Zoltán Tichov
AuthorDate: Sun Dec 3 22:25:26 2023 +0100
Implement tomee.mp.jwt.allow.no-exp property over mp.jwt.tomee.allow.no-exp
---
.../microprofile/jwt/itest/AllowNoExpPropertyTest.java| 2 +-
.../jwt/config/JWTAuthConfigurationProperties.java| 15 ---
2 files changed, 9 insertions(+), 8 deletions(-)
diff --git
a/itests/microprofile-jwt-itests/src/test/java/org/apache/tomee/microprofile/jwt/itest/AllowNoExpPropertyTest.java
b/itests/microprofile-jwt-itests/src/test/java/org/apache/tomee/microprofile/jwt/itest/AllowNoExpPropertyTest.java
index 467cc17a6d..17003fb50d 100644
---
a/itests/microprofile-jwt-itests/src/test/java/org/apache/tomee/microprofile/jwt/itest/AllowNoExpPropertyTest.java
+++
b/itests/microprofile-jwt-itests/src/test/java/org/apache/tomee/microprofile/jwt/itest/AllowNoExpPropertyTest.java
@@ -45,7 +45,7 @@ import org.junit.Test;
public class AllowNoExpPropertyTest {
-
+
@Test
public void testNewPropertyOverridesOld1() throws Exception {
final Tokens tokens = Tokens.rsa(2048, 256);
diff --git
a/mp-jwt/src/main/java/org/apache/tomee/microprofile/jwt/config/JWTAuthConfigurationProperties.java
b/mp-jwt/src/main/java/org/apache/tomee/microprofile/jwt/config/JWTAuthConfigurationProperties.java
index 65fac63995..f258d8f4ca 100644
---
a/mp-jwt/src/main/java/org/apache/tomee/microprofile/jwt/config/JWTAuthConfigurationProperties.java
+++
b/mp-jwt/src/main/java/org/apache/tomee/microprofile/jwt/config/JWTAuthConfigurationProperties.java
@@ -121,14 +121,15 @@ public class JWTAuthConfigurationProperties {
}
private Boolean queryAllowExp(){
-AtomicBoolean result = new AtomicBoolean(false);
-config.getOptionalValue("mp.jwt.tomee.allow.no-exp",
Boolean.class).ifPresent(value -> {
-result.set(value);
-CONFIGURATION.warning("mp.jwt.tomee.allow.no-exp property is
deprecated, use tomee.mp.jwt.allow.no-exp propert instead.");
-});
-return config.getOptionalValue("tomee.mp.jwt.allow.no-exp",
Boolean.class).orElse(result.get());
+return config.getOptionalValue("tomee.mp.jwt.allow.no-exp",
Boolean.class)
+.or(() -> config.getOptionalValue("mp.jwt.tomee.allow.no-exp",
Boolean.class)
+.map(value -> {
+CONFIGURATION.warning("mp.jwt.tomee.allow.no-exp
property is deprecated, use tomee.mp.jwt.allow.no-exp propert instead.");
+return value;
+}))
+.orElse(false);
}
-
+
enum Keys {
VERIFY("mp.jwt.verify.publickey", "tomee.jwt.verify.publickey"),
DECRYPT("mp.jwt.decrypt.key", "tomee.jwt.decrypt.key");
(tomee) 01/02: Implement tomee.mp.jwt.allow.no-exp property over mp.jwt.tomee.allow.no-exp
This is an automated email from the ASF dual-hosted git repository.
jgallimore pushed a commit to branch tomee-9.x
in repository https://gitbox.apache.org/repos/asf/tomee.git
commit 8414084c93193767bea7b81783de53a7be866e08
Author: Zoltán Tichov
AuthorDate: Sun Dec 18 12:37:48 2022 +0100
Implement tomee.mp.jwt.allow.no-exp property over mp.jwt.tomee.allow.no-exp
---
docs/microprofile/jwt.adoc | 3 +-
.../jwt/itest/AllowNoExpPropertyTest.java | 253 +
.../jwt/config/JWTAuthConfigurationProperties.java | 15 +-
3 files changed, 268 insertions(+), 3 deletions(-)
diff --git a/docs/microprofile/jwt.adoc b/docs/microprofile/jwt.adoc
index 270be03e6e..d1b2e948e0 100644
--- a/docs/microprofile/jwt.adoc
+++ b/docs/microprofile/jwt.adoc
@@ -81,7 +81,8 @@ In addition to the standard MicroProfile JWT configuration
properties above, the
| Property
| Type
| Description
-| `mp.jwt.tomee.allow.no-exp`
+| `mp.jwt.tomee.allow.no-exp` is deprecated please use
`tomee.mp.jwt.allow.no-exp` property instead
+| `tomee.mp.jwt.allow.no-exp`
| Boolean
| Disables enforcing the `exp` time of the JWT. Useful if JWTs are also
verified by an API Gateway or proxy before reaching the server. The default
value is `false`
| `tomee.jwt.verify.publickey.cache`
diff --git
a/itests/microprofile-jwt-itests/src/test/java/org/apache/tomee/microprofile/jwt/itest/AllowNoExpPropertyTest.java
b/itests/microprofile-jwt-itests/src/test/java/org/apache/tomee/microprofile/jwt/itest/AllowNoExpPropertyTest.java
new file mode 100644
index 00..467cc17a6d
--- /dev/null
+++
b/itests/microprofile-jwt-itests/src/test/java/org/apache/tomee/microprofile/jwt/itest/AllowNoExpPropertyTest.java
@@ -0,0 +1,253 @@
+/*
+ * 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.jwt.itest;
+
+import jakarta.annotation.security.RolesAllowed;
+import jakarta.enterprise.context.RequestScoped;
+import jakarta.ws.rs.ApplicationPath;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.Application;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
+import java.io.File;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Base64;
+import static java.util.Collections.singletonList;
+import java.util.Optional;
+import org.apache.cxf.feature.LoggingFeature;
+import org.apache.cxf.jaxrs.client.WebClient;
+import org.apache.johnzon.jaxrs.JohnzonProvider;
+import org.apache.tomee.server.composer.Archive;
+import org.apache.tomee.server.composer.TomEE;
+import org.eclipse.microprofile.auth.LoginConfig;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import org.junit.Test;
+
+
+public class AllowNoExpPropertyTest {
+
+@Test
+public void testNewPropertyOverridesOld1() throws Exception {
+final Tokens tokens = Tokens.rsa(2048, 256);
+final File appJar = Archive.archive()
+.add(AllowNoExpPropertyTest.class)
+.add(ColorService.class)
+.add(Api.class)
+.add("META-INF/microprofile-config.properties", "#\n" +
+"mp.jwt.verify.publickey=" +
Base64.getEncoder().encodeToString(tokens.getPublicKey().getEncoded())
+ + "\n" + "mp.jwt.tomee.allow.no-exp=false"
+ + "\n" + "tomee.mp.jwt.allow.no-exp=true")
+.asJar();
+
+final ArrayList output = new ArrayList<>();
+final TomEE tomee = TomEE.microprofile()
+.add("webapps/test/WEB-INF/beans.xml", "")
+.add("webapps/test/WEB-INF/lib/app.jar", appJar)
+.watch("org.apache.tomee.microprofile.jwt.", "\n", output::add)
+.build();
+
+final WebClient webClient =
createWebClient(tomee.toURI().resolve("/test").toURL());
+
+final String claims = "{" +
+" \&
(tomee) branch tomee-9.x updated (f4215af59f -> a67e403418)
This is an automated email from the ASF dual-hosted git repository.
jgallimore pushed a change to branch tomee-9.x
in repository https://gitbox.apache.org/repos/asf/tomee.git
from f4215af59f TOMEE-4287 patch xbean-finder for a better exception message
new 8414084c93 Implement tomee.mp.jwt.allow.no-exp property over
mp.jwt.tomee.allow.no-exp
new a67e403418 Implement tomee.mp.jwt.allow.no-exp property over
mp.jwt.tomee.allow.no-exp
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/microprofile/jwt.adoc | 3 +-
...ClaimsTest.java => AllowNoExpPropertyTest.java} | 136 +
.../jwt/config/JWTAuthConfigurationProperties.java | 18 ++-
3 files changed, 127 insertions(+), 30 deletions(-)
copy
itests/microprofile-jwt-itests/src/test/java/org/apache/tomee/microprofile/jwt/itest/{MissingRequiredClaimsTest.java
=> AllowNoExpPropertyTest.java} (54%)
(tomee) branch main updated (2a17f9dd3f -> fe14799204)
This is an automated email from the ASF dual-hosted git repository.
jgallimore pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/tomee.git
from 2a17f9dd3f TOMEE-4286 look at http:// in the namespace as well as
https://
new 20e6d5a703 Implement tomee.mp.jwt.allow.no-exp property over
mp.jwt.tomee.allow.no-exp
new b361c5d91e Merge branch 'apache:main' into
mp-jwt-tomee.mp.jwt.allow.no-exp-property
new cb3a231dde Merge branch 'apache:main' into
mp-jwt-tomee.mp.jwt.allow.no-exp-property
new 1be9dc7eed Merge branch 'apache:main' into
mp-jwt-tomee.mp.jwt.allow.no-exp-property
new 36ecd39792 Merge branch 'apache:main' into
mp-jwt-tomee.mp.jwt.allow.no-exp-property
new 681df83979 Merge branch 'apache:main' into
mp-jwt-tomee.mp.jwt.allow.no-exp-property
new 6c9f71eba2 Merge branch 'apache:main' into TOMEE-4284
new 914e9cf4ef Implement tomee.mp.jwt.allow.no-exp property over
mp.jwt.tomee.allow.no-exp
new fe14799204 Merge pull request #1086 from tichovz/TOMEE-4284
The 14753 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/microprofile/jwt.adoc | 3 +-
...ClaimsTest.java => AllowNoExpPropertyTest.java} | 136 +
.../jwt/config/JWTAuthConfigurationProperties.java | 18 ++-
3 files changed, 127 insertions(+), 30 deletions(-)
copy
itests/microprofile-jwt-itests/src/test/java/org/apache/tomee/microprofile/jwt/itest/{MissingRequiredClaimsTest.java
=> AllowNoExpPropertyTest.java} (54%)
(tomee) branch tomee-8.x updated (e00a6b50eb -> 77cb27972d)
This is an automated email from the ASF dual-hosted git repository.
jgallimore pushed a change to branch tomee-8.x
in repository https://gitbox.apache.org/repos/asf/tomee.git
from e00a6b50eb Post release fixes
new 5a94c92d7e Update SLF4J to 2.0.9
new 21e2a31548 Always use SLF4J in the webapp if it is there
new 219957b644 Add Arquillian tests for SLF4J logging changes
new 55abd9997e Fix namespace
new 220249 Fix logback version for test
new 77cb27972d Merge pull request #1087 from jgallimore/TOMEE-4269-8x
The 14349 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:
.../BasicSlf4jWebappTest.java} | 50 ++--
.../SimpleServlet.java}| 47 ++-
.../tests/slf4j/Slf4j1xLogbackWebappTest.java | 94 ++
.../tests/slf4j/Slf4j2xLogbackWebappTest.java | 94 ++
.../openejb/arquillian/tests/slf4j/logback.xml}| 38 -
.../src/test/resources/slf4j1x-pom.xml | 38 -
.../src/test/resources/slf4j2x-pom.xml | 50 ++--
boms/tomee-microprofile/pom.xml| 4 +-
boms/tomee-plume/pom.xml | 4 +-
boms/tomee-plus/pom.xml| 4 +-
boms/tomee-webprofile/pom.xml | 4 +-
.../util/classloader/URLClassLoaderFirst.java | 24 +-
pom.xml| 2 +-
13 files changed, 311 insertions(+), 142 deletions(-)
copy
arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/{servlet/SimpleServletTest.java
=> slf4j/BasicSlf4jWebappTest.java} (59%)
copy
arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/{bmp/remote/FinderServlet.java
=> slf4j/SimpleServlet.java} (53%)
create mode 100644
arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/slf4j/Slf4j1xLogbackWebappTest.java
create mode 100644
arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/slf4j/Slf4j2xLogbackWebappTest.java
copy arquillian/arquillian-tomee-tests/{arquillian-tomee-codi-tests/pom.xml =>
arquillian-tomee-webprofile-tests/src/test/resources/org/apache/openejb/arquillian/tests/slf4j/logback.xml}
(52%)
copy examples/multi-jpa-provider-testing/src/test/resources/openjpa-pom.xml =>
arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/resources/slf4j1x-pom.xml
(66%)
copy examples/multi-jpa-provider-testing/src/test/resources/openjpa-pom.xml =>
arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/resources/slf4j2x-pom.xml
(53%)
(tomee) branch tomee-9.x updated: TOMEE-4287 patch xbean-finder for a better exception message
This is an automated email from the ASF dual-hosted git repository.
jgallimore pushed a commit to branch tomee-9.x
in repository https://gitbox.apache.org/repos/asf/tomee.git
The following commit(s) were added to refs/heads/tomee-9.x by this push:
new f4215af59f TOMEE-4287 patch xbean-finder for a better exception message
f4215af59f is described below
commit f4215af59f2a3c0a8d903ead3f34456ec7a442d5
Author: Jonathan Gallimore
AuthorDate: Wed Dec 6 15:05:21 2023 +
TOMEE-4287 patch xbean-finder for a better exception message
---
.../apache/xbean/finder/archive/JarArchive.java| 268 +
1 file changed, 268 insertions(+)
diff --git
a/tomee/apache-tomee/src/patch/java/org/apache/xbean/finder/archive/JarArchive.java
b/tomee/apache-tomee/src/patch/java/org/apache/xbean/finder/archive/JarArchive.java
new file mode 100644
index 00..78ffbaed27
--- /dev/null
+++
b/tomee/apache-tomee/src/patch/java/org/apache/xbean/finder/archive/JarArchive.java
@@ -0,0 +1,268 @@
+/**
+ * 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.xbean.finder.archive;
+
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Enumeration;
+import java.util.Iterator;
+import java.util.List;
+import java.util.NoSuchElementException;
+import java.util.jar.JarEntry;
+import java.util.jar.JarFile;
+import java.util.jar.Manifest;
+import java.util.zip.ZipEntry;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public class JarArchive implements Archive, AutoCloseable {
+
+private final ClassLoader loader;
+private final URL url;
+private final JarFile jar;
+private final MJarSupport mjar = new MJarSupport();
+
+/*
+ * Supports only 'file:/...' or 'jar:file:/...!/' URLs
+ */
+public JarArchive(ClassLoader loader, URL url){
+//if (!"jar".equals(url.getProtocol())) throw new
IllegalArgumentException("not a jar url: " + url);
+
+this.loader = loader;
+this.url = url;
+File jarFile = null;
+String jarPath;
+int idx;
+
+// Wipe out 'jar:' prefix AND '!/{...}' suffix(if any)
+if("jar".equalsIgnoreCase(url.getProtocol())){
+
+try{
+jarPath = url.getPath();
+url = new URL(jarPath.endsWith("!/") ?
+jarPath.substring(0, jarPath.lastIndexOf("!/"))
+: jarPath);
+}catch(MalformedURLException ex){
+throw new IllegalArgumentException(
+"Please provide 'file:/...' or 'jar:file:/...!/' URL"
++ " instead of '" +
FileArchive.decode(String.valueOf(url)) + "'");
+}
+}
+
+try{
+// handle 'file:/...' URL
+if("file".equalsIgnoreCase(url.getProtocol())){
+
+// Testing if file DOEN't exists AND trying
+// substrings up to every '!/{...}' as path
+idx = 0;
+jarPath = FileArchive.decode(url.getPath());
+for(String jp = jarPath; !(jarFile = new File(jp)).exists()
+&& (idx = jarPath.indexOf("!/", idx + 1)) > 0;
+jp = jarPath.substring(0, idx)){}
+
+// All substrings attempted, but referenced file wasn't
discovered
+if(!jarFile.exists()){
+
+// To be caught later and wrapped into IllegalStateEx -
default behavior
+throw new
FileNotFoundException(FileArchive.decode(String.valueOf(url)));
+}
+
+}else{
+throw new IllegalArgumentException(
+"Please provide 'file:/...' or 'jar:file:/...!/' URL"
++ " instead of '" +
FileArchive.decode(String.valueOf(url)) + "'"
(tomee) branch tomee-9.x updated: TOMEE-4286 look at http:// in the namespace as well as https://
This is an automated email from the ASF dual-hosted git repository.
jgallimore pushed a commit to branch tomee-9.x
in repository https://gitbox.apache.org/repos/asf/tomee.git
The following commit(s) were added to refs/heads/tomee-9.x by this push:
new 5b9dd0d34d TOMEE-4286 look at http:// in the namespace as well as
https://
5b9dd0d34d is described below
commit 5b9dd0d34dd03efed4e82bd0301444e5889917ff
Author: Jonathan Gallimore
AuthorDate: Tue Dec 5 14:37:02 2023 +
TOMEE-4286 look at http:// in the namespace as well as https://
---
.../openejb-jee/src/main/java/org/apache/openejb/jee/JaxbJavaee.java| 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/container/openejb-jee/src/main/java/org/apache/openejb/jee/JaxbJavaee.java
b/container/openejb-jee/src/main/java/org/apache/openejb/jee/JaxbJavaee.java
index 7b39e9e570..487dfcd209 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/JaxbJavaee.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/JaxbJavaee.java
@@ -352,7 +352,7 @@ public class JaxbJavaee {
protected String eeUri(final String uri) {
// if ee 7 or jakarta ee then switch back on ee 6 to not break
compatibility - to rework surely when we'll be fully ee 7 or jakarta ee
-if ("http://xmlns.jcp.org/xml/ns/javaee".equals(uri) ||
"https://jakarta.ee/xml/ns/jakartaee".equals(uri)){
+if ("http://xmlns.jcp.org/xml/ns/javaee".equals(uri) ||
"https://jakarta.ee/xml/ns/jakartaee".equals(uri) ||
"http://jakarta.ee/xml/ns/jakartaee".equals(uri)){
return "http://java.sun.com/xml/ns/javaee;;
}
return uri;
(tomee) branch main updated: TOMEE-4286 look at http:// in the namespace as well as https://
This is an automated email from the ASF dual-hosted git repository.
jgallimore pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomee.git
The following commit(s) were added to refs/heads/main by this push:
new 2a17f9dd3f TOMEE-4286 look at http:// in the namespace as well as
https://
2a17f9dd3f is described below
commit 2a17f9dd3f4820f2f98a5c8deb82a53193cc955e
Author: Jonathan Gallimore
AuthorDate: Tue Dec 5 14:37:02 2023 +
TOMEE-4286 look at http:// in the namespace as well as https://
---
.../openejb-jee/src/main/java/org/apache/openejb/jee/JaxbJavaee.java| 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/container/openejb-jee/src/main/java/org/apache/openejb/jee/JaxbJavaee.java
b/container/openejb-jee/src/main/java/org/apache/openejb/jee/JaxbJavaee.java
index 7b39e9e570..487dfcd209 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/JaxbJavaee.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/JaxbJavaee.java
@@ -352,7 +352,7 @@ public class JaxbJavaee {
protected String eeUri(final String uri) {
// if ee 7 or jakarta ee then switch back on ee 6 to not break
compatibility - to rework surely when we'll be fully ee 7 or jakarta ee
-if ("http://xmlns.jcp.org/xml/ns/javaee".equals(uri) ||
"https://jakarta.ee/xml/ns/jakartaee".equals(uri)){
+if ("http://xmlns.jcp.org/xml/ns/javaee".equals(uri) ||
"https://jakarta.ee/xml/ns/jakartaee".equals(uri) ||
"http://jakarta.ee/xml/ns/jakartaee".equals(uri)){
return "http://java.sun.com/xml/ns/javaee;;
}
return uri;
(tomee) branch tomee-9.x updated (5d7d2c54aa -> 0d60466f3e)
This is an automated email from the ASF dual-hosted git repository. jgallimore pushed a change to branch tomee-9.x in repository https://gitbox.apache.org/repos/asf/tomee.git from 5d7d2c54aa feat(#TOMEE-4281): Try to also catch the getClasses from application new 6473c4d94d TOMEE-4285 progress on porting the fix for CVE-2023-46589 new 9bafd32704 TOMEE-4285 skip this test for embedded mode new 0d60466f3e Merge pull request #1085 from jgallimore/TOMEE-4285 The 14751 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/tests/tomcat/SimpleHttpClient.java | 494 ++ .../arquillian/tests/tomcat/TrailersTest.java | 169 tomee/apache-tomee/pom.xml |5 + .../catalina/connector/ClientAbortException.java | 73 ++ .../org/apache/catalina/connector/InputBuffer.java | 681 + .../catalina/core/ApplicationDispatcher.java | 1036 .../apache/catalina/core/StandardHostValve.java| 406 .../apache/catalina/core/StandardWrapperValve.java | 369 +++ .../org/apache/coyote/BadRequestException.java | 68 ++ 9 files changed, 3301 insertions(+) create mode 100644 arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/tomcat/SimpleHttpClient.java create mode 100644 arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/tomcat/TrailersTest.java create mode 100644 tomee/apache-tomee/src/patch/java/org/apache/catalina/connector/ClientAbortException.java create mode 100644 tomee/apache-tomee/src/patch/java/org/apache/catalina/connector/InputBuffer.java create mode 100644 tomee/apache-tomee/src/patch/java/org/apache/catalina/core/ApplicationDispatcher.java create mode 100644 tomee/apache-tomee/src/patch/java/org/apache/catalina/core/StandardHostValve.java create mode 100644 tomee/apache-tomee/src/patch/java/org/apache/catalina/core/StandardWrapperValve.java create mode 100644 tomee/apache-tomee/src/patch/java/org/apache/coyote/BadRequestException.java
(tomee) branch tomee-9.x updated: Fix version numbers after cherrypick
This is an automated email from the ASF dual-hosted git repository. jgallimore pushed a commit to branch tomee-9.x in repository https://gitbox.apache.org/repos/asf/tomee.git The following commit(s) were added to refs/heads/tomee-9.x by this push: new 9f7aa2a62c Fix version numbers after cherrypick 9f7aa2a62c is described below commit 9f7aa2a62ccfdd55af07b9c633f726c650b605fa Author: Jonathan Gallimore AuthorDate: Mon Nov 13 10:30:32 2023 + Fix version numbers after cherrypick --- examples/mp-openapi-reader/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/mp-openapi-reader/pom.xml b/examples/mp-openapi-reader/pom.xml index 95ae07fc7e..eb887590a1 100644 --- a/examples/mp-openapi-reader/pom.xml +++ b/examples/mp-openapi-reader/pom.xml @@ -19,14 +19,14 @@ 4.0.0 org.superbiz mp-openapi-reader - 10.0.0-SNAPSHOT + 9.1.2-SNAPSHOT war TomEE :: Examples :: Microprofile OpenAPI Reader 9.1.1 1.7.0.Final 4.13.2 -10.0.0-SNAPSHOT +9.1.2-SNAPSHOT 3.0.1 3.1.1
(tomee) branch tomee-9.x updated (fd8f3e658d -> 464d7e04ba)
This is an automated email from the ASF dual-hosted git repository.
jgallimore pushed a change to branch tomee-9.x
in repository https://gitbox.apache.org/repos/asf/tomee.git
from fd8f3e658d Merge pull request #1079 from jgallimore/update-slf4j-9x
new f0b8eecd6b feat(#TOMEE-4267): MicroProfile Metrics JMX Registrar must
be initialized once
new 464d7e04ba feat(#TOMEE-4268): MicroProfile OpenAPI Reader example.
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| 29 +++--
.../microprofile/openapi/CustomReader.java | 77
.../microprofile/openapi}/WeatherService.java | 7 +-
.../microprofile/openapi}/moviefun/Movie.java | 2 +-
.../microprofile/openapi}/moviefun/MoviesBean.java | 3 +-
.../openapi}/moviefun/rest/ApplicationConfig.java | 3 +-
.../openapi}/moviefun/rest/LoadRest.java | 7 +-
.../openapi}/moviefun/rest/MoviesRest.java | 8 +-
.../META-INF/microprofile-config.properties| 2 +
.../src/main/resources/META-INF/persistence.xml| 0
.../jakarta.servlet.ServletContainerInitializer| 1 +
.../src/main/webapp/WEB-INF/web.xml| 2 +-
.../src/main/webapp/my-openapi.json| 25
.../src/main/webapp/openapi/openapi.yaml | 135 +
.../src/test/java/WeatherServiceTest.java | 95 +++
.../src/test/resources/arquillian.xml | 3 +-
examples/pom.xml | 1 +
.../metrics/MPMetricsCDIExtension.java | 18 ++-
18 files changed, 386 insertions(+), 32 deletions(-)
copy examples/{mp-metrics-timed => mp-openapi-reader}/pom.xml (80%)
create mode 100644
examples/mp-openapi-reader/src/main/java/org/superbiz/microprofile/openapi/CustomReader.java
copy examples/{mp-metrics-timed/src/main/java =>
mp-openapi-reader/src/main/java/org/superbiz/microprofile/openapi}/WeatherService.java
(84%)
copy examples/{moviefun-rest/src/main/java/org/superbiz =>
mp-openapi-reader/src/main/java/org/superbiz/microprofile/openapi}/moviefun/Movie.java
(97%)
copy examples/{moviefun-rest/src/main/java/org/superbiz =>
mp-openapi-reader/src/main/java/org/superbiz/microprofile/openapi}/moviefun/MoviesBean.java
(98%)
copy examples/{moviefun-rest/src/main/java/org/superbiz =>
mp-openapi-reader/src/main/java/org/superbiz/microprofile/openapi}/moviefun/rest/ApplicationConfig.java
(95%)
copy examples/{moviefun-rest/src/main/java/org/superbiz =>
mp-openapi-reader/src/main/java/org/superbiz/microprofile/openapi}/moviefun/rest/LoadRest.java
(90%)
copy examples/{moviefun-rest/src/main/java/org/superbiz =>
mp-openapi-reader/src/main/java/org/superbiz/microprofile/openapi}/moviefun/rest/MoviesRest.java
(92%)
create mode 100644
examples/mp-openapi-reader/src/main/resources/META-INF/microprofile-config.properties
copy {arquillian/arquillian-tomee-moviefun-example =>
examples/mp-openapi-reader}/src/main/resources/META-INF/persistence.xml (100%)
create mode 100644
examples/mp-openapi-reader/src/main/resources/META-INF/services/jakarta.servlet.ServletContainerInitializer
copy examples/{rest-example-with-application =>
mp-openapi-reader}/src/main/webapp/WEB-INF/web.xml (95%)
create mode 100644 examples/mp-openapi-reader/src/main/webapp/my-openapi.json
create mode 100644
examples/mp-openapi-reader/src/main/webapp/openapi/openapi.yaml
create mode 100644
examples/mp-openapi-reader/src/test/java/WeatherServiceTest.java
copy examples/{mp-custom-healthcheck =>
mp-openapi-reader}/src/test/resources/arquillian.xml (98%)
(tomee) 02/02: feat(#TOMEE-4268): MicroProfile OpenAPI Reader example.
This is an automated email from the ASF dual-hosted git repository.
jgallimore pushed a commit to branch tomee-9.x
in repository https://gitbox.apache.org/repos/asf/tomee.git
commit 464d7e04bac1a376e3f8e8621edb6165764f6c59
Author: Jean-Louis Monteiro
AuthorDate: Mon Oct 30 15:29:04 2023 +0100
feat(#TOMEE-4268): MicroProfile OpenAPI Reader example.
---
examples/mp-openapi-reader/pom.xml | 127 +++
.../microprofile/openapi/CustomReader.java | 77
.../microprofile/openapi/WeatherService.java | 37 ++
.../microprofile/openapi/moviefun/Movie.java | 102
.../microprofile/openapi/moviefun/MoviesBean.java | 92 ++
.../openapi/moviefun/rest/ApplicationConfig.java | 34 ++
.../openapi/moviefun/rest/LoadRest.java| 41 +++
.../openapi/moviefun/rest/MoviesRest.java | 82 +
.../META-INF/microprofile-config.properties| 2 +
.../src/main/resources/META-INF/persistence.xml| 31 +
.../jakarta.servlet.ServletContainerInitializer| 1 +
.../src/main/webapp/WEB-INF/web.xml| 25
.../src/main/webapp/my-openapi.json| 25
.../src/main/webapp/openapi/openapi.yaml | 135 +
.../src/test/java/WeatherServiceTest.java | 95 +++
.../src/test/resources/arquillian.xml | 31 +
examples/pom.xml | 1 +
17 files changed, 938 insertions(+)
diff --git a/examples/mp-openapi-reader/pom.xml
b/examples/mp-openapi-reader/pom.xml
new file mode 100644
index 00..95ae07fc7e
--- /dev/null
+++ b/examples/mp-openapi-reader/pom.xml
@@ -0,0 +1,127 @@
+
+
+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-openapi-reader
+ 10.0.0-SNAPSHOT
+ war
+ TomEE :: Examples :: Microprofile OpenAPI Reader
+
+9.1.1
+1.7.0.Final
+4.13.2
+10.0.0-SNAPSHOT
+
3.0.1
+3.1.1
+
+
+
+ org.apache.tomee
+ jakartaee-api
+ ${version.jakartaee-api}
+ provided
+
+
+ org.eclipse.microprofile.openapi
+ microprofile-openapi-api
+ ${version.openapi-api}
+
+
+ io.smallrye
+ smallrye-open-api
+ ${version.microprofile.impl.openapi}
+ provided
+ pom
+
+
+ io.smallrye
+ smallrye-open-api-core
+ ${version.microprofile.impl.openapi}
+ provided
+
+
+ junit
+ junit
+ ${junit.version}
+ test
+
+
+ org.apache.tomee
+ openejb-cxf-rs
+ ${tomee.version}
+ test
+
+
+ org.jboss.arquillian.junit
+ arquillian-junit-container
+ ${version.arquillian.bom}
+ test
+
+
+ org.apache.tomee
+ arquillian-tomee-remote
+ ${tomee.version}
+ test
+
+
+ org.apache.tomee
+ apache-tomee
+ ${tomee.version}
+ zip
+ microprofile
+ test
+
+
+
+
+
+org.apache.tomee.maven
+tomee-maven-plugin
+${tomee.version}
+
+ microprofile
+ ${project.artifactId}
+
+
+
+org.apache.maven.plugins
+maven-compiler-plugin
+3.7.0
+
+ 1.8
+ 1.8
+
+
+
+
+
+
+
+
+ localhost
+ file://${basedir}/target/repo/
+
+
+ localhost
+ file://${basedir}/target/snapshot-repo/
+
+
+
diff --git
a/examples/mp-openapi-reader/src/main/java/org/superbiz/microprofile/openapi/CustomReader.java
b/examples/mp-openapi-reader/src/main/java/org/superbiz/microprofile/openapi/CustomReader.java
new file mode 100644
index 00..2dc481d838
--- /dev/null
+++
b/examples/mp-openapi-reader/src/main/java/org/superbiz/microprofile/openapi/CustomReader.java
@@ -0,0 +1,77 @@
+package org.superbiz.microprofile.openapi;
+
+import io.smallrye.openapi.api.OpenApiConfig;
+import io.smallrye.openapi.api.OpenApiConfigImpl;
+import io.smallrye.openapi.api.OpenApiDocument;
+import io.smallrye.openapi.runtime.OpenApiProcessor;
+import io.smallrye.openapi.runtime.OpenApiStaticFile;
+import io.smallrye.openapi.runtime.io.Format;
+import jakarta.servlet.ServletContainerInitializer;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletException;
+import org.eclipse.microprofile.config.ConfigProvider;
+import org.eclipse.microprofile.openapi.OASModelReader;
+import org.eclipse.microprofile.openapi.models.OpenAPI;
+
+import java.net.URL;
+import java.util.Optional;
+import java.util.Set;
+import java.util.logging.Logger;
+
+import static io.smallrye.openapi.runtime.io.Format.JSON;
+import static io.smallrye.openapi.runtime.io.Format.YAML;
+
+public class CustomReader implements O
(tomee) 01/02: feat(#TOMEE-4267): MicroProfile Metrics JMX Registrar must be initialized once
This is an automated email from the ASF dual-hosted git repository.
jgallimore pushed a commit to branch tomee-9.x
in repository https://gitbox.apache.org/repos/asf/tomee.git
commit f0b8eecd6b2bbaab61088cd20ecc50d37422b514
Author: Jean-Louis Monteiro
AuthorDate: Mon Oct 30 14:59:21 2023 +0100
feat(#TOMEE-4267): MicroProfile Metrics JMX Registrar must be initialized
once
---
.../microprofile/metrics/MPMetricsCDIExtension.java| 18 +-
1 file changed, 13 insertions(+), 5 deletions(-)
diff --git
a/tomee/tomee-microprofile/mp-common/src/main/java/org/apache/tomee/microprofile/metrics/MPMetricsCDIExtension.java
b/tomee/tomee-microprofile/mp-common/src/main/java/org/apache/tomee/microprofile/metrics/MPMetricsCDIExtension.java
index a058238c91..f406c9614e 100644
---
a/tomee/tomee-microprofile/mp-common/src/main/java/org/apache/tomee/microprofile/metrics/MPMetricsCDIExtension.java
+++
b/tomee/tomee-microprofile/mp-common/src/main/java/org/apache/tomee/microprofile/metrics/MPMetricsCDIExtension.java
@@ -24,15 +24,23 @@ import jakarta.enterprise.inject.spi.Extension;
import org.apache.openejb.util.LogCategory;
import org.apache.openejb.util.Logger;
+import java.io.IOException;
+import java.util.concurrent.atomic.AtomicBoolean;
+
public class MPMetricsCDIExtension implements Extension {
+private static final AtomicBoolean INIT = new AtomicBoolean(false);
+
private void afterDeploymentValidation(@Observes final
AfterDeploymentValidation avd, BeanManager bm) {
-try {
-final JmxRegistrar registrar = new JmxRegistrar();
-registrar.init();
-} catch (final Exception e) {
-Logger.getInstance(LogCategory.OPENEJB,
MPMetricsCDIExtension.class).error("Can't initialize Metrics Registrar: " +
e.getMessage());
+if (INIT.compareAndSet(false, true)) {
+try {
+final JmxRegistrar registrar = new JmxRegistrar();
+registrar.init();
+
+} catch (final IOException e) {
+Logger.getInstance(LogCategory.OPENEJB,
MPMetricsCDIExtension.class).error("Can't initialize Metrics Registrar: " +
e.getMessage());
+}
}
}
(tomee) branch main updated (46f9fd746f -> f15c485352)
This is an automated email from the ASF dual-hosted git repository.
jgallimore pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/tomee.git
from 46f9fd746f Fix checkstyle / rat for TOMEE-4268
new 92d723a394 Update SLF4J to 2.0.9
new 3d88ef2224 Always use SLF4J in the webapp if it is there
new df1806fb1e Add Arquillian tests for SLF4J logging changes
new f15c485352 Merge pull request #1080 from jgallimore/update-slf4j
The 14729 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:
.../BasicSlf4jWebappTest.java} | 50 ++--
.../SimpleServlet.java}| 47 ++-
.../tests/slf4j/Slf4j1xLogbackWebappTest.java | 94 ++
.../tests/slf4j/Slf4j2xLogbackWebappTest.java | 94 ++
.../openejb/arquillian/tests/slf4j/logback.xml}| 35
.../src/test/resources/slf4j1x-pom.xml | 31 ---
.../src/test/resources/slf4j2x-pom.xml | 43 +-
boms/tomee-microprofile/pom.xml| 4 +-
boms/tomee-plume/pom.xml | 4 +-
boms/tomee-plus/pom.xml| 4 +-
boms/tomee-webprofile/pom.xml | 4 +-
.../util/classloader/URLClassLoaderFirst.java | 24 +-
pom.xml| 2 +-
13 files changed, 308 insertions(+), 128 deletions(-)
copy
arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/{servlet/SimpleServletTest.java
=> slf4j/BasicSlf4jWebappTest.java} (59%)
copy
arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/{bmp/remote/FinderServlet.java
=> slf4j/SimpleServlet.java} (55%)
create mode 100644
arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/slf4j/Slf4j1xLogbackWebappTest.java
create mode 100644
arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/slf4j/Slf4j2xLogbackWebappTest.java
copy
arquillian/arquillian-tomee-tests/{arquillian-tomee-config-tests/src/test/resources/org/apache/openejb/arquillian/tests/servlet/web.xml
=>
arquillian-tomee-webprofile-tests/src/test/resources/org/apache/openejb/arquillian/tests/slf4j/logback.xml}
(52%)
mode change 100755 => 100644
copy examples/multi-jpa-provider-testing/src/test/resources/openjpa-pom.xml =>
arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/resources/slf4j1x-pom.xml
(66%)
copy examples/multi-jpa-provider-testing/src/test/resources/openjpa-pom.xml =>
arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/resources/slf4j2x-pom.xml
(53%)
(tomee) branch tomee-9.x updated (533c08f64f -> fd8f3e658d)
This is an automated email from the ASF dual-hosted git repository.
jgallimore pushed a change to branch tomee-9.x
in repository https://gitbox.apache.org/repos/asf/tomee.git
from 533c08f64f Merge pull request #1076 from
apache/tomee-9.x-regenerate_boms_after_dep_upgrade
new 2bfa444bba Update SLF4J to 2.0.9
new e7f615116c Always use SLF4J in the webapp if it is there
new cd8a3ada13 Add Arquillian tests for SLF4J logging changes
new fd8f3e658d Merge pull request #1079 from jgallimore/update-slf4j-9x
The 14730 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:
.../BasicSlf4jWebappTest.java} | 50 ++--
.../SimpleServlet.java}| 47 ++-
.../tests/slf4j/Slf4j1xLogbackWebappTest.java | 94 ++
.../tests/slf4j/Slf4j2xLogbackWebappTest.java | 94 ++
.../openejb/arquillian/tests/slf4j/logback.xml}| 35
.../src/test/resources/slf4j1x-pom.xml | 31 ---
.../src/test/resources/slf4j2x-pom.xml | 43 +-
boms/tomee-microprofile/pom.xml| 4 +-
boms/tomee-plume/pom.xml | 4 +-
boms/tomee-plus/pom.xml| 4 +-
boms/tomee-webprofile/pom.xml | 4 +-
.../util/classloader/URLClassLoaderFirst.java | 24 +-
pom.xml| 2 +-
13 files changed, 308 insertions(+), 128 deletions(-)
copy
arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/{servlet/SimpleServletTest.java
=> slf4j/BasicSlf4jWebappTest.java} (59%)
copy
arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/{bmp/remote/FinderServlet.java
=> slf4j/SimpleServlet.java} (55%)
create mode 100644
arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/slf4j/Slf4j1xLogbackWebappTest.java
create mode 100644
arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/slf4j/Slf4j2xLogbackWebappTest.java
copy
arquillian/arquillian-tomee-tests/{arquillian-tomee-config-tests/src/test/resources/org/apache/openejb/arquillian/tests/servlet/web.xml
=>
arquillian-tomee-webprofile-tests/src/test/resources/org/apache/openejb/arquillian/tests/slf4j/logback.xml}
(52%)
mode change 100755 => 100644
copy examples/multi-jpa-provider-testing/src/test/resources/openjpa-pom.xml =>
arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/resources/slf4j1x-pom.xml
(66%)
copy examples/multi-jpa-provider-testing/src/test/resources/openjpa-pom.xml =>
arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/resources/slf4j2x-pom.xml
(53%)
(tomee) branch main updated (09fb89c37b -> 654a81881c)
This is an automated email from the ASF dual-hosted git repository. jgallimore pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/tomee.git from 09fb89c37b TOMEE-4266 bom update add 165af42e53 Minor: Regenerated BOMs for 5cc381361ca78e15e553904f7009ea95dff73e29 new 654a81881c Merge pull request #1077 from apache/regenerate_boms_after_dep_upgrade 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:
(tomee) 01/01: Merge pull request #1077 from apache/regenerate_boms_after_dep_upgrade
This is an automated email from the ASF dual-hosted git repository. jgallimore pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomee.git commit 654a81881c4ad7c6f431303c886e88502cf6c788 Merge: 09fb89c37b 165af42e53 Author: Jonathan Gallimore AuthorDate: Fri Oct 27 22:02:17 2023 +0100 Merge pull request #1077 from apache/regenerate_boms_after_dep_upgrade Regenerated BOMs after dependency upgrades
(tomee) branch tomee-9.x updated (d3716b31b1 -> 533c08f64f)
This is an automated email from the ASF dual-hosted git repository. jgallimore pushed a change to branch tomee-9.x in repository https://gitbox.apache.org/repos/asf/tomee.git from d3716b31b1 TOMEE-4266 update to ActiveMQ 5.18.3 add 1e442834b1 Minor: Regenerated BOMs for d3716b31b172d30a2a9c68de065a6618d4790b31 new 533c08f64f Merge pull request #1076 from apache/tomee-9.x-regenerate_boms_after_dep_upgrade 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: boms/tomee-plume/pom.xml | 4 ++-- boms/tomee-plus/pom.xml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
(tomee) 01/01: Merge pull request #1076 from apache/tomee-9.x-regenerate_boms_after_dep_upgrade
This is an automated email from the ASF dual-hosted git repository. jgallimore pushed a commit to branch tomee-9.x in repository https://gitbox.apache.org/repos/asf/tomee.git commit 533c08f64f84a53af7818ca62c075f3da96bf5b0 Merge: d3716b31b1 1e442834b1 Author: Jonathan Gallimore AuthorDate: Fri Oct 27 21:58:50 2023 +0100 Merge pull request #1076 from apache/tomee-9.x-regenerate_boms_after_dep_upgrade Regenerated BOMs after dependency upgrades boms/tomee-plume/pom.xml | 4 ++-- boms/tomee-plus/pom.xml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
(tomee) branch main updated: TOMEE-4266 bom update
This is an automated email from the ASF dual-hosted git repository. jgallimore pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomee.git The following commit(s) were added to refs/heads/main by this push: new 09fb89c37b TOMEE-4266 bom update 09fb89c37b is described below commit 09fb89c37bed7c4cdbfb6252fdfc1e0e23424335 Author: Jonathan Gallimore AuthorDate: Fri Oct 27 21:56:49 2023 +0100 TOMEE-4266 bom update --- boms/tomee-plume/pom.xml | 4 ++-- boms/tomee-plus/pom.xml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/boms/tomee-plume/pom.xml b/boms/tomee-plume/pom.xml index 58afe68a20..ea29c5ba52 100644 --- a/boms/tomee-plume/pom.xml +++ b/boms/tomee-plume/pom.xml @@ -565,7 +565,7 @@ org.apache.activemq activemq-client-jakarta - 5.18.2 + 5.18.3 * @@ -576,7 +576,7 @@ org.apache.activemq activemq-jdbc-store - 5.18.2 + 5.18.3 * diff --git a/boms/tomee-plus/pom.xml b/boms/tomee-plus/pom.xml index ded2dfa69c..fa30c3ca88 100644 --- a/boms/tomee-plus/pom.xml +++ b/boms/tomee-plus/pom.xml @@ -576,7 +576,7 @@ org.apache.activemq activemq-client-jakarta - 5.18.2 + 5.18.3 * @@ -587,7 +587,7 @@ org.apache.activemq activemq-jdbc-store - 5.18.2 + 5.18.3 *
(tomee) branch main updated: TOMEE-4266 update to ActiveMQ 5.18.3
This is an automated email from the ASF dual-hosted git repository. jgallimore pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomee.git The following commit(s) were added to refs/heads/main by this push: new 5cc381361c TOMEE-4266 update to ActiveMQ 5.18.3 5cc381361c is described below commit 5cc381361ca78e15e553904f7009ea95dff73e29 Author: Jonathan Gallimore AuthorDate: Fri Oct 27 21:49:54 2023 +0100 TOMEE-4266 update to ActiveMQ 5.18.3 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 1df55a9b2c..6a758950e7 100644 --- a/pom.xml +++ b/pom.xml @@ -207,7 +207,7 @@ 2.0.1 -5.18.2 +5.18.3 1.0.2 2.0.6 4.0.3
(tomee) branch tomee-9.x updated: TOMEE-4266 update to ActiveMQ 5.18.3
This is an automated email from the ASF dual-hosted git repository. jgallimore pushed a commit to branch tomee-9.x in repository https://gitbox.apache.org/repos/asf/tomee.git The following commit(s) were added to refs/heads/tomee-9.x by this push: new d3716b31b1 TOMEE-4266 update to ActiveMQ 5.18.3 d3716b31b1 is described below commit d3716b31b172d30a2a9c68de065a6618d4790b31 Author: Jonathan Gallimore AuthorDate: Fri Oct 27 21:49:54 2023 +0100 TOMEE-4266 update to ActiveMQ 5.18.3 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a0c0a74812..68c8cb28a6 100644 --- a/pom.xml +++ b/pom.xml @@ -206,7 +206,7 @@ 2.0.1 -5.18.2 +5.18.3 1.0.2 2.0.6 4.0.3
(tomee) branch tomee-8.x updated: TOMEE-4266 update ActiveMQ to 5.16.7
This is an automated email from the ASF dual-hosted git repository. jgallimore pushed a commit to branch tomee-8.x in repository https://gitbox.apache.org/repos/asf/tomee.git The following commit(s) were added to refs/heads/tomee-8.x by this push: new c63eacac49 TOMEE-4266 update ActiveMQ to 5.16.7 c63eacac49 is described below commit c63eacac4956c29454a0efc3e75e933dd4316b26 Author: Jonathan Gallimore AuthorDate: Fri Oct 27 21:45:52 2023 +0100 TOMEE-4266 update ActiveMQ to 5.16.7 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ae44d6a964..79c7c27bce 100644 --- a/pom.xml +++ b/pom.xml @@ -193,7 +193,7 @@ 1.5.3 -5.16.6 +5.16.7 1.0.2 2.0.5 3.5.7
[tomee] branch cxf4 updated: Touching README.adoc
This is an automated email from the ASF dual-hosted git repository. jgallimore pushed a commit to branch cxf4 in repository https://gitbox.apache.org/repos/asf/tomee.git The following commit(s) were added to refs/heads/cxf4 by this push: new 12dfd1aee9 Touching README.adoc 12dfd1aee9 is described below commit 12dfd1aee9526d154a83e416925a56610a5a0fb4 Author: Jonathan Gallimore AuthorDate: Thu Aug 31 10:39:16 2023 +0100 Touching README.adoc --- README.adoc | 2 -- 1 file changed, 2 deletions(-) diff --git a/README.adoc b/README.adoc index d1fb4b311d..08d6851178 100644 --- a/README.adoc +++ b/README.adoc @@ -120,5 +120,3 @@ Releases] (*) === License link:LICENSE[Apache License 2.0] - -
[tomee] branch main updated: Touching README.adoc
This is an automated email from the ASF dual-hosted git repository. jgallimore pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomee.git The following commit(s) were added to refs/heads/main by this push: new 9fd2b62ef0 Touching README.adoc 9fd2b62ef0 is described below commit 9fd2b62ef07b8fd8f43e07479a5497cdfcd2a829 Author: Jonathan Gallimore AuthorDate: Thu Aug 31 10:38:39 2023 +0100 Touching README.adoc --- README.adoc | 2 -- 1 file changed, 2 deletions(-) diff --git a/README.adoc b/README.adoc index d1fb4b311d..08d6851178 100644 --- a/README.adoc +++ b/README.adoc @@ -120,5 +120,3 @@ Releases] (*) === License link:LICENSE[Apache License 2.0] - -
[tomee] branch main updated: Headers
This is an automated email from the ASF dual-hosted git repository. jgallimore pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomee.git The following commit(s) were added to refs/heads/main by this push: new a6acf05faf Headers a6acf05faf is described below commit a6acf05faf0931e71a45b52941d9b8e1ee7aa4c5 Author: Jonathan Gallimore AuthorDate: Tue Aug 8 15:27:16 2023 +0100 Headers --- .../org/superbiz/rest/service/Broadcaster.java | 24 -- .../java/org/superbiz/rest/service/Producer.java | 16 +++ 2 files changed, 38 insertions(+), 2 deletions(-) diff --git a/examples/activemq-multiple-brokers/src/main/java/org/superbiz/rest/service/Broadcaster.java b/examples/activemq-multiple-brokers/src/main/java/org/superbiz/rest/service/Broadcaster.java index 21a00df905..2ccaa4cad6 100644 --- a/examples/activemq-multiple-brokers/src/main/java/org/superbiz/rest/service/Broadcaster.java +++ b/examples/activemq-multiple-brokers/src/main/java/org/superbiz/rest/service/Broadcaster.java @@ -1,12 +1,32 @@ +/* + * 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.superbiz.rest.service; -import jakarta.ejb.*; +import jakarta.ejb.EJB; +import jakarta.ejb.Singleton; +import jakarta.ejb.TransactionAttribute; +import jakarta.ejb.TransactionAttributeType; +import jakarta.ejb.TransactionManagement; +import jakarta.ejb.TransactionManagementType; import javax.naming.InitialContext; import javax.naming.NameClassPair; import javax.naming.NamingEnumeration; -import javax.naming.NamingException; @Singleton @TransactionManagement(TransactionManagementType.CONTAINER) diff --git a/examples/activemq-multiple-brokers/src/main/java/org/superbiz/rest/service/Producer.java b/examples/activemq-multiple-brokers/src/main/java/org/superbiz/rest/service/Producer.java index d572bf1ef4..0211d2d0fb 100644 --- a/examples/activemq-multiple-brokers/src/main/java/org/superbiz/rest/service/Producer.java +++ b/examples/activemq-multiple-brokers/src/main/java/org/superbiz/rest/service/Producer.java @@ -1,3 +1,19 @@ +/* + * 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.superbiz.rest.service;
[tomee] 07/07: TOMEE-4236 add example for working with multiple brokers in the same application
This is an automated email from the ASF dual-hosted git repository.
jgallimore pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomee.git
commit 4f3ba2fcca1ab406ca69d0d7539352d14e17e443
Author: Jonathan Gallimore
AuthorDate: Tue Aug 8 14:53:00 2023 +0100
TOMEE-4236 add example for working with multiple brokers in the same
application
---
examples/activemq-multiple-brokers/pom.xml | 147 +
.../org/superbiz/rest/service/Broadcaster.java | 40 ++
.../org/superbiz/rest/service/JmsResource.java | 79 +++
.../java/org/superbiz/rest/service/Producer.java | 78 +++
.../org/superbiz/rest/service/TopicListener.java | 33 +
.../src/main/resources/META-INF/beans.xml | 18 +++
.../src/main/resources/META-INF/openejb-jar.xml| 21 +++
.../src/main/resources/META-INF/resources.xml | 48 +++
.../src/main/webapp/WEB-INF/beans.xml | 17 +++
.../src/main/webapp/WEB-INF/ejb-jar.xml| 59 +
.../src/main/webapp/WEB-INF/web.xml| 25
.../src/main/webapp/index.html | 47 +++
examples/pom.xml | 1 +
13 files changed, 613 insertions(+)
diff --git a/examples/activemq-multiple-brokers/pom.xml
b/examples/activemq-multiple-brokers/pom.xml
new file mode 100644
index 00..9c55d1f0e9
--- /dev/null
+++ b/examples/activemq-multiple-brokers/pom.xml
@@ -0,0 +1,147 @@
+
+
+http://maven.apache.org/POM/4.0.0;
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd;>
+ 4.0.0
+ org.superbiz
+ multi-broker
+ war
+ 10.0.0-SNAPSHOT
+ TomEE :: Web Examples :: Multi-Broker
+
+UTF-8
+10.0.0-SNAPSHOT
+2.0.0
+
+
+${project.artifactId}
+package
+
+
+org.apache.maven.plugins
+maven-compiler-plugin
+3.5.1
+
+ 1.8
+ 1.8
+
+
+
+maven-war-plugin
+3.1.0
+
+ WEB-INF/web.xml
+
+
+
+org.apache.maven.plugins
+maven-surefire-plugin
+2.22.1
+
+ -Djdk.attach.allowAttachSelf
+
+
+
+org.apache.tomee.maven
+tomee-maven-plugin
+${tomee.version}
+
+ true
+ ${tomee.version}
+ plus
+
+
+
+
+
+
+
+
+org.jboss.shrinkwrap.resolver
+shrinkwrap-resolver-bom
+${version.shrinkwrap.resolver}
+import
+pom
+
+
+
+org.jboss.arquillian
+arquillian-bom
+1.7.0.Final
+import
+pom
+
+
+
+
+
+ org.apache.tomee
+ jakartaee-api
+ 9.1.1
+ provided
+
+
+ junit
+ junit
+ 4.13.2
+ test
+
+
+ org.apache.tomee
+ openejb-core
+ ${tomee.version}
+ test
+
+
+ org.apache.tomee
+ tomee-embedded
+ ${tomee.version}
+ test
+
+
+ commons-lang
+ commons-lang
+ 2.4
+
+
+ org.jboss.arquillian.junit
+ arquillian-junit-container
+ 1.7.0.Final
+ test
+
+
+ org.jboss.shrinkwrap.resolver
+ shrinkwrap-resolver-depchain
+ pom
+ test
+
+
+ org.apache.tomee
+ ziplock
+ ${tomee.version}
+ test
+
+
+ org.apache.activemq
+ activemq-broker
+ 5.18.1
+ test
+
+
+
diff --git
a/examples/activemq-multiple-brokers/src/main/java/org/superbiz/rest/service/Broadcaster.java
b/examples/activemq-multiple-brokers/src/main/java/org/superbiz/rest/service/Broadcaster.java
new file mode 100644
index 00..21a00df905
--- /dev/null
+++
b/examples/activemq-multiple-brokers/src/main/java/org/superbiz/rest/service/Broadcaster.java
@@ -0,0 +1,40 @@
+package org.superbiz.rest.service;
+
+
+import jakarta.ejb.*;
+
+import javax.naming.InitialContext;
+import javax.naming.NameClassPair;
+import javax.naming.NamingEnumeration;
+import javax.naming.NamingException;
+
+@Singleton
+@TransactionManagement(TransactionManagementType.CONTAINER)
+public class Broadcaster {
+
+@EJB
+private Producer producer;
+
+@TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED)
+public void broadcastMessage(final String message) {
+try {
+final InitialContext context = new InitialContext();
+final NamingEnumeration list =
context.list("openejb:Resource");
+
+while (list.hasMoreElements()) {
+final NameClassPair nameClassPair = list.nextElement();
+final String name = nameClassPair.getName();
+if (name.endsWith("ConnectionFactory")) {
+producer.sendMessage(message, name
[tomee] 05/07: Merge remote-tracking branch 'apache/main' into main
This is an automated email from the ASF dual-hosted git repository. jgallimore pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomee.git commit f2281aac66b0924034dbf49b4a3f13480b001ada Merge: b63e670d26 80517d625c Author: Jonathan Gallimore AuthorDate: Tue Jul 4 10:25:14 2023 +0100 Merge remote-tracking branch 'apache/main' into main arquillian/arquillian-tomee-common/pom.xml |2 +- arquillian/arquillian-tomee-embedded/pom.xml |4 +- .../arquillian-tomee-moviefun-example/pom.xml |4 +- arquillian/arquillian-tomee-remote/pom.xml |8 +- .../openejb/arquillian/EarWarResourcesXmlTest.java |4 + .../arquillian-tomee-config-tests/pom.xml |2 +- .../arquillian-tomee-webprofile-tests/pom.xml |2 +- boms/tomee-microprofile-api/pom.xml|4 +- boms/tomee-microprofile/pom.xml| 82 +- boms/tomee-plume-api/pom.xml |4 +- boms/tomee-plume/pom.xml | 123 +- boms/tomee-plus-api/pom.xml|4 +- boms/tomee-plus/pom.xml| 123 +- boms/tomee-webprofile-api/pom.xml |2 +- boms/tomee-webprofile/pom.xml | 48 +- container/openejb-core/pom.xml |6 +- .../org/apache/openejb/cdi/AppBeanManager.java}| 24 +- .../org/apache/openejb/cdi/AppWebBeansContext.java | 53 + .../openejb/cdi/ThreadSingletonServiceImpl.java| 10 +- .../openejb/cdi/WebAppInjectionResolver.java | 103 +- .../apache/openejb/config/AnnotationDeployer.java |2 + .../java/org/apache/openejb/config/AutoConfig.java |3 +- .../event/DataSourceDefinitionUrlBuild.java} | 27 +- .../openejb/monitoring/DynamicMBeanWrapper.java|7 +- .../openejb/testing/ApplicationComposers.java | 11 + .../src/main/resources/default.exclusions |4 +- .../classic/DataSourceDefinitionUrlBuildTest.java | 217 .../openejb/cdi/InjectionResolverCacheTest.java| 102 ++ .../jdbc/driver/AlternateDriverJarTest.java|6 +- .../openejb/junit5/RunWithApplicationComposer.java |2 + .../junit5/AppComposerMemoryReleaseTest.java | 74 ++ .../openejb/junit5/AppComposerPerClassBase.java| 54 + .../AppComposerPerClassInheritanceTest.java} | 19 +- .../junit5/AppComposerSnifferExtension.java} | 26 +- deps/activemq-broker-shade/pom.xml |6 +- deps/activemq-client-shade/pom.xml | 99 -- deps/activemq-kahadb-store-shade/pom.xml |2 +- deps/activemq-ra-shade/pom.xml |2 +- deps/cxf-rt-rs-mp-client-shade/pom.xml |3 +- deps/cxf-shade/pom.xml | 32 +- .../java/org/apache/cxf/common/jaxb/JAXBUtils.java | 1180 .../patch/java/org/apache/cxf/helpers/IOUtils.java | 428 --- .../AbstractFaultChainInitiatorObserver.java | 142 --- .../apache/cxf/jaxb/JAXBContextInitializer.java| 569 -- .../org/apache/cxf/jaxb/io/DataWriterImpl.java | 321 -- deps/pom.xml |1 - examples/access-timeout-meta/pom.xml |2 +- examples/alternate-descriptors/pom.xml |2 +- examples/application-composer/pom.xml |2 +- examples/applicationexception/pom.xml |2 +- examples/arquillian-jpa/pom.xml|4 +- examples/async-methods/pom.xml |2 +- examples/async-postconstruct/pom.xml |2 +- examples/async-servlet/pom.xml |4 +- .../bean-validation-design-by-contract/pom.xml |2 +- examples/bval-evaluation-redeployment/pom.xml |2 +- examples/cdi-alternative-and-stereotypes/pom.xml |2 +- examples/cdi-application-scope/pom.xml |2 +- examples/cdi-basic/pom.xml |2 +- examples/cdi-dynamic-inject/pom.xml|2 +- examples/cdi-ejbcontext-jaas/pom.xml |2 +- examples/cdi-events/pom.xml|2 +- examples/cdi-interceptors/pom.xml |2 +- examples/cdi-produces-disposes/pom.xml |2 +- examples/cdi-produces-field/pom.xml|2 +- examples/cdi-qualifier/pom.xml |2 +- examples/cdi-realm/pom.xml |4 +- examples/cdi-request-scope/pom.xml |2 +- examples/cdi-session-scope/pom.xml |2 +- examples/client-resource-lookup-preview/pom.xml|2 +- examples/cloud-tomee-azure/pom.xml |2 +- examples/component-interfaces/pom.xml |2 +- examples/concurrency-utils/pom.xml |6 +- .../connector-sample-functional-tests/pom.xml |4
[tomee] 02/07: TOMEE-4181 Exclude bc jars from the patch plugin
This is an automated email from the ASF dual-hosted git repository. jgallimore pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomee.git commit 47285041dccb20518ff55527894fccf508f56f85 Author: Jonathan Gallimore AuthorDate: Mon Jan 30 20:53:17 2023 + TOMEE-4181 Exclude bc jars from the patch plugin --- boms/tomee-microprofile/pom.xml | 12 ++-- boms/tomee-plume/pom.xml| 12 ++-- boms/tomee-plus/pom.xml | 12 ++-- tomee/apache-tomee/pom.xml | 4 4 files changed, 22 insertions(+), 18 deletions(-) diff --git a/boms/tomee-microprofile/pom.xml b/boms/tomee-microprofile/pom.xml index 2eb23dd2f1..99d2bc2f92 100644 --- a/boms/tomee-microprofile/pom.xml +++ b/boms/tomee-microprofile/pom.xml @@ -356,7 +356,7 @@ io.smallrye.reactive mutiny - 1.7.0 + 1.8.0 * @@ -367,7 +367,7 @@ io.smallrye jandex - 3.0.0 + 3.0.1 * @@ -422,7 +422,7 @@ io.smallrye smallrye-health-api - 4.0.0 + 4.0.1 * @@ -433,7 +433,7 @@ io.smallrye smallrye-health - 4.0.0 + 4.0.1 * @@ -455,7 +455,7 @@ io.smallrye smallrye-open-api-core - 3.0.0 + 3.0.1 * @@ -466,7 +466,7 @@ io.smallrye smallrye-open-api-jaxrs - 3.0.0 + 3.0.1 * diff --git a/boms/tomee-plume/pom.xml b/boms/tomee-plume/pom.xml index 2fa2f7e832..5df6e0a3cd 100644 --- a/boms/tomee-plume/pom.xml +++ b/boms/tomee-plume/pom.xml @@ -367,7 +367,7 @@ io.smallrye.reactive mutiny - 1.7.0 + 1.8.0 * @@ -378,7 +378,7 @@ io.smallrye jandex - 3.0.0 + 3.0.1 * @@ -433,7 +433,7 @@ io.smallrye smallrye-health-api - 4.0.0 + 4.0.1 * @@ -444,7 +444,7 @@ io.smallrye smallrye-health - 4.0.0 + 4.0.1 * @@ -466,7 +466,7 @@ io.smallrye smallrye-open-api-core - 3.0.0 + 3.0.1 * @@ -477,7 +477,7 @@ io.smallrye smallrye-open-api-jaxrs - 3.0.0 + 3.0.1 * diff --git a/boms/tomee-plus/pom.xml b/boms/tomee-plus/pom.xml index d2fd087b03..b352d7c081 100644 --- a/boms/tomee-plus/pom.xml +++ b/boms/tomee-plus/pom.xml @@ -378,7 +378,7 @@ io.smallrye.reactive mutiny - 1.7.0 + 1.8.0 * @@ -389,7 +389,7 @@ io.smallrye jandex - 3.0.0 + 3.0.1 * @@ -444,7 +444,7 @@ io.smallrye smallrye-health-api - 4.0.0 + 4.0.1 * @@ -455,7 +455,7 @@ io.smallrye smallrye-health - 4.0.0 + 4.0.1 * @@ -477,7 +477,7 @@ io.smallrye smallrye-open-api-core - 3.0.0 + 3.0.1 * @@ -488,7 +488,7 @@ io.smallrye smallrye-open-api-jaxrs - 3.0.0 + 3.0.1 * diff --git a/tomee/apache-tomee/pom.xml b/tomee/apache-tomee/pom.xml index b2057ec289..f8a9223b85 100644 --- a/tomee/apache-tomee/pom.xml +++ b/tomee/apache-tomee/pom.xml @@ -581,7 +581,11 @@ true + org.bouncycastle:bcpkix-jdk15on:jar:1.70 org.bouncycastle:bcprov-jdk15on:jar:1.70 + org.bouncycastle:bcprov-jdk15to18:jar:1.70 + org.bouncycastle:bcprov-jdk18on:jar:1.71 + org.bouncycastle:bcutil-jdk15on:jar:1.70
[tomee] 03/07: Merge remote-tracking branch 'apache/main' into main
This is an automated email from the ASF dual-hosted git repository. jgallimore pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomee.git commit 98b9042d075d2b78a5715cf3b9a1546f680dc3a2 Merge: 47285041dc 59585b15ad Author: Jonathan Gallimore AuthorDate: Thu Feb 2 14:35:50 2023 + Merge remote-tracking branch 'apache/main' into main .github/workflows/main-pull-request-build.yml | 6 +-- .github/workflows/main-push-build.yml | 6 +-- .github/workflows/tomee-8.x-pull-request-build.yml | 33 - .github/workflows/tomee-8.x-push-build.yml | 55 -- 4 files changed, 6 insertions(+), 94 deletions(-)
[tomee] 04/07: Merge remote-tracking branch 'apache/main' into main
This is an automated email from the ASF dual-hosted git repository. jgallimore pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomee.git commit b63e670d264d49b837e1a9943da0adb25fd34dd1 Merge: 98b9042d07 ca64fc5f7a Author: Jonathan Gallimore AuthorDate: Fri Feb 17 16:38:55 2023 + Merge remote-tracking branch 'apache/main' into main .../src/main/resources/TomEE.amd64.exe | Bin 179971 -> 124024 bytes tomee/apache-tomee/src/main/resources/TomEE.exe| Bin 199659 -> 120952 bytes .../apache-tomee/src/main/resources/TomEE.x86.exe | Bin 155344 -> 104056 bytes 3 files changed, 0 insertions(+), 0 deletions(-)
[tomee] 06/07: Merge remote-tracking branch 'apache/main' into main
This is an automated email from the ASF dual-hosted git repository. jgallimore pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomee.git commit dda37ebfe133d17ee755af7d3616f8f6cf58fc93 Merge: f2281aac66 2646a9c8c1 Author: Jonathan Gallimore AuthorDate: Mon Aug 7 10:17:51 2023 +0100 Merge remote-tracking branch 'apache/main' into main .asf.yaml | 19 +++ boms/tomee-microprofile/pom.xml | 6 +++--- boms/tomee-plume/pom.xml | 6 +++--- boms/tomee-plus/pom.xml | 6 +++--- boms/tomee-webprofile/pom.xml | 6 +++--- .../src/main/resources/default.exclusions | 2 ++ server/openejb-cxf/pom.xml| 4 ++-- tomee/apache-tomee/pom.xml| 12 ++-- .../org/apache/tomee/configs/catalina.properties | 2 +- 9 files changed, 42 insertions(+), 21 deletions(-)
[tomee] branch main updated (2646a9c8c1 -> 4f3ba2fcca)
This is an automated email from the ASF dual-hosted git repository.
jgallimore pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/tomee.git
from 2646a9c8c1 TOMEE-4235 - Bouncy Castle 1.75
new 6deb87e0c8 TOMEE-4181 Exclude bcprov from the patch plugin
new 47285041dc TOMEE-4181 Exclude bc jars from the patch plugin
new 98b9042d07 Merge remote-tracking branch 'apache/main' into main
new b63e670d26 Merge remote-tracking branch 'apache/main' into main
new f2281aac66 Merge remote-tracking branch 'apache/main' into main
new dda37ebfe1 Merge remote-tracking branch 'apache/main' into main
new 4f3ba2fcca TOMEE-4236 add example for working with multiple brokers in
the same application
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:
.../pom.xml| 121 +
.../org/superbiz/rest/service/Broadcaster.java | 40 +++
.../org/superbiz/rest/service/JmsResource.java | 33 +-
.../java/org/superbiz/rest/service/Producer.java | 78 +
.../org/superbiz/rest/service/TopicListener.java | 6 -
.../src/main/resources/META-INF}/beans.xml | 0
.../src/main/resources/META-INF/openejb-jar.xml| 5 +-
.../src/main/resources/META-INF/resources.xml | 31 --
.../src/main/webapp/WEB-INF/beans.xml | 0
.../src/main/webapp/WEB-INF/ejb-jar.xml| 59 ++
.../src/main/webapp/WEB-INF/web.xml| 0
.../src/main/webapp/index.html | 0
examples/pom.xml | 1 +
13 files changed, 282 insertions(+), 92 deletions(-)
copy examples/{mp-rest-jwt-jwk => activemq-multiple-brokers}/pom.xml (63%)
create mode 100644
examples/activemq-multiple-brokers/src/main/java/org/superbiz/rest/service/Broadcaster.java
copy examples/{rest-sse-example =>
activemq-multiple-brokers}/src/main/java/org/superbiz/rest/service/JmsResource.java
(66%)
create mode 100644
examples/activemq-multiple-brokers/src/main/java/org/superbiz/rest/service/Producer.java
copy examples/{rest-sse-example =>
activemq-multiple-brokers}/src/main/java/org/superbiz/rest/service/TopicListener.java
(79%)
copy examples/{cdi-realm/src/main/webapp/WEB-INF =>
activemq-multiple-brokers/src/main/resources/META-INF}/beans.xml (100%)
copy
arquillian/arquillian-tomee-moviefun-example/src/main/webapp/WEB-INF/beans.xml
=>
examples/activemq-multiple-brokers/src/main/resources/META-INF/openejb-jar.xml
(78%)
copy examples/{rest-sse-example =>
activemq-multiple-brokers}/src/main/resources/META-INF/resources.xml (50%)
copy examples/{rest-example =>
activemq-multiple-brokers}/src/main/webapp/WEB-INF/beans.xml (100%)
create mode 100644
examples/activemq-multiple-brokers/src/main/webapp/WEB-INF/ejb-jar.xml
copy examples/{rest-sse-example =>
activemq-multiple-brokers}/src/main/webapp/WEB-INF/web.xml (100%)
copy examples/{rest-sse-example =>
activemq-multiple-brokers}/src/main/webapp/index.html (100%)
[tomee] 01/07: TOMEE-4181 Exclude bcprov from the patch plugin
This is an automated email from the ASF dual-hosted git repository. jgallimore pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomee.git commit 6deb87e0c8f8b9a4c4ea07ae1688487228c03882 Author: Jonathan Gallimore AuthorDate: Fri Jan 27 15:01:18 2023 + TOMEE-4181 Exclude bcprov from the patch plugin --- tomee/apache-tomee/pom.xml | 5 + 1 file changed, 5 insertions(+) diff --git a/tomee/apache-tomee/pom.xml b/tomee/apache-tomee/pom.xml index 5a3134cdda..b2057ec289 100644 --- a/tomee/apache-tomee/pom.xml +++ b/tomee/apache-tomee/pom.xml @@ -579,6 +579,11 @@ apache-tomee-(plus|plume|webprofile|microprofile).*\.zip true true + + + org.bouncycastle:bcprov-jdk15on:jar:1.70 + +
[tomee-tck] branch tomee-10-with-ee-91 updated: Seems to prevent a stackoverflow error
This is an automated email from the ASF dual-hosted git repository.
jgallimore pushed a commit to branch tomee-10-with-ee-91
in repository https://gitbox.apache.org/repos/asf/tomee-tck.git
The following commit(s) were added to refs/heads/tomee-10-with-ee-91 by this
push:
new a08a6ed Seems to prevent a stackoverflow error
a08a6ed is described below
commit a08a6edf1563670e7b6e5fcfe94309eba60f0285
Author: Jonathan Gallimore
AuthorDate: Mon Aug 7 16:20:55 2023 +0100
Seems to prevent a stackoverflow error
---
src/test/resources/testsuite.properties | 1 -
1 file changed, 1 deletion(-)
diff --git a/src/test/resources/testsuite.properties
b/src/test/resources/testsuite.properties
index a1c6cfc..d63558a 100644
--- a/src/test/resources/testsuite.properties
+++ b/src/test/resources/testsuite.properties
@@ -62,7 +62,6 @@
command.testExecuteAppClient=com.sun.ts.lib.harness.ExecTSTestCmd \
-DResource/jakarta.jms.ConnectionFactory=connectionfactory:org.apache.activemq.ActiveMQConnectionFactory:tcp://localhost:61616
\
-DResource/org.omg.CORBA.ORB=orb:/ \
-Djdbc/DB1=link:Resource/javax.sql.DataSource \
--Djava.protocol.handler.pkgs=javax.net.ssl \
-Djavax.net.ssl.keyStore=${keystores.dir}/clientcert.jks \
-Djavax.net.ssl.keyStorePassword=changeit \
-Djavax.net.ssl.trustStore=${keystores.dir}/ssl-truststore \
[tomee-tck] branch tomee-10-with-ee-91 updated: Put back the echo/exec change committed by accident. Don't add quotes to the JAVA_HOME environment variable on Windows.
This is an automated email from the ASF dual-hosted git repository.
jgallimore pushed a commit to branch tomee-10-with-ee-91
in repository https://gitbox.apache.org/repos/asf/tomee-tck.git
The following commit(s) were added to refs/heads/tomee-10-with-ee-91 by this
push:
new bc3a0d4 Put back the echo/exec change committed by accident. Don't
add quotes to the JAVA_HOME environment variable on Windows.
bc3a0d4 is described below
commit bc3a0d4576b217d113514f5866da96c83401c3b5
Author: Jonathan Gallimore
AuthorDate: Mon Aug 7 16:16:03 2023 +0100
Put back the echo/exec change committed by accident. Don't add quotes to
the JAVA_HOME environment variable on Windows.
---
runtests| 4 ++--
src/test/script/openejb/tck/commands/JavaTestCommand.groovy | 8 +---
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/runtests b/runtests
index cd95d8c..b5025b2 100755
--- a/runtests
+++ b/runtests
@@ -339,7 +339,7 @@ egrep '(javaee|jakarta).(ri|cts).home' ~/.m2/settings.xml |
perl -pe 's,^ *|<[^>
# Fire up Maven to do the real work
if [ -z $nc ]; then
-echo mvn -V --file "$DIRNAME/pom.xml" \
+exec mvn -V --file "$DIRNAME/pom.xml" \
--batch-mode \
--errors \
$CONFIG \
@@ -355,7 +355,7 @@ echo mvn -V --file "$DIRNAME/pom.xml" \
-e
"s/\(\[ERROR\].*\)/${BOLD}${TEXT_RED}\1${RESET_FORMATTING}/g" \
-e "s/Tests run: \([^,]*\), Failures: \([^,]*\), Errors:
\([^,]*\), Skipped: \([^,]*\)/${BOLD}${TEXT_GREEN}Tests run:
\1${RESET_FORMATTING}, Failures: ${BOLD}${TEXT_RED}\2${RESET_FORMATTING},
Errors: ${BOLD}${TEXT_RED}\3${RESET_FORMATTING}, Skipped:
${BOLD}${TEXT_YELLOW}\4${RESET_FORMATTING}/g"
else
-echo mvn -V --file "$DIRNAME/pom.xml" \
+exec mvn -V --file "$DIRNAME/pom.xml" \
--batch-mode \
--errors \
$CONFIG \
diff --git a/src/test/script/openejb/tck/commands/JavaTestCommand.groovy
b/src/test/script/openejb/tck/commands/JavaTestCommand.groovy
index 998f4ab..1413982 100644
--- a/src/test/script/openejb/tck/commands/JavaTestCommand.groovy
+++ b/src/test/script/openejb/tck/commands/JavaTestCommand.groovy
@@ -147,9 +147,11 @@ class JavaTestCommand
// HACK: For some reason, need to quote JAVA_HOME on Windows...
//
def javaHome = require('java.home')
-if (SystemUtils.IS_OS_WINDOWS) {
-javaHome = "'${javaHome}'"
-}
+// JRG: I commented this out, as this appeared to append the content
of the JAVA_HOME environment variable to the current working directory
+// on Windows 11 for me. 2023-08-07
+//if (SystemUtils.IS_OS_WINDOWS) {
+//javaHome = "${javaHome}"
+//}
ant.mkdir(dir: workingDir)
[tomee-tck] branch tomee-10-with-ee-91 updated: Not sure we need endorsed anymore - TomEE 9 doesn't work with older versions of the JDK
This is an automated email from the ASF dual-hosted git repository.
jgallimore pushed a commit to branch tomee-10-with-ee-91
in repository https://gitbox.apache.org/repos/asf/tomee-tck.git
The following commit(s) were added to refs/heads/tomee-10-with-ee-91 by this
push:
new 60878c7 Not sure we need endorsed anymore - TomEE 9 doesn't work with
older versions of the JDK
60878c7 is described below
commit 60878c7b0c969446739c207839afac46843ec8e0
Author: Jonathan Gallimore
AuthorDate: Mon Aug 7 14:52:51 2023 +0100
Not sure we need endorsed anymore - TomEE 9 doesn't work with older
versions of the JDK
---
runtests | 4 ++--
.../script/openejb/tck/commands/JavaTestCommand.groovy | 14 +++---
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/runtests b/runtests
index b5025b2..cd95d8c 100755
--- a/runtests
+++ b/runtests
@@ -339,7 +339,7 @@ egrep '(javaee|jakarta).(ri|cts).home' ~/.m2/settings.xml |
perl -pe 's,^ *|<[^>
# Fire up Maven to do the real work
if [ -z $nc ]; then
-exec mvn -V --file "$DIRNAME/pom.xml" \
+echo mvn -V --file "$DIRNAME/pom.xml" \
--batch-mode \
--errors \
$CONFIG \
@@ -355,7 +355,7 @@ exec mvn -V --file "$DIRNAME/pom.xml" \
-e
"s/\(\[ERROR\].*\)/${BOLD}${TEXT_RED}\1${RESET_FORMATTING}/g" \
-e "s/Tests run: \([^,]*\), Failures: \([^,]*\), Errors:
\([^,]*\), Skipped: \([^,]*\)/${BOLD}${TEXT_GREEN}Tests run:
\1${RESET_FORMATTING}, Failures: ${BOLD}${TEXT_RED}\2${RESET_FORMATTING},
Errors: ${BOLD}${TEXT_RED}\3${RESET_FORMATTING}, Skipped:
${BOLD}${TEXT_YELLOW}\4${RESET_FORMATTING}/g"
else
-exec mvn -V --file "$DIRNAME/pom.xml" \
+echo mvn -V --file "$DIRNAME/pom.xml" \
--batch-mode \
--errors \
$CONFIG \
diff --git a/src/test/script/openejb/tck/commands/JavaTestCommand.groovy
b/src/test/script/openejb/tck/commands/JavaTestCommand.groovy
index e76e744..998f4ab 100644
--- a/src/test/script/openejb/tck/commands/JavaTestCommand.groovy
+++ b/src/test/script/openejb/tck/commands/JavaTestCommand.groovy
@@ -253,13 +253,13 @@ class JavaTestCommand
// not sure about this
-if (tckJavaHome == null || !new File(tckJavaHome as String,
'jmods').exists()/*j9 doesnt support it*/) {
-sysproperty(key: "java.endorsed.dirs", file:
"${javaeeRiHome}/lib/endorsed")
-sysproperty(key: "command.testExecute.endorsed.dir",
value: "-Djava.endorsed.dirs=${javaeeCtsHome}/endorsedlib")
-sysproperty(key:
"command.testExecuteEjbEmbed.endorsed.dir", value:
"-Djava.endorsed.dirs=${openejbHome}/endorsed")
-
-containerJavaOpts += " -Djava.locale.providers=COMPAT"
-}
+//if (tckJavaHome == null || !new File(tckJavaHome as String,
'jmods').exists()/*j9 doesnt support it*/) {
+//sysproperty(key: "java.endorsed.dirs", file:
"${javaeeRiHome}/lib/endorsed")
+//sysproperty(key: "command.testExecute.endorsed.dir",
value: "-Djava.endorsed.dirs=${javaeeCtsHome}/endorsedlib")
+//sysproperty(key:
"command.testExecuteEjbEmbed.endorsed.dir", value:
"-Djava.endorsed.dirs=${openejbHome}/endorsed")
+//
+//containerJavaOpts += " -Djava.locale.providers=COMPAT"
+//}
// force memory on tasks because with JDK 8 it's computed with
a bit too much
// containerJavaOpts += " -Xmx512m
-Dtest.ejb.stateful.timeout.wait.seconds=60"
[tomee-tck] branch tomee-8.x updated: Don't check the for SSE jar as this is part of the cxf-shade jar
This is an automated email from the ASF dual-hosted git repository.
jgallimore pushed a commit to branch tomee-8.x
in repository https://gitbox.apache.org/repos/asf/tomee-tck.git
The following commit(s) were added to refs/heads/tomee-8.x by this push:
new 36058ff Don't check the for SSE jar as this is part of the cxf-shade
jar
36058ff is described below
commit 36058ffa7b8740d4f3587dd378d84aa1d6a76bde
Author: Jonathan Gallimore
AuthorDate: Tue May 9 11:04:43 2023 +0100
Don't check the for SSE jar as this is part of the cxf-shade jar
---
src/test/script/openejb/tck/commands/CommandSupport.groovy | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/test/script/openejb/tck/commands/CommandSupport.groovy
b/src/test/script/openejb/tck/commands/CommandSupport.groovy
index 30069e1..b336409 100644
--- a/src/test/script/openejb/tck/commands/CommandSupport.groovy
+++ b/src/test/script/openejb/tck/commands/CommandSupport.groovy
@@ -243,7 +243,7 @@ abstract class CommandSupport {
builder.append("woodstox-core-*.jar")
builder.append("stax2-api-*.jar")
builder.append("xmlschema-core-*.jar")
-builder.append("cxf-rt-rs-sse-*.jar")
+// builder.append("cxf-rt-rs-sse-*.jar") // commented out as this is
part of cxf-shade...?
// for jonzon
builder.appendAll("johnzon-*.jar")
[tomee-tck] branch tomee-8.x updated: Update TomEE version
This is an automated email from the ASF dual-hosted git repository. jgallimore pushed a commit to branch tomee-8.x in repository https://gitbox.apache.org/repos/asf/tomee-tck.git The following commit(s) were added to refs/heads/tomee-8.x by this push: new cd20313 Update TomEE version cd20313 is described below commit cd20313626723873640af3e515842fd22c726b1b Author: Jonathan Gallimore AuthorDate: Fri Apr 28 15:16:52 2023 +0100 Update TomEE version --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 30b0d53..547033d 100644 --- a/pom.xml +++ b/pom.xml @@ -38,10 +38,10 @@ org.apache.tomee -8.0.13-SNAPSHOT -8.0.13-SNAPSHOT +8.0.15-SNAPSHOT +8.0.15-SNAPSHOT -9.0.68 +9.0.74 10.14.2.0
[tomee] branch tomee-8.x updated: TOMEE-4112 further fix to cache lookup results for empty result sets in EAR files
This is an automated email from the ASF dual-hosted git repository.
jgallimore pushed a commit to branch tomee-8.x
in repository https://gitbox.apache.org/repos/asf/tomee.git
The following commit(s) were added to refs/heads/tomee-8.x by this push:
new db45f8c7d6 TOMEE-4112 further fix to cache lookup results for empty
result sets in EAR files
db45f8c7d6 is described below
commit db45f8c7d6422f3788585df8b00a5f27f8cbc4a1
Author: Jonathan Gallimore
AuthorDate: Thu Apr 27 14:27:22 2023 +0100
TOMEE-4112 further fix to cache lookup results for empty result sets in EAR
files
---
.../org/apache/openejb/cdi/AppBeanManager.java | 30
.../org/apache/openejb/cdi/AppWebBeansContext.java | 53 ++
.../openejb/cdi/ThreadSingletonServiceImpl.java| 10 +++-
.../openejb/cdi/WebAppInjectionResolver.java | 16 ---
4 files changed, 102 insertions(+), 7 deletions(-)
diff --git
a/container/openejb-core/src/main/java/org/apache/openejb/cdi/AppBeanManager.java
b/container/openejb-core/src/main/java/org/apache/openejb/cdi/AppBeanManager.java
new file mode 100755
index 00..9da6e6b1e9
--- /dev/null
+++
b/container/openejb-core/src/main/java/org/apache/openejb/cdi/AppBeanManager.java
@@ -0,0 +1,30 @@
+/*
+ * 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.cdi;
+
+import org.apache.openejb.util.reflection.Reflections;
+import org.apache.webbeans.config.WebBeansContext;
+import org.apache.webbeans.container.BeanManagerImpl;
+
+public class AppBeanManager extends BeanManagerImpl {
+
+public AppBeanManager(final WebBeansContext ctx) {
+super(ctx);
+Reflections.set(this, "injectionResolver", new
WebAppInjectionResolver(ctx));
+}
+}
diff --git
a/container/openejb-core/src/main/java/org/apache/openejb/cdi/AppWebBeansContext.java
b/container/openejb-core/src/main/java/org/apache/openejb/cdi/AppWebBeansContext.java
new file mode 100755
index 00..5dccb93ced
--- /dev/null
+++
b/container/openejb-core/src/main/java/org/apache/openejb/cdi/AppWebBeansContext.java
@@ -0,0 +1,53 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.openejb.cdi;
+
+import org.apache.webbeans.config.WebBeansContext;
+import org.apache.webbeans.container.BeanManagerImpl;
+import org.apache.webbeans.container.InjectableBeanManager;
+
+import java.util.Map;
+import java.util.Properties;
+
+public class AppWebBeansContext extends WebBeansContext {
+private final InjectableBeanManager ibm;
+private BeanManagerImpl bm;
+
+public AppWebBeansContext(final Map, Object> services, final
Properties properties) {
+super(services, properties);
+ibm = new InjectableBeanManager(getBeanManagerImpl());
+}
+
+@Override
+public InjectableBeanManager getInjectableBeanManager() {
+return ibm;
+}
+
+@SuppressWarnings("PMD.DoubleCheckedLocking")
+@Override
+public BeanManagerImpl getBeanManagerImpl() {
+if (bm == null) { // should be done in the constructor
+synchronized (this) {
+if (bm == null) {
+bm = new AppBeanManager(this);
+}
+}
+}
+return bm;
+}
+}
diff --git
a/container/openejb-core/src/main/java/org/apache/openejb/cdi/ThreadSingletonServiceImpl.java
b/container/openejb-core/src/main/ja
[tomee] 01/02: TOMEE-4181 Exclude bcprov from the patch plugin
This is an automated email from the ASF dual-hosted git repository. jgallimore pushed a commit to branch tomee-9.x in repository https://gitbox.apache.org/repos/asf/tomee.git commit 50b4efd15c353ed3983217ea8b70b1ff4d891676 Author: Jonathan Gallimore AuthorDate: Fri Jan 27 15:01:18 2023 + TOMEE-4181 Exclude bcprov from the patch plugin --- tomee/apache-tomee/pom.xml | 5 + 1 file changed, 5 insertions(+) diff --git a/tomee/apache-tomee/pom.xml b/tomee/apache-tomee/pom.xml index 989ac8dc82..6dcb99ad73 100644 --- a/tomee/apache-tomee/pom.xml +++ b/tomee/apache-tomee/pom.xml @@ -579,6 +579,11 @@ apache-tomee-(plus|plume|webprofile|microprofile).*\.zip true true + + + org.bouncycastle:bcprov-jdk15on:jar:1.70 + +
[tomee] 02/02: TOMEE-4181 Exclude bc jars from the patch plugin
This is an automated email from the ASF dual-hosted git repository. jgallimore pushed a commit to branch tomee-9.x in repository https://gitbox.apache.org/repos/asf/tomee.git commit 088eb99c5cdb075e2eafa495ff35ff6b51c146a6 Author: Jonathan Gallimore AuthorDate: Mon Jan 30 20:53:17 2023 + TOMEE-4181 Exclude bc jars from the patch plugin --- boms/tomee-microprofile/pom.xml | 12 ++-- boms/tomee-plume/pom.xml| 12 ++-- boms/tomee-plus/pom.xml | 12 ++-- tomee/apache-tomee/pom.xml | 4 4 files changed, 22 insertions(+), 18 deletions(-) diff --git a/boms/tomee-microprofile/pom.xml b/boms/tomee-microprofile/pom.xml index fb76a10ca0..7aab0e9adf 100644 --- a/boms/tomee-microprofile/pom.xml +++ b/boms/tomee-microprofile/pom.xml @@ -356,7 +356,7 @@ io.smallrye.reactive mutiny - 1.7.0 + 1.8.0 * @@ -367,7 +367,7 @@ io.smallrye jandex - 3.0.0 + 3.0.1 * @@ -422,7 +422,7 @@ io.smallrye smallrye-health-api - 4.0.0 + 4.0.1 * @@ -433,7 +433,7 @@ io.smallrye smallrye-health - 4.0.0 + 4.0.1 * @@ -455,7 +455,7 @@ io.smallrye smallrye-open-api-core - 3.0.0 + 3.0.1 * @@ -466,7 +466,7 @@ io.smallrye smallrye-open-api-jaxrs - 3.0.0 + 3.0.1 * diff --git a/boms/tomee-plume/pom.xml b/boms/tomee-plume/pom.xml index 3b11a14409..181b6f4e6c 100644 --- a/boms/tomee-plume/pom.xml +++ b/boms/tomee-plume/pom.xml @@ -367,7 +367,7 @@ io.smallrye.reactive mutiny - 1.7.0 + 1.8.0 * @@ -378,7 +378,7 @@ io.smallrye jandex - 3.0.0 + 3.0.1 * @@ -433,7 +433,7 @@ io.smallrye smallrye-health-api - 4.0.0 + 4.0.1 * @@ -444,7 +444,7 @@ io.smallrye smallrye-health - 4.0.0 + 4.0.1 * @@ -466,7 +466,7 @@ io.smallrye smallrye-open-api-core - 3.0.0 + 3.0.1 * @@ -477,7 +477,7 @@ io.smallrye smallrye-open-api-jaxrs - 3.0.0 + 3.0.1 * diff --git a/boms/tomee-plus/pom.xml b/boms/tomee-plus/pom.xml index b4bc58f74f..0c04cde1e6 100644 --- a/boms/tomee-plus/pom.xml +++ b/boms/tomee-plus/pom.xml @@ -378,7 +378,7 @@ io.smallrye.reactive mutiny - 1.7.0 + 1.8.0 * @@ -389,7 +389,7 @@ io.smallrye jandex - 3.0.0 + 3.0.1 * @@ -444,7 +444,7 @@ io.smallrye smallrye-health-api - 4.0.0 + 4.0.1 * @@ -455,7 +455,7 @@ io.smallrye smallrye-health - 4.0.0 + 4.0.1 * @@ -477,7 +477,7 @@ io.smallrye smallrye-open-api-core - 3.0.0 + 3.0.1 * @@ -488,7 +488,7 @@ io.smallrye smallrye-open-api-jaxrs - 3.0.0 + 3.0.1 * diff --git a/tomee/apache-tomee/pom.xml b/tomee/apache-tomee/pom.xml index 6dcb99ad73..daa9bf5a85 100644 --- a/tomee/apache-tomee/pom.xml +++ b/tomee/apache-tomee/pom.xml @@ -581,7 +581,11 @@ true + org.bouncycastle:bcpkix-jdk15on:jar:1.70 org.bouncycastle:bcprov-jdk15on:jar:1.70 + org.bouncycastle:bcprov-jdk15to18:jar:1.70 + org.bouncycastle:bcprov-jdk18on:jar:1.71 + org.bouncycastle:bcutil-jdk15on:jar:1.70
[tomee] branch tomee-9.x updated (847c7eaa7a -> 088eb99c5c)
This is an automated email from the ASF dual-hosted git repository. jgallimore pushed a change to branch tomee-9.x in repository https://gitbox.apache.org/repos/asf/tomee.git from 847c7eaa7a Merge pull request #969 from sultan/properties_9.x new 50b4efd15c TOMEE-4181 Exclude bcprov from the patch plugin new 088eb99c5c TOMEE-4181 Exclude bc jars from the patch plugin 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: boms/tomee-microprofile/pom.xml | 12 ++-- boms/tomee-plume/pom.xml| 12 ++-- boms/tomee-plus/pom.xml | 12 ++-- tomee/apache-tomee/pom.xml | 9 + 4 files changed, 27 insertions(+), 18 deletions(-)
[tomee] branch UpdateJakartaEEApi10 updated (f505d22666 -> 599fd0d0e5)
This is an automated email from the ASF dual-hosted git repository. jgallimore pushed a change to branch UpdateJakartaEEApi10 in repository https://gitbox.apache.org/repos/asf/tomee.git from f505d22666 Update to MyFaces 4 add 599fd0d0e5 Copying the profile config to these other profiles No new revisions were added by this update. Summary of changes: .../src/test/resources/arquillian.xml | 41 -- 1 file changed, 38 insertions(+), 3 deletions(-)
[tomee] branch tomee-8.x updated: TOMEE-4181 Exclude bcprov from the patch plugin
This is an automated email from the ASF dual-hosted git repository. jgallimore pushed a commit to branch tomee-8.x in repository https://gitbox.apache.org/repos/asf/tomee.git The following commit(s) were added to refs/heads/tomee-8.x by this push: new c985e75724 TOMEE-4181 Exclude bcprov from the patch plugin c985e75724 is described below commit c985e757246ef4c1323f2c5d069b81d2308fbcc2 Author: Jonathan Gallimore AuthorDate: Fri Jan 27 15:01:18 2023 + TOMEE-4181 Exclude bcprov from the patch plugin --- tomee/apache-tomee/pom.xml | 5 + 1 file changed, 5 insertions(+) diff --git a/tomee/apache-tomee/pom.xml b/tomee/apache-tomee/pom.xml index 2f3acec579..83f68e47ad 100644 --- a/tomee/apache-tomee/pom.xml +++ b/tomee/apache-tomee/pom.xml @@ -562,6 +562,11 @@ apache-tomee-(plus|plume|webprofile|microprofile).*\.zip true true + + + org.bouncycastle:bcprov-jdk15on:jar:1.70 + +
[tomee] branch UpdateJakartaEEApi10 updated (4931d634e1 -> f505d22666)
This is an automated email from the ASF dual-hosted git repository. jgallimore pushed a change to branch UpdateJakartaEEApi10 in repository https://gitbox.apache.org/repos/asf/tomee.git from 4931d634e1 Add testng to classpath, and add user/groups needed for the TCK add f505d22666 Update to MyFaces 4 No new revisions were added by this update. Summary of changes: .../org/superbiz/moviefun/MovieController.java | 6 ++-- .../arquillian/tests/jms/DummyManagedBean.java | 4 +-- .../arquillian/tests/jsf/ejb/DummyManagedBean.java | 4 +-- .../arquillian/tests/jsf/jpa/DummyManagedBean.java | 4 +-- .../tests/jsf/resource/ResourceManagedBean.java| 5 +-- boms/tomee-microprofile-api/pom.xml| 2 +- boms/tomee-microprofile/pom.xml| 33 +++ boms/tomee-plume/pom.xml | 21 ++-- boms/tomee-plus-api/pom.xml| 2 +- boms/tomee-plus/pom.xml| 36 +++-- boms/tomee-webprofile-api/pom.xml | 2 +- boms/tomee-webprofile/pom.xml | 33 +++ pom.xml| 2 +- tck/concurrency-standalone/dev.xml | 2 +- .../src/test/resources/arquillian.xml | 2 +- .../tomee/myfaces/TomEEAnnotationProvider.java | 2 +- .../myfaces/TomEEFacesConfigResourceProvider.java | 2 +- .../TomEEFacesConfigResourceProviderFactory.java | 2 +- .../myfaces/TomEEMyFacesContainerInitializer.java | 16 -- .../tomee/myfaces/TomEEWebConfigProvider.java | 37 +- 20 files changed, 73 insertions(+), 144 deletions(-)
[tomee] branch UpdateJakartaEEApi10 updated (ef79aa192a -> 4931d634e1)
This is an automated email from the ASF dual-hosted git repository.
jgallimore pushed a change to branch UpdateJakartaEEApi10
in repository https://gitbox.apache.org/repos/asf/tomee.git
from ef79aa192a Add Derby to Concurrency TCK setup
add 66a6e08ca2 Propagate context to new thread
add 4931d634e1 Add testng to classpath, and add user/groups needed for the
TCK
No new revisions were added by this update.
Summary of changes:
.../org/apache/openejb/threads/impl/ManagedThreadFactoryImpl.java | 4 +++-
tck/concurrency-standalone/pom.xml| 4 ++--
.../concurrency-standalone/src/test}/conf/tomcat-users.xml| 2 ++
tck/concurrency-standalone/src/test/resources/arquillian.xml | 4
4 files changed, 11 insertions(+), 3 deletions(-)
copy {boms/tomee-plume/src/main/resources/tomee =>
tck/concurrency-standalone/src/test}/conf/tomcat-users.xml (96%)
[tomee] branch UpdateJakartaEEApi10 updated (c04bc64577 -> ef79aa192a)
This is an automated email from the ASF dual-hosted git repository.
jgallimore pushed a change to branch UpdateJakartaEEApi10
in repository https://gitbox.apache.org/repos/asf/tomee.git
from c04bc64577 Use BVal snapshot to avoid CDI 4 issue with annotated type
add ef79aa192a Add Derby to Concurrency TCK setup
No new revisions were added by this update.
Summary of changes:
pom.xml| 2 +-
tck/concurrency-standalone/{suite.xml => dev.xml} | 14 ++-
tck/concurrency-standalone/pom.xml | 14 +++
.../src/test/resources/arquillian.xml | 47 +-
4 files changed, 57 insertions(+), 20 deletions(-)
copy tck/concurrency-standalone/{suite.xml => dev.xml} (78%)
copy {examples/mp-rest-jwt-jwk =>
tck/concurrency-standalone}/src/test/resources/arquillian.xml (50%)
[tomee] branch UpdateJakartaEEApi10 updated (8c183e6617 -> e3644c1a8e)
This is an automated email from the ASF dual-hosted git repository. jgallimore pushed a change to branch UpdateJakartaEEApi10 in repository https://gitbox.apache.org/repos/asf/tomee.git from 8c183e6617 Seems to basically compile now add e3644c1a8e Adding concurrency TCK No new revisions were added by this update. Summary of changes: tck/concurrency-signature-test/pom.xml| 164 +++ tck/concurrency-standalone/logging.properties | 40 + tck/concurrency-standalone/pom.xml| 221 ++ tck/concurrency-standalone/suite-web.xml | 35 tck/concurrency-standalone/suite.xml | 35 tck/pom.xml | 1 + 6 files changed, 496 insertions(+) create mode 100644 tck/concurrency-signature-test/pom.xml create mode 100644 tck/concurrency-standalone/logging.properties create mode 100644 tck/concurrency-standalone/pom.xml create mode 100644 tck/concurrency-standalone/suite-web.xml create mode 100644 tck/concurrency-standalone/suite.xml
[tomee] branch UpdateJakartaEEApi10 updated (e2b6ece227 -> 8c183e6617)
This is an automated email from the ASF dual-hosted git repository. jgallimore pushed a change to branch UpdateJakartaEEApi10 in repository https://gitbox.apache.org/repos/asf/tomee.git from e2b6ece227 More compilation fixing add 8c183e6617 Seems to basically compile now No new revisions were added by this update. Summary of changes: .../openejb/OpenEJBInjectionEnricher.java | 2 +- .../cdi/ejb/OverloadedEjbObserverMethodsTest.java | 4 ++-- .../tests/securityejb/TheServerAuthContext.java| 2 +- boms/tomee-microprofile/pom.xml| 27 -- boms/tomee-plume/pom.xml | 27 -- boms/tomee-plus/pom.xml| 27 -- boms/tomee-webprofile/pom.xml | 27 -- .../tomee/microprofile/jwt/cdi/ClaimBean.java | 5 .../microprofile/jwt/cdi/MPJWTCDIExtension.java| 10 .../microprofile/health/MPHealthCDIExtension.java | 2 +- .../opentracing/MPOpenTracingCDIExtension.java | 2 +- .../tomee/security/cdi/TomEESecurityExtension.java | 18 +++ 12 files changed, 40 insertions(+), 113 deletions(-)
[tomee] branch UpdateJakartaEEApi10 updated (0956270d86 -> e2b6ece227)
This is an automated email from the ASF dual-hosted git repository. jgallimore pushed a change to branch UpdateJakartaEEApi10 in repository https://gitbox.apache.org/repos/asf/tomee.git from 0956270d86 Almost certainly getting all of this entirely wrong. Just trying to get it to compile at the moment add e2b6ece227 More compilation fixing No new revisions were added by this update. Summary of changes: .../src/main/java/org/apache/openejb/server/cxf/rs/CxfRSService.java | 5 - 1 file changed, 5 deletions(-)
[tomee] branch UpdateJakartaEEApi10 updated (7524453e83 -> 0956270d86)
This is an automated email from the ASF dual-hosted git repository. jgallimore pushed a change to branch UpdateJakartaEEApi10 in repository https://gitbox.apache.org/repos/asf/tomee.git from 7524453e83 Update Jakarta EE API to 10.1-M1 Update Johnzon to 2.0.0-SNAPSHOT Update Geronimo TxManager to 4.0.0-SNAPSHOT Fixes for API changes add 0956270d86 Almost certainly getting all of this entirely wrong. Just trying to get it to compile at the moment No new revisions were added by this update. Summary of changes: .../openejb/resource/thread/ThreadFactories.java | 5 ++ .../openejb/threads/impl/ContextServiceImpl.java | 58 + .../threads/impl/ManagedExecutorServiceImpl.java | 59 +++--- .../threads/impl/ManagedThreadFactoryImpl.java | 21 .../org/apache/openejb/cdi/BasicObserverTest.java | 2 +- .../apache/tomee/catalina/realm/CdiEventRealm.java | 10 ++-- 6 files changed, 143 insertions(+), 12 deletions(-)
[tomee] 03/03: Update API version
This is an automated email from the ASF dual-hosted git repository.
jgallimore pushed a commit to branch TOMEE-4159_Concurrency_TCK
in repository https://gitbox.apache.org/repos/asf/tomee.git
commit ebb939800c4f96a399739a16dc7d503ac72cb52d
Author: Jonathan Gallimore
AuthorDate: Thu Jan 12 11:39:19 2023 +
Update API version
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 05054b74c4..96e4f34ae4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -98,7 +98,7 @@
${project.groupId}.${project.artifactId}
-9.1-M2
+10.0-SNAPSHOT
0.9
[tomee] 01/03: Merge remote-tracking branch 'apache/TOMEE-4165_JSONP-TCK' into TOMEE-4159_Concurrency_TCK
This is an automated email from the ASF dual-hosted git repository. jgallimore pushed a commit to branch TOMEE-4159_Concurrency_TCK in repository https://gitbox.apache.org/repos/asf/tomee.git commit 4513eeaa78edbcd364309a08996140fcc1aec699 Merge: 81080e83e2 945aa1368c Author: Jonathan Gallimore AuthorDate: Wed Jan 11 11:58:58 2023 + Merge remote-tracking branch 'apache/TOMEE-4165_JSONP-TCK' into TOMEE-4159_Concurrency_TCK tck/jsonp-signature-test/pom.xml | 119 ++ tck/jsonp-standalone/pom.xml | 174 +++ tck/pom.xml | 2 + 3 files changed, 295 insertions(+) diff --cc tck/pom.xml index 3bba6d45c3,f6cac472c7..7a0bf23cb2 --- a/tck/pom.xml +++ b/tck/pom.xml @@@ -41,8 -41,8 +41,10 @@@ bval-embedded bval-tomee bval-signature-test +jsonb-standalone +jsonb-signature-test + jsonp-standalone + jsonp-signature-test microprofile-tck
[tomee] 02/03: Adding concurrency TCK
This is an automated email from the ASF dual-hosted git repository.
jgallimore pushed a commit to branch TOMEE-4159_Concurrency_TCK
in repository https://gitbox.apache.org/repos/asf/tomee.git
commit 1f2fd80df9ea67ed21b2f290d32c74ff8a305255
Author: Jonathan Gallimore
AuthorDate: Wed Jan 11 13:46:58 2023 +
Adding concurrency TCK
---
tck/concurrency-signature-test/pom.xml| 164 +++
tck/concurrency-standalone/logging.properties | 40 +
tck/concurrency-standalone/pom.xml| 221 ++
tck/concurrency-standalone/suite-web.xml | 35
tck/concurrency-standalone/suite.xml | 35
tck/pom.xml | 1 +
6 files changed, 496 insertions(+)
diff --git a/tck/concurrency-signature-test/pom.xml
b/tck/concurrency-signature-test/pom.xml
new file mode 100644
index 00..447cc11695
--- /dev/null
+++ b/tck/concurrency-signature-test/pom.xml
@@ -0,0 +1,164 @@
+
+
+http://maven.apache.org/POM/4.0.0;
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd;>
+
+tck
+org.apache.tomee
+10.0.0-SNAPSHOT
+
+
+ 4.0.0
+ jsonb-signature-test
+ TomEE :: TCK :: JSON-B Signature Tests
+
+
+
+ org.apache.johnzon
+ johnzon-core
+ jakarta
+
+
+ org.apache.johnzon
+ *
+
+
+ org.apache.geronimo.specs
+ *
+
+
+
+
+ org.apache.johnzon
+ johnzon-mapper
+ jakarta
+
+
+ org.apache.johnzon
+ *
+
+
+ org.apache.geronimo.specs
+ *
+
+
+
+
+ org.apache.johnzon
+ johnzon-jsonb
+ jakarta
+
+
+ org.apache.johnzon
+ *
+
+
+ org.apache.geronimo.specs
+ *
+
+
+
+
+
+ org.apache.tomee
+ jakartaee-api
+
+
+
+ jakarta.json.bind
+ jakarta.json.bind-tck
+ 3.0.0
+ test
+
+
+
+ org.apache.openwebbeans
+ openwebbeans-se
+ 2.0.27
+ jakarta
+
+
+ org.apache.openwebbeans
+ *
+
+
+ org.apache.geronimo.specs
+ *
+
+
+
+
+ org.apache.openwebbeans
+ openwebbeans-impl
+ 2.0.27
+ jakarta
+
+
+ org.apache.openwebbeans
+ *
+
+
+ org.apache.geronimo.specs
+ *
+
+
+
+
+ org.apache.openwebbeans
+ openwebbeans-spi
+ 2.0.27
+ jakarta
+
+
+ org.apache.openwebbeans
+ *
+
+
+ org.apache.geronimo.specs
+ *
+
+
+
+
+
+
+
+
+src/test/resources
+true
+
+
+
+
+org.apache.maven.plugins
+maven-surefire-plugin
+${surefire.version}
+
+ false
+ 1
+
+jakarta.json.bind:jakarta.json.bind-tck
+
+
+**/JSONBSigTest
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/tck/concurrency-standalone/logging.properties
b/tck/concurrency-standalone/logging.properties
new file mode 100644
index 00..891082e145
--- /dev/null
+++ b/tck/concurrency-standalone/logging.properties
@@ -0,0 +1,40 @@
+# Ensure that both your client and sever JVMs point to this file using the
java.util.logging property
+# -Djava.util.logging.config.file=/path/to/logging.properties
+
+#Handlers we plan to use
+handlers=java.util.logging.FileHandler,java.util.logging.ConsoleHandler
+
+#Global logger - By default only log warnings
+.level=WARNING
+
+#Concurrency logger - By default log everything for concurrency loggers
+ee.jakarta.tck.concurrent.level=ALL
+
+#Formatting for the simple formatter
+java.util.logging.SimpleFormatter.class.log=true
+java.util.logging.SimpleFormatter.class.full=false
+java.util.logging.SimpleFormatter.class.length=30
+
+java.util.logging.SimpleFormatter.level.log=true
+
+java.util.logging.SimpleFormatter.method.log=true
+java.util.logging.SimpleFormatter.method.length=30
+
+java.util.logging.SimpleFormatter.thread.log=true
+java.util.logging.SimpleFormatter.thread.length=3
+
+java.util.logging.SimpleFormatter.time.log=true
+java.util.logging.SimpleFormatter.time.format=[MM/dd/ HH:mm:ss:SSS z]
+
+java.util.logging.SimpleFormatter.format=[%1$tF %1$tT] %4$.1s %3$s %5$s %n
+
+#File logging
+java.util.logging.FileHandler.pattern=ConcurrentTCK%g%u.log
+java.util.logging.FileHandler.limit = 50
+java.util.logging.FileHandler.count = 5
+java.util.logging.FileHandler.formatter=java.util.logging.SimpleFormatter
+java.util.logging.FileHandler.level=CONFIG
+
+# Co
[tomee] branch TOMEE-4159_Concurrency_TCK created (now ebb939800c)
This is an automated email from the ASF dual-hosted git repository. jgallimore pushed a change to branch TOMEE-4159_Concurrency_TCK in repository https://gitbox.apache.org/repos/asf/tomee.git at ebb939800c Update API version This branch includes the following new commits: new 4513eeaa78 Merge remote-tracking branch 'apache/TOMEE-4165_JSONP-TCK' into TOMEE-4159_Concurrency_TCK new 1f2fd80df9 Adding concurrency TCK new ebb939800c Update API version 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.
[tomee] branch tomee-8.x updated: TOMEE-4014 alternative approach that does not touch ServerInfo.properties in catalina.jar, and works around the reflection issue with the final modifier
This is an automated email from the ASF dual-hosted git repository.
jgallimore pushed a commit to branch tomee-8.x
in repository https://gitbox.apache.org/repos/asf/tomee.git
The following commit(s) were added to refs/heads/tomee-8.x by this push:
new 7ce518e291 TOMEE-4014 alternative approach that does not touch
ServerInfo.properties in catalina.jar, and works around the reflection issue
with the final modifier
new 04039d7d30 Merge pull request #984 from jgallimore/TOMEE-4014
7ce518e291 is described below
commit 7ce518e29111ba10cd6bcf5a8fc613fc912b84a8
Author: Jonathan Gallimore
AuthorDate: Fri Dec 9 13:54:39 2022 +
TOMEE-4014 alternative approach that does not touch ServerInfo.properties
in catalina.jar, and works around the reflection issue with the final modifier
---
tomee/apache-tomee/pom.xml | 30 -
.../java/org/apache/catalina/util/ServerInfo.java | 137 +
.../org/apache/catalina/util/ServerInfo.properties | 18 ---
3 files changed, 137 insertions(+), 48 deletions(-)
diff --git a/tomee/apache-tomee/pom.xml b/tomee/apache-tomee/pom.xml
index 5aa594d417..6eae70fad5 100644
--- a/tomee/apache-tomee/pom.xml
+++ b/tomee/apache-tomee/pom.xml
@@ -498,31 +498,6 @@
-
-org.apache.maven.plugins
-maven-antrun-plugin
-
-
-package
-
- run
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
org.codehaus.mojo
build-helper-maven-plugin
@@ -587,11 +562,6 @@
apache-tomee-(plus|plume|webprofile|microprofile).*\.zip
true
true
-
-
-
${project.build.outputDirectory}/ServerInfo.properties
-
-
diff --git
a/tomee/apache-tomee/src/patch/java/org/apache/catalina/util/ServerInfo.java
b/tomee/apache-tomee/src/patch/java/org/apache/catalina/util/ServerInfo.java
new file mode 100644
index 00..3bfc21b404
--- /dev/null
+++ b/tomee/apache-tomee/src/patch/java/org/apache/catalina/util/ServerInfo.java
@@ -0,0 +1,137 @@
+/*
+ * 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.catalina.util;
+
+
+import java.io.InputStream;
+import java.util.Properties;
+
+import org.apache.tomcat.util.ExceptionUtils;
+
+
+/**
+ * Simple utility module to make it easy to plug in the server identifier
+ * when integrating Tomcat.
+ *
+ * @author Craig R. McClanahan
+ */
+public class ServerInfo {
+
+
+// --- Static Variables
+
+
+/**
+ * The server information String with which we identify ourselves.
+ */
+private static final String serverInfo;
+
+/**
+ * The server built String.
+ */
+private static final String serverBuilt;
+
+/**
+ * The server's version number String.
+ */
+private static final String serverNumber;
+
+static {
+
+String info = null;
+String built = null;
+String number = null;
+
+Properties props = new Properties();
+try (InputStream is = ServerInfo.class.getResourceAsStream
+("/org/apache/catalina/util/ServerInfo.properties")) {
+props.load(is);
+info = props.getProperty("server.info");
+built = props.getProperty("server.built");
+number = props.getProperty("server.number");
+} catch (Throwable t) {
+ExceptionUtils.handleThrowable(t);
+}
+if (info == null || info.equals("Apache Tomcat/@VERSION@")) {
+info = "Apache Tomcat/9.0.x-dev";
+}
+if (built == null || built.equals("@VERSION_BUILT@")) {
+b
[tomee] branch tomee-8.x updated (ea77d58d42 -> 27fc134370)
This is an automated email from the ASF dual-hosted git repository. jgallimore pushed a change to branch tomee-8.x in repository https://gitbox.apache.org/repos/asf/tomee.git from ea77d58d42 [TOMEE-4053] Dependency properties cleanup new 4068152e37 Optionally cache type resolution failure at runtime as a performance enhancement new 3f275a37e9 Merge remote-tracking branch 'origin/tomee-8.x' into cache-lookup-failures new 0ae4bc85e9 Fix missing assigment of startup field, and add unit test new 27fc134370 Merge pull request #971 from jgallimore/cache-lookup-failures The 14237 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: boms/tomee-microprofile-api/pom.xml| 55 +++ boms/tomee-microprofile/pom.xml| 55 +++ boms/tomee-plume-api/pom.xml | 55 +++ boms/tomee-plume/pom.xml | 66 + boms/tomee-plus-api/pom.xml| 55 +++ boms/tomee-plus/pom.xml| 66 + boms/tomee-webprofile-api/pom.xml | 55 +++ boms/tomee-webprofile/pom.xml | 77 .../openejb/cdi/WebAppInjectionResolver.java | 93 ++- .../openejb/cdi/InjectionResolverCacheTest.java| 102 + 10 files changed, 676 insertions(+), 3 deletions(-) create mode 100755 container/openejb-core/src/test/java/org/apache/openejb/cdi/InjectionResolverCacheTest.java
[tomee] branch tomee-8.x updated: Missed on previous commit
This is an automated email from the ASF dual-hosted git repository.
jgallimore pushed a commit to branch tomee-8.x
in repository https://gitbox.apache.org/repos/asf/tomee.git
The following commit(s) were added to refs/heads/tomee-8.x by this push:
new ddd32456ca Missed on previous commit
new 8e42797655 Merge branch 'tomee-8.x' of github.com:apache/tomee into
tomee-8.x
ddd32456ca is described below
commit ddd32456cab34a8a1cba3dd1149ed743ebf94a67
Author: Jonathan Gallimore
AuthorDate: Wed Oct 12 09:45:50 2022 +0100
Missed on previous commit
---
.../openejb/activemq/MDBAutoConfigOffTest.java | 22 --
1 file changed, 8 insertions(+), 14 deletions(-)
diff --git
a/container/openejb-core/src/test/java/org/apache/openejb/activemq/MDBAutoConfigOffTest.java
b/container/openejb-core/src/test/java/org/apache/openejb/activemq/MDBAutoConfigOffTest.java
old mode 100644
new mode 100755
index fb7542afd6..39f5f128cc
---
a/container/openejb-core/src/test/java/org/apache/openejb/activemq/MDBAutoConfigOffTest.java
+++
b/container/openejb-core/src/test/java/org/apache/openejb/activemq/MDBAutoConfigOffTest.java
@@ -17,6 +17,7 @@
package org.apache.openejb.activemq;
import org.apache.activemq.ActiveMQXAConnectionFactory;
+import org.apache.activemq.command.ActiveMQQueue;
import org.apache.openejb.jee.MessageDrivenBean;
import org.apache.openejb.junit.ApplicationComposer;
import org.apache.openejb.testing.Configuration;
@@ -35,7 +36,6 @@ import javax.jms.JMSException;
import javax.jms.Message;
import javax.jms.MessageListener;
import javax.jms.MessageProducer;
-import javax.jms.Queue;
import javax.jms.Session;
import javax.jms.TextMessage;
import javax.jms.XAConnectionFactory;
@@ -47,12 +47,13 @@ import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
@RunWith(ApplicationComposer.class)
-public class ActivationContainerOverwriteBothConfigurationTest {
+public class MDBAutoConfigOffTest {
private static final String TEXT = "foo";
@Configuration
public Properties config() {
return new PropertiesBuilder()
+.p("tomee.autoconfig", "false")
.p("amq", "new://Resource?type=ActiveMQResourceAdapter")
.p("amq.DataSource", "")
@@ -63,14 +64,14 @@ public class
ActivationContainerOverwriteBothConfigurationTest {
.p("mdbs", "new://Container?type=MESSAGE")
.p("mdbs.ResourceAdapter", "amq")
-.p("mdb.container.amq.activation.destination","wrongTarget")
-.p("mdbs.activation.destination", "target")
.p("cf", "new://Resource?type=" +
ConnectionFactory.class.getName())
.p("cf.ResourceAdapter", "amq")
.p("xaCf", "new://Resource?class-name=" +
ActiveMQXAConnectionFactory.class.getName())
.p("xaCf.BrokerURL", "vm://localhost")
+.p("managedContainer", "new://Container?type=MANAGED")
+
.build();
}
@@ -79,9 +80,6 @@ public class
ActivationContainerOverwriteBothConfigurationTest {
return new MessageDrivenBean(Listener.class);
}
-@Resource(name = "target")
-private Queue destination;
-
@Resource(name = "xaCf")
private XAConnectionFactory xacf;
@@ -96,17 +94,13 @@ public class
ActivationContainerOverwriteBothConfigurationTest {
@Test
public void test() throws Exception {
assertNotNull(cf);
-
-
-final Connection connection = cf.createConnection();
-testConnection(connection);
+testConnection(cf.createConnection());
}
-
private void testConnection(final Connection connection) throws
JMSException, InterruptedException {
try {
final Session session = connection.createSession(false,
Session.AUTO_ACKNOWLEDGE);
-final MessageProducer producer =
session.createProducer(destination);
+final MessageProducer producer = session.createProducer(new
ActiveMQQueue("testQueue"));
producer.send(session.createTextMessage(TEXT));
assertTrue(Listener.sync());
} finally {
@@ -120,7 +114,7 @@ public class
ActivationContainerOverwriteBothConfigurationTest {
@MessageDriven(activationConfig = {
@ActivationConfigProperty(propertyName = "destinationType",
propertyValue = "javax.jms.Queue"),
-@ActivationConfigProperty(propertyName = "destination",
propertyValue = "toBeOverwrite")
+@ActivationConfigProperty(propertyName = "destination",
propertyValue = "testQueue")
})
public static class Listener implements MessageListener {
public static CountDownLatch latch;
[tomee] 03/03: Merge branch 'tomee-8.x' of github.com:apache/tomee into tomee-8.x
This is an automated email from the ASF dual-hosted git repository. jgallimore pushed a commit to branch tomee-8.x in repository https://gitbox.apache.org/repos/asf/tomee.git commit 23a343170b198b826fd4adc88ac6093501078486 Merge: 2c07749163 227c730797 Author: Jonathan Gallimore AuthorDate: Tue Oct 11 17:19:23 2022 +0100 Merge branch 'tomee-8.x' of github.com:apache/tomee into tomee-8.x .../java/org/apache/cxf/annotations/Policy.java| 80 - .../apache/cxf/annotations/WSDLDocumentation.java | 88 - .../cxf/attachment/AttachmentDataSource.java | 107 - .../cxf/attachment/AttachmentDeserializer.java | 462 .../cxf/attachment/AttachmentSerializer.java | 345 --- .../org/apache/cxf/attachment/AttachmentUtil.java | 572 - .../apache/cxf/attachment/Base64DecoderStream.java | 196 -- .../apache/cxf/attachment/ContentDisposition.java | 144 -- .../cxf/attachment/LazyAttachmentCollection.java | 362 .../cxf/attachment/MimeBodyPartInputStream.java| 275 --- .../java/org/apache/cxf/bus/CXFBusFactory.java | 47 - .../bus/blueprint/BundleDelegatingClassLoader.java | 134 -- .../cxf/bus/blueprint/BusDefinitionParser.java | 72 - .../apache/cxf/bus/blueprint/ConfigurerImpl.java | 180 -- .../org/apache/cxf/bus/extension/Extension.java| 291 --- .../cxf/bus/extension/ExtensionManagerImpl.java| 381 .../ServiceContractResolverRegistryImpl.java | 113 - .../java/org/apache/cxf/bus/osgi/CXFActivator.java | 134 -- .../cxf/bus/osgi/CXFExtensionBundleListener.java | 181 -- .../org/apache/cxf/bus/osgi/OSGIBusListener.java | 224 -- .../cxf/bus/resource/ResourceManagerImpl.java | 85 - .../apache/cxf/bus/spring/BusDefinitionParser.java | 310 --- .../apache/cxf/bus/spring/BusEntityResolver.java | 94 - .../cxf/bus/spring/BusExtensionPostProcessor.java | 71 - .../cxf/bus/spring/Jsr250BeanPostProcessor.java| 164 -- .../apache/cxf/bus/spring/NamespaceHandler.java| 57 - .../java/org/apache/cxf/bus/spring/SpringBus.java | 142 -- .../cxf/catalog/CatalogXmlSchemaURIResolver.java | 102 - .../java/org/apache/cxf/common/i18n/Exception.java | 58 - .../java/org/apache/cxf/common/i18n/Message.java | 91 - .../apache/cxf/common/i18n/UncheckedException.java | 84 - .../cxf/common/injection/ResourceInjector.java | 446 .../java/org/apache/cxf/common/jaxb/JAXBUtils.java | 1180 --- .../common/logging/AbstractDelegatingLogger.java | 457 .../org/apache/cxf/common/logging/LogUtils.java| 485 - .../cxf/common/logging/RegexLoggingFilter.java | 117 -- .../cxf/common/spi/ClassGeneratorClassLoader.java | 153 -- .../cxf/common/spi/NamespaceClassGenerator.java| 450 .../org/apache/cxf/common/util/ASMHelperImpl.java | 273 --- .../org/apache/cxf/common/util/Base64Utility.java | 474 - .../org/apache/cxf/common/util/CachedClass.java| 37 - .../org/apache/cxf/common/util/ClassHelper.java| 140 -- .../apache/cxf/common/util/CollectionUtils.java| 126 -- .../java/org/apache/cxf/common/util/Compiler.java | 382 .../common/util/ModCountCopyOnWriteArrayList.java | 156 -- .../org/apache/cxf/common/util/PackageUtils.java | 181 -- .../apache/cxf/common/util/ProxyClassLoader.java | 89 - .../org/apache/cxf/common/util/ProxyHelper.java| 140 -- .../common/util/ReflectionInvokationHandler.java | 199 -- .../org/apache/cxf/common/util/SortedArraySet.java | 266 --- .../cxf/common/util/SpringClassUnwrapper.java | 111 - .../cxf/common/util/SpringClasspathScanner.java| 202 -- .../org/apache/cxf/common/util/StreamPrinter.java | 63 - .../org/apache/cxf/common/util/URIParserUtil.java | 209 -- .../cxf/common/xmlschema/SchemaCollection.java | 389 .../jsse/MultiKeyPasswordKeyManager.java | 84 - .../configuration/jsse/TLSClientParameters.java| 258 --- .../configuration/jsse/TLSParameterJaxBUtils.java | 420 .../cxf/configuration/spring/ConfigurerImpl.java | 288 --- .../cxf/databinding/source/SourceDataBinding.java | 104 - .../cxf/databinding/stax/StaxDataBinding.java | 187 -- .../cxf/endpoint/AbstractConduitSelector.java | 308 --- .../org/apache/cxf/endpoint/ClientCallback.java| 166 -- .../java/org/apache/cxf/endpoint/ClientImpl.java | 1192 --- .../java/org/apache/cxf/endpoint/EndpointImpl.java | 220 -- .../java/org/apache/cxf/endpoint/ServerImpl.java | 221 -- .../org/apache/cxf/feature/FastInfosetFeature.java | 110 - .../org/apache/cxf/feature/WrappedFeature.java | 61 - .../cxf/feature/transform/XSLTOutInterceptor.java | 210 -- .../patch/java/org/apache/cxf/headers/Header.java | 78 - .../java/org/apache/cxf/helpers/DOMUtils.java | 895 .../patch/java/org/apache/cxf/helpers/IOUtils.java | 428 .../java/org/apache/cxf/helpers/ServiceUtils.java | 214
[tomee] branch tomee-8.x updated (227c730797 -> 23a343170b)
This is an automated email from the ASF dual-hosted git repository.
jgallimore pushed a change to branch tomee-8.x
in repository https://gitbox.apache.org/repos/asf/tomee.git
from 227c730797 TOMEE-4057 - Remove CXF classes from our patch sources
which do not contain any 'real' patches
new 0ceeae206f Continue if we cannot create a resource for the MDB
destination
new 2c07749163 Test to ensure that a JMS destination does not need to be
created for a MDB to work
new 23a343170b Merge branch 'tomee-8.x' of github.com:apache/tomee into
tomee-8.x
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:
.../src/main/java/org/apache/openejb/config/AutoConfig.java | 4
...rOverwriteBothConfigurationTest.java => MDBAutoConfigOffTest.java} | 0
2 files changed, 4 insertions(+)
copy
container/openejb-core/src/test/java/org/apache/openejb/activemq/{ActivationContainerOverwriteBothConfigurationTest.java
=> MDBAutoConfigOffTest.java} (100%)
[tomee] 01/03: Continue if we cannot create a resource for the MDB destination
This is an automated email from the ASF dual-hosted git repository.
jgallimore pushed a commit to branch tomee-8.x
in repository https://gitbox.apache.org/repos/asf/tomee.git
commit 0ceeae206f23b9b0d58d4cc68105f3a427b44964
Author: Jonathan Gallimore
AuthorDate: Tue Oct 11 16:31:42 2022 +0100
Continue if we cannot create a resource for the MDB destination
---
.../src/main/java/org/apache/openejb/config/AutoConfig.java | 4
1 file changed, 4 insertions(+)
diff --git
a/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java
b/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java
index e64c566246..cec361397e 100644
---
a/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java
+++
b/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java
@@ -64,6 +64,7 @@ import org.apache.openejb.util.PropertyPlaceHolderHelper;
import org.apache.openejb.util.SuperProperties;
import org.apache.openejb.util.URISupport;
import org.apache.openejb.util.URLs;
+import org.apache.xbean.recipe.ConstructionException;
import javax.annotation.ManagedBean;
import javax.ejb.TimerService;
@@ -932,6 +933,9 @@ public class AutoConfig implements DynamicDeployer,
JndiConstants {
} catch (final OpenEJBException e) {
// The MDB doesn't need the auto configured
"openejb/destination" env entry
ejbDeployment.removeResourceLink("openejb/destination");
+} catch (ConstructionException e) {
+logger.warning("Unable to create destination {0} for
{1}. The MDB may not require this, so attempting to continue without it.",
resourceLink.getResId(), mdb.getEjbName());
+
ejbDeployment.removeResourceLink("openejb/destination");
}
}
}
[tomee] 02/03: Test to ensure that a JMS destination does not need to be created for a MDB to work
This is an automated email from the ASF dual-hosted git repository.
jgallimore pushed a commit to branch tomee-8.x
in repository https://gitbox.apache.org/repos/asf/tomee.git
commit 2c07749163b774e73f3f8fd8f531a7f307cc3eb6
Author: Jonathan Gallimore
AuthorDate: Tue Oct 11 17:18:18 2022 +0100
Test to ensure that a JMS destination does not need to be created for a MDB
to work
---
.../openejb/activemq/MDBAutoConfigOffTest.java | 152 +
1 file changed, 152 insertions(+)
diff --git
a/container/openejb-core/src/test/java/org/apache/openejb/activemq/MDBAutoConfigOffTest.java
b/container/openejb-core/src/test/java/org/apache/openejb/activemq/MDBAutoConfigOffTest.java
new file mode 100644
index 00..fb7542afd6
--- /dev/null
+++
b/container/openejb-core/src/test/java/org/apache/openejb/activemq/MDBAutoConfigOffTest.java
@@ -0,0 +1,152 @@
+/**
+ * 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.activemq;
+
+import org.apache.activemq.ActiveMQXAConnectionFactory;
+import org.apache.openejb.jee.MessageDrivenBean;
+import org.apache.openejb.junit.ApplicationComposer;
+import org.apache.openejb.testing.Configuration;
+import org.apache.openejb.testing.Module;
+import org.apache.openejb.testng.PropertiesBuilder;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import javax.annotation.Resource;
+import javax.ejb.ActivationConfigProperty;
+import javax.ejb.MessageDriven;
+import javax.jms.Connection;
+import javax.jms.ConnectionFactory;
+import javax.jms.JMSException;
+import javax.jms.Message;
+import javax.jms.MessageListener;
+import javax.jms.MessageProducer;
+import javax.jms.Queue;
+import javax.jms.Session;
+import javax.jms.TextMessage;
+import javax.jms.XAConnectionFactory;
+import java.util.Properties;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+@RunWith(ApplicationComposer.class)
+public class ActivationContainerOverwriteBothConfigurationTest {
+private static final String TEXT = "foo";
+
+@Configuration
+public Properties config() {
+return new PropertiesBuilder()
+
+.p("amq", "new://Resource?type=ActiveMQResourceAdapter")
+.p("amq.DataSource", "")
+.p("amq.BrokerXmlConfig", "broker:(vm://localhost)")
+
+.p("target", "new://Resource?type=Queue")
+
+
+.p("mdbs", "new://Container?type=MESSAGE")
+.p("mdbs.ResourceAdapter", "amq")
+.p("mdb.container.amq.activation.destination","wrongTarget")
+.p("mdbs.activation.destination", "target")
+.p("cf", "new://Resource?type=" +
ConnectionFactory.class.getName())
+.p("cf.ResourceAdapter", "amq")
+
+.p("xaCf", "new://Resource?class-name=" +
ActiveMQXAConnectionFactory.class.getName())
+.p("xaCf.BrokerURL", "vm://localhost")
+
+.build();
+}
+
+@Module
+public MessageDrivenBean jar() {
+return new MessageDrivenBean(Listener.class);
+}
+
+@Resource(name = "target")
+private Queue destination;
+
+@Resource(name = "xaCf")
+private XAConnectionFactory xacf;
+
+@Resource(name = "cf")
+private ConnectionFactory cf;
+
+@Before
+public void resetLatch() {
+Listener.reset();
+}
+
+@Test
+public void test() throws Exception {
+assertNotNull(cf);
+
+
+final Connection connection = cf.createConnection();
+testConnection(connection);
+}
+
+
+private void testConnection(final Connection connection) throws
JMSException, InterruptedException {
+try {
+final Session session = connection.createSession(false,
Session.AUTO_ACKNOWLEDGE);
+
[tomee] branch master updated: TOMEE-4015 - patch BCEL included in Xalan, which is shaded in taglibs for a recent fix to prevent exceeding the maximum constant pool size
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 9eb228dd36 TOMEE-4015 - patch BCEL included in Xalan, which is shaded in taglibs for a recent fix to prevent exceeding the maximum constant pool size new e37ca44205 Merge remote-tracking branch 'apache/master' 9eb228dd36 is described below commit 9eb228dd36e6d28fee962b05f3a027632bc4 Author: Jonathan Gallimore AuthorDate: Fri Jul 29 14:23:41 2022 +0100 TOMEE-4015 - patch BCEL included in Xalan, which is shaded in taglibs for a recent fix to prevent exceeding the maximum constant pool size --- deps/taglibs-shade/pom.xml | 18 + .../org/apache/bcel/classfile/ConstantPool.java| 378 ++ .../org/apache/bcel/generic/ConstantPoolGen.java | 794 + 3 files changed, 1190 insertions(+) diff --git a/deps/taglibs-shade/pom.xml b/deps/taglibs-shade/pom.xml index 8e8c4442c7..2a724cd211 100644 --- a/deps/taglibs-shade/pom.xml +++ b/deps/taglibs-shade/pom.xml @@ -151,6 +151,24 @@ + +org.apache.tomee.patch +tomee-patch-plugin + + taglibs-shade-.*\.jar + false + 1.8 + 1.8 + + + + + run + +package + + + diff --git a/deps/taglibs-shade/src/patch/java/openejb/shade/org/apache/bcel/classfile/ConstantPool.java b/deps/taglibs-shade/src/patch/java/openejb/shade/org/apache/bcel/classfile/ConstantPool.java new file mode 100644 index 00..a1268d21b5 --- /dev/null +++ b/deps/taglibs-shade/src/patch/java/openejb/shade/org/apache/bcel/classfile/ConstantPool.java @@ -0,0 +1,378 @@ +package openejb.shade.org.apache.bcel.classfile; + +/* + * The Apache Software License, Version 1.1 + * + * Copyright (c) 2001 The Apache Software Foundation. All rights + * reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + *notice, this list of conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright + *notice, this list of conditions and the following disclaimer in + *the documentation and/or other materials provided with the + *distribution. + * + * 3. The end-user documentation included with the redistribution, + *if any, must include the following acknowledgment: + * "This product includes software developed by the + *Apache Software Foundation (http://www.apache.org/)." + *Alternately, this acknowledgment may appear in the software itself, + *if and wherever such third-party acknowledgments normally appear. + * + * 4. The names "Apache" and "Apache Software Foundation" and + *"Apache BCEL" must not be used to endorse or promote products + *derived from this software without prior written permission. For + *written permission, please contact apa...@apache.org. + * + * 5. Products derived from this software may not be called "Apache", + *"Apache BCEL", nor may "Apache" appear in their name, without + *prior written permission of the Apache Software Foundation. + * + * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR + * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF + * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * + * This software consists of voluntary contributions made by many + * individuals on behalf of the Apache Software Foundation. For more + * information on the Apache Software Foundation, please see + * <http://www.apache.org/>. + */ + +import openejb.shade.org.apache.bcel.Constants; +import openejb.shade.org.apache.bcel.generic.ConstantPoolGen; +import java.io.*; + +/** + * This class represents the constant pool, i.e., a table of constants. + * It may c
[tomee] branch tomee-8.x updated (b78a122cfb -> 6719f07386)
This is an automated email from the ASF dual-hosted git repository. jgallimore pushed a change to branch tomee-8.x in repository https://gitbox.apache.org/repos/asf/tomee.git from b78a122cfb Minor: Regenerated BOMs for 1e005c4f9e71b029c419c2453c875eb832db6655 new a17071bb66 Patch to ensure the ConstantPool is not exceeded new 1d66f32179 Patch relocated classes new 6719f07386 Merge pull request #906 from jgallimore/TOMEE-4015 The 14168 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: deps/taglibs-shade/pom.xml | 18 + .../org/apache/bcel/classfile/ConstantPool.java| 378 ++ .../org/apache/bcel/generic/ConstantPoolGen.java | 794 + 3 files changed, 1190 insertions(+) create mode 100755 deps/taglibs-shade/src/patch/java/openejb/shade/org/apache/bcel/classfile/ConstantPool.java create mode 100755 deps/taglibs-shade/src/patch/java/openejb/shade/org/apache/bcel/generic/ConstantPoolGen.java
[tomee] branch TOMEE-4015 created (now a17071bb66)
This is an automated email from the ASF dual-hosted git repository. jgallimore pushed a change to branch TOMEE-4015 in repository https://gitbox.apache.org/repos/asf/tomee.git at a17071bb66 Patch to ensure the ConstantPool is not exceeded This branch includes the following new commits: new a17071bb66 Patch to ensure the ConstantPool is not exceeded The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[tomee] 01/01: Patch to ensure the ConstantPool is not exceeded
This is an automated email from the ASF dual-hosted git repository.
jgallimore pushed a commit to branch TOMEE-4015
in repository https://gitbox.apache.org/repos/asf/tomee.git
commit a17071bb66033e502d9347a70d242b00e5dd0a18
Author: Jonathan Gallimore
AuthorDate: Fri Jul 22 13:45:45 2022 +0100
Patch to ensure the ConstantPool is not exceeded
---
deps/taglibs-shade/pom.xml | 18 +
.../org/apache/bcel/classfile/ConstantPool.java| 378 ++
.../org/apache/bcel/generic/ConstantPoolGen.java | 794 +
3 files changed, 1190 insertions(+)
diff --git a/deps/taglibs-shade/pom.xml b/deps/taglibs-shade/pom.xml
index 12ffb0712d..3e435e5ae3 100644
--- a/deps/taglibs-shade/pom.xml
+++ b/deps/taglibs-shade/pom.xml
@@ -143,6 +143,24 @@
+
+org.apache.tomee.patch
+tomee-patch-plugin
+
+ taglibs-shade-.*\.jar
+ false
+ 1.8
+ 1.8
+
+
+
+
+ run
+
+package
+
+
+
diff --git
a/deps/taglibs-shade/src/patch/java/openejb/shade/org/apache/bcel/classfile/ConstantPool.java
b/deps/taglibs-shade/src/patch/java/openejb/shade/org/apache/bcel/classfile/ConstantPool.java
new file mode 100644
index 00..a1268d21b5
--- /dev/null
+++
b/deps/taglibs-shade/src/patch/java/openejb/shade/org/apache/bcel/classfile/ConstantPool.java
@@ -0,0 +1,378 @@
+package openejb.shade.org.apache.bcel.classfile;
+
+/*
+ * The Apache Software License, Version 1.1
+ *
+ * Copyright (c) 2001 The Apache Software Foundation. All rights
+ * reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in
+ *the documentation and/or other materials provided with the
+ *distribution.
+ *
+ * 3. The end-user documentation included with the redistribution,
+ *if any, must include the following acknowledgment:
+ * "This product includes software developed by the
+ *Apache Software Foundation (http://www.apache.org/)."
+ *Alternately, this acknowledgment may appear in the software itself,
+ *if and wherever such third-party acknowledgments normally appear.
+ *
+ * 4. The names "Apache" and "Apache Software Foundation" and
+ *"Apache BCEL" must not be used to endorse or promote products
+ *derived from this software without prior written permission. For
+ *written permission, please contact apa...@apache.org.
+ *
+ * 5. Products derived from this software may not be called "Apache",
+ *"Apache BCEL", nor may "Apache" appear in their name, without
+ *prior written permission of the Apache Software Foundation.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Software Foundation. For more
+ * information on the Apache Software Foundation, please see
+ * <http://www.apache.org/>.
+ */
+
+import openejb.shade.org.apache.bcel.Constants;
+import openejb.shade.org.apache.bcel.generic.ConstantPoolGen;
+import java.io.*;
+
+/**
+ * This class represents the constant pool, i.e., a table of constants.
+ * It may contain null references, due to the JVM specification that skips
+ * an entry after an 8-byte constant (double, long) entry.
+ *
+ * @version $Id$
+ * @see Constant
+ * @author mailto:markus.d...@berlin.de;>M. Dahm
+ */
+public class ConstantPool implements Cloneable, Node {
+private intconstant_pool_count;
+private Constant[] constant_pool;
+
+/**
+ * @param constant_poo
[tomee] branch tomee-8.x updated: TOMEE-3775 Upgrade to HSQLDB 2.5.2
This is an automated email from the ASF dual-hosted git repository.
jgallimore pushed a commit to branch tomee-8.x
in repository https://gitbox.apache.org/repos/asf/tomee.git
The following commit(s) were added to refs/heads/tomee-8.x by this push:
new b92094ecf6 TOMEE-3775 Upgrade to HSQLDB 2.5.2
b92094ecf6 is described below
commit b92094ecf6ec093e4f2e749c13906af84539fd8b
Author: Jonathan Gallimore
AuthorDate: Wed May 25 09:10:32 2022 +0100
TOMEE-3775 Upgrade to HSQLDB 2.5.2
---
boms/tomee-microprofile/pom.xml | 2 +-
boms/tomee-plume/pom.xml | 2 +-
boms/tomee-plus/pom.xml | 2 +-
boms/tomee-webprofile/pom.xml | 2 +-
.../src/main/java/org/apache/openejb/loader/SystemInstance.java | 4
pom.xml | 2 +-
6 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/boms/tomee-microprofile/pom.xml b/boms/tomee-microprofile/pom.xml
index dff24f356b..ac33a31c90 100644
--- a/boms/tomee-microprofile/pom.xml
+++ b/boms/tomee-microprofile/pom.xml
@@ -1841,7 +1841,7 @@
org.hsqldb
hsqldb
- 2.3.4
+ 2.5.2
*
diff --git a/boms/tomee-plume/pom.xml b/boms/tomee-plume/pom.xml
index e403fce97d..4cd9ad4994 100644
--- a/boms/tomee-plume/pom.xml
+++ b/boms/tomee-plume/pom.xml
@@ -1984,7 +1984,7 @@
org.hsqldb
hsqldb
- 2.3.4
+ 2.5.2
*
diff --git a/boms/tomee-plus/pom.xml b/boms/tomee-plus/pom.xml
index 6bed278b53..170637e5af 100644
--- a/boms/tomee-plus/pom.xml
+++ b/boms/tomee-plus/pom.xml
@@ -1984,7 +1984,7 @@
org.hsqldb
hsqldb
- 2.3.4
+ 2.5.2
*
diff --git a/boms/tomee-webprofile/pom.xml b/boms/tomee-webprofile/pom.xml
index 181de0f78c..bf564b7063 100644
--- a/boms/tomee-webprofile/pom.xml
+++ b/boms/tomee-webprofile/pom.xml
@@ -1269,7 +1269,7 @@
org.hsqldb
hsqldb
- 2.3.4
+ 2.5.2
*
diff --git
a/container/openejb-loader/src/main/java/org/apache/openejb/loader/SystemInstance.java
b/container/openejb-loader/src/main/java/org/apache/openejb/loader/SystemInstance.java
index c41bb37531..f200a16d7f 100644
---
a/container/openejb-loader/src/main/java/org/apache/openejb/loader/SystemInstance.java
+++
b/container/openejb-loader/src/main/java/org/apache/openejb/loader/SystemInstance.java
@@ -141,6 +141,10 @@ public final class SystemInstance {
if (!
this.internalProperties.containsKey(ACTIVEMQ_CREATE_JMX_CONNECTOR)) {
this.internalProperties.setProperty(ACTIVEMQ_CREATE_JMX_CONNECTOR,
Boolean.FALSE.toString());
}
+
+if (getProperty("hsqldb.reconfig_logging") == null) {
+setProperty("hsqldb.reconfig_logging", "false", true);
+}
}
public E fireEvent(final E event) {
diff --git a/pom.xml b/pom.xml
index dc91c2d558..c6c4430ab4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -213,7 +213,7 @@
'examples' have issues with hsqldb > 2.3.5
'QuartzPersistenceForEJBTimersTest' cannot obtain a connection -> never
timeouts
-->
-2.3.4
+2.5.2
1.3.0
2.7.2
5.6.7.Final
[tomee] branch tomee-8.x updated: TOMEE-3967 set javaee-api to provided
This is an automated email from the ASF dual-hosted git repository. jgallimore pushed a commit to branch tomee-8.x in repository https://gitbox.apache.org/repos/asf/tomee.git The following commit(s) were added to refs/heads/tomee-8.x by this push: new be72ba9510 TOMEE-3967 set javaee-api to provided be72ba9510 is described below commit be72ba95102ad9796e7425c88c78b7fed4873b52 Author: Jonathan Gallimore AuthorDate: Wed May 18 16:15:56 2022 +0100 TOMEE-3967 set javaee-api to provided --- examples/filter-cdi/pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/examples/filter-cdi/pom.xml b/examples/filter-cdi/pom.xml index fa064237ec..c00389d480 100644 --- a/examples/filter-cdi/pom.xml +++ b/examples/filter-cdi/pom.xml @@ -36,6 +36,7 @@ org.apache.tomee javaee-api 8.0-5 + provided
[tomee] branch tomee-8.x updated: TOMEE-3967 adding simple example for CDI in a Servlet Filter
This is an automated email from the ASF dual-hosted git repository.
jgallimore pushed a commit to branch tomee-8.x
in repository https://gitbox.apache.org/repos/asf/tomee.git
The following commit(s) were added to refs/heads/tomee-8.x by this push:
new 0a70adb812 TOMEE-3967 adding simple example for CDI in a Servlet Filter
0a70adb812 is described below
commit 0a70adb812caa432cd4cfca679da9a5428b29f02
Author: Jonathan Gallimore
AuthorDate: Wed May 18 15:15:37 2022 +0100
TOMEE-3967 adding simple example for CDI in a Servlet Filter
---
examples/filter-cdi/README.adoc| 91 ++
examples/filter-cdi/pom.xml| 74 ++
.../java/org/superbiz/filterexample/Counter.java | 31
.../superbiz/filterexample/ExampleEndpoint.java| 39 ++
.../org/superbiz/filterexample/ExampleFilter.java | 37 +
.../org/superbiz/filterexample/RequestRole.java| 36 +
.../filter-cdi/src/main/webapp/WEB-INF/web.xml | 24 ++
examples/pom.xml | 1 +
8 files changed, 333 insertions(+)
diff --git a/examples/filter-cdi/README.adoc b/examples/filter-cdi/README.adoc
new file mode 100644
index 00..f909288942
--- /dev/null
+++ b/examples/filter-cdi/README.adoc
@@ -0,0 +1,91 @@
+= Filter CDI
+:index-group: Misc
+:jbake-type: page
+:jbake-status: published
+
+*Help us document this example! Click the blue pencil icon in the upper right
to edit this page.*
+
+== Using CDI beans in a Servlet Filter
+
+This is a simple example to demonstrate using CDI beans in a Servlet Filter.
This example comprises four Java Classes:
+
+* Counter - this is an Application Scoped CDI bean to provide a global counter
+* RequestRole - this is a Request Scoped CDI bean which holds a role name.
This bean is injected into a filter to set the role name, and into a JAX-RS
endpoint to read it
+* ExampleFilter - Example Servlet Filter to set the rolename on the Request
Role
+* ExampleEndpoint - JAX-RS endpoint that reads the rolename on the Request Role
+
+
+[source,java,numbered]
+
+@ApplicationScoped
+public class Counter {
+
+private final AtomicInteger count = new AtomicInteger(0);
+
+public int get() {
+return count.incrementAndGet();
+}
+
+}
+
+
+[source,java,numbered]
+
+@RequestScoped
+public class RequestRole {
+
+private String role;
+
+public RequestRole() {
+}
+
+public String getRole() {
+return role;
+}
+
+public void setRole(final String role) {
+this.role = role;
+}
+}
+
+
+[source,java,numbered]
+
+@WebFilter(urlPatterns = "/*")
+public class ExampleFilter implements Filter {
+
+@Inject
+private RequestRole requestRole;
+
+@Inject Counter counter;
+
+@Override
+public void doFilter(final ServletRequest request, final ServletResponse
response, final FilterChain chain) throws IOException, ServletException {
+requestRole.setRole("sample-role-" + counter.get());
+chain.doFilter(request, response);
+}
+}
+
+
+[source,java,numbered]
+
+@Path("example")
+public class ExampleEndpoint {
+
+ @Inject
+ private RequestRole requestRole;
+
+ @GET
+ @Produces(MediaType.TEXT_PLAIN)
+ public String get(@Context HttpServletRequest request) {
+ return requestRole.getRole();
+ }
+
+}
+
+
+Steps to replicate:
+
+ 1. Run mvn clean install tomee:run
+ 2. Startup server and go to http://localhost:8080/filter-cdi/example
+ 3. You should see the sample role set in the filter, with a unique number
appended on the end.
\ No newline at end of file
diff --git a/examples/filter-cdi/pom.xml b/examples/filter-cdi/pom.xml
new file mode 100644
index 00..fa064237ec
--- /dev/null
+++ b/examples/filter-cdi/pom.xml
@@ -0,0 +1,74 @@
+
+
+
+http://maven.apache.org/POM/4.0.0;
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd;>
+ 4.0.0
+ org.superbiz
+ filter-cdi
+ war
+ 8.0.12-SNAPSHOT
+ TomEE :: Examples :: Filter with CDI
+
+ http://maven.apache.org
+
+
+ junit
+ junit
+ 3.8.1
+ test
+
+
+ org.apache.tomee
+ javaee-api
+ 8.0-5
+
+
+
+filter-cdi
+
+
+org.apache.tomee.maven
+tomee-maven-plugin
+${tomee.version}
+
+
+
+
+1.8
+1.8
+8.0.12-SNAPSHOT
+
+
+
+
+
+ localhost
+ file://${basedir}/target/repo/
+
+
+ localhost
+ file://${basedir}/target/snapshot-repo/
+
+
+
+
+
diff --git
a/examples/filter-cdi/src/main/java/org/superbiz/filterexample/Counter.java
b/examples/filter-cdi/src/main/java/org/superbiz/filterexample/Counter.java
new file mode 100644
index 00..031cedeae6
--- /dev/null
+++ b/exa
