Skip to content

Commit

Permalink
Messaging - apply copyright and apply formatting to original src files
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 5ecd875 commit 550a60f
Show file tree
Hide file tree
Showing 8 changed files with 1,525 additions and 1,240 deletions.
74 changes: 55 additions & 19 deletions src/com/sun/ts/tests/jms/ee20/resourcedefs/annotations/Client.java
View file
@@ -1,5 +1,6 @@
/*
* Copyright (c) 2013, 2018, 2020 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2022 Contributors to Eclipse Foundation. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0, which is available at
Expand Down Expand Up @@ -45,26 +46,61 @@
//-------------------------------------
// 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 = "j2ee", password = "j2ee"),

@JMSConnectionFactoryDefinition(description = "Define QueueConnectionFactory AppClientMyTestQueueConnectionFactory", interfaceName = "jakarta.jms.QueueConnectionFactory", name = "java:app/AppClientMyTestQueueConnectionFactory", user = "j2ee", password = "j2ee"),

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

@JMSConnectionFactoryDefinition(description = "Define Durable TopicConnectionFactory AppClientMyTestDurableTopicConnectionFactory", interfaceName = "jakarta.jms.TopicConnectionFactory", name = "java:comp/env/jms/AppClientMyTestDurableTopicConnectionFactory", user = "j2ee", password = "j2ee", 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 = "j2ee",
password = "j2ee"
)

@JMSConnectionFactoryDefinition(
description="Define QueueConnectionFactory AppClientMyTestQueueConnectionFactory",
interfaceName="jakarta.jms.QueueConnectionFactory",
name="java:app/AppClientMyTestQueueConnectionFactory",
user = "j2ee",
password = "j2ee"
)

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


@JMSConnectionFactoryDefinition(
description="Define Durable TopicConnectionFactory AppClientMyTestDurableTopicConnectionFactory",
interfaceName="jakarta.jms.TopicConnectionFactory",
name="java:comp/env/jms/AppClientMyTestDurableTopicConnectionFactory",
user = "j2ee",
password = "j2ee",
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
72 changes: 53 additions & 19 deletions src/com/sun/ts/tests/jms/ee20/resourcedefs/annotations/EjbClient.java
View file
@@ -1,5 +1,6 @@
/*
* Copyright (c) 2013, 2018, 2020 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2022 Contributors to Eclipse Foundation. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0, which is available at
Expand Down Expand Up @@ -45,26 +46,59 @@
//-------------------------------------
// 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", interfaceName = "jakarta.jms.Topic", name = "java:app/env/EJBMyTestTopic", destinationName = "EJBMyTestTopic")

})

// -------------------------------------------
@JMSDestinationDefinition(
description="Define Queue EJBMyTestQueue",
interfaceName="jakarta.jms.Queue",
name="java:global/env/EJBMyTestQueue",
destinationName="EJBMyTestQueue"
)

@JMSDestinationDefinition(
description="Define Topic EJBMyTestTopic",
interfaceName="jakarta.jms.Topic",
name="java:app/env/EJBMyTestTopic",
destinationName="EJBMyTestTopic"
)

//-------------------------------------------
// JMS ConnectionFactory Resource Definitions
// -------------------------------------------
@JMSConnectionFactoryDefinitions(value = {
@JMSConnectionFactoryDefinition(description = "Define ConnectionFactory EJBMyTestConnectionFactory", interfaceName = "jakarta.jms.ConnectionFactory", name = "java:global/EJBMyTestConnectionFactory", user = "j2ee", password = "j2ee"),

@JMSConnectionFactoryDefinition(description = "Define QueueConnectionFactory EJBMyTestQueueConnectionFactory", interfaceName = "jakarta.jms.QueueConnectionFactory", name = "java:app/EJBMyTestQueueConnectionFactory", user = "j2ee", password = "j2ee"),

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

@JMSConnectionFactoryDefinition(description = "Define Durable TopicConnectionFactory EJBMyTestDurableTopicConnectionFactory", interfaceName = "jakarta.jms.TopicConnectionFactory", name = "java:comp/env/jms/EJBMyTestDurableTopicConnectionFactory", user = "j2ee", password = "j2ee", clientId = "MyClientID", properties = {
"Property1=10",
"Property2=20" }, transactional = false, maxPoolSize = 30, minPoolSize = 20) })
//-------------------------------------------
@JMSConnectionFactoryDefinition(
description="Define ConnectionFactory EJBMyTestConnectionFactory",
interfaceName="jakarta.jms.ConnectionFactory",
name="java:global/EJBMyTestConnectionFactory",
user = "j2ee",
password = "j2ee"
)

@JMSConnectionFactoryDefinition(
description="Define QueueConnectionFactory EJBMyTestQueueConnectionFactory",
interfaceName="jakarta.jms.QueueConnectionFactory",
name="java:app/EJBMyTestQueueConnectionFactory",
user = "j2ee",
password = "j2ee"
)

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

@JMSConnectionFactoryDefinition(
description="Define Durable TopicConnectionFactory EJBMyTestDurableTopicConnectionFactory",
interfaceName="jakarta.jms.TopicConnectionFactory",
name="java:comp/env/jms/EJBMyTestDurableTopicConnectionFactory",
user = "j2ee",
password = "j2ee",
clientId = "MyClientID",
properties = { "Property1=10", "Property2=20" },
transactional = false,
maxPoolSize = 30,
minPoolSize = 20
)

@Stateful(name = "JMSResourceDefsEjbClientBean")
@Remote({ EjbClientIF.class })
Expand Down
62 changes: 48 additions & 14 deletions src/com/sun/ts/tests/jms/ee20/resourcedefs/annotations/MyBean.java
View file
@@ -1,5 +1,6 @@
/*
* Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2022 Contributors to Eclipse Foundation. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0, which is available at
Expand All @@ -24,26 +25,59 @@
//-------------------------------------
// 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 = "j2ee", password = "j2ee"),
//-------------------------------------------
@JMSConnectionFactoryDefinition(
description="Define ConnectionFactory JSPMyTestConnectionFactory",
interfaceName="jakarta.jms.ConnectionFactory",
name="java:global/JSPMyTestConnectionFactory",
user = "j2ee",
password = "j2ee"
)

@JMSConnectionFactoryDefinition(description = "Define QueueConnectionFactory JSPMyTestQueueConnectionFactory", interfaceName = "jakarta.jms.QueueConnectionFactory", name = "java:app/JSPMyTestQueueConnectionFactory", user = "j2ee", password = "j2ee"),
@JMSConnectionFactoryDefinition(
description="Define QueueConnectionFactory JSPMyTestQueueConnectionFactory",
interfaceName="jakarta.jms.QueueConnectionFactory",
name="java:app/JSPMyTestQueueConnectionFactory",
user = "j2ee",
password = "j2ee"
)

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

@JMSConnectionFactoryDefinition(description = "Define Durable TopicConnectionFactory JSPMyTestDurableTopicConnectionFactory", interfaceName = "jakarta.jms.TopicConnectionFactory", name = "java:comp/env/jms/JSPMyTestDurableTopicConnectionFactory", user = "j2ee", password = "j2ee", 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 = "j2ee",
password = "j2ee",
clientId = "MyClientID",
properties = { "Property1=10", "Property2=20" },
transactional = false,
maxPoolSize = 30,
minPoolSize = 20
)

public class MyBean {
public MyBean() {
Expand Down
72 changes: 53 additions & 19 deletions src/com/sun/ts/tests/jms/ee20/resourcedefs/annotations/ServletClient.java
View file
@@ -1,5 +1,6 @@
/*
* Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2022 Contributors to Eclipse Foundation. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0, which is available at
Expand Down Expand Up @@ -48,26 +49,59 @@
//-------------------------------------
// 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 Topic ServletMyTestTopic", interfaceName = "jakarta.jms.Topic", name = "java:app/env/ServletMyTestTopic", destinationName = "ServletMyTestTopic")

})

// -------------------------------------------
@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"
)

//-------------------------------------------
// JMS ConnectionFactory Resource Definitions
// -------------------------------------------
@JMSConnectionFactoryDefinitions(value = {
@JMSConnectionFactoryDefinition(description = "Define ConnectionFactory ServletMyTestConnectionFactory", interfaceName = "jakarta.jms.ConnectionFactory", name = "java:global/ServletMyTestConnectionFactory", user = "j2ee", password = "j2ee"),

@JMSConnectionFactoryDefinition(description = "Define QueueConnectionFactory ServletMyTestQueueConnectionFactory", interfaceName = "jakarta.jms.QueueConnectionFactory", name = "java:app/ServletMyTestQueueConnectionFactory", user = "j2ee", password = "j2ee"),

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

@JMSConnectionFactoryDefinition(description = "Define Durable TopicConnectionFactory ServletMyTestDurableTopicConnectionFactory", interfaceName = "jakarta.jms.TopicConnectionFactory", name = "java:comp/env/jms/ServletMyTestDurableTopicConnectionFactory", user = "j2ee", password = "j2ee", clientId = "MyClientID", properties = {
"Property1=10",
"Property2=20" }, transactional = false, maxPoolSize = 30, minPoolSize = 20) })
//-------------------------------------------
@JMSConnectionFactoryDefinition(
description="Define ConnectionFactory ServletMyTestConnectionFactory",
interfaceName="jakarta.jms.ConnectionFactory",
name="java:global/ServletMyTestConnectionFactory",
user = "j2ee",
password = "j2ee"
)

@JMSConnectionFactoryDefinition(
description="Define QueueConnectionFactory ServletMyTestQueueConnectionFactory",
interfaceName="jakarta.jms.QueueConnectionFactory",
name="java:app/ServletMyTestQueueConnectionFactory",
user = "j2ee",
password = "j2ee"
)

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

@JMSConnectionFactoryDefinition(
description="Define Durable TopicConnectionFactory ServletMyTestDurableTopicConnectionFactory",
interfaceName="jakarta.jms.TopicConnectionFactory",
name="java:comp/env/jms/ServletMyTestDurableTopicConnectionFactory",
user = "j2ee",
password = "j2ee",
clientId = "MyClientID",
properties = { "Property1=10", "Property2=20" },
transactional = false,
maxPoolSize = 30,
minPoolSize = 20
)

@WebServlet("/ServletTest")
public class ServletClient extends HttpServlet {
Expand Down

0 comments on commit 550a60f

Please sign in to comment.