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 2015/09/04 02:45:57 UTC
activemq-artemis git commit: Some extra fixes for mac (possibly
windows) on examples
Repository: activemq-artemis
Updated Branches:
refs/heads/master 90d05bb17 -> 7cb462f2a
Some extra fixes for mac (possibly windows) on examples
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/7cb462f2
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/7cb462f2
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/7cb462f2
Branch: refs/heads/master
Commit: 7cb462f2ab6c3806c7c3951bf3f90c8dad4f32ff
Parents: 90d05bb
Author: Clebert Suconic <cl...@apache.org>
Authored: Wed Sep 2 19:14:34 2015 -0400
Committer: Clebert Suconic <cl...@apache.org>
Committed: Thu Sep 3 20:45:03 2015 -0400
----------------------------------------------------------------------
examples/features/ha/application-layer-failover/pom.xml | 4 ++++
examples/features/ha/client-side-failoverlistener/pom.xml | 4 ++++
examples/features/ha/colocated-failover-scale-down/pom.xml | 4 ++++
examples/features/ha/colocated-failover/pom.xml | 4 ++++
examples/features/ha/ha-policy-autobackup/pom.xml | 4 ++++
examples/features/ha/multiple-failover-failback/pom.xml | 6 ++++++
examples/features/ha/multiple-failover/pom.xml | 6 ++++++
examples/features/ha/non-transaction-failover/pom.xml | 4 ++++
examples/features/ha/replicated-failback-static/pom.xml | 4 ++++
examples/features/ha/replicated-failback/pom.xml | 4 ++++
examples/features/ha/replicated-multiple-failover/pom.xml | 4 ++++
examples/features/ha/replicated-transaction-failover/pom.xml | 4 ++--
examples/features/ha/scale-down/pom.xml | 4 ++--
examples/features/ha/stop-server-failover/pom.xml | 2 ++
14 files changed, 54 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/7cb462f2/examples/features/ha/application-layer-failover/pom.xml
----------------------------------------------------------------------
diff --git a/examples/features/ha/application-layer-failover/pom.xml b/examples/features/ha/application-layer-failover/pom.xml
index c0d9b84..c36aed1 100644
--- a/examples/features/ha/application-layer-failover/pom.xml
+++ b/examples/features/ha/application-layer-failover/pom.xml
@@ -61,6 +61,8 @@ under the License.
<goal>create</goal>
</goals>
<configuration>
+ <!-- this makes it easier in certain envs -->
+ <javaOptions>-Djava.net.preferIPv4Stack=true</javaOptions>
<instance>${basedir}/target/server0</instance>
</configuration>
</execution>
@@ -70,6 +72,8 @@ under the License.
<goal>create</goal>
</goals>
<configuration>
+ <!-- this makes it easier in certain envs -->
+ <javaOptions>-Djava.net.preferIPv4Stack=true</javaOptions>
<instance>${basedir}/target/server1</instance>
<portOffset>1</portOffset>
</configuration>
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/7cb462f2/examples/features/ha/client-side-failoverlistener/pom.xml
----------------------------------------------------------------------
diff --git a/examples/features/ha/client-side-failoverlistener/pom.xml b/examples/features/ha/client-side-failoverlistener/pom.xml
index 03101ac..82da759 100644
--- a/examples/features/ha/client-side-failoverlistener/pom.xml
+++ b/examples/features/ha/client-side-failoverlistener/pom.xml
@@ -61,6 +61,8 @@ under the License.
<goal>create</goal>
</goals>
<configuration>
+ <!-- this makes it easier in certain envs -->
+ <javaOptions>-Djava.net.preferIPv4Stack=true</javaOptions>
<instance>${basedir}/target/server0</instance>
<dataFolder>../shared</dataFolder>
<sharedStore>true</sharedStore>
@@ -74,6 +76,8 @@ under the License.
<goal>create</goal>
</goals>
<configuration>
+ <!-- this makes it easier in certain envs -->
+ <javaOptions>-Djava.net.preferIPv4Stack=true</javaOptions>
<instance>${basedir}/target/server1</instance>
<dataFolder>../shared</dataFolder>
<sharedStore>true</sharedStore>
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/7cb462f2/examples/features/ha/colocated-failover-scale-down/pom.xml
----------------------------------------------------------------------
diff --git a/examples/features/ha/colocated-failover-scale-down/pom.xml b/examples/features/ha/colocated-failover-scale-down/pom.xml
index 9213d18..2ff87d8 100644
--- a/examples/features/ha/colocated-failover-scale-down/pom.xml
+++ b/examples/features/ha/colocated-failover-scale-down/pom.xml
@@ -60,6 +60,8 @@ under the License.
<goal>create</goal>
</goals>
<configuration>
+ <!-- this makes it easier in certain envs -->
+ <javaOptions>-Djava.net.preferIPv4Stack=true</javaOptions>
<instance>${basedir}/target/server0</instance>
<configuration>${basedir}/target/classes/activemq/server0</configuration>
</configuration>
@@ -70,6 +72,8 @@ under the License.
<goal>create</goal>
</goals>
<configuration>
+ <!-- this makes it easier in certain envs -->
+ <javaOptions>-Djava.net.preferIPv4Stack=true</javaOptions>
<instance>${basedir}/target/server1</instance>
<configuration>${basedir}/target/classes/activemq/server1</configuration>
</configuration>
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/7cb462f2/examples/features/ha/colocated-failover/pom.xml
----------------------------------------------------------------------
diff --git a/examples/features/ha/colocated-failover/pom.xml b/examples/features/ha/colocated-failover/pom.xml
index d15a948..b154d41 100644
--- a/examples/features/ha/colocated-failover/pom.xml
+++ b/examples/features/ha/colocated-failover/pom.xml
@@ -61,6 +61,8 @@ under the License.
<goal>create</goal>
</goals>
<configuration>
+ <!-- this makes it easier in certain envs -->
+ <javaOptions>-Djava.net.preferIPv4Stack=true</javaOptions>
<instance>${basedir}/target/server0</instance>
<configuration>${basedir}/target/classes/activemq/server0</configuration>
</configuration>
@@ -71,6 +73,8 @@ under the License.
<goal>create</goal>
</goals>
<configuration>
+ <!-- this makes it easier in certain envs -->
+ <javaOptions>-Djava.net.preferIPv4Stack=true</javaOptions>
<instance>${basedir}/target/server1</instance>
<configuration>${basedir}/target/classes/activemq/server1</configuration>
</configuration>
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/7cb462f2/examples/features/ha/ha-policy-autobackup/pom.xml
----------------------------------------------------------------------
diff --git a/examples/features/ha/ha-policy-autobackup/pom.xml b/examples/features/ha/ha-policy-autobackup/pom.xml
index 9322e2a..1680044 100644
--- a/examples/features/ha/ha-policy-autobackup/pom.xml
+++ b/examples/features/ha/ha-policy-autobackup/pom.xml
@@ -61,6 +61,8 @@ under the License.
<goal>create</goal>
</goals>
<configuration>
+ <!-- this makes it easier in certain envs -->
+ <javaOptions>-Djava.net.preferIPv4Stack=true</javaOptions>
<instance>${basedir}/target/server0</instance>
<configuration>${basedir}/target/classes/activemq/server0</configuration>
</configuration>
@@ -71,6 +73,8 @@ under the License.
<goal>create</goal>
</goals>
<configuration>
+ <!-- this makes it easier in certain envs -->
+ <javaOptions>-Djava.net.preferIPv4Stack=true</javaOptions>
<instance>${basedir}/target/server1</instance>
<configuration>${basedir}/target/classes/activemq/server1</configuration>
</configuration>
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/7cb462f2/examples/features/ha/multiple-failover-failback/pom.xml
----------------------------------------------------------------------
diff --git a/examples/features/ha/multiple-failover-failback/pom.xml b/examples/features/ha/multiple-failover-failback/pom.xml
index fd04228..b1bed86 100644
--- a/examples/features/ha/multiple-failover-failback/pom.xml
+++ b/examples/features/ha/multiple-failover-failback/pom.xml
@@ -60,6 +60,8 @@ under the License.
<goal>create</goal>
</goals>
<configuration>
+ <!-- this makes it easier in certain envs -->
+ <javaOptions>-Djava.net.preferIPv4Stack=true</javaOptions>
<instance>${basedir}/target/server0</instance>
<sharedStore>true</sharedStore>
<slave>false</slave>
@@ -73,6 +75,8 @@ under the License.
<goal>create</goal>
</goals>
<configuration>
+ <!-- this makes it easier in certain envs -->
+ <javaOptions>-Djava.net.preferIPv4Stack=true</javaOptions>
<instance>${basedir}/target/server1</instance>
<sharedStore>true</sharedStore>
<slave>true</slave>
@@ -86,6 +90,8 @@ under the License.
<goal>create</goal>
</goals>
<configuration>
+ <!-- this makes it easier in certain envs -->
+ <javaOptions>-Djava.net.preferIPv4Stack=true</javaOptions>
<instance>${basedir}/target/server2</instance>
<sharedStore>true</sharedStore>
<slave>true</slave>
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/7cb462f2/examples/features/ha/multiple-failover/pom.xml
----------------------------------------------------------------------
diff --git a/examples/features/ha/multiple-failover/pom.xml b/examples/features/ha/multiple-failover/pom.xml
index a9a0b03..72f73a7 100644
--- a/examples/features/ha/multiple-failover/pom.xml
+++ b/examples/features/ha/multiple-failover/pom.xml
@@ -60,6 +60,8 @@ under the License.
<goal>create</goal>
</goals>
<configuration>
+ <!-- this makes it easier in certain envs -->
+ <javaOptions>-Djava.net.preferIPv4Stack=true</javaOptions>
<instance>${basedir}/target/server0</instance>
<sharedStore>true</sharedStore>
<slave>false</slave>
@@ -73,6 +75,8 @@ under the License.
<goal>create</goal>
</goals>
<configuration>
+ <!-- this makes it easier in certain envs -->
+ <javaOptions>-Djava.net.preferIPv4Stack=true</javaOptions>
<instance>${basedir}/target/server1</instance>
<sharedStore>true</sharedStore>
<slave>true</slave>
@@ -86,6 +90,8 @@ under the License.
<goal>create</goal>
</goals>
<configuration>
+ <!-- this makes it easier in certain envs -->
+ <javaOptions>-Djava.net.preferIPv4Stack=true</javaOptions>
<instance>${basedir}/target/server2</instance>
<sharedStore>true</sharedStore>
<slave>true</slave>
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/7cb462f2/examples/features/ha/non-transaction-failover/pom.xml
----------------------------------------------------------------------
diff --git a/examples/features/ha/non-transaction-failover/pom.xml b/examples/features/ha/non-transaction-failover/pom.xml
index 1b5a600..1476106 100644
--- a/examples/features/ha/non-transaction-failover/pom.xml
+++ b/examples/features/ha/non-transaction-failover/pom.xml
@@ -61,6 +61,8 @@ under the License.
<goal>create</goal>
</goals>
<configuration>
+ <!-- this makes it easier in certain envs -->
+ <javaOptions>-Djava.net.preferIPv4Stack=true</javaOptions>
<instance>${basedir}/target/server0</instance>
<sharedStore>true</sharedStore>
<slave>false</slave>
@@ -74,6 +76,8 @@ under the License.
<goal>create</goal>
</goals>
<configuration>
+ <!-- this makes it easier in certain envs -->
+ <javaOptions>-Djava.net.preferIPv4Stack=true</javaOptions>
<instance>${basedir}/target/server1</instance>
<sharedStore>true</sharedStore>
<slave>true</slave>
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/7cb462f2/examples/features/ha/replicated-failback-static/pom.xml
----------------------------------------------------------------------
diff --git a/examples/features/ha/replicated-failback-static/pom.xml b/examples/features/ha/replicated-failback-static/pom.xml
index 91bb01e..7c54c14 100644
--- a/examples/features/ha/replicated-failback-static/pom.xml
+++ b/examples/features/ha/replicated-failback-static/pom.xml
@@ -61,6 +61,8 @@ under the License.
<goal>create</goal>
</goals>
<configuration>
+ <!-- this makes it easier in certain envs -->
+ <javaOptions>-Djava.net.preferIPv4Stack=true</javaOptions>
<instance>${basedir}/target/server0</instance>
<configuration>${basedir}/target/classes/activemq/server0</configuration>
<javaOptions>-Dudp-address=${udp-address}</javaOptions>
@@ -72,6 +74,8 @@ under the License.
<goal>create</goal>
</goals>
<configuration>
+ <!-- this makes it easier in certain envs -->
+ <javaOptions>-Djava.net.preferIPv4Stack=true</javaOptions>
<instance>${basedir}/target/server1</instance>
<configuration>${basedir}/target/classes/activemq/server1</configuration>
<javaOptions>-Dudp-address=${udp-address}</javaOptions>
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/7cb462f2/examples/features/ha/replicated-failback/pom.xml
----------------------------------------------------------------------
diff --git a/examples/features/ha/replicated-failback/pom.xml b/examples/features/ha/replicated-failback/pom.xml
index d996718..bed38dd 100644
--- a/examples/features/ha/replicated-failback/pom.xml
+++ b/examples/features/ha/replicated-failback/pom.xml
@@ -60,6 +60,8 @@ under the License.
<goal>create</goal>
</goals>
<configuration>
+ <!-- this makes it easier in certain envs -->
+ <javaOptions>-Djava.net.preferIPv4Stack=true</javaOptions>
<instance>${basedir}/target/server0</instance>
<configuration>${basedir}/target/classes/activemq/server0</configuration>
<javaOptions>-Dudp-address=${udp-address}</javaOptions>
@@ -71,6 +73,8 @@ under the License.
<goal>create</goal>
</goals>
<configuration>
+ <!-- this makes it easier in certain envs -->
+ <javaOptions>-Djava.net.preferIPv4Stack=true</javaOptions>
<instance>${basedir}/target/server1</instance>
<configuration>${basedir}/target/classes/activemq/server1</configuration>
<javaOptions>-Dudp-address=${udp-address}</javaOptions>
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/7cb462f2/examples/features/ha/replicated-multiple-failover/pom.xml
----------------------------------------------------------------------
diff --git a/examples/features/ha/replicated-multiple-failover/pom.xml b/examples/features/ha/replicated-multiple-failover/pom.xml
index 23dcfd7..c64b1d7 100644
--- a/examples/features/ha/replicated-multiple-failover/pom.xml
+++ b/examples/features/ha/replicated-multiple-failover/pom.xml
@@ -61,6 +61,8 @@ under the License.
<goal>create</goal>
</goals>
<configuration>
+ <!-- this makes it easier in certain envs -->
+ <javaOptions>-Djava.net.preferIPv4Stack=true</javaOptions>
<instance>${basedir}/target/server0</instance>
<configuration>${basedir}/target/classes/activemq/server0</configuration>
<javaOptions>-Dudp-address=${udp-address}</javaOptions>
@@ -72,6 +74,8 @@ under the License.
<goal>create</goal>
</goals>
<configuration>
+ <!-- this makes it easier in certain envs -->
+ <javaOptions>-Djava.net.preferIPv4Stack=true</javaOptions>
<instance>${basedir}/target/server1</instance>
<configuration>${basedir}/target/classes/activemq/server1</configuration>
<javaOptions>-Dudp-address=${udp-address}</javaOptions>
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/7cb462f2/examples/features/ha/replicated-transaction-failover/pom.xml
----------------------------------------------------------------------
diff --git a/examples/features/ha/replicated-transaction-failover/pom.xml b/examples/features/ha/replicated-transaction-failover/pom.xml
index 4c1839e..1651545 100644
--- a/examples/features/ha/replicated-transaction-failover/pom.xml
+++ b/examples/features/ha/replicated-transaction-failover/pom.xml
@@ -62,7 +62,7 @@ under the License.
<configuration>
<instance>${basedir}/target/server0</instance>
<configuration>${basedir}/target/classes/activemq/server0</configuration>
- <javaOptions>-Dudp-address=${udp-address}</javaOptions>
+ <javaOptions>-Dudp-address=${udp-address} -Djava.net.preferIPv4Stack=true</javaOptions>
</configuration>
</execution>
<execution>
@@ -73,7 +73,7 @@ under the License.
<configuration>
<instance>${basedir}/target/server1</instance>
<configuration>${basedir}/target/classes/activemq/server1</configuration>
- <javaOptions>-Dudp-address=${udp-address}</javaOptions>
+ <javaOptions>-Dudp-address=${udp-address} -Djava.net.preferIPv4Stack=true</javaOptions>
</configuration>
</execution>
<execution>
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/7cb462f2/examples/features/ha/scale-down/pom.xml
----------------------------------------------------------------------
diff --git a/examples/features/ha/scale-down/pom.xml b/examples/features/ha/scale-down/pom.xml
index e722413..6cce733 100644
--- a/examples/features/ha/scale-down/pom.xml
+++ b/examples/features/ha/scale-down/pom.xml
@@ -63,7 +63,7 @@ under the License.
<configuration>
<instance>${basedir}/target/server0</instance>
<configuration>${basedir}/target/classes/activemq/server0</configuration>
- <javaOptions>-Dudp-address=${udp-address}</javaOptions>
+ <javaOptions>-Dudp-address=${udp-address} -Djava.net.preferIPv4Stack=true</javaOptions>
</configuration>
</execution>
<execution>
@@ -74,7 +74,7 @@ under the License.
<configuration>
<instance>${basedir}/target/server1</instance>
<configuration>${basedir}/target/classes/activemq/server1</configuration>
- <javaOptions>-Dudp-address=${udp-address}</javaOptions>
+ <javaOptions>-Dudp-address=${udp-address} -Djava.net.preferIPv4Stack=true</javaOptions>
</configuration>
</execution>
<execution>
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/7cb462f2/examples/features/ha/stop-server-failover/pom.xml
----------------------------------------------------------------------
diff --git a/examples/features/ha/stop-server-failover/pom.xml b/examples/features/ha/stop-server-failover/pom.xml
index 7fb647c..b18fdc9 100644
--- a/examples/features/ha/stop-server-failover/pom.xml
+++ b/examples/features/ha/stop-server-failover/pom.xml
@@ -56,6 +56,7 @@ under the License.
<goal>create</goal>
</goals>
<configuration>
+ <javaOptions>-Djava.net.preferIPv4Stack=true</javaOptions>
<ignore>${noServer}</ignore>
<instance>${basedir}/target/server0</instance>
<sharedStore>true</sharedStore>
@@ -70,6 +71,7 @@ under the License.
<goal>create</goal>
</goals>
<configuration>
+ <javaOptions>-Djava.net.preferIPv4Stack=true</javaOptions>
<ignore>${noServer}</ignore>
<instance>${basedir}/target/server1</instance>
<sharedStore>true</sharedStore>