diff --git a/src/com/sun/ts/tests/jms/ee20/resourcedefs/annotations/files/Client.java.src b/src/com/sun/ts/tests/jms/ee20/resourcedefs/annotations/files/Client.java.src
index 1de6055191..39b2a04cdc 100644
--- a/src/com/sun/ts/tests/jms/ee20/resourcedefs/annotations/files/Client.java.src
+++ b/src/com/sun/ts/tests/jms/ee20/resourcedefs/annotations/files/Client.java.src
@@ -32,65 +32,61 @@ import java.util.Iterator;
 //-------------------------------------
 // JMS Destination Resource Definitions
 //-------------------------------------
-@JMSDestinationDefinitions(value = {
-  @JMSDestinationDefinition(
-	description="Define Queue AppClientMyTestQueue",
-	interfaceName="jakarta.jms.Queue",
-	name="java:global/env/AppClientMyTestQueue",
-    	destinationName="AppClientMyTestQueue"
-   ),
-
-  @JMSDestinationDefinition(
-	description="Define Topic AppClientMyTestTopic",
-	interfaceName="jakarta.jms.Topic",
-	name="java:app/env/AppClientMyTestTopic",
-	destinationName="AppClientMyTestTopic"
-   )
-
-})
+@JMSDestinationDefinition(
+      description="Define Queue AppClientMyTestQueue",
+      interfaceName="jakarta.jms.Queue",
+      name="java:global/env/AppClientMyTestQueue",
+      destinationName="AppClientMyTestQueue"
+ )
+
+@JMSDestinationDefinition(
+      description="Define Topic AppClientMyTestTopic",
+      interfaceName="jakarta.jms.Topic",
+      name="java:app/env/AppClientMyTestTopic",
+      destinationName="AppClientMyTestTopic"
+ )
+
 
 //-------------------------------------------
 // JMS ConnectionFactory Resource Definitions
 //-------------------------------------------
-@JMSConnectionFactoryDefinitions(value = {
-  @JMSConnectionFactoryDefinition(
-	description="Define ConnectionFactory AppClientMyTestConnectionFactory",
-	interfaceName="jakarta.jms.ConnectionFactory",
-    	name="java:global/AppClientMyTestConnectionFactory",
-	user = "@user@",
-	password = "@password@"
-   ),
-
-  @JMSConnectionFactoryDefinition(
-	description="Define QueueConnectionFactory AppClientMyTestQueueConnectionFactory",
-	interfaceName="jakarta.jms.QueueConnectionFactory",
-    	name="java:app/AppClientMyTestQueueConnectionFactory",
-	user = "@user@",
-	password = "@password@"
-   ),
-
-  @JMSConnectionFactoryDefinition(
-	description="Define TopicConnectionFactory AppClientMyTestTopicConnectionFactory",
-	interfaceName="jakarta.jms.TopicConnectionFactory",
-    	name="java:module/AppClientMyTestTopicConnectionFactory",
-	user = "@user@",
-	password = "@password@"
-   ),
-
-
-  @JMSConnectionFactoryDefinition(
-	description="Define Durable TopicConnectionFactory AppClientMyTestDurableTopicConnectionFactory",
-	interfaceName="jakarta.jms.TopicConnectionFactory",
-    	name="java:comp/env/jms/AppClientMyTestDurableTopicConnectionFactory",
-	user = "@user@",
-	password = "@password@",
-	clientId = "MyClientID",
-	properties = { "Property1=10", "Property2=20" },
-	transactional = false,
-	maxPoolSize = 30,
-	minPoolSize = 20
-   )
-})
+@JMSConnectionFactoryDefinition(
+      description="Define ConnectionFactory AppClientMyTestConnectionFactory",
+      interfaceName="jakarta.jms.ConnectionFactory",
+      name="java:global/AppClientMyTestConnectionFactory",
+      user = "@user@",
+      password = "@password@"
+ )
+
+@JMSConnectionFactoryDefinition(
+      description="Define QueueConnectionFactory AppClientMyTestQueueConnectionFactory",
+      interfaceName="jakarta.jms.QueueConnectionFactory",
+      name="java:app/AppClientMyTestQueueConnectionFactory",
+      user = "@user@",
+      password = "@password@"
+ )
+
+@JMSConnectionFactoryDefinition(
+      description="Define TopicConnectionFactory AppClientMyTestTopicConnectionFactory",
+      interfaceName="jakarta.jms.TopicConnectionFactory",
+      name="java:module/AppClientMyTestTopicConnectionFactory",
+      user = "@user@",
+      password = "@password@"
+ )
+
+
+@JMSConnectionFactoryDefinition(
+      description="Define Durable TopicConnectionFactory AppClientMyTestDurableTopicConnectionFactory",
+      interfaceName="jakarta.jms.TopicConnectionFactory",
+      name="java:comp/env/jms/AppClientMyTestDurableTopicConnectionFactory",
+      user = "@user@",
+      password = "@password@",
+      clientId = "MyClientID",
+      properties = { "Property1=10", "Property2=20" },
+      transactional = false,
+      maxPoolSize = 30,
+      minPoolSize = 20
+ )
 
 public class Client extends EETest {
     private static final long serialVersionUID = 1L;
diff --git a/src/com/sun/ts/tests/jms/ee20/resourcedefs/annotations/files/EjbClient.java.src b/src/com/sun/ts/tests/jms/ee20/resourcedefs/annotations/files/EjbClient.java.src
index 34502526ea..be983259cf 100644
--- a/src/com/sun/ts/tests/jms/ee20/resourcedefs/annotations/files/EjbClient.java.src
+++ b/src/com/sun/ts/tests/jms/ee20/resourcedefs/annotations/files/EjbClient.java.src
@@ -38,13 +38,12 @@ import com.sun.ts.tests.jms.common.*;
 //-------------------------------------
 // JMS Destination Resource Definitions
 //-------------------------------------
-@JMSDestinationDefinitions(value = {
   @JMSDestinationDefinition(
 	description="Define Queue EJBMyTestQueue",
 	interfaceName="jakarta.jms.Queue",
 	name="java:global/env/EJBMyTestQueue",
     	destinationName="EJBMyTestQueue"
-   ),
+   )
 
   @JMSDestinationDefinition(
 	description="Define Topic EJBMyTestTopic",
@@ -53,19 +52,16 @@ import com.sun.ts.tests.jms.common.*;
 	destinationName="EJBMyTestTopic"
    )
 
-})
-
 //-------------------------------------------
 // JMS ConnectionFactory Resource Definitions
 //-------------------------------------------
