[29/50] [abbrv] activemq-artemis git commit: ARTEMIS-782 Added configuration elements for new address model
ARTEMIS-782 Added configuration elements for new address model
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/6e01d686
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/6e01d686
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/6e01d686
Branch: refs/heads/ARTEMIS-780
Commit: 6e01d6861846af09115d13c29e4d28fdb70643ee
Parents: 6c664c1
Author: Martyn Taylor
Authored: Tue Oct 18 19:45:02 2016 +0100
Committer: Clebert Suconic
Committed: Mon Nov 7 11:28:07 2016 -0500
--
.../config/ActiveMQDefaultConfiguration.java| 12 ++
.../artemis/core/config/Configuration.java | 15 ++
.../core/config/CoreAddressConfiguration.java | 145 +++
.../core/config/CoreQueueConfiguration.java | 43 ++
.../core/config/impl/ConfigurationImpl.java | 20 +++
.../deployers/impl/FileConfigurationParser.java | 80 +-
.../resources/schema/artemis-configuration.xsd | 78 +-
.../impl/DefaultsFileConfigurationTest.java | 2 +
.../core/config/impl/FileConfigurationTest.java | 63
.../resources/ConfigurationTest-full-config.xml | 26
10 files changed, 478 insertions(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/6e01d686/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/config/ActiveMQDefaultConfiguration.java
--
diff --git
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/config/ActiveMQDefaultConfiguration.java
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/config/ActiveMQDefaultConfiguration.java
index 60dd3eb..b952430 100644
---
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/config/ActiveMQDefaultConfiguration.java
+++
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/config/ActiveMQDefaultConfiguration.java
@@ -438,6 +438,10 @@ public final class ActiveMQDefaultConfiguration {
public static final int DEFAULT_DISK_SCAN = 5000;
+ public static final int DEFAULT_MAX_QUEUE_CONSUMERS = -1;
+
+ public static final boolean DEFAULT_DELETE_QUEUE_ON_NO_CONSUMERS = false;
+
/**
* If true then the ActiveMQ Artemis Server will make use of any Protocol
Managers that are in available on the classpath. If false then only the core
protocol will be available, unless in Embedded mode where users can inject
their own Protocol Managers.
*/
@@ -1175,4 +1179,12 @@ public final class ActiveMQDefaultConfiguration {
public static int getDefaultDiskScanPeriod() {
return DEFAULT_DISK_SCAN;
}
+
+ public static int getDefaultMaxQueueConsumers() {
+ return DEFAULT_MAX_QUEUE_CONSUMERS;
+ }
+
+ public static boolean getDefaultDeleteQueueOnNoConsumers() {
+ return DEFAULT_DELETE_QUEUE_ON_NO_CONSUMERS;
+ }
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/6e01d686/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/Configuration.java
--
diff --git
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/Configuration.java
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/Configuration.java
index c1ed6ce..8d47f97 100644
---
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/Configuration.java
+++
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/Configuration.java
@@ -404,6 +404,21 @@ public interface Configuration {
Configuration addQueueConfiguration(final CoreQueueConfiguration config);
/**
+* Returns the addresses configured for this server.
+*/
+ List getAddressConfigurations();
+
+ /**
+* Sets the addresses configured for this server.
+*/
+ Configuration setAddressConfigurations(final List
configs);
+
+ /**
+* Adds an addresses configuration
+*/
+ Configuration addAddressConfiguration(final CoreAddressConfiguration
config);
+
+ /**
* Returns the management address of this server.
* Clients can send management messages to this address to manage this
server.
* Default value is {@link
org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration#DEFAULT_MANAGEMENT_ADDRESS}.
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/6e01d686/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/CoreAddressConfiguration.java
--
diff --git
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/CoreAddressConfiguration.java
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/CoreAddressConfigurati
[24/34] activemq-artemis git commit: ARTEMIS-782 Added configuration elements for new address model
ARTEMIS-782 Added configuration elements for new address model
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/af5f1b1b
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/af5f1b1b
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/af5f1b1b
Branch: refs/heads/ARTEMIS-780
Commit: af5f1b1b0da46dac608d582186b2062433a307c2
Parents: cdb52b8
Author: Martyn Taylor
Authored: Tue Oct 18 19:45:02 2016 +0100
Committer: Martyn Taylor
Committed: Tue Nov 1 10:20:52 2016 +
--
.../config/ActiveMQDefaultConfiguration.java| 12 ++
.../artemis/core/config/Configuration.java | 15 ++
.../core/config/CoreAddressConfiguration.java | 145 +++
.../core/config/CoreQueueConfiguration.java | 43 ++
.../core/config/impl/ConfigurationImpl.java | 20 +++
.../deployers/impl/FileConfigurationParser.java | 80 +-
.../resources/schema/artemis-configuration.xsd | 78 +-
.../impl/DefaultsFileConfigurationTest.java | 2 +
.../core/config/impl/FileConfigurationTest.java | 63
.../resources/ConfigurationTest-full-config.xml | 26
10 files changed, 478 insertions(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/af5f1b1b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/config/ActiveMQDefaultConfiguration.java
--
diff --git
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/config/ActiveMQDefaultConfiguration.java
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/config/ActiveMQDefaultConfiguration.java
index e07493f..04d06c0 100644
---
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/config/ActiveMQDefaultConfiguration.java
+++
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/config/ActiveMQDefaultConfiguration.java
@@ -435,6 +435,10 @@ public final class ActiveMQDefaultConfiguration {
public static final int DEFAULT_DISK_SCAN = 5000;
+ public static final int DEFAULT_MAX_QUEUE_CONSUMERS = -1;
+
+ public static final boolean DEFAULT_DELETE_QUEUE_ON_NO_CONSUMERS = false;
+
/**
* If true then the ActiveMQ Artemis Server will make use of any Protocol
Managers that are in available on the classpath. If false then only the core
protocol will be available, unless in Embedded mode where users can inject
their own Protocol Managers.
*/
@@ -1168,4 +1172,12 @@ public final class ActiveMQDefaultConfiguration {
public static int getDefaultDiskScanPeriod() {
return DEFAULT_DISK_SCAN;
}
+
+ public static int getDefaultMaxQueueConsumers() {
+ return DEFAULT_MAX_QUEUE_CONSUMERS;
+ }
+
+ public static boolean getDefaultDeleteQueueOnNoConsumers() {
+ return DEFAULT_DELETE_QUEUE_ON_NO_CONSUMERS;
+ }
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/af5f1b1b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/Configuration.java
--
diff --git
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/Configuration.java
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/Configuration.java
index f486a88..17a305e 100644
---
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/Configuration.java
+++
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/Configuration.java
@@ -387,6 +387,21 @@ public interface Configuration {
Configuration addQueueConfiguration(final CoreQueueConfiguration config);
/**
+* Returns the addresses configured for this server.
+*/
+ List getAddressConfigurations();
+
+ /**
+* Sets the addresses configured for this server.
+*/
+ Configuration setAddressConfigurations(final List
configs);
+
+ /**
+* Adds an addresses configuration
+*/
+ Configuration addAddressConfiguration(final CoreAddressConfiguration
config);
+
+ /**
* Returns the management address of this server.
* Clients can send management messages to this address to manage this
server.
* Default value is {@link
org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration#DEFAULT_MANAGEMENT_ADDRESS}.
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/af5f1b1b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/CoreAddressConfiguration.java
--
diff --git
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/CoreAddressConfiguration.java
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/CoreAddressConfiguration
[22/33] activemq-artemis git commit: ARTEMIS-782 Added configuration elements for new address model
ARTEMIS-782 Added configuration elements for new address model
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/2ad66b2e
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/2ad66b2e
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/2ad66b2e
Branch: refs/heads/ARTEMIS-780
Commit: 2ad66b2e045b6cbd72791fd5cd88d1d171c13f65
Parents: ad8919d
Author: Martyn Taylor
Authored: Tue Oct 18 19:45:02 2016 +0100
Committer: Martyn Taylor
Committed: Tue Oct 25 14:17:23 2016 +0100
--
.../config/ActiveMQDefaultConfiguration.java| 12 ++
.../artemis/core/config/Configuration.java | 15 ++
.../core/config/CoreAddressConfiguration.java | 145 +++
.../core/config/CoreQueueConfiguration.java | 43 ++
.../core/config/impl/ConfigurationImpl.java | 20 +++
.../deployers/impl/FileConfigurationParser.java | 80 +-
.../resources/schema/artemis-configuration.xsd | 78 +-
.../impl/DefaultsFileConfigurationTest.java | 2 +
.../core/config/impl/FileConfigurationTest.java | 63
.../resources/ConfigurationTest-full-config.xml | 26
10 files changed, 478 insertions(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/2ad66b2e/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/config/ActiveMQDefaultConfiguration.java
--
diff --git
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/config/ActiveMQDefaultConfiguration.java
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/config/ActiveMQDefaultConfiguration.java
index e07493f..04d06c0 100644
---
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/config/ActiveMQDefaultConfiguration.java
+++
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/config/ActiveMQDefaultConfiguration.java
@@ -435,6 +435,10 @@ public final class ActiveMQDefaultConfiguration {
public static final int DEFAULT_DISK_SCAN = 5000;
+ public static final int DEFAULT_MAX_QUEUE_CONSUMERS = -1;
+
+ public static final boolean DEFAULT_DELETE_QUEUE_ON_NO_CONSUMERS = false;
+
/**
* If true then the ActiveMQ Artemis Server will make use of any Protocol
Managers that are in available on the classpath. If false then only the core
protocol will be available, unless in Embedded mode where users can inject
their own Protocol Managers.
*/
@@ -1168,4 +1172,12 @@ public final class ActiveMQDefaultConfiguration {
public static int getDefaultDiskScanPeriod() {
return DEFAULT_DISK_SCAN;
}
+
+ public static int getDefaultMaxQueueConsumers() {
+ return DEFAULT_MAX_QUEUE_CONSUMERS;
+ }
+
+ public static boolean getDefaultDeleteQueueOnNoConsumers() {
+ return DEFAULT_DELETE_QUEUE_ON_NO_CONSUMERS;
+ }
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/2ad66b2e/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/Configuration.java
--
diff --git
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/Configuration.java
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/Configuration.java
index f486a88..17a305e 100644
---
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/Configuration.java
+++
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/Configuration.java
@@ -387,6 +387,21 @@ public interface Configuration {
Configuration addQueueConfiguration(final CoreQueueConfiguration config);
/**
+* Returns the addresses configured for this server.
+*/
+ List getAddressConfigurations();
+
+ /**
+* Sets the addresses configured for this server.
+*/
+ Configuration setAddressConfigurations(final List
configs);
+
+ /**
+* Adds an addresses configuration
+*/
+ Configuration addAddressConfiguration(final CoreAddressConfiguration
config);
+
+ /**
* Returns the management address of this server.
* Clients can send management messages to this address to manage this
server.
* Default value is {@link
org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration#DEFAULT_MANAGEMENT_ADDRESS}.
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/2ad66b2e/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/CoreAddressConfiguration.java
--
diff --git
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/CoreAddressConfiguration.java
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/CoreAddressConfiguratio
[09/17] activemq-artemis git commit: ARTEMIS-782 Added configuration elements for new address model
ARTEMIS-782 Added configuration elements for new address model
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/8c51ed73
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/8c51ed73
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/8c51ed73
Branch: refs/heads/ARTEMIS-780
Commit: 8c51ed739699460e1add2cbfae343e64c3b5c0c6
Parents: 5315acb
Author: Martyn Taylor
Authored: Tue Oct 18 19:45:02 2016 +0100
Committer: Martyn Taylor
Committed: Mon Oct 24 14:33:52 2016 +0100
--
.../config/ActiveMQDefaultConfiguration.java| 12 ++
.../artemis/core/config/Configuration.java | 15 ++
.../core/config/CoreAddressConfiguration.java | 145 +++
.../core/config/CoreQueueConfiguration.java | 43 ++
.../core/config/impl/ConfigurationImpl.java | 20 +++
.../deployers/impl/FileConfigurationParser.java | 80 +-
.../resources/schema/artemis-configuration.xsd | 78 +-
.../impl/DefaultsFileConfigurationTest.java | 2 +
.../core/config/impl/FileConfigurationTest.java | 63
.../resources/ConfigurationTest-full-config.xml | 26
10 files changed, 478 insertions(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/8c51ed73/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/config/ActiveMQDefaultConfiguration.java
--
diff --git
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/config/ActiveMQDefaultConfiguration.java
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/config/ActiveMQDefaultConfiguration.java
index e07493f..04d06c0 100644
---
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/config/ActiveMQDefaultConfiguration.java
+++
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/config/ActiveMQDefaultConfiguration.java
@@ -435,6 +435,10 @@ public final class ActiveMQDefaultConfiguration {
public static final int DEFAULT_DISK_SCAN = 5000;
+ public static final int DEFAULT_MAX_QUEUE_CONSUMERS = -1;
+
+ public static final boolean DEFAULT_DELETE_QUEUE_ON_NO_CONSUMERS = false;
+
/**
* If true then the ActiveMQ Artemis Server will make use of any Protocol
Managers that are in available on the classpath. If false then only the core
protocol will be available, unless in Embedded mode where users can inject
their own Protocol Managers.
*/
@@ -1168,4 +1172,12 @@ public final class ActiveMQDefaultConfiguration {
public static int getDefaultDiskScanPeriod() {
return DEFAULT_DISK_SCAN;
}
+
+ public static int getDefaultMaxQueueConsumers() {
+ return DEFAULT_MAX_QUEUE_CONSUMERS;
+ }
+
+ public static boolean getDefaultDeleteQueueOnNoConsumers() {
+ return DEFAULT_DELETE_QUEUE_ON_NO_CONSUMERS;
+ }
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/8c51ed73/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/Configuration.java
--
diff --git
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/Configuration.java
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/Configuration.java
index f486a88..17a305e 100644
---
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/Configuration.java
+++
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/Configuration.java
@@ -387,6 +387,21 @@ public interface Configuration {
Configuration addQueueConfiguration(final CoreQueueConfiguration config);
/**
+* Returns the addresses configured for this server.
+*/
+ List getAddressConfigurations();
+
+ /**
+* Sets the addresses configured for this server.
+*/
+ Configuration setAddressConfigurations(final List
configs);
+
+ /**
+* Adds an addresses configuration
+*/
+ Configuration addAddressConfiguration(final CoreAddressConfiguration
config);
+
+ /**
* Returns the management address of this server.
* Clients can send management messages to this address to manage this
server.
* Default value is {@link
org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration#DEFAULT_MANAGEMENT_ADDRESS}.
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/8c51ed73/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/CoreAddressConfiguration.java
--
diff --git
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/CoreAddressConfiguration.java
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/CoreAddressConfiguratio
[37/41] activemq-artemis git commit: ARTEMIS-782 Added configuration elements for new address model
ARTEMIS-782 Added configuration elements for new address model
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/a351d90f
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/a351d90f
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/a351d90f
Branch: refs/heads/ARTEMIS-780
Commit: a351d90f26e63877d3d6ff26de3d899b3ab89d24
Parents: e44c99d
Author: Martyn Taylor
Authored: Tue Oct 18 19:45:02 2016 +0100
Committer: Martyn Taylor
Committed: Fri Oct 21 10:55:30 2016 +0100
--
.../config/ActiveMQDefaultConfiguration.java| 12 ++
.../artemis/core/config/Configuration.java | 15 ++
.../core/config/CoreAddressConfiguration.java | 145 +++
.../core/config/CoreQueueConfiguration.java | 43 ++
.../core/config/impl/ConfigurationImpl.java | 20 +++
.../deployers/impl/FileConfigurationParser.java | 80 +-
.../resources/schema/artemis-configuration.xsd | 78 +-
.../impl/DefaultsFileConfigurationTest.java | 2 +
.../core/config/impl/FileConfigurationTest.java | 63
.../resources/ConfigurationTest-full-config.xml | 26
10 files changed, 478 insertions(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a351d90f/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/config/ActiveMQDefaultConfiguration.java
--
diff --git
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/config/ActiveMQDefaultConfiguration.java
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/config/ActiveMQDefaultConfiguration.java
index e07493f..04d06c0 100644
---
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/config/ActiveMQDefaultConfiguration.java
+++
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/config/ActiveMQDefaultConfiguration.java
@@ -435,6 +435,10 @@ public final class ActiveMQDefaultConfiguration {
public static final int DEFAULT_DISK_SCAN = 5000;
+ public static final int DEFAULT_MAX_QUEUE_CONSUMERS = -1;
+
+ public static final boolean DEFAULT_DELETE_QUEUE_ON_NO_CONSUMERS = false;
+
/**
* If true then the ActiveMQ Artemis Server will make use of any Protocol
Managers that are in available on the classpath. If false then only the core
protocol will be available, unless in Embedded mode where users can inject
their own Protocol Managers.
*/
@@ -1168,4 +1172,12 @@ public final class ActiveMQDefaultConfiguration {
public static int getDefaultDiskScanPeriod() {
return DEFAULT_DISK_SCAN;
}
+
+ public static int getDefaultMaxQueueConsumers() {
+ return DEFAULT_MAX_QUEUE_CONSUMERS;
+ }
+
+ public static boolean getDefaultDeleteQueueOnNoConsumers() {
+ return DEFAULT_DELETE_QUEUE_ON_NO_CONSUMERS;
+ }
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a351d90f/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/Configuration.java
--
diff --git
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/Configuration.java
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/Configuration.java
index f486a88..17a305e 100644
---
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/Configuration.java
+++
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/Configuration.java
@@ -387,6 +387,21 @@ public interface Configuration {
Configuration addQueueConfiguration(final CoreQueueConfiguration config);
/**
+* Returns the addresses configured for this server.
+*/
+ List getAddressConfigurations();
+
+ /**
+* Sets the addresses configured for this server.
+*/
+ Configuration setAddressConfigurations(final List
configs);
+
+ /**
+* Adds an addresses configuration
+*/
+ Configuration addAddressConfiguration(final CoreAddressConfiguration
config);
+
+ /**
* Returns the management address of this server.
* Clients can send management messages to this address to manage this
server.
* Default value is {@link
org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration#DEFAULT_MANAGEMENT_ADDRESS}.
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a351d90f/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/CoreAddressConfiguration.java
--
diff --git
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/CoreAddressConfiguration.java
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/CoreAddressConfiguratio
activemq-artemis git commit: ARTEMIS-782 Added configuration elements for new address model
Repository: activemq-artemis
Updated Branches:
refs/heads/ARTEMIS-780 [created] 58310fa85
ARTEMIS-782 Added configuration elements for new address model
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/58310fa8
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/58310fa8
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/58310fa8
Branch: refs/heads/ARTEMIS-780
Commit: 58310fa8553e9d4a6c6433cb4e99b8ea9e53537e
Parents: ffaeceb
Author: Martyn Taylor
Authored: Tue Oct 18 19:45:02 2016 +0100
Committer: Martyn Taylor
Committed: Tue Oct 18 19:45:02 2016 +0100
--
.../config/ActiveMQDefaultConfiguration.java| 12 ++
.../artemis/core/config/Configuration.java | 15 ++
.../core/config/CoreAddressConfiguration.java | 145 +++
.../core/config/CoreQueueConfiguration.java | 43 ++
.../core/config/impl/ConfigurationImpl.java | 20 +++
.../deployers/impl/FileConfigurationParser.java | 80 +-
.../resources/schema/artemis-configuration.xsd | 78 +-
.../impl/DefaultsFileConfigurationTest.java | 2 +
.../core/config/impl/FileConfigurationTest.java | 63
.../resources/ConfigurationTest-full-config.xml | 26
10 files changed, 478 insertions(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/58310fa8/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/config/ActiveMQDefaultConfiguration.java
--
diff --git
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/config/ActiveMQDefaultConfiguration.java
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/config/ActiveMQDefaultConfiguration.java
index e07493f..04d06c0 100644
---
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/config/ActiveMQDefaultConfiguration.java
+++
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/config/ActiveMQDefaultConfiguration.java
@@ -435,6 +435,10 @@ public final class ActiveMQDefaultConfiguration {
public static final int DEFAULT_DISK_SCAN = 5000;
+ public static final int DEFAULT_MAX_QUEUE_CONSUMERS = -1;
+
+ public static final boolean DEFAULT_DELETE_QUEUE_ON_NO_CONSUMERS = false;
+
/**
* If true then the ActiveMQ Artemis Server will make use of any Protocol
Managers that are in available on the classpath. If false then only the core
protocol will be available, unless in Embedded mode where users can inject
their own Protocol Managers.
*/
@@ -1168,4 +1172,12 @@ public final class ActiveMQDefaultConfiguration {
public static int getDefaultDiskScanPeriod() {
return DEFAULT_DISK_SCAN;
}
+
+ public static int getDefaultMaxQueueConsumers() {
+ return DEFAULT_MAX_QUEUE_CONSUMERS;
+ }
+
+ public static boolean getDefaultDeleteQueueOnNoConsumers() {
+ return DEFAULT_DELETE_QUEUE_ON_NO_CONSUMERS;
+ }
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/58310fa8/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/Configuration.java
--
diff --git
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/Configuration.java
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/Configuration.java
index f486a88..17a305e 100644
---
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/Configuration.java
+++
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/Configuration.java
@@ -387,6 +387,21 @@ public interface Configuration {
Configuration addQueueConfiguration(final CoreQueueConfiguration config);
/**
+* Returns the addresses configured for this server.
+*/
+ List getAddressConfigurations();
+
+ /**
+* Sets the addresses configured for this server.
+*/
+ Configuration setAddressConfigurations(final List
configs);
+
+ /**
+* Adds an addresses configuration
+*/
+ Configuration addAddressConfiguration(final CoreAddressConfiguration
config);
+
+ /**
* Returns the management address of this server.
* Clients can send management messages to this address to manage this
server.
* Default value is {@link
org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration#DEFAULT_MANAGEMENT_ADDRESS}.
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/58310fa8/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/CoreAddressConfiguration.java
--
diff --git
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/CoreAddressConfiguration.java
