Skip to content

Commit 05cfbe0

Browse files
committed
Fixed ra.xml - previous state failed it's validation
- failure was detected when I enabled some tests on GlassFish - temporarily I "hacked" the descriptor, but we should use corrected release of openmq Signed-off-by: David Matějček <[email protected]>
1 parent c9c7407 commit 05cfbe0

File tree

1 file changed

+21
-21
lines changed
  • mq/main/mq-jmsra/jmsra-ra/src/main/java/com/sun/messaging/jms/ra

1 file changed

+21
-21
lines changed

mq/main/mq-jmsra/jmsra-ra/src/main/java/com/sun/messaging/jms/ra/ra.xml

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
4+
Copyright (c) 2022 Contributors to Eclipse Foundation. All rights reserved.
45
Copyright (c) 2000, 2020 Oracle and/or its affiliates. All rights reserved.
56
67
This program and the accompanying materials are made available under the
@@ -17,16 +18,16 @@
1718
1819
-->
1920

20-
<connector xmlns="http://java.sun.com/xml/ns/j2ee"
21+
<connector xmlns="https://jakarta.ee/xml/ns/jakartaee"
2122
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
22-
xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
23-
http://java.sun.com/xml/ns/j2ee/connector_1_5.xsd"
24-
version="1.5">
25-
<description>Oracle GlassFish(tm) Server Message Queue JMS Resource Adapter</description>
26-
<display-name>Oracle GlassFish(tm) Server Message Queue 5.1 Java EE Resource Adapter for JMS</display-name>
27-
<vendor-name>Oracle</vendor-name>
28-
<eis-type>Java Message Service v 1.1</eis-type>
29-
<resourceadapter-version>5.1</resourceadapter-version>
23+
xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee
24+
https://jakarta.ee/xml/ns/jakartaee/connector_2_0.xsd"
25+
version="2.0">
26+
<description>Eclipse OpenMQ(tm) JMS Resource Adapter</description>
27+
<display-name>Eclipse OpenMQ(tm) Jakarta EE Resource Adapter for JMS</display-name>
28+
<vendor-name>Eclipse Foundation</vendor-name>
29+
<eis-type>Jakarta Messaging v 3.0</eis-type>
30+
<resourceadapter-version>6.2.1</resourceadapter-version>
3031

3132
<resourceadapter>
3233
<resourceadapter-class>
@@ -74,7 +75,7 @@
7475
<config-property-name>AddressList</config-property-name>
7576
<config-property-type>java.lang.String</config-property-type>
7677
<config-property-value>localhost</config-property-value>
77-
</config-property>
78+
</config-property>
7879
<config-property>
7980
<config-property-name>UserName</config-property-name>
8081
<config-property-type>java.lang.String</config-property-type>
@@ -85,13 +86,13 @@
8586
<config-property-type>java.lang.String</config-property-type>
8687
<config-property-value>guest</config-property-value>
8788
</config-property>
88-
<connectionfactory-interface>
89+
<connectionfactory-interface>
8990
jakarta.jms.ConnectionFactory
9091
</connectionfactory-interface>
9192
<connectionfactory-impl-class>
9293
com.sun.messaging.jms.ra.ConnectionFactoryAdapter
9394
</connectionfactory-impl-class>
94-
<connection-interface>
95+
<connection-interface>
9596
jakarta.jms.QueueConnection
9697
</connection-interface>
9798
<connection-impl-class>
@@ -106,7 +107,7 @@
106107
<config-property-name>AddressList</config-property-name>
107108
<config-property-type>java.lang.String</config-property-type>
108109
<config-property-value>localhost</config-property-value>
109-
</config-property>
110+
</config-property>
110111
<config-property>
111112
<config-property-name>UserName</config-property-name>
112113
<config-property-type>java.lang.String</config-property-type>
@@ -117,13 +118,13 @@
117118
<config-property-type>java.lang.String</config-property-type>
118119
<config-property-value>guest</config-property-value>
119120
</config-property>
120-
<connectionfactory-interface>
121+
<connectionfactory-interface>
121122
jakarta.jms.QueueConnectionFactory
122123
</connectionfactory-interface>
123124
<connectionfactory-impl-class>
124125
com.sun.messaging.jms.ra.ConnectionFactoryAdapter
125126
</connectionfactory-impl-class>
126-
<connection-interface>
127+
<connection-interface>
127128
jakarta.jms.QueueConnection
128129
</connection-interface>
129130
<connection-impl-class>
@@ -149,13 +150,13 @@
149150
<config-property-type>java.lang.String</config-property-type>
150151
<config-property-value>guest</config-property-value>
151152
</config-property>
152-
<connectionfactory-interface>
153+
<connectionfactory-interface>
153154
jakarta.jms.TopicConnectionFactory
154155
</connectionfactory-interface>
155156
<connectionfactory-impl-class>
156157
com.sun.messaging.jms.ra.ConnectionFactoryAdapter
157158
</connectionfactory-impl-class>
158-
<connection-interface>
159+
<connection-interface>
159160
jakarta.jms.TopicConnection
160161
</connection-interface>
161162
<connection-impl-class>
@@ -178,15 +179,15 @@
178179
</reauthentication-support>
179180
</outbound-resourceadapter>
180181
<inbound-resourceadapter>
181-
<messageadapter>
182+
<messageadapter>
182183
<messagelistener>
183184
<messagelistener-type>
184185
jakarta.jms.MessageListener
185186
</messagelistener-type>
186187
<activationspec>
187188
<activationspec-class>
188189
com.sun.messaging.jms.ra.ActivationSpec
189-
</activationspec-class>
190+
</activationspec-class>
190191
<required-config-property>
191192
<config-property-name>
192193
destination
@@ -199,7 +200,7 @@
199200
</required-config-property>
200201
</activationspec>
201202
</messagelistener>
202-
</messageadapter>
203+
</messageadapter>
203204
</inbound-resourceadapter>
204205
<adminobject>
205206
<adminobject-interface>jakarta.jms.Queue
@@ -258,4 +259,3 @@
258259
</adminobject>
259260
</resourceadapter>
260261
</connector>
261-

0 commit comments

Comments
 (0)