-@JMSConnectionFactoryDefinitions(value = {
   @JMSConnectionFactoryDefinition(
 	description="Define ConnectionFactory EJBMyTestConnectionFactory",
 	interfaceName="jakarta.jms.ConnectionFactory",
     	name="java:global/EJBMyTestConnectionFactory",
 	user = "@user@",
 	password = "@password@"
-   ),
+   )
 
   @JMSConnectionFactoryDefinition(
 	description="Define QueueConnectionFactory EJBMyTestQueueConnectionFactory",
@@ -73,7 +69,7 @@ import com.sun.ts.tests.jms.common.*;
     	name="java:app/EJBMyTestQueueConnectionFactory",
 	user = "@user@",
 	password = "@password@"
-   ),
+   )
 
   @JMSConnectionFactoryDefinition(
 	description="Define TopicConnectionFactory EJBMyTestTopicConnectionFactory",
@@ -81,7 +77,7 @@ import com.sun.ts.tests.jms.common.*;
     	name="java:module/EJBMyTestTopicConnectionFactory",
 	user = "@user@",
 	password = "@password@"
-   ),
+   )
 
   @JMSConnectionFactoryDefinition(
 	description="Define Durable TopicConnectionFactory EJBMyTestDurableTopicConnectionFactory",
@@ -95,8 +91,6 @@ import com.sun.ts.tests.jms.common.*;
 	maxPoolSize = 30,
 	minPoolSize = 20
    )
-})
-
 
 @Stateful(name="JMSResourceDefsEjbClientBean")
 @Remote({EjbClientIF.class})
diff --git a/src/com/sun/ts/tests/jms/ee20/resourcedefs/annotations/files/MyBean.java.src b/src/com/sun/ts/tests/jms/ee20/resourcedefs/annotations/files/MyBean.java.src
index caeff3f8a0..73a11c8859 100644
--- a/src/com/sun/ts/tests/jms/ee20/resourcedefs/annotations/files/MyBean.java.src
+++ b/src/com/sun/ts/tests/jms/ee20/resourcedefs/annotations/files/MyBean.java.src
@@ -21,64 +21,59 @@ import jakarta.jms.*;
 //-------------------------------------
 // JMS Destination Resource Definitions
 //-------------------------------------
