You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by jg...@apache.org on 2023/08/08 13:54:29 UTC
[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
Posted by jg...@apache.org.
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 <jo...@jrg.me.uk>
AuthorDate: Fri Jan 27 15:01:18 2023 +0000
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 @@
<select>apache-tomee-(plus|plume|webprofile|microprofile).*\.zip</select>
<skipTransform>true</skipTransform>
<createTarGz>true</createTarGz>
+ <skips>
+ <jars>
+ <bcprov-jdk15on-1.70.jar>org.bouncycastle:bcprov-jdk15on:jar:1.70</bcprov-jdk15on-1.70.jar>
+ </jars>
+ </skips>
</configuration>
<executions>
<execution>
[tomee] 02/07: TOMEE-4181 Exclude bc jars from the patch plugin
Posted by jg...@apache.org.
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 <jo...@jrg.me.uk>
AuthorDate: Mon Jan 30 20:53:17 2023 +0000
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 @@
<dependency>
<groupId>io.smallrye.reactive</groupId>
<artifactId>mutiny</artifactId>
- <version>1.7.0</version>
+ <version>1.8.0</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -367,7 +367,7 @@
<dependency>
<groupId>io.smallrye</groupId>
<artifactId>jandex</artifactId>
- <version>3.0.0</version>
+ <version>3.0.1</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -422,7 +422,7 @@
<dependency>
<groupId>io.smallrye</groupId>
<artifactId>smallrye-health-api</artifactId>
- <version>4.0.0</version>
+ <version>4.0.1</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -433,7 +433,7 @@
<dependency>
<groupId>io.smallrye</groupId>
<artifactId>smallrye-health</artifactId>
- <version>4.0.0</version>
+ <version>4.0.1</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -455,7 +455,7 @@
<dependency>
<groupId>io.smallrye</groupId>
<artifactId>smallrye-open-api-core</artifactId>
- <version>3.0.0</version>
+ <version>3.0.1</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -466,7 +466,7 @@
<dependency>
<groupId>io.smallrye</groupId>
<artifactId>smallrye-open-api-jaxrs</artifactId>
- <version>3.0.0</version>
+ <version>3.0.1</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
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 @@
<dependency>
<groupId>io.smallrye.reactive</groupId>
<artifactId>mutiny</artifactId>
- <version>1.7.0</version>
+ <version>1.8.0</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -378,7 +378,7 @@
<dependency>
<groupId>io.smallrye</groupId>
<artifactId>jandex</artifactId>
- <version>3.0.0</version>
+ <version>3.0.1</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -433,7 +433,7 @@
<dependency>
<groupId>io.smallrye</groupId>
<artifactId>smallrye-health-api</artifactId>
- <version>4.0.0</version>
+ <version>4.0.1</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -444,7 +444,7 @@
<dependency>
<groupId>io.smallrye</groupId>
<artifactId>smallrye-health</artifactId>
- <version>4.0.0</version>
+ <version>4.0.1</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -466,7 +466,7 @@
<dependency>
<groupId>io.smallrye</groupId>
<artifactId>smallrye-open-api-core</artifactId>
- <version>3.0.0</version>
+ <version>3.0.1</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -477,7 +477,7 @@
<dependency>
<groupId>io.smallrye</groupId>
<artifactId>smallrye-open-api-jaxrs</artifactId>
- <version>3.0.0</version>
+ <version>3.0.1</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
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 @@
<dependency>
<groupId>io.smallrye.reactive</groupId>
<artifactId>mutiny</artifactId>
- <version>1.7.0</version>
+ <version>1.8.0</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -389,7 +389,7 @@
<dependency>
<groupId>io.smallrye</groupId>
<artifactId>jandex</artifactId>
- <version>3.0.0</version>
+ <version>3.0.1</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -444,7 +444,7 @@
<dependency>
<groupId>io.smallrye</groupId>
<artifactId>smallrye-health-api</artifactId>
- <version>4.0.0</version>
+ <version>4.0.1</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -455,7 +455,7 @@
<dependency>
<groupId>io.smallrye</groupId>
<artifactId>smallrye-health</artifactId>
- <version>4.0.0</version>
+ <version>4.0.1</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -477,7 +477,7 @@
<dependency>
<groupId>io.smallrye</groupId>
<artifactId>smallrye-open-api-core</artifactId>
- <version>3.0.0</version>
+ <version>3.0.1</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -488,7 +488,7 @@
<dependency>
<groupId>io.smallrye</groupId>
<artifactId>smallrye-open-api-jaxrs</artifactId>
- <version>3.0.0</version>
+ <version>3.0.1</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
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 @@
<createTarGz>true</createTarGz>
<skips>
<jars>
+ <bcpkix-jdk15on-1.70.jar>org.bouncycastle:bcpkix-jdk15on:jar:1.70</bcpkix-jdk15on-1.70.jar>
<bcprov-jdk15on-1.70.jar>org.bouncycastle:bcprov-jdk15on:jar:1.70</bcprov-jdk15on-1.70.jar>
+ <bcprov-jdk15to18-1.70.jar>org.bouncycastle:bcprov-jdk15to18:jar:1.70</bcprov-jdk15to18-1.70.jar>
+ <bcprov-jdk18on-1.71.jar>org.bouncycastle:bcprov-jdk18on:jar:1.71</bcprov-jdk18on-1.71.jar>
+ <bcutil-jdk15on-1.70.jar>org.bouncycastle:bcutil-jdk15on:jar:1.70</bcutil-jdk15on-1.70.jar>
</jars>
</skips>
</configuration>
[tomee] 06/07: Merge remote-tracking branch 'apache/main' into main
Posted by jg...@apache.org.
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 <jo...@jrg.me.uk>
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] 07/07: TOMEE-4236 add example for working with multiple brokers in the same application
Posted by jg...@apache.org.
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 <jo...@jrg.me.uk>
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 0000000000..9c55d1f0e9
--- /dev/null
+++ b/examples/activemq-multiple-brokers/pom.xml
@@ -0,0 +1,147 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ 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.
+-->
+<project xmlns="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">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.superbiz</groupId>
+ <artifactId>multi-broker</artifactId>
+ <packaging>war</packaging>
+ <version>10.0.0-SNAPSHOT</version>
+ <name>TomEE :: Web Examples :: Multi-Broker</name>
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <tomee.version>10.0.0-SNAPSHOT</tomee.version>
+ <version.shrinkwrap.resolver>2.0.0</version.shrinkwrap.resolver>
+ </properties>
+ <build>
+ <finalName>${project.artifactId}</finalName>
+ <defaultGoal>package</defaultGoal>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>3.5.1</version>
+ <configuration>
+ <source>1.8</source>
+ <target>1.8</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-war-plugin</artifactId>
+ <version>3.1.0</version>
+ <configuration>
+ <packagingExcludes>WEB-INF/web.xml</packagingExcludes>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.22.1</version>
+ <configuration>
+ <argLine>-Djdk.attach.allowAttachSelf</argLine>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.tomee.maven</groupId>
+ <artifactId>tomee-maven-plugin</artifactId>
+ <version>${tomee.version}</version>
+ <configuration>
+ <simpleLog>true</simpleLog>
+ <tomeeVersion>${tomee.version}</tomeeVersion>
+ <tomeeClassifier>plus</tomeeClassifier>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <dependencyManagement>
+ <dependencies>
+ <!-- Override dependency resolver with test version. This must go *BEFORE*
+ the Arquillian BOM. -->
+ <dependency>
+ <groupId>org.jboss.shrinkwrap.resolver</groupId>
+ <artifactId>shrinkwrap-resolver-bom</artifactId>
+ <version>${version.shrinkwrap.resolver}</version>
+ <scope>import</scope>
+ <type>pom</type>
+ </dependency>
+ <!-- Now pull in our server-based unit testing framework -->
+ <dependency>
+ <groupId>org.jboss.arquillian</groupId>
+ <artifactId>arquillian-bom</artifactId>
+ <version>1.7.0.Final</version>
+ <scope>import</scope>
+ <type>pom</type>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.tomee</groupId>
+ <artifactId>jakartaee-api</artifactId>
+ <version>9.1.1</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.13.2</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomee</groupId>
+ <artifactId>openejb-core</artifactId>
+ <version>${tomee.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomee</groupId>
+ <artifactId>tomee-embedded</artifactId>
+ <version>${tomee.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>2.4</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.arquillian.junit</groupId>
+ <artifactId>arquillian-junit-container</artifactId>
+ <version>1.7.0.Final</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.shrinkwrap.resolver</groupId>
+ <artifactId>shrinkwrap-resolver-depchain</artifactId>
+ <type>pom</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomee</groupId>
+ <artifactId>ziplock</artifactId>
+ <version>${tomee.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-broker</artifactId>
+ <version>5.18.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+</project>
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 0000000000..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<NameClassPair> 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.substring(0, name.length() - 17));
+ }
+ }
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+
+
+
+
+}
diff --git a/examples/activemq-multiple-brokers/src/main/java/org/superbiz/rest/service/JmsResource.java b/examples/activemq-multiple-brokers/src/main/java/org/superbiz/rest/service/JmsResource.java
new file mode 100644
index 0000000000..3a536a324e
--- /dev/null
+++ b/examples/activemq-multiple-brokers/src/main/java/org/superbiz/rest/service/JmsResource.java
@@ -0,0 +1,79 @@
+/*
+ * 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.EJB;
+import jakarta.ejb.Singleton;
+import jakarta.enterprise.event.Observes;
+import jakarta.jms.Message;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.sse.OutboundSseEvent;
+import jakarta.ws.rs.sse.Sse;
+import jakarta.ws.rs.sse.SseBroadcaster;
+import jakarta.ws.rs.sse.SseEventSink;
+
+@Path("jms")
+@Singleton
+public class JmsResource {
+
+ private SseBroadcaster sseBroadcaster;
+ private OutboundSseEvent.Builder builder;
+
+ @EJB
+ private Broadcaster broadcaster;
+
+ @EJB
+ private Producer producer;
+
+ @GET
+ @Produces(MediaType.SERVER_SENT_EVENTS)
+ public void stats(final @Context SseEventSink sink) {
+ sseBroadcaster.register(sink);
+ }
+
+ @POST
+ @Path("send/{brokerid}")
+ public void send(@PathParam("brokerid") final String brokerId, final String message) {
+ producer.sendMessage(message, brokerId);
+ }
+
+ @POST
+ @Path("broadcast")
+ public void setBroadcast(final String message) {
+ broadcaster.broadcastMessage(message);
+ }
+
+ @Context
+ public void setSse(final Sse sse) {
+ this.sseBroadcaster = sse.newBroadcaster();
+ this.builder = sse.newEventBuilder();
+ }
+
+ public void onMessage(final @Observes Message message) {
+ if (sseBroadcaster == null) {
+ return;
+ }
+
+ sseBroadcaster.broadcast(builder.data(Message.class, message).mediaType(MediaType.APPLICATION_JSON_TYPE).build());
+ }
+}
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
new file mode 100644
index 0000000000..d572bf1ef4
--- /dev/null
+++ b/examples/activemq-multiple-brokers/src/main/java/org/superbiz/rest/service/Producer.java
@@ -0,0 +1,78 @@
+package org.superbiz.rest.service;
+
+
+import jakarta.annotation.Resource;
+import jakarta.ejb.Singleton;
+import jakarta.ejb.TransactionAttribute;
+import jakarta.ejb.TransactionAttributeType;
+import jakarta.ejb.TransactionManagement;
+import jakarta.ejb.TransactionManagementType;
+import jakarta.jms.Connection;
+import jakarta.jms.ConnectionFactory;
+import jakarta.jms.JMSException;
+import jakarta.jms.Message;
+import jakarta.jms.MessageProducer;
+import jakarta.jms.Session;
+import jakarta.jms.Topic;
+
+import javax.naming.InitialContext;
+import javax.naming.NameClassPair;
+import javax.naming.NamingEnumeration;
+
+@Singleton
+@TransactionManagement(TransactionManagementType.CONTAINER)
+public class Producer {
+
+ @Resource(name = "event")
+ private Topic event;
+
+ @TransactionAttribute(TransactionAttributeType.REQUIRED)
+ public void sendMessage(final String message, final String broker) {
+ try {
+ final InitialContext context = new InitialContext();
+ final NamingEnumeration<NameClassPair> list = context.list("openejb:Resource");
+
+ while (list.hasMoreElements()) {
+ final NameClassPair nameClassPair = list.nextElement();
+ final String name = nameClassPair.getName();
+ if (name.endsWith("ConnectionFactory") && name.substring(0, name.length() - 17).toLowerCase().equals(broker.toLowerCase())) {
+ ConnectionFactory cf = null;
+ Connection connection = null;
+ Session session = null;
+ MessageProducer producer = null;
+
+ try {
+ cf = (ConnectionFactory) context.lookup("openejb:Resource/" + name);
+ connection = cf.createConnection();
+ session = connection.createSession(true, Session.AUTO_ACKNOWLEDGE);
+ producer = session.createProducer(event);
+ final Message msg = session.createTextMessage(message);
+ producer.send(msg);
+ } finally {
+ try {
+ if (producer != null) producer.close();
+ } catch (Exception e) {
+ // ignore
+ }
+
+ try {
+ if (session != null) session.close();
+ } catch (JMSException e) {
+ // ignore
+ }
+
+ try {
+ if (connection != null) connection.close();
+ } catch (JMSException e) {
+ // ignore
+ }
+ }
+
+ }
+ }
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+}
diff --git a/examples/activemq-multiple-brokers/src/main/java/org/superbiz/rest/service/TopicListener.java b/examples/activemq-multiple-brokers/src/main/java/org/superbiz/rest/service/TopicListener.java
new file mode 100644
index 0000000000..ac4dc9bb20
--- /dev/null
+++ b/examples/activemq-multiple-brokers/src/main/java/org/superbiz/rest/service/TopicListener.java
@@ -0,0 +1,33 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.superbiz.rest.service;
+
+import jakarta.enterprise.event.Event;
+import jakarta.inject.Inject;
+import jakarta.jms.Message;
+import jakarta.jms.MessageListener;
+
+public class TopicListener implements MessageListener {
+
+ @Inject
+ private Event<Message> messageReceivedEvent;
+
+ @Override
+ public void onMessage(final Message message) {
+ messageReceivedEvent.fire(message);
+ }
+}
diff --git a/examples/activemq-multiple-brokers/src/main/resources/META-INF/beans.xml b/examples/activemq-multiple-brokers/src/main/resources/META-INF/beans.xml
new file mode 100644
index 0000000000..9b0b74fadb
--- /dev/null
+++ b/examples/activemq-multiple-brokers/src/main/resources/META-INF/beans.xml
@@ -0,0 +1,18 @@
+<!--
+
+ 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.
+-->
+<beans/>
diff --git a/examples/activemq-multiple-brokers/src/main/resources/META-INF/openejb-jar.xml b/examples/activemq-multiple-brokers/src/main/resources/META-INF/openejb-jar.xml
new file mode 100644
index 0000000000..db0c4e4f70
--- /dev/null
+++ b/examples/activemq-multiple-brokers/src/main/resources/META-INF/openejb-jar.xml
@@ -0,0 +1,21 @@
+<!--
+
+ 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.
+-->
+<openejb-jar>
+ <ejb-deployment ejb-name="TopicListenerOne" container-id="multi-broker/Broker1MdbContainer"/>
+ <ejb-deployment ejb-name="TopicListenerTwo" container-id="multi-broker/Broker2MdbContainer"/>
+</openejb-jar>
\ No newline at end of file
diff --git a/examples/activemq-multiple-brokers/src/main/resources/META-INF/resources.xml b/examples/activemq-multiple-brokers/src/main/resources/META-INF/resources.xml
new file mode 100644
index 0000000000..ccc81e63cc
--- /dev/null
+++ b/examples/activemq-multiple-brokers/src/main/resources/META-INF/resources.xml
@@ -0,0 +1,48 @@
+<!--
+
+ 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.
+-->
+<resources>
+ <Resource id="Broker1ResourceAdapter" type="ActiveMQResourceAdapter">
+ BrokerXmlConfig =
+ ServerUrl = tcp://localhost:61616
+ </Resource>
+
+ <Resource id="Broker1ConnectionFactory" type="jakarta.jms.ConnectionFactory">
+ ResourceAdapter = Broker1ResourceAdapter
+ </Resource>
+
+ <Container id="Broker1MdbContainer" ctype="MESSAGE">
+ ResourceAdapter = Broker1ResourceAdapter
+ </Container>
+
+ <Resource id="Broker2ResourceAdapter" type="ActiveMQResourceAdapter">
+ BrokerXmlConfig =
+ ServerUrl = tcp://localhost:61617
+ </Resource>
+
+ <Resource id="Broker2ConnectionFactory" type="jakarta.jms.ConnectionFactory">
+ ResourceAdapter = Broker2ResourceAdapter
+ </Resource>
+
+ <Container id="Broker2MdbContainer" ctype="MESSAGE">
+ ResourceAdapter = Broker2ResourceAdapter
+ </Container>
+
+ <Resource id="event" type="jakarta.jms.Topic">
+ destination = EVENT
+ </Resource>
+</resources>
diff --git a/examples/activemq-multiple-brokers/src/main/webapp/WEB-INF/beans.xml b/examples/activemq-multiple-brokers/src/main/webapp/WEB-INF/beans.xml
new file mode 100644
index 0000000000..bbc3399790
--- /dev/null
+++ b/examples/activemq-multiple-brokers/src/main/webapp/WEB-INF/beans.xml
@@ -0,0 +1,17 @@
+<!--
+ 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.
+ -->
+<beans/>
diff --git a/examples/activemq-multiple-brokers/src/main/webapp/WEB-INF/ejb-jar.xml b/examples/activemq-multiple-brokers/src/main/webapp/WEB-INF/ejb-jar.xml
new file mode 100644
index 0000000000..3781eb8454
--- /dev/null
+++ b/examples/activemq-multiple-brokers/src/main/webapp/WEB-INF/ejb-jar.xml
@@ -0,0 +1,59 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!--
+
+ 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.
+-->
+<ejb-jar xmlns="https://jakarta.ee/xml/ns/jakartaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/ejb-jar_4_0.xsd"
+ version="4.0">
+ <enterprise-beans>
+ <message-driven id="TopicListenerOne">
+ <ejb-name>TopicListenerOne</ejb-name>
+ <ejb-class>org.superbiz.rest.service.TopicListener</ejb-class>
+ <messaging-type>jakarta.jms.MessageListener</messaging-type>
+ <transaction-type>Container</transaction-type>
+ <message-destination-type>jakarta.jms.Topic</message-destination-type>
+ <activation-config>
+ <activation-config-property>
+ <activation-config-property-name>destinationType</activation-config-property-name>
+ <activation-config-property-value>jakarta.jms.Topic</activation-config-property-value>
+ </activation-config-property>
+ <activation-config-property>
+ <activation-config-property-name>destination</activation-config-property-name>
+ <activation-config-property-value>EVENT</activation-config-property-value>
+ </activation-config-property>
+ </activation-config>
+ </message-driven>
+ <message-driven id="TopicListenerTwo">
+ <ejb-name>TopicListenerTwo</ejb-name>
+ <ejb-class>org.superbiz.rest.service.TopicListener</ejb-class>
+ <messaging-type>jakarta.jms.MessageListener</messaging-type>
+ <transaction-type>Container</transaction-type>
+ <message-destination-type>jakarta.jms.Topic</message-destination-type>
+ <activation-config>
+ <activation-config-property>
+ <activation-config-property-name>destinationType</activation-config-property-name>
+ <activation-config-property-value>jakarta.jms.Topic</activation-config-property-value>
+ </activation-config-property>
+ <activation-config-property>
+ <activation-config-property-name>destination</activation-config-property-name>
+ <activation-config-property-value>EVENT</activation-config-property-value>
+ </activation-config-property>
+ </activation-config>
+ </message-driven>
+ </enterprise-beans>
+</ejb-jar>
diff --git a/examples/activemq-multiple-brokers/src/main/webapp/WEB-INF/web.xml b/examples/activemq-multiple-brokers/src/main/webapp/WEB-INF/web.xml
new file mode 100644
index 0000000000..17930cf9cc
--- /dev/null
+++ b/examples/activemq-multiple-brokers/src/main/webapp/WEB-INF/web.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+ -->
+<web-app xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
+ metadata-complete="false"
+ version="2.5">
+
+ <display-name>SSE Example</display-name>
+</web-app>
diff --git a/examples/activemq-multiple-brokers/src/main/webapp/index.html b/examples/activemq-multiple-brokers/src/main/webapp/index.html
new file mode 100644
index 0000000000..36d425b8eb
--- /dev/null
+++ b/examples/activemq-multiple-brokers/src/main/webapp/index.html
@@ -0,0 +1,47 @@
+<!DOCTYPE html>
+<!--
+ 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.
+ -->
+
+<html>
+ <head>
+ <title>Fun with SSE and JMS</title>
+ </head>
+
+ <body>
+ <p>This example demonstrates how to send Server Side Events, and how to receive them, both using a JAX-RS client,
+ and also in Javascript in your web-browser.</p>
+ <p>You should be able to send messages to an ActiveMQ topic called 'EVENT' using the OpenWire port tcp/61616 on this machine.
+ Any messages sent to this topic will appear below.</p>
+
+ <div id="messages">
+
+ </div>
+
+ <script type="text/javascript">
+ var es = new EventSource('jms');
+ var messages = document.getElementById('messages');
+
+ es.onmessage = function(e) {
+ var newElement = document.createElement("p");
+
+ newElement.textContent = e.data;
+ messages.appendChild(newElement);
+ }
+ </script>
+ </body>
+</html>
+
diff --git a/examples/pom.xml b/examples/pom.xml
index 6cf33e6e97..d966da9fa5 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -203,6 +203,7 @@
<module>cloud-tomee-azure</module>
<module>xa-datasource</module>
<module>websocket-jms</module>
+ <module>activemq-multiple-brokers</module>
<!-- Jakarta Security Examples -->
<module>security-tomcat-user-identitystore</module>
[tomee] 04/07: Merge remote-tracking branch 'apache/main' into main
Posted by jg...@apache.org.
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 <jo...@jrg.me.uk>
AuthorDate: Fri Feb 17 16:38:55 2023 +0000
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] 05/07: Merge remote-tracking branch 'apache/main' into main
Posted by jg...@apache.org.
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 <jo...@jrg.me.uk>
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 +-
examples/connector-ear/pom.xml | 2 +-
examples/connector-war/pom.xml | 4 +-
examples/cucumber-jvm/pom.xml | 2 +-
examples/custom-injection/pom.xml | 2 +-
examples/datasource-ciphered-password/pom.xml | 2 +-
examples/datasource-definition/pom.xml | 2 +-
examples/datasource-versioning/pom.xml | 6 +-
examples/decorators/pom.xml | 2 +-
examples/dynamic-dao-implementation/pom.xml | 2 +-
examples/dynamic-datasource-routing/pom.xml | 2 +-
examples/dynamic-implementation/pom.xml | 2 +-
examples/dynamic-proxy-to-access-mbean/pom.xml | 2 +-
examples/ear-testing/business-logic/pom.xml | 2 +-
examples/ear-testing/pom.xml | 2 +-
examples/ejb-examples/pom.xml | 2 +-
examples/ejb-remote-call-2/pom.xml | 2 +-
examples/ejb-remote-call/pom.xml | 2 +-
examples/ejb-webservice/pom.xml | 2 +-
examples/groovy-cdi/pom.xml | 2 +-
examples/groovy-jpa/pom.xml | 2 +-
examples/groovy-spock/pom.xml | 4 +-
examples/helloworld-weblogic/pom.xml | 2 +-
examples/injection-of-datasource/pom.xml | 2 +-
examples/injection-of-ejbs/pom.xml | 2 +-
examples/injection-of-entitymanager/pom.xml | 2 +-
examples/injection-of-env-entry/pom.xml | 2 +-
examples/interceptors/pom.xml | 2 +-
examples/java-modules/pom.xml | 4 +-
examples/javamail/pom.xml | 2 +-
examples/jaxrs-filter/pom.xml | 2 +-
examples/jaxrs-json-provider-jettison/pom.xml | 4 +-
examples/jpa-eclipselink/pom.xml | 2 +-
examples/jpa-enumerated/pom.xml | 2 +-
examples/jpa-hibernate-arquillian/pom.xml | 4 +-
examples/jpa-hibernate/pom.xml | 2 +-
examples/jsf-cdi-and-ejb/pom.xml | 2 +-
examples/jsf-managedBean-and-ejb/pom.xml | 2 +-
examples/jsonb-configuration/pom.xml | 2 +-
examples/jsonb-custom-serializer/pom.xml | 2 +-
examples/junit5-application-composer/pom.xml | 2 +-
examples/junit5-arquillian-multiple-tomee/pom.xml | 4 +-
.../junit5-arquillian-simple-websockets/pom.xml | 4 +-
examples/lookup-of-ejbs-with-descriptor/pom.xml | 2 +-
examples/lookup-of-ejbs/pom.xml | 2 +-
examples/moviefun-rest/pom.xml | 4 +-
examples/moviefun/pom.xml | 6 +-
examples/movies-complete-meta/pom.xml | 2 +-
examples/movies-complete/pom.xml | 2 +-
examples/mp-config-example/pom.xml | 8 +-
examples/mp-config-source-database/pom.xml | 4 +-
examples/mp-custom-healthcheck/pom.xml | 8 +-
examples/mp-faulttolerance-fallback/pom.xml | 8 +-
examples/mp-faulttolerance-retry/pom.xml | 6 +-
examples/mp-faulttolerance-timeout/pom.xml | 8 +-
examples/mp-jsonb-configuration/pom.xml | 2 +-
.../mp-jwt-bean-validation-strongly-typed/pom.xml | 4 +-
examples/mp-jwt-bean-validation/pom.xml | 4 +-
examples/mp-metrics-counted/pom.xml | 8 +-
examples/mp-metrics-gauge/pom.xml | 8 +-
examples/mp-metrics-histogram/pom.xml | 8 +-
examples/mp-metrics-metered/pom.xml | 10 +-
examples/mp-metrics-timed/pom.xml | 8 +-
examples/mp-opentracing-traced/pom.xml | 4 +-
examples/mp-rest-client/README.adoc | 2 +-
examples/mp-rest-client/README_es.adoc | 2 +-
examples/mp-rest-client/README_pt.adoc | 2 +-
examples/mp-rest-client/pom.xml | 8 +-
examples/mp-rest-jwt-jwk/pom.xml | 2 +-
examples/mp-rest-jwt-principal/pom.xml | 2 +-
examples/mp-rest-jwt-public-key/pom.xml | 4 +-
examples/multi-jpa-provider-testing/pom.xml | 2 +-
examples/multiple-arquillian-adapters/pom.xml | 4 +-
examples/multiple-tomee-arquillian/pom.xml | 4 +-
examples/persistence-fragment/pom.xml | 2 +-
examples/pojo-webservice/pom.xml | 2 +-
examples/polling-parent/polling-client/pom.xml | 2 +-
examples/polling-parent/pom.xml | 2 +-
examples/realm-in-tomee/pom.xml | 2 +-
.../reload-persistence-unit-properties/pom.xml | 2 +-
examples/resources-declared-in-webapp/pom.xml | 2 +-
examples/resources-jmx-example/pom.xml | 2 +-
.../resources-jmx-ejb/pom.xml | 2 +-
examples/rest-applicationcomposer-mockito/pom.xml | 2 +-
examples/rest-applicationcomposer/pom.xml | 2 +-
examples/rest-cdi/pom.xml | 2 +-
examples/rest-example-with-application/pom.xml | 2 +-
examples/rest-example/pom.xml | 2 +-
examples/rest-jaas/pom.xml | 2 +-
examples/rest-on-ejb/pom.xml | 2 +-
examples/rest-sse-example/pom.xml | 2 +-
examples/rest-xml-json/pom.xml | 2 +-
examples/scala-basic/build.sbt | 2 +-
examples/scala-basic/pom.xml | 2 +-
examples/schedule-events/pom.xml | 2 +-
examples/schedule-expression/pom.xml | 2 +-
examples/schedule-methods-meta/pom.xml | 2 +-
examples/schedule-methods/pom.xml | 2 +-
examples/server-events/pom.xml | 2 +-
examples/simple-cdi-interceptor/pom.xml | 2 +-
examples/simple-cmp2/pom.xml | 2 +-
.../simple-ear/moviefun-business-logic/pom.xml | 2 +-
.../simple-ear/moviefun-functional-tests/pom.xml | 4 +-
examples/simple-ear/moviefun-webapp/pom.xml | 2 +-
examples/simple-ear/pom.xml | 2 +-
examples/simple-jms-context/pom.xml | 4 +-
examples/simple-jms/pom.xml | 4 +-
examples/simple-remote-tomcatusers/pom.xml | 4 +-
examples/simple-rest/pom.xml | 2 +-
examples/simple-singleton/pom.xml | 2 +-
examples/simple-stateful-callbacks/pom.xml | 2 +-
examples/simple-stateful/pom.xml | 2 +-
examples/simple-stateless-callbacks/pom.xml | 2 +-
examples/simple-stateless-with-descriptor/pom.xml | 2 +-
examples/simple-stateless/pom.xml | 2 +-
examples/singleton-startup-ordering/pom.xml | 4 +-
examples/struts/pom.xml | 2 +-
examples/telephone-stateful/pom.xml | 2 +-
examples/testcase-injection/pom.xml | 2 +-
examples/testing-security-2/pom.xml | 2 +-
examples/testing-security-3/pom.xml | 2 +-
examples/testing-security-4/pom.xml | 2 +-
examples/testing-security-meta/pom.xml | 2 +-
examples/testing-security/pom.xml | 2 +-
examples/testing-transactions-bmt/pom.xml | 2 +-
examples/testing-transactions/pom.xml | 2 +-
examples/tomee-jersey-eclipselink/pom.xml | 2 +-
examples/tomee-jms-portability/pom.xml | 2 +-
examples/transaction-rollback/pom.xml | 2 +-
examples/troubleshooting/pom.xml | 2 +-
examples/webservice-attachments/pom.xml | 2 +-
examples/webservice-ssl-client-cert/pom.xml | 4 +-
examples/websocket-jms/pom.xml | 4 +-
examples/websocket-tls-basic-auth/pom.xml | 6 +-
examples/xa-datasource/pom.xml | 4 +-
itests/microprofile-jwt-itests/pom.xml | 3 +-
itests/tomee-microprofile-itests/pom.xml | 6 +-
itests/tomee-security-itests/pom.xml | 2 +-
maven/jarstxt-maven-plugin/pom.xml | 2 +-
maven/pom.xml | 2 +-
.../openejb/maven/plugins/TomEEEmbeddedMojo.java | 8 +-
mp-jwt/pom.xml | 4 +-
namespace-change.adoc | 2 +-
pipelines/main-build-full | 69 ++
pipelines/main-build-full-arquillian | 69 ++
pipelines/main-build-full-examples | 69 ++
pipelines/main-build-full-itests | 69 ++
pipelines/main-build-full-tck | 69 ++
pipelines/main-build-quick | 69 ++
pipelines/main-deploy | 69 ++
pipelines/main-owasp-check | 69 ++
pipelines/main-sanity-checks | 77 ++
pom.xml | 263 +++--
server/openejb-bonecp/pom.xml | 2 +-
server/openejb-client/pom.xml | 2 +-
server/openejb-cxf/pom.xml | 33 +-
server/openejb-http/pom.xml | 4 +-
server/openejb-webservices/pom.xml | 2 +-
tck/bval-embedded/pom.xml | 2 +-
tck/cdi-embedded/pom.xml | 8 +-
tck/cdi-tomee/pom.xml | 10 +-
tck/cdi-tomee/src/test/resources/arquillian.xml | 2 +-
tck/microprofile-tck/config/pom.xml | 2 -
tck/microprofile-tck/fault-tolerance/pom.xml | 2 -
tck/microprofile-tck/health/pom.xml | 2 -
tck/microprofile-tck/jwt/pom.xml | 4 +-
tck/microprofile-tck/metrics/pom.xml | 3 -
tck/microprofile-tck/openapi/pom.xml | 4 +-
tck/microprofile-tck/opentracing/pom.xml | 8 +-
tck/microprofile-tck/pom.xml | 68 ++
tck/microprofile-tck/rest-client/pom.xml | 4 +-
tomee/apache-tomee/pom.xml | 34 +-
tomee/pom.xml | 10 +-
.../java/org/apache/tomee/installer/Installer.java | 14 +-
tomee/tomee-embedded/pom.xml | 2 +-
tomee/tomee-loader/pom.xml | 2 +-
tomee/tomee-microprofile/mp-common/pom.xml | 226 ++--
.../tomee-microprofile-webapp/pom.xml | 16 +-
tomee/tomee-myfaces/pom.xml | 2 +-
tomee/tomee-plume-webapp/pom.xml | 8 +-
tomee/tomee-plus-webapp/pom.xml | 12 +-
tomee/tomee-security/pom.xml | 2 +-
.../tomee/security/http/SavedAuthentication.java | 5 +-
.../apache/tomee/security/http/SavedRequest.java | 5 +-
.../security/http/SavedAuthenticationTest.java} | 29 +-
.../tomee/security/http/SavedRequestTest.java} | 29 +-
tomee/tomee-webaccess/pom.xml | 4 +-
tomee/tomee-webapp/pom.xml | 6 +-
utils/log4j2-tomee/pom.xml | 5 +-
utils/openejb-core-hibernate/pom.xml | 8 +-
263 files changed, 2219 insertions(+), 3694 deletions(-)
[tomee] 03/07: Merge remote-tracking branch 'apache/main' into main
Posted by jg...@apache.org.
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 <jo...@jrg.me.uk>
AuthorDate: Thu Feb 2 14:35:50 2023 +0000
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(-)