You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cl...@apache.org on 2019/10/03 18:46:34 UTC

[activemq-artemis] branch master updated: NO-JIRA moving shared-storage-static-cluster under clustering examples

This is an automated email from the ASF dual-hosted git repository.

clebertsuconic pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git


The following commit(s) were added to refs/heads/master by this push:
     new 2f5691c  NO-JIRA moving shared-storage-static-cluster under clustering examples
2f5691c is described below

commit 2f5691c3f7a1a3a15c8dbb4357c8e6e2c4dcfd1c
Author: Clebert Suconic <cl...@apache.org>
AuthorDate: Thu Oct 3 13:34:43 2019 -0400

    NO-JIRA moving shared-storage-static-cluster under clustering examples
---
 artemis-distribution/src/test/scripts/run-examples.sh               | 1 +
 examples/features/clustered/pom.xml                                 | 2 ++
 .../{ha => clustered}/shared-storage-static-cluster/pom.xml         | 6 +++---
 .../activemq/artemis/jms/example/SharedStorageStaticCluster.java    | 0
 examples/features/ha/pom.xml                                        | 2 --
 5 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/artemis-distribution/src/test/scripts/run-examples.sh b/artemis-distribution/src/test/scripts/run-examples.sh
index 8f2910f..bf643f6 100755
--- a/artemis-distribution/src/test/scripts/run-examples.sh
+++ b/artemis-distribution/src/test/scripts/run-examples.sh
@@ -115,6 +115,7 @@ cd clustered-topic; mvn verify; cd ..
 cd clustered-topic-uri; mvn verify; cd ..
 cd queue-message-redistribution; mvn verify; cd ..
 cd symmetric-cluster; mvn verify; cd ..
+cd shared-storage-static-cluster; mvn verify; cd ..
 
 
 # TODO: these will hung eventually when ran in series
diff --git a/examples/features/clustered/pom.xml b/examples/features/clustered/pom.xml
index 13697d8..d13d6e6 100644
--- a/examples/features/clustered/pom.xml
+++ b/examples/features/clustered/pom.xml
@@ -59,6 +59,7 @@ under the License.
             <module>clustered-topic-uri</module>
             <module>queue-message-redistribution</module>
             <module>symmetric-cluster</module>
+            <module>shared-storage-static-cluster</module>
          </modules>
       </profile>
       <profile>
@@ -76,6 +77,7 @@ under the License.
             <module>clustered-topic-uri</module>
             <module>queue-message-redistribution</module>
             <module>symmetric-cluster</module>
+            <module>shared-storage-static-cluster</module>
          </modules>
       </profile>
    </profiles>
diff --git a/examples/features/ha/shared-storage-static-cluster/pom.xml b/examples/features/clustered/shared-storage-static-cluster/pom.xml
similarity index 96%
rename from examples/features/ha/shared-storage-static-cluster/pom.xml
rename to examples/features/clustered/shared-storage-static-cluster/pom.xml
index 7853633..c0acbf3 100644
--- a/examples/features/ha/shared-storage-static-cluster/pom.xml
+++ b/examples/features/clustered/shared-storage-static-cluster/pom.xml
@@ -22,8 +22,8 @@ under the License.
    <modelVersion>4.0.0</modelVersion>
 
    <parent>
-      <groupId>org.apache.activemq.examples.failover</groupId>
-      <artifactId>broker-failover</artifactId>
+      <groupId>org.apache.activemq.examples.clustered</groupId>
+      <artifactId>broker-features</artifactId>
       <version>2.11.0-SNAPSHOT</version>
    </parent>
 
@@ -133,7 +133,7 @@ under the License.
             </executions>
             <dependencies>
                <dependency>
-                  <groupId>org.apache.activemq.examples.failover</groupId>
+                  <groupId>org.apache.activemq.examples.clustered</groupId>
                   <artifactId>shared-storage-static-cluster</artifactId>
                   <version>${project.version}</version>
                </dependency>
diff --git a/examples/features/ha/shared-storage-static-cluster/src/main/java/org/apache/activemq/artemis/jms/example/SharedStorageStaticCluster.java b/examples/features/clustered/shared-storage-static-cluster/src/main/java/org/apache/activemq/artemis/jms/example/SharedStorageStaticCluster.java
similarity index 100%
rename from examples/features/ha/shared-storage-static-cluster/src/main/java/org/apache/activemq/artemis/jms/example/SharedStorageStaticCluster.java
rename to examples/features/clustered/shared-storage-static-cluster/src/main/java/org/apache/activemq/artemis/jms/example/SharedStorageStaticCluster.java
diff --git a/examples/features/ha/pom.xml b/examples/features/ha/pom.xml
index ea46436..b3afd99 100644
--- a/examples/features/ha/pom.xml
+++ b/examples/features/ha/pom.xml
@@ -60,7 +60,6 @@ under the License.
             <module>replicated-multiple-failover</module>
             <module>replicated-transaction-failover</module>
             <module>scale-down</module>
-            <module>shared-storage-static-cluster</module>
             <module>stop-server-failover</module>
             <module>transaction-failover</module>
          </modules>
@@ -81,7 +80,6 @@ under the License.
             <module>replicated-multiple-failover</module>
             <module>replicated-transaction-failover</module>
             <module>scale-down</module>
-            <module>shared-storage-static-cluster</module>
             <module>transaction-failover</module>
          </modules>
       </profile>