This is an automated email from the ASF dual-hosted git repository.
clebertsuconic pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
The following commit(s) were added to refs/heads/main by this push:
new 694bf20d08 ARTEMIS-3707 fix ra.xml
694bf20d08 is described below
commit 694bf20d085f91d1451b59e57a77cbd8cfbff522
Author: waldi5001 <[email protected]>
AuthorDate: Fri Mar 4 21:46:42 2022 +0100
ARTEMIS-3707 fix ra.xml
* update xml schemas
* fix ConnectionParameters
* remove TransactionManagerLocatorMethod and "The producer max rate"
* remove The max connections
---
.../src/main/resources/ra.xml | 45 ++++++++--------------
.../artemis-ra-rar/src/main/resources/ra.xml | 24 +++---------
2 files changed, 20 insertions(+), 49 deletions(-)
diff --git
a/examples/features/sub-modules/artemis-jakarta-ra-rar/src/main/resources/ra.xml
b/examples/features/sub-modules/artemis-jakarta-ra-rar/src/main/resources/ra.xml
index 943f84f6fb..1427986a91 100644
---
a/examples/features/sub-modules/artemis-jakarta-ra-rar/src/main/resources/ra.xml
+++
b/examples/features/sub-modules/artemis-jakarta-ra-rar/src/main/resources/ra.xml
@@ -2,14 +2,13 @@
<!-- $Id: ra.xml 76819 2008-08-08 11:04:20Z jesper.pedersen $ -->
-<connector xmlns="http://java.sun.com/xml/ns/j2ee";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
- http://java.sun.com/xml/ns/j2ee/connector_1_5.xsd";
- version="1.5">
+<connector xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ version="2.0"
+ xmlns="https://jakarta.ee/xml/ns/jakartaee";
+ xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee
https://jakarta.ee/xml/ns/jakartaee/connector_2_0.xsd ">
- <display-name>ArtemisRA</display-name>
<description>ActiveMQ Artemis Resource Adapter</description>
+ <display-name>ArtemisRA</display-name>
<vendor-name>Apache Software Foundation</vendor-name>
<eis-type>Jakarta Messaging 3.0 Server</eis-type>
<resourceadapter-version>1.0</resourceadapter-version>
@@ -52,7 +51,7 @@
</description>
<config-property-name>ConnectionParameters</config-property-name>
<config-property-type>java.lang.String</config-property-type>
-
<config-property-value>host=localhost,port=61616</config-property-value>
+
<config-property-value>host=localhost;port=61616</config-property-value>
</config-property>
<!-- <config-property>
@@ -60,11 +59,6 @@
<config-property-name>HA</config-property-name>
<config-property-type>java.lang.Boolean</config-property-type>
</config-property>
- <config-property>
- <description>The method to use for locating the
transactionmanager</description>
-
<config-property-name>TransactionManagerLocatorMethod</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- </config-property>
<config-property>
<description>Use A local Transaction instead of XA?</description>
<config-property-name>UseLocalTx</config-property-name>
@@ -160,11 +154,6 @@
<config-property-name>ConfirmationWindowSize</config-property-name>
<config-property-type>java.lang.Integer</config-property-type>
</config-property>
- <config-property>
- <description>The producer max rate</description>
- <config-property-name>ProducerMaxRate</config-property-name>
- <config-property-type>java.lang.Integer</config-property-type>
- </config-property>
<config-property>
<description>The min large message size</description>
<config-property-name>MinLargeMessageSize</config-property-name>
@@ -190,10 +179,6 @@
<config-property-name>AutoGroup</config-property-name>
<config-property-type>java.lang.Boolean</config-property-type>
</config-property>
- <config-property>
- <description>The max connections</description>
- <config-property-type>java.lang.Integer</config-property-type>
- </config-property>
<config-property>
<description>The pre acknowledge</description>
<config-property-name>PreAcknowledge</config-property-name>
@@ -238,7 +223,7 @@
<description>The default session type</description>
<config-property-name>SessionDefaultType</config-property-name>
<config-property-type>java.lang.String</config-property-type>
- <config-property-value>javax.jms.Queue</config-property-value>
+ <config-property-value>jakarta.jms.Queue</config-property-value>
</config-property>
<config-property>
<description>Whether or not to participate in a JTA
transaction, this is used if the RA does not have access to the Transaction
Manager</description>
@@ -255,13 +240,13 @@
<connectionfactory-interface>org.apache.activemq.artemis.ra.ActiveMQRAConnectionFactory</connectionfactory-interface>
<connectionfactory-impl-class>org.apache.activemq.artemis.ra.ActiveMQRAConnectionFactoryImpl</connectionfactory-impl-class>
- <connection-interface>javax.jms.Session</connection-interface>
+ <connection-interface>jakarta.jms.Session</connection-interface>
<connection-impl-class>org.apache.activemq.artemis.ra.ActiveMQRASession</connection-impl-class>
</connection-definition>
<transaction-support>XATransaction</transaction-support>
<authentication-mechanism>
<authentication-mechanism-type>BasicPassword</authentication-mechanism-type>
-
<credential-interface>javax.resource.spi.security.PasswordCredential</credential-interface>
+
<credential-interface>jakarta.resource.spi.security.PasswordCredential</credential-interface>
</authentication-mechanism>
<reauthentication-support>false</reauthentication-support>
</outbound-resourceadapter>
@@ -269,18 +254,18 @@
<inbound-resourceadapter>
<messageadapter>
<messagelistener>
-
<messagelistener-type>javax.jms.MessageListener</messagelistener-type>
+
<messagelistener-type>jakarta.jms.MessageListener</messagelistener-type>
<activationspec>
<activationspec-class>org.apache.activemq.artemis.ra.inflow.ActiveMQActivationSpec</activationspec-class>
<required-config-property>
- <config-property-name>destination</config-property-name>
+ <config-property-name>destination</config-property-name>
</required-config-property>
</activationspec>
</messagelistener>
</messageadapter>
</inbound-resourceadapter>
<adminobject>
- <adminobject-interface>javax.jms.Queue</adminobject-interface>
+ <adminobject-interface>jakarta.jms.Queue</adminobject-interface>
<adminobject-class>org.apache.activemq.artemis.jms.client.ActiveMQQueue</adminobject-class>
<config-property>
<config-property-name>Address</config-property-name>
@@ -288,7 +273,7 @@
</config-property>
</adminobject>
<adminobject>
- <adminobject-interface>javax.jms.Topic</adminobject-interface>
+ <adminobject-interface>jakarta.jms.Topic</adminobject-interface>
<adminobject-class>org.apache.activemq.artemis.jms.client.ActiveMQTopic</adminobject-class>
<config-property>
<config-property-name>Address</config-property-name>
@@ -296,7 +281,7 @@
</config-property>
</adminobject>
<adminobject>
-
<adminobject-interface>javax.jms.ConnectionFactory</adminobject-interface>
+
<adminobject-interface>jakarta.jms.ConnectionFactory</adminobject-interface>
<adminobject-class>org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory</adminobject-class>
<config-property>
<config-property-name>BrokerURL</config-property-name>
@@ -304,7 +289,7 @@
</config-property>
</adminobject>
<adminobject>
-
<adminobject-interface>javax.jms.XAConnectionFactory</adminobject-interface>
+
<adminobject-interface>jakarta.jms.XAConnectionFactory</adminobject-interface>
<adminobject-class>org.apache.activemq.artemis.jms.client.ActiveMQXAConnectionFactory</adminobject-class>
<config-property>
<config-property-name>BrokerURL</config-property-name>
diff --git
a/examples/features/sub-modules/artemis-ra-rar/src/main/resources/ra.xml
b/examples/features/sub-modules/artemis-ra-rar/src/main/resources/ra.xml
index 935665bf72..d008ff5b4c 100644
--- a/examples/features/sub-modules/artemis-ra-rar/src/main/resources/ra.xml
+++ b/examples/features/sub-modules/artemis-ra-rar/src/main/resources/ra.xml
@@ -2,11 +2,11 @@
<!-- $Id: ra.xml 76819 2008-08-08 11:04:20Z jesper.pedersen $ -->
-<connector xmlns="http://java.sun.com/xml/ns/j2ee";
+<connector xmlns="http://xmlns.jcp.org/xml/ns/javaee";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
- http://java.sun.com/xml/ns/j2ee/connector_1_5.xsd";
- version="1.5">
+ xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
+ http://xmlns.jcp.org/xml/ns/javaee/connector_1_7.xsd "
+ version="1.7">
<description>ActiveMQ Artemis Resource Adapter</description>
<display-name>ArtemisRA</display-name>
@@ -52,7 +52,7 @@
</description>
<config-property-name>ConnectionParameters</config-property-name>
<config-property-type>java.lang.String</config-property-type>
-
<config-property-value>host=localhost,port=61616</config-property-value>
+
<config-property-value>host=localhost;port=61616</config-property-value>
</config-property>
<!-- <config-property>
@@ -60,11 +60,6 @@
<config-property-name>HA</config-property-name>
<config-property-type>java.lang.Boolean</config-property-type>
</config-property>
- <config-property>
- <description>The method to use for locating the
transactionmanager</description>
-
<config-property-name>TransactionManagerLocatorMethod</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- </config-property>
<config-property>
<description>Use A local Transaction instead of XA?</description>
<config-property-name>UseLocalTx</config-property-name>
@@ -160,11 +155,6 @@
<config-property-name>ConfirmationWindowSize</config-property-name>
<config-property-type>java.lang.Integer</config-property-type>
</config-property>
- <config-property>
- <description>The producer max rate</description>
- <config-property-name>ProducerMaxRate</config-property-name>
- <config-property-type>java.lang.Integer</config-property-type>
- </config-property>
<config-property>
<description>The min large message size</description>
<config-property-name>MinLargeMessageSize</config-property-name>
@@ -190,10 +180,6 @@
<config-property-name>AutoGroup</config-property-name>
<config-property-type>java.lang.Boolean</config-property-type>
</config-property>
- <config-property>
- <description>The max connections</description>
- <config-property-type>java.lang.Integer</config-property-type>
- </config-property>
<config-property>
<description>The pre acknowledge</description>
<config-property-name>PreAcknowledge</config-property-name>
