git commit: AMQ-5167 ActiveMQ web-cosole fails to start in Karaf - missing import
Repository: activemq Updated Branches: refs/heads/trunk 35aaed479 - 25600944e AMQ-5167 ActiveMQ web-cosole fails to start in Karaf - missing import Project: http://git-wip-us.apache.org/repos/asf/activemq/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/25600944 Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/25600944 Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/25600944 Branch: refs/heads/trunk Commit: 25600944e662279ec1113acd4d27e9c64ba8415f Parents: 35aaed4 Author: Krzysztof Sobkowiak krzys.sobkow...@gmail.com Authored: Wed Jun 4 18:06:22 2014 +0200 Committer: Dejan Bosanac de...@nighttale.net Committed: Thu Jun 5 11:33:24 2014 +0200 -- activemq-web-console/pom.xml | 4 1 file changed, 4 insertions(+) -- http://git-wip-us.apache.org/repos/asf/activemq/blob/25600944/activemq-web-console/pom.xml -- diff --git a/activemq-web-console/pom.xml b/activemq-web-console/pom.xml index 6966779..c3ed2b0 100755 --- a/activemq-web-console/pom.xml +++ b/activemq-web-console/pom.xml @@ -132,6 +132,9 @@ org.xml.sax.helpers, javax.xml.parsers, javax.xml.transform, + javax.xml.transform.dom, + javax.xml.transform.sax, + javax.xml.transform.stream, javax.management.remote, javax.naming, org.w3c.dom, @@ -144,6 +147,7 @@ javax.management, javax.management.openmbean, javax.net, + javax.net.ssl, org.osgi.framework;version=[1.5,2), org.osgi.service.cm, org.apache.commons.logging;version=[1.1,2);resolution:=optional,
Git Push Summary
Repository: activemq Updated Tags: refs/tags/activemq-5.10.0 [deleted] 2c5f93e33
git commit: [maven-release-plugin] prepare release activemq-5.10.0
Repository: activemq Updated Branches: refs/heads/trunk 25600944e - 58dd93e42 [maven-release-plugin] prepare release activemq-5.10.0 Project: http://git-wip-us.apache.org/repos/asf/activemq/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/58dd93e4 Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/58dd93e4 Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/58dd93e4 Branch: refs/heads/trunk Commit: 58dd93e42e7405768fd89154ff94b45ac71f151f Parents: 2560094 Author: Dejan Bosanac de...@nighttale.net Authored: Thu Jun 5 11:59:17 2014 +0200 Committer: Dejan Bosanac de...@nighttale.net Committed: Thu Jun 5 11:59:17 2014 +0200 -- activemq-all/pom.xml | 8 +++- activemq-amqp/pom.xml | 2 +- activemq-blueprint/pom.xml | 2 +- activemq-broker/pom.xml| 2 +- activemq-camel/pom.xml | 2 +- activemq-client/pom.xml| 2 +- activemq-console/pom.xml | 2 +- activemq-fileserver/pom.xml| 2 +- activemq-http/pom.xml | 2 +- activemq-itests-spring31/pom.xml | 2 +- activemq-jaas/pom.xml | 2 +- activemq-jdbc-store/pom.xml| 2 +- activemq-jms-pool/pom.xml | 2 +- activemq-kahadb-store/pom.xml | 2 +- activemq-karaf-itest/pom.xml | 2 +- activemq-karaf/pom.xml | 2 +- activemq-leveldb-store/pom.xml | 2 +- activemq-log4j-appender/pom.xml| 2 +- activemq-mqtt/pom.xml | 2 +- activemq-openwire-generator/pom.xml| 2 +- activemq-openwire-legacy/pom.xml | 2 +- activemq-osgi/pom.xml | 2 +- activemq-partition/pom.xml | 2 +- activemq-pool/pom.xml | 2 +- activemq-ra/pom.xml| 2 +- activemq-rar/pom.xml | 2 +- activemq-run/pom.xml | 2 +- activemq-runtime-config/pom.xml| 2 +- activemq-shiro/pom.xml | 2 +- activemq-spring/pom.xml| 2 +- activemq-stomp/pom.xml | 2 +- activemq-tooling/activemq-maven-plugin/pom.xml | 2 +- activemq-tooling/activemq-memtest-maven-plugin/pom.xml | 2 +- activemq-tooling/activemq-perf-maven-plugin/pom.xml| 2 +- activemq-tooling/pom.xml | 2 +- activemq-unit-tests/pom.xml| 2 +- activemq-web-console/pom.xml | 2 +- activemq-web-demo/pom.xml | 2 +- activemq-web/pom.xml | 2 +- assembly/pom.xml | 2 +- pom.xml| 4 ++-- 41 files changed, 44 insertions(+), 46 deletions(-) -- http://git-wip-us.apache.org/repos/asf/activemq/blob/58dd93e4/activemq-all/pom.xml -- diff --git a/activemq-all/pom.xml b/activemq-all/pom.xml index 34f67c3..eba000d 100644 --- a/activemq-all/pom.xml +++ b/activemq-all/pom.xml @@ -7,15 +7,14 @@ software distributed under the License is distributed on an AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. -- -project xmlns=http://maven.apache.org/POM/4.0.0; xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance; - xsi:schemaLocation=http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd; +project xmlns=http://maven.apache.org/POM/4.0.0; xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance; xsi:schemaLocation=http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd; modelVersion4.0.0/modelVersion parent groupIdorg.apache.activemq/groupId artifactIdactivemq-parent/artifactId -version5.11-SNAPSHOT/version +version5.10.0/version /parent artifactIdactivemq-all/artifactId @@ -126,8 +125,7 @@ resource.java/resource /transformer -transformer - implementation=org.apache.maven.plugins.shade.resource.ApacheNoticeResourceTransformer +transformer
Git Push Summary
Repository: activemq Updated Tags: refs/tags/activemq-5.10.0 [created] c2b2111af
git commit: [maven-release-plugin] prepare for next development iteration
Repository: activemq Updated Branches: refs/heads/trunk 58dd93e42 - fa086396a [maven-release-plugin] prepare for next development iteration Project: http://git-wip-us.apache.org/repos/asf/activemq/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/fa086396 Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/fa086396 Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/fa086396 Branch: refs/heads/trunk Commit: fa086396a744b3fc16396c35dc35287f9e828239 Parents: 58dd93e Author: Dejan Bosanac de...@nighttale.net Authored: Thu Jun 5 11:59:29 2014 +0200 Committer: Dejan Bosanac de...@nighttale.net Committed: Thu Jun 5 11:59:29 2014 +0200 -- activemq-all/pom.xml | 2 +- activemq-amqp/pom.xml | 2 +- activemq-blueprint/pom.xml | 2 +- activemq-broker/pom.xml| 2 +- activemq-camel/pom.xml | 2 +- activemq-client/pom.xml| 2 +- activemq-console/pom.xml | 2 +- activemq-fileserver/pom.xml| 2 +- activemq-http/pom.xml | 2 +- activemq-itests-spring31/pom.xml | 2 +- activemq-jaas/pom.xml | 2 +- activemq-jdbc-store/pom.xml| 2 +- activemq-jms-pool/pom.xml | 2 +- activemq-kahadb-store/pom.xml | 2 +- activemq-karaf-itest/pom.xml | 2 +- activemq-karaf/pom.xml | 2 +- activemq-leveldb-store/pom.xml | 2 +- activemq-log4j-appender/pom.xml| 2 +- activemq-mqtt/pom.xml | 2 +- activemq-openwire-generator/pom.xml| 2 +- activemq-openwire-legacy/pom.xml | 2 +- activemq-osgi/pom.xml | 2 +- activemq-partition/pom.xml | 2 +- activemq-pool/pom.xml | 2 +- activemq-ra/pom.xml| 2 +- activemq-rar/pom.xml | 2 +- activemq-run/pom.xml | 2 +- activemq-runtime-config/pom.xml| 2 +- activemq-shiro/pom.xml | 2 +- activemq-spring/pom.xml| 2 +- activemq-stomp/pom.xml | 2 +- activemq-tooling/activemq-maven-plugin/pom.xml | 2 +- activemq-tooling/activemq-memtest-maven-plugin/pom.xml | 2 +- activemq-tooling/activemq-perf-maven-plugin/pom.xml| 2 +- activemq-tooling/pom.xml | 2 +- activemq-unit-tests/pom.xml| 2 +- activemq-web-console/pom.xml | 2 +- activemq-web-demo/pom.xml | 2 +- activemq-web/pom.xml | 2 +- assembly/pom.xml | 2 +- pom.xml| 4 ++-- 41 files changed, 42 insertions(+), 42 deletions(-) -- http://git-wip-us.apache.org/repos/asf/activemq/blob/fa086396/activemq-all/pom.xml -- diff --git a/activemq-all/pom.xml b/activemq-all/pom.xml index eba000d..3265af6 100644 --- a/activemq-all/pom.xml +++ b/activemq-all/pom.xml @@ -14,7 +14,7 @@ parent groupIdorg.apache.activemq/groupId artifactIdactivemq-parent/artifactId -version5.10.0/version +version5.11-SNAPSHOT/version /parent artifactIdactivemq-all/artifactId http://git-wip-us.apache.org/repos/asf/activemq/blob/fa086396/activemq-amqp/pom.xml -- diff --git a/activemq-amqp/pom.xml b/activemq-amqp/pom.xml index 01d76da..9028ab5 100644 --- a/activemq-amqp/pom.xml +++ b/activemq-amqp/pom.xml @@ -22,7 +22,7 @@ parent groupIdorg.apache.activemq/groupId artifactIdactivemq-parent/artifactId -version5.10.0/version +version5.11-SNAPSHOT/version /parent artifactIdactivemq-amqp/artifactId http://git-wip-us.apache.org/repos/asf/activemq/blob/fa086396/activemq-blueprint/pom.xml -- diff --git a/activemq-blueprint/pom.xml b/activemq-blueprint/pom.xml index 2a5340a..6b71950 100644 --- a/activemq-blueprint/pom.xml +++ b/activemq-blueprint/pom.xml @@ -22,7 +22,7 @@ parent groupIdorg.apache.activemq/groupId artifactIdactivemq-parent/artifactId -version5.10.0/version +version5.11-SNAPSHOT/version
buildbot failure in ASF Buildbot on activemq-site-production
The Buildbot has detected a new failure on builder activemq-site-production while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/activemq-site-production/builds/1077 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-cms-slave Build Reason: The Nightly scheduler named 'activemq-site-production' triggered this build Build Source Stamp: [branch activemq/activemq-website] HEAD Blamelist: BUILD FAILED: failed compile sincerely, -The Buildbot
buildbot success in ASF Buildbot on activemq-site-production
The Buildbot has detected a restored build on builder activemq-site-production while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/activemq-site-production/builds/1078 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-cms-slave Build Reason: The Nightly scheduler named 'activemq-site-production' triggered this build Build Source Stamp: [branch activemq/activemq-website] HEAD Blamelist: Build succeeded! sincerely, -The Buildbot
git commit: https://issues.apache.org/jira/browse/AMQ-5213
Repository: activemq
Updated Branches:
refs/heads/trunk fa086396a - 25f1fe846
https://issues.apache.org/jira/browse/AMQ-5213
Adds a Log4JConfigViewMBean for use in configuring runtime logger
levels.
Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/25f1fe84
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/25f1fe84
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/25f1fe84
Branch: refs/heads/trunk
Commit: 25f1fe8460242530b7d2deb7ae9a48a85a90662b
Parents: fa08639
Author: Timothy Bish tabish...@gmail.com
Authored: Thu Jun 5 14:39:56 2014 -0400
Committer: Timothy Bish tabish...@gmail.com
Committed: Thu Jun 5 14:39:56 2014 -0400
--
.../apache/activemq/broker/BrokerService.java | 7 +
.../activemq/broker/jmx/BrokerMBeanSupport.java | 8 +
.../apache/activemq/broker/jmx/BrokerView.java | 34 +--
.../activemq/broker/jmx/Log4JConfigView.java| 286 +++
.../broker/jmx/Log4JConfigViewMBean.java| 92 ++
.../activemq/broker/jmx/Log4JConfigTest.java| 200 +
6 files changed, 594 insertions(+), 33 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/activemq/blob/25f1fe84/activemq-broker/src/main/java/org/apache/activemq/broker/BrokerService.java
--
diff --git
a/activemq-broker/src/main/java/org/apache/activemq/broker/BrokerService.java
b/activemq-broker/src/main/java/org/apache/activemq/broker/BrokerService.java
index 3c542ce..6ecd427 100644
---
a/activemq-broker/src/main/java/org/apache/activemq/broker/BrokerService.java
+++
b/activemq-broker/src/main/java/org/apache/activemq/broker/BrokerService.java
@@ -68,6 +68,7 @@ import org.apache.activemq.broker.jmx.HealthViewMBean;
import org.apache.activemq.broker.jmx.JmsConnectorView;
import org.apache.activemq.broker.jmx.JobSchedulerView;
import org.apache.activemq.broker.jmx.JobSchedulerViewMBean;
+import org.apache.activemq.broker.jmx.Log4JConfigView;
import org.apache.activemq.broker.jmx.ManagedRegionBroker;
import org.apache.activemq.broker.jmx.ManagementContext;
import org.apache.activemq.broker.jmx.NetworkConnectorView;
@@ -690,6 +691,12 @@ public class BrokerService implements Service {
setIoExceptionHandler(new DefaultIOExceptionHandler());
}
+if (isUseJmx() Log4JConfigView.isLog4JAvailable()) {
+ObjectName objectName =
BrokerMBeanSupport.createLog4JConfigViewName(getBrokerObjectName().toString());
+Log4JConfigView log4jConfigView = new Log4JConfigView();
+AnnotatedMBean.registerMBean(getManagementContext(),
log4jConfigView, objectName);
+}
+
startAllConnectors();
LOG.info(Apache ActiveMQ {} ({}, {}) started, new Object[]{
getBrokerVersion(), getBrokerName(), brokerId});
http://git-wip-us.apache.org/repos/asf/activemq/blob/25f1fe84/activemq-broker/src/main/java/org/apache/activemq/broker/jmx/BrokerMBeanSupport.java
--
diff --git
a/activemq-broker/src/main/java/org/apache/activemq/broker/jmx/BrokerMBeanSupport.java
b/activemq-broker/src/main/java/org/apache/activemq/broker/jmx/BrokerMBeanSupport.java
index 87605bc..97a4f98 100644
---
a/activemq-broker/src/main/java/org/apache/activemq/broker/jmx/BrokerMBeanSupport.java
+++
b/activemq-broker/src/main/java/org/apache/activemq/broker/jmx/BrokerMBeanSupport.java
@@ -118,6 +118,14 @@ public class BrokerMBeanSupport {
return new ObjectName(objectNameStr);
}
+public static ObjectName createLog4JConfigViewName(String
brokerObjectName) throws MalformedObjectNameException {
+String objectNameStr = brokerObjectName;
+
+objectNameStr += , + Service=Log4JConfiguration;
+
+return new ObjectName(objectNameStr);
+}
+
public static ObjectName createPersistenceAdapterName(String
brokerObjectName, String name) throws MalformedObjectNameException {
String objectNameStr = brokerObjectName;
http://git-wip-us.apache.org/repos/asf/activemq/blob/25f1fe84/activemq-broker/src/main/java/org/apache/activemq/broker/jmx/BrokerView.java
--
diff --git
a/activemq-broker/src/main/java/org/apache/activemq/broker/jmx/BrokerView.java
b/activemq-broker/src/main/java/org/apache/activemq/broker/jmx/BrokerView.java
index 852120f..3f34768 100755
---
a/activemq-broker/src/main/java/org/apache/activemq/broker/jmx/BrokerView.java
+++
b/activemq-broker/src/main/java/org/apache/activemq/broker/jmx/BrokerView.java
@@ -18,11 +18,7 @@ package org.apache.activemq.broker.jmx;
import java.io.File;
import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
-import
git commit: Convert to JUnit 4 test and add a timeout, also remove the tcp transport connector on a fixed port as its not needed.
Repository: activemq
Updated Branches:
refs/heads/trunk 707940f1a - b8830ddab
Convert to JUnit 4 test and add a timeout, also remove the tcp transport
connector on a fixed port as its not needed.
Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/b8830dda
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/b8830dda
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/b8830dda
Branch: refs/heads/trunk
Commit: b8830ddab15bd5739f8ec30de81d9e98908727aa
Parents: 707940f
Author: Timothy Bish tabish...@gmail.com
Authored: Thu Jun 5 17:52:01 2014 -0400
Committer: Timothy Bish tabish...@gmail.com
Committed: Thu Jun 5 17:52:01 2014 -0400
--
.../transport/vm/VMTransportWaitForTest.java| 48 +++-
1 file changed, 26 insertions(+), 22 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/activemq/blob/b8830dda/activemq-unit-tests/src/test/java/org/apache/activemq/transport/vm/VMTransportWaitForTest.java
--
diff --git
a/activemq-unit-tests/src/test/java/org/apache/activemq/transport/vm/VMTransportWaitForTest.java
b/activemq-unit-tests/src/test/java/org/apache/activemq/transport/vm/VMTransportWaitForTest.java
index 505e65c..faa93e4 100644
---
a/activemq-unit-tests/src/test/java/org/apache/activemq/transport/vm/VMTransportWaitForTest.java
+++
b/activemq-unit-tests/src/test/java/org/apache/activemq/transport/vm/VMTransportWaitForTest.java
@@ -16,28 +16,32 @@
*/
package org.apache.activemq.transport.vm;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
import java.net.URI;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
import javax.jms.JMSException;
-import junit.framework.TestCase;
-
import org.apache.activemq.ActiveMQConnectionFactory;
import org.apache.activemq.broker.BrokerService;
+import org.junit.Test;
-public class VMTransportWaitForTest extends TestCase {
+public class VMTransportWaitForTest {
-private static final String VM_BROKER_URI_NO_WAIT =
+private static final String VM_BROKER_URI_NO_WAIT =
vm://localhost?broker.persistent=falsecreate=false;
-
-private static final String VM_BROKER_URI_WAIT_FOR_START =
+
+private static final String VM_BROKER_URI_WAIT_FOR_START =
VM_BROKER_URI_NO_WAIT + waitForStart=2;
-
+
CountDownLatch started = new CountDownLatch(1);
CountDownLatch gotConnection = new CountDownLatch(1);
+@Test(timeout=9)
public void testWaitFor() throws Exception {
try {
ActiveMQConnectionFactory cf = new ActiveMQConnectionFactory(new
URI(VM_BROKER_URI_NO_WAIT));
@@ -45,32 +49,32 @@ public class VMTransportWaitForTest extends TestCase {
fail(expect broker not exist exception);
} catch (JMSException expectedOnNoBrokerAndNoCreate) {
}
-
-// spawn a thread that will wait for an embedded broker to start via
vm://..
+
+// spawn a thread that will wait for an embedded broker to start via
+// vm://..
Thread t = new Thread() {
+@Override
public void run() {
-try {
-started.countDown();
-ActiveMQConnectionFactory cf = new
ActiveMQConnectionFactory(new URI(VM_BROKER_URI_WAIT_FOR_START));
-cf.createConnection();
-gotConnection.countDown();
-
-} catch (Exception e) {
-e.printStackTrace();
-fail(unexpected exception: + e);
-}
+try {
+started.countDown();
+ActiveMQConnectionFactory cf = new
ActiveMQConnectionFactory(new URI(VM_BROKER_URI_WAIT_FOR_START));
+cf.createConnection();
+gotConnection.countDown();
+} catch (Exception e) {
+e.printStackTrace();
+fail(unexpected exception: + e);
+}
}
};
t.start();
started.await(20, TimeUnit.SECONDS);
Thread.yield();
assertFalse(has not got connection, gotConnection.await(2,
TimeUnit.SECONDS));
-
+
BrokerService broker = new BrokerService();
broker.setPersistent(false);
-broker.addConnector(tcp://localhost:61616);
broker.start();
assertTrue(has got connection, gotConnection.await(400,
TimeUnit.MILLISECONDS));
-broker.stop();
+broker.stop();
}
}