-@JMSDestinationDefinitions(value = {
-  @JMSDestinationDefinition(
-	description="Define Queue JSPMyTestQueue",
-	interfaceName="jakarta.jms.Queue",
-	name="java:global/env/JSPMyTestQueue",
-    	destinationName="JSPMyTestQueue"
-   ),
+@JMSDestinationDefinition(
+      description="Define Queue JSPMyTestQueue",
+      interfaceName="jakarta.jms.Queue",
+      name="java:global/env/JSPMyTestQueue",
+      destinationName="JSPMyTestQueue"
+ )
 
-  @JMSDestinationDefinition(
-	description="Define Topic JSPMyTestTopic",
-	interfaceName="jakarta.jms.Topic",
-	name="java:app/env/JSPMyTestTopic",
-	destinationName="JSPMyTestTopic"
-   )
-
-})
+@JMSDestinationDefinition(
+      description="Define Topic JSPMyTestTopic",
+      interfaceName="jakarta.jms.Topic",
+      name="java:app/env/JSPMyTestTopic",
+      destinationName="JSPMyTestTopic"
+ )
 
 //-------------------------------------------
 // JMS ConnectionFactory Resource Definitions
 //-------------------------------------------
-@JMSConnectionFactoryDefinitions(value = {
-  @JMSConnectionFactoryDefinition(
-	description="Define ConnectionFactory JSPMyTestConnectionFactory",
-	interfaceName="jakarta.jms.ConnectionFactory",
-    	name="java:global/JSPMyTestConnectionFactory",
-	user = "@user@",
-	password = "@password@"
-   ),
+@JMSConnectionFactoryDefinition(
+      description="Define ConnectionFactory JSPMyTestConnectionFactory",
+      interfaceName="jakarta.jms.ConnectionFactory",
+      name="java:global/JSPMyTestConnectionFactory",
+      user = "@user@",
+      password = "@password@"
+ )
 
-  @JMSConnectionFactoryDefinition(
-	description="Define QueueConnectionFactory JSPMyTestQueueConnectionFactory",
-	interfaceName="jakarta.jms.QueueConnectionFactory",
-    	name="java:app/JSPMyTestQueueConnectionFactory",
-	user = "@user@",
-	password = "@password@"
-   ),
+@JMSConnectionFactoryDefinition(
+      description="Define QueueConnectionFactory JSPMyTestQueueConnectionFactory",
+      interfaceName="jakarta.jms.QueueConnectionFactory",
+      name="java:app/JSPMyTestQueueConnectionFactory",
+      user = "@user@",
+      password = "@password@"
+ )
 
-  @JMSConnectionFactoryDefinition(
-	description="Define TopicConnectionFactory JSPMyTestTopicConnectionFactory",
-	interfaceName="jakarta.jms.TopicConnectionFactory",
-    	name="java:module/JSPMyTestTopicConnectionFactory",
-	user = "@user@",
-	password = "@password@"
-   ),
+@JMSConnectionFactoryDefinition(
+      description="Define TopicConnectionFactory JSPMyTestTopicConnectionFactory",
+      interfaceName="jakarta.jms.TopicConnectionFactory",
+      name="java:module/JSPMyTestTopicConnectionFactory",
+      user = "@user@",
+      password = "@password@"
+ )
 
-  @JMSConnectionFactoryDefinition(
-	description="Define Durable TopicConnectionFactory JSPMyTestDurableTopicConnectionFactory",
-	interfaceName="jakarta.jms.TopicConnectionFactory",
-    	name="java:comp/env/jms/JSPMyTestDurableTopicConnectionFactory",
-	user = "@user@",
-	password = "@password@",
-	clientId = "MyClientID",
-	properties = { "Property1=10", "Property2=20" },
-	transactional = false,
-	maxPoolSize = 30,
-	minPoolSize = 20
-   )
-})
+@JMSConnectionFactoryDefinition(
+      description="Define Durable TopicConnectionFactory JSPMyTestDurableTopicConnectionFactory",
+      interfaceName="jakarta.jms.TopicConnectionFactory",
+      name="java:comp/env/jms/JSPMyTestDurableTopicConnectionFactory",
+      user = "@user@",
+      password = "@password@",
+      clientId = "MyClientID",
+      properties = { "Property1=10", "Property2=20" },
+      transactional = false,
+      maxPoolSize = 30,
+      minPoolSize = 20
+ )
 
 public class MyBean {
     public MyBean() {
diff --git a/src/com/sun/ts/tests/jms/ee20/resourcedefs/annotations/files/ServletClient.java.src b/src/com/sun/ts/tests/jms/ee20/resourcedefs/annotations/files/ServletClient.java.src
index 93ad4e930a..d7abd4f4ff 100644
--- a/src/com/sun/ts/tests/jms/ee20/resourcedefs/annotations/files/ServletClient.java.src
+++ b/src/com/sun/ts/tests/jms/ee20/resourcedefs/annotations/files/ServletClient.java.src
@@ -36,65 +36,59 @@ import jakarta.annotation.Resource;
 //-------------------------------------
 // JMS Destination Resource Definitions
 //-------------------------------------
-@JMSDestinationDefinitions(value = {
-  @JMSDestinationDefinition(
-	description="Define Queue ServletMyTestQueue",
-	interfaceName="jakarta.jms.Queue",
-	name="java:global/env/ServletMyTestQueue",
-    	destinationName="ServletMyTestQueue"
-   ),
+@JMSDestinationDefinition(
+      description="Define Queue ServletMyTestQueue",
+      interfaceName="jakarta.jms.Queue",
+      name="java:global/env/ServletMyTestQueue",
+      destinationName="ServletMyTestQueue"
+ )
 
-  @JMSDestinationDefinition(
-	description="Define Topic ServletMyTestTopic",
-	interfaceName="jakarta.jms.Topic",
-	name="java:app/env/ServletMyTestTopic",
-	destinationName="ServletMyTestTopic"
-   )
-
-})
+@JMSDestinationDefinition(
+      description="Define Topic ServletMyTestTopic",
+      interfaceName="jakarta.jms.Topic",
+      name="java:app/env/ServletMyTestTopic",
+      destinationName="ServletMyTestTopic"
+ )
 
 //-------------------------------------------
 // JMS ConnectionFactory Resource Definitions
 //-------------------------------------------
-@JMSConnectionFactoryDefinitions(value = {
-  @JMSConnectionFactoryDefinition(
-	description="Define ConnectionFactory ServletMyTestConnectionFactory",
-	interfaceName="jakarta.jms.ConnectionFactory",
-    	name="java:global/ServletMyTestConnectionFactory",
-	user = "@user@",
-	password = "@password@"
-   ),
-
-  @JMSConnectionFactoryDefinition(
-	description="Define QueueConnectionFactory ServletMyTestQueueConnectionFactory",
-	interfaceName="jakarta.jms.QueueConnectionFactory",
-    	name="java:app/ServletMyTestQueueConnectionFactory",
-	user = "@user@",
-	password = "@password@"
-   ),
+@JMSConnectionFactoryDefinition(
+      description="Define ConnectionFactory ServletMyTestConnectionFactory",
+      interfaceName="jakarta.jms.ConnectionFactory",
+      name="java:global/ServletMyTestConnectionFactory",
+      user = "@user@",
+      password = "@password@"
+ )
 
-  @JMSConnectionFactoryDefinition(
-	description="Define TopicConnectionFactory ServletMyTestTopicConnectionFactory",
-	interfaceName="jakarta.jms.TopicConnectionFactory",
-    	name="java:module/ServletMyTestTopicConnectionFactory",
-	user = "@user@",
-	password = "@password@"
-   ),
+@JMSConnectionFactoryDefinition(
+      description="Define QueueConnectionFactory ServletMyTestQueueConnectionFactory",
+      interfaceName="jakarta.jms.QueueConnectionFactory",
+      name="java:app/ServletMyTestQueueConnectionFactory",
+      user = "@user@",
+      password = "@password@"
+ )
 
+@JMSConnectionFactoryDefinition(
+      description="Define TopicConnectionFactory ServletMyTestTopicConnectionFactory",
+      interfaceName="jakarta.jms.TopicConnectionFactory",
+      name="java:module/ServletMyTestTopicConnectionFactory",
+      user = "@user@",
+      password = "@password@"
+ )
 
-  @JMSConnectionFactoryDefinition(
-	description="Define Durable TopicConnectionFactory ServletMyTestDurableTopicConnectionFactory",
-	interfaceName="jakarta.jms.TopicConnectionFactory",
-    	name="java:comp/env/jms/ServletMyTestDurableTopicConnectionFactory",
-	user = "@user@",
-	password = "@password@",
-	clientId = "MyClientID",
-	properties = { "Property1=10", "Property2=20" },
-	transactional = false,
-	maxPoolSize = 30,
-	minPoolSize = 20
-   )
-})
+@JMSConnectionFactoryDefinition(
+      description="Define Durable TopicConnectionFactory ServletMyTestDurableTopicConnectionFactory",
+      interfaceName="jakarta.jms.TopicConnectionFactory",
+      name="java:comp/env/jms/ServletMyTestDurableTopicConnectionFactory",
+      user = "@user@",
+      password = "@password@",
+      clientId = "MyClientID",
+      properties = { "Property1=10", "Property2=20" },
+      transactional = false,
+      maxPoolSize = 30,
+      minPoolSize = 20
+ )
 
 @WebServlet("/ServletTest")
 public class ServletClient extends HttpServlet {