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/05/06 23:14:16 UTC
[1/8] activemq-artemis git commit: Update surefire plugin versions
Repository: activemq-artemis
Updated Branches:
refs/heads/master ebccde954 -> 9a81e201e
Update surefire plugin versions
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/4735d38d
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/4735d38d
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/4735d38d
Branch: refs/heads/master
Commit: 4735d38d7bfdbbed6d5b2f0fae6c6c6629a5dc12
Parents: ebccde9
Author: jbertram <jb...@apache.org>
Authored: Wed May 6 11:15:33 2015 -0500
Committer: jbertram <jb...@apache.org>
Committed: Wed May 6 15:05:49 2015 -0500
----------------------------------------------------------------------
pom.xml | 4 ++--
tests/extra-tests/pom.xml | 9 +++++++--
2 files changed, 9 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/4735d38d/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 5bf0be8..fa845b6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -726,7 +726,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.14.1</version>
+ <version>2.18.1</version>
<configuration>
<forkMode>once</forkMode>
<testFailureIgnore>true</testFailureIgnore>
@@ -738,7 +738,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-report-plugin</artifactId>
- <version>2.14.1</version>
+ <version>2.18.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/4735d38d/tests/extra-tests/pom.xml
----------------------------------------------------------------------
diff --git a/tests/extra-tests/pom.xml b/tests/extra-tests/pom.xml
index 8727e62..7d7e2cc 100644
--- a/tests/extra-tests/pom.xml
+++ b/tests/extra-tests/pom.xml
@@ -211,6 +211,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
+ <version>2.18.1</version>
<configuration>
<skipTests>${skipExtraTests}</skipTests>
<!-- ensure we don't inherit a byteman jar form any env settings -->
@@ -239,11 +240,15 @@
</systemProperties>
<!-- make sure maven puts the byteman jar in the classpath rather than in a manifest jar -->
<useManifestOnlyJar>false</useManifestOnlyJar>
- <forkMode>once</forkMode>
+ <!-- when upgrading this plugin from 2.4 to 2.18.1 <forkMode>once</forkMode> was replaced with these: -->
+ <forkCount>1</forkCount>
+ <reuseForks>true</reuseForks>
<!--
<debugForkedProcess>true</debugForkedProcess>
-->
- <parallel>false</parallel>
+
+ <!-- the option <parallel>false</parallel> is not supported after the plugin upgrade from 2.4 to 2.18.1 -->
+
<!--<argLine>${activemq-surefire-argline} -Dorg.jboss.byteman.verbose -Dorg.jboss.byteman.contrib.bmunit.verbose</argLine>-->
<!-- '-noverify' is needed here to fix VerifyErrors on ScaleDownFailoverTest and ScaleDownFailureTest (and their subclasses). I got the tip from https://issues.jboss.org/browse/BYTEMAN-248. -->
<argLine>${activemq-surefire-argline} -noverify</argLine>
[2/8] activemq-artemis git commit: Enable extra tests in
'extra-tests' profile
Posted by cl...@apache.org.
Enable extra tests in 'extra-tests' profile
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/7377672f
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/7377672f
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/7377672f
Branch: refs/heads/master
Commit: 7377672fa342cf4d6fe41f3bd32f7a6751657b61
Parents: ca6fb05
Author: jbertram <jb...@apache.org>
Authored: Wed May 6 14:18:41 2015 -0500
Committer: jbertram <jb...@apache.org>
Committed: Wed May 6 15:37:45 2015 -0500
----------------------------------------------------------------------
tests/pom.xml | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/7377672f/tests/pom.xml
----------------------------------------------------------------------
diff --git a/tests/pom.xml b/tests/pom.xml
index 6f8c061..daacd70 100644
--- a/tests/pom.xml
+++ b/tests/pom.xml
@@ -80,6 +80,9 @@
<modules>
<module>extra-tests</module>
</modules>
+ <properties>
+ <skipExtraTests>false</skipExtraTests>
+ </properties>
</profile>
</profiles>
[8/8] activemq-artemis git commit: This closes #231 on maven/build
changes
Posted by cl...@apache.org.
This closes #231 on maven/build changes
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/9a81e201
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/9a81e201
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/9a81e201
Branch: refs/heads/master
Commit: 9a81e201ef54cbb7e78f50061a99134d92f60eef
Parents: ebccde9 96a0fe8
Author: Clebert Suconic <cl...@apache.org>
Authored: Wed May 6 17:13:55 2015 -0400
Committer: Clebert Suconic <cl...@apache.org>
Committed: Wed May 6 17:13:55 2015 -0400
----------------------------------------------------------------------
.gitignore | 756 +------------------
pom.xml | 49 +-
tests/extra-tests/pom.xml | 17 +-
.../extras/byteman/ReplicationBackupTest.java | 8 +-
tests/pom.xml | 3 +
5 files changed, 71 insertions(+), 762 deletions(-)
----------------------------------------------------------------------
[5/8] activemq-artemis git commit: Set Arjuna properties
Posted by cl...@apache.org.
Set Arjuna properties
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/8cea209a
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/8cea209a
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/8cea209a
Branch: refs/heads/master
Commit: 8cea209a8b4e3637bee67daa46227afeca521402
Parents: 286eabd
Author: jbertram <jb...@apache.org>
Authored: Wed May 6 14:51:31 2015 -0500
Committer: jbertram <jb...@apache.org>
Committed: Wed May 6 15:37:46 2015 -0500
----------------------------------------------------------------------
tests/extra-tests/pom.xml | 8 ++++++++
1 file changed, 8 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/8cea209a/tests/extra-tests/pom.xml
----------------------------------------------------------------------
diff --git a/tests/extra-tests/pom.xml b/tests/extra-tests/pom.xml
index 7d7e2cc..8ad559c 100644
--- a/tests/extra-tests/pom.xml
+++ b/tests/extra-tests/pom.xml
@@ -219,6 +219,14 @@
<BYTEMAN_HOME></BYTEMAN_HOME>
</environmentVariables>
<systemProperties>
+ <property>
+ <name>com.arjuna.ats.arjuna.objectstore.objectStoreDir</name>
+ <value>target/ObjectStore</value>
+ </property>
+ <property>
+ <name>ObjectStoreEnvironmentBean.objectStoreDir</name>
+ <value>target/ObjectStore</value>
+ </property>
<!--
<property>
<name>org.jboss.byteman.home</name>
[4/8] activemq-artemis git commit: Drastically simplify git ignores
Posted by cl...@apache.org.
Drastically simplify git ignores
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/b51160f4
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/b51160f4
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/b51160f4
Branch: refs/heads/master
Commit: b51160f48d34445721b5819dfe1504de83eb2ffe
Parents: 7377672
Author: jbertram <jb...@apache.org>
Authored: Wed May 6 14:19:57 2015 -0500
Committer: jbertram <jb...@apache.org>
Committed: Wed May 6 15:37:45 2015 -0500
----------------------------------------------------------------------
.gitignore | 756 +-------------------------------------------------------
1 file changed, 5 insertions(+), 751 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/b51160f4/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index a98a607..e43bb20 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,752 +1,6 @@
-#idea files
-activemq-pom.ipr
-activemq-pom.iws
-.idea
-*.iml
-*/*.iml
-*/*/*.iml
-*/*/*/*.iml
-dependency-reduced-pom.xml
-*/dependency-reduced-pom.xml
-*/*/dependency-reduced-pom.xml
-*/*/*dependency-reduced-pom.xml
-.factorypath
-
-# compilation from native
-*/*/bin
-*~
-.DS_Store
-
-target
-tests/integration-tests/data/
-tests/joram-tests/data/
-org.eclipse.jdt.core.prefs
-org.eclipse.jdt.ui.prefs
-org.eclipse.m2e.core.prefs
-*/.settings/org.eclipse.*
-*/*/.settings/org.eclipse.*
-examples/*/*/.settings/org.eclipse.*
-examples/*/*/.project
-examples/*/.project
-!etc/org.eclipse.jdt.ui.prefs
-!etc/org.eclipse.jdt.core.prefs
-org.maven.ide.eclipse.prefs
-.classpath
-tests/*-tests/hs_err_pid*.log
-tests/**/server.lock
-activemq-core/*.log
-.checkstyle
-
-# /
-/build
-/eclipse-output
-/thirdparty
-/logs
-/ObjectStore
-/tmp
-/data
-/junit*.properties
-/target
-/.metadata
-
-integration/activemq-*-integration/.project
-
-# /distribution/
-/distribution/target
-/distribution/.project
-/distribution/jboss-mc/.project
-
-# /distribution/activemq/
-/distribution/activemq/.project
-
-# /docs/
-/docs/.project
-
-# /docs/eap-manual/
-/docs/eap-manual/build
-
-# /docs/quickstart-guide/
-/docs/quickstart-guide/build
-/docs/quickstart-guide/target
-
-# /docs/user-manual/
-/docs/user-manual/build
-/docs/user-manual/target
-/docs/user-manual/bin
-/docs/user-manual/.project
-
-# /examples/
-/examples/bin
-/examples/.project
-
-# /examples/common/
-/examples/common/build
-
-# /examples/core/embedded/
-/examples/core/embedded/logs
-/examples/core/embedded/build
-
-# /examples/core/embedded-remote/
-/examples/core/embedded-remote/build
-
-# /examples/core/microcontainer/
-/examples/core/microcontainer/build
-
-# /examples/core/perf/
-/examples/core/perf/build
-/examples/core/perf/data
-/examples/core/perf/logs
-
-# /examples/javaee/ejb-jms-transaction/
-/examples/javaee/ejb-jms-transaction/build
-
-# /examples/javaee/hajndi/
-/examples/javaee/hajndi/build
-
-# /examples/javaee/jca-config/
-/examples/javaee/jca-config/build
-
-# /examples/javaee/jms-bridge/
-/examples/javaee/jms-bridge/build
-
-# /examples/javaee/mdb-cmt-tx-local/
-/examples/javaee/mdb-cmt-tx-local/build
-
-# /examples/javaee/mdb-cmt-tx-required/
-/examples/javaee/mdb-cmt-tx-required/build
-
-# /examples/javaee/servlet-ssl/
-/examples/javaee/servlet-ssl/build
-
-# /examples/javaee/servlet-transport/
-/examples/javaee/servlet-transport/build
-
-# /examples/javaee/xarecovery/
-/examples/javaee/xarecovery/build
-
-# /examples/
-/examples/build
-
-# /examples/applet/
-/examples/applet/build
-
-# /examples/applet/server0/
-/examples/applet/server0/data
-
-# /examples/application-layer-failover/
-/examples/application-layer-failover/build
-/examples/application-layer-failover/logs
-
-# /examples/application-layer-failover/server0/
-/examples/application-layer-failover/server0/data
-/examples/application-layer-failover/server0/logs
-
-# /examples/application-layer-failover/server1/
-/examples/application-layer-failover/server1/data
-/examples/application-layer-failover/server1/logs
-/examples/application-layer-failover/server1/KILL_ME
-
-# /examples/bridge/
-/examples/bridge/build
-/examples/bridge/logs
-
-# /examples/bridge/server0/
-/examples/bridge/server0/data
-/examples/bridge/server0/logs
-
-# /examples/bridge/server1/
-/examples/bridge/server1/data
-/examples/bridge/server1/logs
-
-# /examples/browser/
-/examples/browser/build
-/examples/browser/logs
-
-# /examples/browser/server0/
-/examples/browser/server0/data
-/examples/browser/server0/logs
-
-# /examples/client-kickoff/
-/examples/client-kickoff/build
-/examples/client-kickoff/logs
-
-# /examples/client-kickoff/server0/
-/examples/client-kickoff/server0/data
-/examples/client-kickoff/server0/logs
-
-# /examples/client-side-load-balancing/
-/examples/client-side-load-balancing/build
-/examples/client-side-load-balancing/logs
-
-# /examples/client-side-load-balancing/server0/
-/examples/client-side-load-balancing/server0/data
-/examples/client-side-load-balancing/server0/logs
-
-# /examples/client-side-load-balancing/server1/
-/examples/client-side-load-balancing/server1/data
-/examples/client-side-load-balancing/server1/logs
-
-# /examples/client-side-load-balancing/server2/
-/examples/client-side-load-balancing/server2/data
-/examples/client-side-load-balancing/server2/logs
-
-# /examples/clustered-durable-subscription/
-/examples/clustered-durable-subscription/build
-/examples/clustered-durable-subscription/logs
-
-# /examples/clustered-durable-subscription/server0/
-/examples/clustered-durable-subscription/server0/data
-/examples/clustered-durable-subscription/server0/logs
-
-# /examples/clustered-durable-subscription/server1/
-/examples/clustered-durable-subscription/server1/data
-/examples/clustered-durable-subscription/server1/logs
-
-# /examples/clustered-queue/
-/examples/clustered-queue/build
-/examples/clustered-queue/logs
-
-# /examples/clustered-jgroups/
-/examples/clustered-jgroups/server0
-/examples/clustered-jgroups/server1
-
-# /examples/clustered-queue/server0/
-/examples/clustered-queue/server0/data
-/examples/clustered-queue/server0/logs
-
-# /examples/clustered-queue/server1/
-/examples/clustered-queue/server1/data
-/examples/clustered-queue/server1/logs
-
-# /examples/clustered-topic/
-/examples/clustered-topic/build
-/examples/clustered-topic/logs
-
-# /examples/clustered-topic/server0/
-/examples/clustered-topic/server0/data
-/examples/clustered-topic/server0/logs
-
-# /examples/clustered-topic/server1/
-/examples/clustered-topic/server1/data
-/examples/clustered-topic/server1/logs
-
-# /examples/consumer-rate-limit/
-/examples/consumer-rate-limit/build
-/examples/consumer-rate-limit/logs
-
-# /examples/consumer-rate-limit/server0/
-/examples/consumer-rate-limit/server0/data
-/examples/consumer-rate-limit/server0/logs
-
-# /examples/dead-letter/
-/examples/dead-letter/build
-/examples/dead-letter/logs
-
-# /examples/dead-letter/server0/
-/examples/dead-letter/server0/data
-/examples/dead-letter/server0/logs
-
-# /examples/delayed-redelivery/
-/examples/delayed-redelivery/build
-/examples/delayed-redelivery/logs
-
-# /examples/delayed-redelivery/server0/
-/examples/delayed-redelivery/server0/data
-/examples/delayed-redelivery/server0/logs
-
-# /examples/divert/
-/examples/divert/build
-/examples/divert/logs
-
-# /examples/divert/server0/
-/examples/divert/server0/data
-/examples/divert/server0/logs
-
-# /examples/divert/server1/
-/examples/divert/server1/data
-/examples/divert/server1/logs
-
-# /examples/durable-subscription/
-/examples/durable-subscription/build
-/examples/durable-subscription/logs
-
-# /examples/durable-subscription/server0/
-/examples/durable-subscription/server0/data
-/examples/durable-subscription/server0/logs
-
-# /examples/embedded/
-/examples/embedded/logs
-/examples/embedded/build
-
-# /examples/expiry/
-/examples/expiry/build
-/examples/expiry/logs
-
-# /examples/expiry/server0/
-/examples/expiry/server0/data
-/examples/expiry/server0/logs
-
-# /examples/http-transport/
-/examples/http-transport/build
-/examples/http-transport/logs
-
-# /examples/http-transport/server0/
-/examples/http-transport/server0/data
-/examples/http-transport/server0/logs
-
-# /examples/instantiate-connection-factory/
-/examples/instantiate-connection-factory/build
-/examples/instantiate-connection-factory/logs
-
-# /examples/instantiate-connection-factory/server0/
-/examples/instantiate-connection-factory/server0/data
-/examples/instantiate-connection-factory/server0/logs
-
-# /examples/interceptor/
-/examples/interceptor/build
-/examples/interceptor/logs
-
-# /examples/interceptor/server0/
-/examples/interceptor/server0/data
-/examples/interceptor/server0/logs
-
-# /examples/jaas/
-/examples/jaas/build
-/examples/jaas/logs
-
-# /examples/jaas/server0/
-/examples/jaas/server0/data
-/examples/jaas/server0/logs
-
-# /examples/jms-bridge/
-/examples/jms-bridge/build
-/examples/jms-bridge/data
-
-# /examples/jmx/
-/examples/jmx/build
-/examples/jmx/logs
-
-# /examples/jmx/server0/
-/examples/jmx/server0/data
-/examples/jmx/server0/logs
-
-# /examples/large-message/
-/examples/large-message/build
-/examples/large-message/logs
-/examples/large-message/huge_message_received.dat
-/examples/large-message/huge_message_to_send.dat
-
-# /examples/large-message/server0/
-/examples/large-message/server0/logs
-/examples/large-message/server0/data
-
-# /examples/last-value-queue/
-/examples/last-value-queue/build
-/examples/last-value-queue/logs
-
-# /examples/last-value-queue/server0/
-/examples/last-value-queue/server0/data
-/examples/last-value-queue/server0/logs
-
-# /examples/management/
-/examples/management/build
-/examples/management/logs
-
-# /examples/management/server0/
-/examples/management/server0/data
-/examples/management/server0/logs
-
-# /examples/management-notifications/
-/examples/management-notifications/build
-/examples/management-notifications/logs
-
-# /examples/management-notifications/server0/
-/examples/management-notifications/server0/logs
-/examples/management-notifications/server0/data
-
-# /examples/message-counters/
-/examples/message-counters/build
-/examples/message-counters/logs
-
-# /examples/message-counters/server0/
-/examples/message-counters/server0/data
-/examples/message-counters/server0/logs
-
-# /examples/message-group/
-/examples/message-group/build
-/examples/message-group/logs
-
-# /examples/message-group/server0/
-/examples/message-group/server0/data
-/examples/message-group/server0/logs
-
-# /examples/message-priority/
-/examples/message-priority/build
-/examples/message-priority/logs
-
-# /examples/message-priority/server0/
-/examples/message-priority/server0/data
-/examples/message-priority/server0/logs
-
-# /examples/no-consumer-buffering/
-/examples/no-consumer-buffering/build
-/examples/no-consumer-buffering/logs
-
-# /examples/no-consumer-buffering/server0/
-/examples/no-consumer-buffering/server0/data
-/examples/no-consumer-buffering/server0/logs
-
-# /examples/non-transaction-failover/
-/examples/non-transaction-failover/build
-
-# /examples/non-transaction-failover/server0/
-/examples/non-transaction-failover/server0/data
-
-# /examples/non-transaction-failover/server1/
-/examples/non-transaction-failover/server1/data
-
-# /examples/paging/
-/examples/paging/build
-/examples/paging/logs
-
-# /examples/paging/server0/
-/examples/paging/server0/data
-/examples/paging/server0/logs
-
-# /examples/perf/
-/examples/perf/build
-/examples/perf/data
-
-# /examples/pre-acknowledge/
-/examples/pre-acknowledge/build
-/examples/pre-acknowledge/logs
-
-# /examples/pre-acknowledge/server0/
-/examples/pre-acknowledge/server0/data
-/examples/pre-acknowledge/server0/logs
-
-# /examples/producer-rate-limit/
-/examples/producer-rate-limit/build
-/examples/producer-rate-limit/logs
-
-# /examples/producer-rate-limit/server0/
-/examples/producer-rate-limit/server0/data
-/examples/producer-rate-limit/server0/logs
-
-# /examples/queue/
-/examples/queue/build
-/examples/queue/logs
-
-# /examples/queue/server0/
-/examples/queue/server0/data
-/examples/queue/server0/logs
-
-# /examples/queue-message-redistribution/
-/examples/queue-message-redistribution/build
-/examples/queue-message-redistribution/logs
-
-# /examples/queue-message-redistribution/server0/
-/examples/queue-message-redistribution/server0/data
-/examples/queue-message-redistribution/server0/logs
-
-# /examples/queue-message-redistribution/server1/
-/examples/queue-message-redistribution/server1/data
-/examples/queue-message-redistribution/server1/logs
-
-# /examples/queue-requestor/
-/examples/queue-requestor/build
-/examples/queue-requestor/logs
-
-# /examples/queue-requestor/server0/
-/examples/queue-requestor/server0/data
-/examples/queue-requestor/server0/logs
-
-# /examples/queue-selector/
-/examples/queue-selector/build
-/examples/queue-selector/logs
-
-# /examples/queue-selector/server0/
-/examples/queue-selector/server0/data
-/examples/queue-selector/server0/logs
-
-# /examples/reattach-node/
-/examples/reattach-node/build
-/examples/reattach-node/logs
-
-# /examples/reattach-node/server0/
-/examples/reattach-node/server0/data
-/examples/reattach-node/server0/logs
-
-# /examples/request-reply/
-/examples/request-reply/build
-/examples/request-reply/logs
-
-# /examples/request-reply/server0/
-/examples/request-reply/server0/data
-/examples/request-reply/server0/logs
-
-# /examples/scheduled-message/
-/examples/scheduled-message/build
-/examples/scheduled-message/logs
-
-# /examples/scheduled-message/server0/
-/examples/scheduled-message/server0/data
-/examples/scheduled-message/server0/logs
-
-# /examples/security/
-/examples/security/build
-/examples/security/logs
-
-# /examples/security/server0/
-/examples/security/server0/data
-/examples/security/server0/logs
-
-# /examples/send-acknowledgements/
-/examples/send-acknowledgements/build
-/examples/send-acknowledgements/logs
-
-# /examples/send-acknowledgements/server0/
-/examples/send-acknowledgements/server0/data
-/examples/send-acknowledgements/server0/logs
-
-# /examples/ssl-enabled/
-/examples/ssl-enabled/build
-/examples/ssl-enabled/logs
-
-# /examples/ssl-enabled/server0/
-/examples/ssl-enabled/server0/data
-/examples/ssl-enabled/server0/logs
-
-# /examples/static-selector/
-/examples/static-selector/build
-/examples/static-selector/logs
-
-# /examples/static-selector/server0/
-/examples/static-selector/server0/data
-/examples/static-selector/server0/logs
-
-# /examples/static-selector-jms/
-/examples/static-selector-jms/logs
-/examples/static-selector-jms/build
-
-# /examples/static-selector-jms/server0/
-/examples/static-selector-jms/server0/data
-/examples/static-selector-jms/server0/logs
-
-# /examples/stomp/
-/examples/stomp/build
-
-# /examples/stomp/server0/
-/examples/stomp/server0/data
-
-# /examples/symmetric-cluster/
-/examples/symmetric-cluster/build
-/examples/symmetric-cluster/logs
-
-# /examples/symmetric-cluster/server0/
-/examples/symmetric-cluster/server0/data
-/examples/symmetric-cluster/server0/logs
-
-# /examples/symmetric-cluster/server1/
-/examples/symmetric-cluster/server1/data
-/examples/symmetric-cluster/server1/logs
-
-# /examples/symmetric-cluster/server2/
-/examples/symmetric-cluster/server2/data
-/examples/symmetric-cluster/server2/logs
-
-# /examples/symmetric-cluster/server3/
-/examples/symmetric-cluster/server3/data
-/examples/symmetric-cluster/server3/logs
-
-# /examples/symmetric-cluster/server4/
-/examples/symmetric-cluster/server4/data
-/examples/symmetric-cluster/server4/logs
-
-# /examples/symmetric-cluster/server5/
-/examples/symmetric-cluster/server5/data
-/examples/symmetric-cluster/server5/logs
-
-# /examples/temp-queue/
-/examples/temp-queue/build
-/examples/temp-queue/logs
-
-# /examples/temp-queue/server0/
-/examples/temp-queue/server0/data
-/examples/temp-queue/server0/logs
-
-# /examples/topic/
-/examples/topic/build
-/examples/topic/logs
-
-# /examples/topic/server0/
-/examples/topic/server0/data
-/examples/topic/server0/logs
-
-# /examples/topic-hierarchies/
-/examples/topic-hierarchies/build
-/examples/topic-hierarchies/logs
-
-# /examples/topic-hierarchies/server0/
-/examples/topic-hierarchies/server0/data
-/examples/topic-hierarchies/server0/logs
-
-# /examples/topic-selector-example1/
-/examples/topic-selector-example1/build
-/examples/topic-selector-example1/logs
-
-# /examples/topic-selector-example1/server0/
-/examples/topic-selector-example1/server0/data
-/examples/topic-selector-example1/server0/logs
-
-# /examples/topic-selector-example2/
-/examples/topic-selector-example2/build
-/examples/topic-selector-example2/logs
-
-# /examples/topic-selector-example2/server0/
-/examples/topic-selector-example2/server0/data
-/examples/topic-selector-example2/server0/logs
-
-# /examples/transaction-failover/
-/examples/transaction-failover/build
-
-# /examples/transaction-failover/server0/
-/examples/transaction-failover/server0/data
-
-# /examples/transaction-failover/server1/
-/examples/transaction-failover/server1/data
-
-# /examples/transactional/
-/examples/transactional/build
-/examples/transactional/logs
-
-# /examples/transactional/server0/
-/examples/transactional/server0/data
-/examples/transactional/server0/logs
-
-# /examples/xa-heuristic/
-/examples/xa-heuristic/build
-/examples/xa-heuristic/logs
-
-# /examples/xa-heuristic/server0/
-/examples/xa-heuristic/server0/data
-/examples/xa-heuristic/server0/logs
-
-# /examples/xa-receive/
-/examples/xa-receive/build
-/examples/xa-receive/logs
-
-# /examples/xa-receive/server0/
-/examples/xa-receive/server0/data
-/examples/xa-receive/server0/logs
-
-# /examples/xa-send/
-/examples/xa-send/build
-/examples/xa-send/logs
-
-# /examples/xa-send/server0/
-/examples/xa-send/server0/data
-/examples/xa-send/server0/logs
-
-# /examples/xa-with-jta/
-/examples/xa-with-jta/server0/data
-/examples/xa-with-jta/build
-/examples/xa-with-jta/logs
-/examples/xa-with-jta/ObjectStore
-
-# /examples/xa-with-jta/server0/
-/examples/xa-with-jta/server0/data
-/examples/xa-with-jta/server0/logs
-
-# examples/browser/data/
-examples/browser/data/
-
-# examples/client-kickoff/data/
-examples/client-kickoff/data/
-
-# examples/consumer-rate-limit/data/
-examples/consumer-rate-limit/data/
-
-# examples/data/
-examples/data/
-
-# examples/dead-letter/data/
-examples/dead-letter/data/
-
-# examples/delayed-redelivery/data/
-examples/delayed-redelivery/data/
-
-# examples/durable-subscription/data/
-examples/durable-subscription/data/
-
-# examples/expiry/data/
-examples/expiry/data/
-
-# examples/http-transport/data/
-examples/http-transport/data/
-
-# examples/instantiate-connection-factory/data/
-examples/instantiate-connection-factory/data/
-
-# examples/interceptor/data/
-examples/interceptor/data/
-
-# examples/jaas/data/
-examples/jaas/data/
-
-# examples/jmx/data/
-examples/jmx/data/
-
-examples/move.sh
-examples/move2.sh
-examples/pom-template.xml
-
-# /examples/soak/normal/
-/examples/soak/normal/build
-
-# /examples/soak/tx-restarts/
-/examples/soak/tx-restarts/build
-
-# /activemq-protocols/
-/activemq-protocols/activemq-amqp-protocol/.project
-/activemq-protocols/activemq-stomp-protocol/.project
-
-# /activemq-ra/activemq-ra-jar/
-/activemq-ra/activemq-ra-jar/target
-/activemq-ra/activemq-ra-jar/.project
-
-# /activemq-ra/activemq-ra-rar/
-/activemq-ra/activemq-ra-rar/target
-/activemq-ra/activemq-ra-rar/.project
-
-# /activemq-rest/activemq-rest/
-/activemq-rest/target
-/activemq-rest/.project
-/activemq-rest/data/
-
-# /activemq-rest/
-/activemq-*/.project
-/activemq-*/target
-
-/tests/.project
-/tests/*-tests/.project
-
-/docs/rest-manual/.project
-/docs/quickstart-guide/.project
-
-native/autom4te.cache
-native/src/.libs
-native/src/.deps
-.settings/org.eclipse.core.resources.prefs
-
-*.iml
-*/*.iml
-*/*/*.iml
-*/*/*/*.iml
-
-activemq.log
-*/activemq.log
-*/*/activemq.log
-*/*/*/activemq.log
-
+**/*.iml
+**/target
+.idea/
ratReport.txt
+**/server.lock
+**/data
\ No newline at end of file
[7/8] activemq-artemis git commit: Use target directory for test data
Posted by cl...@apache.org.
Use target directory for test data
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/96a0fe8f
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/96a0fe8f
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/96a0fe8f
Branch: refs/heads/master
Commit: 96a0fe8f531eff340dd0011d47f473f930d4e2ad
Parents: 8cea209
Author: jbertram <jb...@apache.org>
Authored: Wed May 6 15:04:41 2015 -0500
Committer: jbertram <jb...@apache.org>
Committed: Wed May 6 15:37:46 2015 -0500
----------------------------------------------------------------------
.../artemis/tests/extras/byteman/ReplicationBackupTest.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/96a0fe8f/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/ReplicationBackupTest.java
----------------------------------------------------------------------
diff --git a/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/ReplicationBackupTest.java b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/ReplicationBackupTest.java
index debd95b..ea0e6f8 100644
--- a/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/ReplicationBackupTest.java
+++ b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/ReplicationBackupTest.java
@@ -67,10 +67,10 @@ public class ReplicationBackupTest extends ServiceTestBase
final String suffix = "_backup";
Configuration backupConfig = createDefaultConfig()
- .setBindingsDirectory(ActiveMQDefaultConfiguration.getDefaultBindingsDirectory() + suffix)
- .setJournalDirectory(ActiveMQDefaultConfiguration.getDefaultJournalDir() + suffix)
- .setPagingDirectory(ActiveMQDefaultConfiguration.getDefaultPagingDir() + suffix)
- .setLargeMessagesDirectory(ActiveMQDefaultConfiguration.getDefaultLargeMessagesDir() + suffix);
+ .setBindingsDirectory("./target/" + ActiveMQDefaultConfiguration.getDefaultBindingsDirectory() + suffix)
+ .setJournalDirectory("./target/" + ActiveMQDefaultConfiguration.getDefaultJournalDir() + suffix)
+ .setPagingDirectory("./target/" + ActiveMQDefaultConfiguration.getDefaultPagingDir() + suffix)
+ .setLargeMessagesDirectory("./target/" + ActiveMQDefaultConfiguration.getDefaultLargeMessagesDir() + suffix);
Configuration liveConfig = createDefaultConfig();
[6/8] activemq-artemis git commit: Obey license check property
Posted by cl...@apache.org.
Obey license check property
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/286eabd1
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/286eabd1
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/286eabd1
Branch: refs/heads/master
Commit: 286eabd1f6211a425e8f1857d244dbd454a37587
Parents: b51160f
Author: jbertram <jb...@apache.org>
Authored: Wed May 6 14:20:18 2015 -0500
Committer: jbertram <jb...@apache.org>
Committed: Wed May 6 15:37:46 2015 -0500
----------------------------------------------------------------------
pom.xml | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/286eabd1/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index f08db43..4ce6569 100644
--- a/pom.xml
+++ b/pom.xml
@@ -943,6 +943,7 @@
<version>0.11</version>
<configuration>
<reportFile>${activemq.basedir}/ratReport.txt</reportFile>
+ <skip>${skipLicenseCheck}</skip>
<excludes>
<exclude>**/*.txt</exclude>
<exclude>**/*.md</exclude>
[3/8] activemq-artemis git commit: Disable license and checkstyle
checks by default;
add a new 'dev' profile with license and checkstyle checks enabled
Posted by cl...@apache.org.
Disable license and checkstyle checks by default; add a new 'dev' profile with license and checkstyle checks enabled
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/ca6fb059
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/ca6fb059
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/ca6fb059
Branch: refs/heads/master
Commit: ca6fb0599af7946108fc8a0955b11518b9717026
Parents: 4735d38
Author: jbertram <jb...@apache.org>
Authored: Wed May 6 11:38:04 2015 -0500
Committer: jbertram <jb...@apache.org>
Committed: Wed May 6 15:37:45 2015 -0500
----------------------------------------------------------------------
pom.xml | 44 +++++++++++++++++++++++++++++++++++++++++---
1 file changed, 41 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ca6fb059/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index fa845b6..f08db43 100644
--- a/pom.xml
+++ b/pom.xml
@@ -100,8 +100,8 @@
-Djava.net.preferIPv4Stack=true
</activemq-surefire-argline>
<activemq.basedir>${project.basedir}</activemq.basedir>
- <skipLicenseCheck>false</skipLicenseCheck>
- <skipStyleCheck>false</skipStyleCheck>
+ <skipLicenseCheck>true</skipLicenseCheck>
+ <skipStyleCheck>true</skipStyleCheck>
<geronimo.jms.2.spec.version>1.0-alpha-1</geronimo.jms.2.spec.version>
</properties>
@@ -481,11 +481,42 @@
<profiles>
<profile>
- <id>distro</id>
+ <id>dev</id>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
<modules>
+ <module>artemis-boot</module>
+ <module>artemis-dto</module>
+ <module>artemis-web</module>
+ <module>artemis-website</module>
+ <module>artemis-cli</module>
+ <module>artemis-commons</module>
+ <module>artemis-selector</module>
+ <module>artemis-core-client</module>
+ <module>artemis-server</module>
+ <module>artemis-jms-client</module>
+ <module>artemis-jms-server</module>
+ <module>artemis-native</module>
+ <module>artemis-protocols</module>
+ <module>artemis-journal</module>
+ <module>artemis-ra</module>
+ <module>artemis-rest</module>
+ <module>artemis-service-extensions</module>
+ <module>artemis-maven-plugin</module>
+ <module>integration/activemq-spring-integration</module>
+ <module>integration/activemq-aerogear-integration</module>
+ <module>integration/activemq-vertx-integration</module>
+ <module>tests</module>
+ </modules>
+ <properties>
+ <skipStyleCheck>false</skipStyleCheck>
+ <skipLicenseCheck>false</skipLicenseCheck>
+ </properties>
+ </profile>
+ <profile>
+ <id>distro</id>
+ <modules>
<module>artemis-dto</module>
<module>artemis-web</module>
<module>artemis-website</module>
@@ -535,6 +566,10 @@
<module>tests</module>
<module>artemis-distribution</module>
</modules>
+ <properties>
+ <skipStyleCheck>false</skipStyleCheck>
+ <skipLicenseCheck>false</skipLicenseCheck>
+ </properties>
</profile>
<profile>
<!-- tests is the profile we use to run the entire testsuite
@@ -574,6 +609,8 @@
<skipSoakTests>true</skipSoakTests>
<skipPerformanceTests>true</skipPerformanceTests>
<skipExtraTests>false</skipExtraTests>
+ <skipStyleCheck>false</skipStyleCheck>
+ <skipLicenseCheck>false</skipLicenseCheck>
</properties>
</profile>
<profile>
@@ -609,6 +646,7 @@
<skipRestTests>false</skipRestTests>
<skipExtraTests>false</skipExtraTests>
<skipStyleCheck>false</skipStyleCheck>
+ <skipLicenseCheck>false</skipLicenseCheck>
</properties>
</profile>
<profile>