gemmellr commented on code in PR #3999:
URL: https://github.com/apache/activemq-artemis/pull/3999#discussion_r853011080
##########
examples/features/sub-modules/artemis-ra-rar/src/main/resources/ra.xml:
##########
@@ -23,7 +23,7 @@
(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
+ http://www.apache.org/licenses/LICENSE-2.0
Review Comment:
This should be left as it was unless there is some compelling reason, thats
how it is in the original license text, and seems an unnecessary change.
##########
examples/features/sub-modules/artemis-ra-rar/src/main/resources/ra.xml:
##########
@@ -39,200 +39,196 @@
<config-property>
<description>
The transport type. Multiple connectors can be configured by using
a comma separated list,
- i.e.
org.apache.activemq.artemis.core.remoting.impl.invm.InVMConnectorFactory,org.apache.activemq.artemis.core.remoting.impl.invm.InVMConnectorFactory.
+ i.e.
+
org.apache.activemq.artemis.core.remoting.impl.invm.InVMConnectorFactory,org.apache.activemq.artemis.core.remoting.impl.invm.InVMConnectorFactory.
</description>
<config-property-name>ConnectorClassName</config-property-name>
<config-property-type>java.lang.String</config-property-type>
-
<config-property-value>org.apache.activemq.artemis.core.remoting.impl.netty.NettyConnectorFactory</config-property-value>
+
<config-property-value>org.apache.activemq.artemis.core.remoting.impl.netty.NettyConnectorFactory
+ </config-property-value>
</config-property>
<config-property>
<description>The transport configuration. These values must be in the
form of key=val;key=val;,
- if multiple connectors are used then each set must be separated by
a comma i.e. host=host1;port=61616,host=host2;port=61617.
+ if multiple connectors are used then each set must be separated by
a comma i.e.
+ host=host1;port=61616,host=host2;port=61617.
Each set of params maps to the connector classname specified.
</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>
-
- <!-- <config-property>
- <description>Does we support HA</description>
- <config-property-name>HA</config-property-name>
- <config-property-type>java.lang.Boolean</config-property-type>
+
<config-property-value>host=localhost;port=61616</config-property-value>
</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>
+ <description>Does we support HA</description>
+ <config-property-name>HA</config-property-name>
+ <config-property-type>java.lang.Boolean</config-property-type>
</config-property>
<config-property>
- <description>Use A local Transaction instead of XA?</description>
- <config-property-name>UseLocalTx</config-property-name>
- <config-property-type>java.lang.Boolean</config-property-type>
+ <description>Use A local Transaction instead of XA?</description>
+ <config-property-name>UseLocalTx</config-property-name>
+ <config-property-type>java.lang.Boolean</config-property-type>
Review Comment:
Re-indenting the whole file as here and below (and the other files similarly
changed), doesnt seem like it should be in this PR and distracts from
[reviewing] the actual-changes.
##########
examples/features/sub-modules/wlp-jakarta/pom.xml:
##########
@@ -0,0 +1,145 @@
+<!--
+~ 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:xsi="http://www.w3.org/2001/XMLSchema-instance";
xmlns="http://maven.apache.org/POM/4.0.0";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.activemq.examples.modules</groupId>
+ <artifactId>broker-modules</artifactId>
+ <version>2.22.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>wlp-jakarta-resource-adapter-sample</artifactId>
+ <packaging>war</packaging>
+ <name>Artemis Websphere Liberty RA Jakarta Example</name>
+
+ <properties>
+ <activemq.basedir>${project.basedir}/../../../..</activemq.basedir>
+ <jakarta.jms-api.version>3.0.0</jakarta.jms-api.version>
+ <jakarta.annotation-api.version>2.0.0</jakarta.annotation-api.version>
+ <jakarta.ws.rs-api.version>3.0.0</jakarta.ws.rs-api.version>
+ <jakarta.ejb-api.version>4.0.0</jakarta.ejb-api.version>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>jakarta.jms</groupId>
+ <artifactId>jakarta.jms-api</artifactId>
+ <version>${jakarta.jms-api.version}</version>
Review Comment:
Similar to the cleanup also in
https://github.com/apache/activemq-artemis/commit/6eb78a26348db54164128c32c7321f1a8ae23c35,
you shouldnt need to define the version for the deps, with it already being
managed via the properties and dependencyManagement at the root. Similarly for
the other modules.
##########
examples/features/sub-modules/wlp-jakarta/pom.xml:
##########
@@ -0,0 +1,145 @@
+<!--
+~ 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:xsi="http://www.w3.org/2001/XMLSchema-instance";
xmlns="http://maven.apache.org/POM/4.0.0";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.activemq.examples.modules</groupId>
+ <artifactId>broker-modules</artifactId>
+ <version>2.22.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>wlp-jakarta-resource-adapter-sample</artifactId>
+ <packaging>war</packaging>
+ <name>Artemis Websphere Liberty RA Jakarta Example</name>
+
+ <properties>
+ <activemq.basedir>${project.basedir}/../../../..</activemq.basedir>
+ <jakarta.jms-api.version>3.0.0</jakarta.jms-api.version>
+ <jakarta.annotation-api.version>2.0.0</jakarta.annotation-api.version>
+ <jakarta.ws.rs-api.version>3.0.0</jakarta.ws.rs-api.version>
+ <jakarta.ejb-api.version>4.0.0</jakarta.ejb-api.version>
Review Comment:
Having every jakarta related module hard code a specific version of various
specs will be quite annoying later. I have pushed some changes to main
addressing this for existing stuff, see
https://github.com/apache/activemq-artemis/commit/6eb78a26348db54164128c32c7321f1a8ae23c35.
You should use the new props I added where appropriate, and follow the same
approach to introduce other ones for the other deps this PR uses.
##########
examples/features/sub-modules/artemis-ra-rar/src/main/resources/ra.xml:
##########
@@ -39,200 +39,196 @@
<config-property>
<description>
The transport type. Multiple connectors can be configured by using
a comma separated list,
- i.e.
org.apache.activemq.artemis.core.remoting.impl.invm.InVMConnectorFactory,org.apache.activemq.artemis.core.remoting.impl.invm.InVMConnectorFactory.
+ i.e.
+
org.apache.activemq.artemis.core.remoting.impl.invm.InVMConnectorFactory,org.apache.activemq.artemis.core.remoting.impl.invm.InVMConnectorFactory.
</description>
<config-property-name>ConnectorClassName</config-property-name>
<config-property-type>java.lang.String</config-property-type>
-
<config-property-value>org.apache.activemq.artemis.core.remoting.impl.netty.NettyConnectorFactory</config-property-value>
+
<config-property-value>org.apache.activemq.artemis.core.remoting.impl.netty.NettyConnectorFactory
+ </config-property-value>
</config-property>
<config-property>
<description>The transport configuration. These values must be in the
form of key=val;key=val;,
- if multiple connectors are used then each set must be separated by
a comma i.e. host=host1;port=61616,host=host2;port=61617.
+ if multiple connectors are used then each set must be separated by
a comma i.e.
+ host=host1;port=61616,host=host2;port=61617.
Each set of params maps to the connector classname specified.
</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>
-
- <!-- <config-property>
- <description>Does we support HA</description>
- <config-property-name>HA</config-property-name>
- <config-property-type>java.lang.Boolean</config-property-type>
+
<config-property-value>host=localhost;port=61616</config-property-value>
</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>
+ <description>Does we support HA</description>
+ <config-property-name>HA</config-property-name>
+ <config-property-type>java.lang.Boolean</config-property-type>
</config-property>
<config-property>
- <description>Use A local Transaction instead of XA?</description>
- <config-property-name>UseLocalTx</config-property-name>
- <config-property-type>java.lang.Boolean</config-property-type>
+ <description>Use A local Transaction instead of XA?</description>
+ <config-property-name>UseLocalTx</config-property-name>
+ <config-property-type>java.lang.Boolean</config-property-type>
</config-property>
<config-property>
- <description>The user name used to login to the JMS
server</description>
- <config-property-name>UserName</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
+ <description>The user name used to login to the JMS
server</description>
+ <config-property-name>UserName</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
</config-property>
<config-property>
- <description>The password used to login to the JMS server</description>
- <config-property-name>Password</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
+ <description>The password used to login to the JMS
server</description>
+ <config-property-name>Password</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
</config-property>
<config-property>
- <description>The jndi params to use to look up the jms resources if
local jndi is not to be used</description>
- <config-property-name>JndiParams</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
+ <description>The jndi params to use to look up the jms resources if
local jndi is not to be used</description>
+ <config-property-name>JndiParams</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
</config-property>
<config-property>
- <description>The jGroups File name</description>
- <config-property-name>JgroupsFile</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
+ <description>The jGroups File name</description>
+ <config-property-name>JgroupsFile</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
</config-property>
<config-property>
- <description>The name of the channel used on this
configuration</description>
- <config-property-name>JgroupsChannelName</config-property-name>
- <config-property-type>java.lang.Integer</config-property-type>
+ <description>The name of the channel used on this
configuration</description>
+ <config-property-name>JgroupsChannelName</config-property-name>
+ <config-property-type>java.lang.Integer</config-property-type>
</config-property>
<config-property>
- <description>The discovery group address</description>
- <config-property-name>DiscoveryAddress</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
+ <description>The discovery group address</description>
+ <config-property-name>DiscoveryAddress</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
</config-property>
<config-property>
- <description>The discovery group port</description>
- <config-property-name>DiscoveryPort</config-property-name>
- <config-property-type>java.lang.Integer</config-property-type>
+ <description>The discovery group port</description>
+ <config-property-name>DiscoveryPort</config-property-name>
+ <config-property-type>java.lang.Integer</config-property-type>
</config-property>
<config-property>
- <description>The discovery refresh timeout</description>
- <config-property-name>DiscoveryRefreshTimeout</config-property-name>
- <config-property-type>java.lang.Long</config-property-type>
+ <description>The discovery refresh timeout</description>
+ <config-property-name>DiscoveryRefreshTimeout</config-property-name>
+ <config-property-type>java.lang.Long</config-property-type>
</config-property>
<config-property>
- <description>The discovery initial wait timeout</description>
-
<config-property-name>DiscoveryInitialWaitTimeout</config-property-name>
- <config-property-type>java.lang.Long</config-property-type>
+ <description>The discovery initial wait timeout</description>
+
<config-property-name>DiscoveryInitialWaitTimeout</config-property-name>
+ <config-property-type>java.lang.Long</config-property-type>
</config-property>
<config-property>
- <description>The load balancing policy class name</description>
-
<config-property-name>LoadBalancingPolicyClassName</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
+ <description>The load balancing policy class name</description>
+
<config-property-name>LoadBalancingPolicyClassName</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
</config-property>
<config-property>
- <description>The client failure check period</description>
- <config-property-name>ClientFailureCheckPeriod</config-property-name>
- <config-property-type>java.lang.Long</config-property-type>
+ <description>The client failure check period</description>
+ <config-property-name>ClientFailureCheckPeriod</config-property-name>
+ <config-property-type>java.lang.Long</config-property-type>
</config-property>
<config-property>
- <description>The connection TTL</description>
- <config-property-name>ConnectionTTL</config-property-name>
- <config-property-type>java.lang.Long</config-property-type>
+ <description>The connection TTL</description>
+ <config-property-name>ConnectionTTL</config-property-name>
+ <config-property-type>java.lang.Long</config-property-type>
</config-property>
<config-property>
- <description>The call timeout</description>
- <config-property-name>CallTimeout</config-property-name>
- <config-property-type>java.lang.Long</config-property-type>
+ <description>The call timeout</description>
+ <config-property-name>CallTimeout</config-property-name>
+ <config-property-type>java.lang.Long</config-property-type>
</config-property>
<config-property>
- <description>The dups ok batch size</description>
- <config-property-name>DupsOKBatchSize</config-property-name>
- <config-property-type>java.lang.Integer</config-property-type>
+ <description>The dups ok batch size</description>
+ <config-property-name>DupsOKBatchSize</config-property-name>
+ <config-property-type>java.lang.Integer</config-property-type>
</config-property>
<config-property>
- <description>The transaction batch size</description>
- <config-property-name>TransactionBatchSize</config-property-name>
- <config-property-type>java.lang.Integer</config-property-type>
+ <description>The transaction batch size</description>
+ <config-property-name>TransactionBatchSize</config-property-name>
+ <config-property-type>java.lang.Integer</config-property-type>
</config-property>
<config-property>
- <description>The consumer window size</description>
- <config-property-name>ConsumerWindowSize</config-property-name>
- <config-property-type>java.lang.Integer</config-property-type>
+ <description>The consumer window size</description>
+ <config-property-name>ConsumerWindowSize</config-property-name>
+ <config-property-type>java.lang.Integer</config-property-type>
</config-property>
<config-property>
- <description>The consumer max rate</description>
- <config-property-name>ConsumerMaxRate</config-property-name>
- <config-property-type>java.lang.Integer</config-property-type>
+ <description>The consumer max rate</description>
+ <config-property-name>ConsumerMaxRate</config-property-name>
+ <config-property-type>java.lang.Integer</config-property-type>
</config-property>
<config-property>
- <description>The confirmation window size</description>
- <config-property-name>ConfirmationWindowSize</config-property-name>
- <config-property-type>java.lang.Integer</config-property-type>
+ <description>The confirmation window size</description>
+ <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>
+ <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>
- <config-property-type>java.lang.Integer</config-property-type>
+ <description>The min large message size</description>
+ <config-property-name>MinLargeMessageSize</config-property-name>
+ <config-property-type>java.lang.Integer</config-property-type>
</config-property>
<config-property>
- <description>The block on acknowledge</description>
- <config-property-name>BlockOnAcknowledge</config-property-name>
- <config-property-type>java.lang.Boolean</config-property-type>
+ <description>The block on acknowledge</description>
+ <config-property-name>BlockOnAcknowledge</config-property-name>
+ <config-property-type>java.lang.Boolean</config-property-type>
</config-property>
<config-property>
- <description>The block on non durable send</description>
- <config-property-name>BlockOnNonDurableSend</config-property-name>
- <config-property-type>java.lang.Boolean</config-property-type>
+ <description>The block on non durable send</description>
+ <config-property-name>BlockOnNonDurableSend</config-property-name>
+ <config-property-type>java.lang.Boolean</config-property-type>
</config-property>
<config-property>
- <description>The block on durable send</description>
- <config-property-name>BlockOnDurableSend</config-property-name>
- <config-property-type>java.lang.Boolean</config-property-type>
+ <description>The block on durable send</description>
+ <config-property-name>BlockOnDurableSend</config-property-name>
+ <config-property-type>java.lang.Boolean</config-property-type>
</config-property>
<config-property>
- <description>The auto group</description>
- <config-property-name>AutoGroup</config-property-name>
- <config-property-type>java.lang.Boolean</config-property-type>
+ <description>The auto group</description>
+ <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>
+ <description>The pre acknowledge</description>
+ <config-property-name>PreAcknowledge</config-property-name>
+ <config-property-type>java.lang.Boolean</config-property-type>
</config-property>
<config-property>
- <description>The pre acknowledge</description>
- <config-property-name>PreAcknowledge</config-property-name>
- <config-property-type>java.lang.Boolean</config-property-type>
+ <description>The retry interval</description>
+ <config-property-name>RetryInterval</config-property-name>
+ <config-property-type>java.lang.Long</config-property-type>
</config-property>
<config-property>
- <description>The retry interval</description>
- <config-property-name>RetryInterval</config-property-name>
- <config-property-type>java.lang.Long</config-property-type>
+ <description>The retry interval multiplier</description>
+ <config-property-name>RetryIntervalMultiplier</config-property-name>
+ <config-property-type>java.lang.Double</config-property-type>
</config-property>
<config-property>
- <description>The retry interval multiplier</description>
- <config-property-name>RetryIntervalMultiplier</config-property-name>
- <config-property-type>java.lang.Double</config-property-type>
+ <description>The client id</description>
+ <config-property-name>ClientID</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
</config-property>
<config-property>
- <description>The client id</description>
- <config-property-name>ClientID</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
+ <description>Whether the password is cleartext or encrypted, default
false</description>
+ <config-property-name>UseMaskedPassword</config-property-name>
+ <config-property-type>java.lang.Boolean</config-property-type>
</config-property>
<config-property>
- <description>Whether the password is cleartext or encrypted, default
false</description>
- <config-property-name>UseMaskedPassword</config-property-name>
- <config-property-type>java.lang.Boolean</config-property-type>
+ <description>The class definition (full qualified name and its
properties) used to encrypt the password
+ </description>
+ <config-property-name>PasswordCodec</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
</config-property>
<config-property>
- <description>The class definition (full qualified name and its
properties) used to encrypt the password</description>
- <config-property-name>PasswordCodec</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
+ <description>Cache destinations per session</description>
+ <config-property-name>CacheDestinations</config-property-name>
+ <config-property-type>java.lang.Boolean</config-property-type>
</config-property>
- <config-property>
- <description>Cache destinations per session</description>
- <config-property-name>CacheDestinations</config-property-name>
- <config-property-type>java.lang.Boolean</config-property-type>
- </config-property>-->
-
+ -->
<outbound-resourceadapter>
<connection-definition>
-
<managedconnectionfactory-class>org.apache.activemq.artemis.ra.ActiveMQRAManagedConnectionFactory</managedconnectionfactory-class>
+
<managedconnectionfactory-class>org.apache.activemq.artemis.ra.ActiveMQRAManagedConnectionFactory
+ </managedconnectionfactory-class>
Review Comment:
All the other changes like this (here and other files) dont seem
particularly necessary either. Its a big enough diff without extra
non-behavioural changes thrown in.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
