Skip to content

Commit

Permalink
Test repeatable annotations for Messaging
Browse files Browse the repository at this point in the history 
Repeatable annotations for @JMSDestinationDefinition @JMSConnectionFactoryDefinition
jakartaee/messaging#299
jakartaee/messaging#300
  • Loading branch information
Ondrej Mihalyi committed Feb 19, 2022
1 parent dabff79 commit 5ecd875
Show file tree
Hide file tree
Showing 4 changed files with 145 additions and 166 deletions.
106 changes: 51 additions & 55 deletions src/com/sun/ts/tests/jms/ee20/resourcedefs/annotations/files/Client.java.src
View file
Expand Up @@ -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;
Expand Down
14 changes: 4 additions & 10 deletions src/com/sun/ts/tests/jms/ee20/resourcedefs/annotations/files/EjbClient.java.src
View file
Expand Up @@ -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",
Expand All @@ -53,35 +52,32 @@ 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",
interfaceName="jakarta.jms.QueueConnectionFactory",
name="java:app/EJBMyTestQueueConnectionFactory",
user = "@user@",
password = "@password@"
),
)

@JMSConnectionFactoryDefinition(
description="Define TopicConnectionFactory EJBMyTestTopicConnectionFactory",
interfaceName="jakarta.jms.TopicConnectionFactory",
name="java:module/EJBMyTestTopicConnectionFactory",
user = "@user@",
password = "@password@"
),
)

@JMSConnectionFactoryDefinition(
description="Define Durable TopicConnectionFactory EJBMyTestDurableTopicConnectionFactory",
Expand All @@ -95,8 +91,6 @@ import com.sun.ts.tests.jms.common.*;
maxPoolSize = 30,
minPoolSize = 20
)
})


@Stateful(name="JMSResourceDefsEjbClientBean")
@Remote({EjbClientIF.class})
Expand Down
95 changes: 45 additions & 50 deletions src/com/sun/ts/tests/jms/ee20/resourcedefs/annotations/files/MyBean.java.src
View file
Expand Up @@ -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() {
Expand Down

0 comments on commit 5ecd875

Please sign in to comment.