Apache
/
activemq
mirror of https://github.com/apache/activemq.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

https://issues.apache.org/jira/browse/AMQ-5515 - tidy up jetty deps - fix jetty maven coords

This commit is contained in:
gtully 2015-01-12 22:58:07 +00:00
parent 869c193d1f
commit cf62d58ae7
18 changed files with 58 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
activemq-amqp/pom.xml
View File

@ -79,7 +79,7 @@
<dependency>
<!-- using it for Jetty's JNDI context to work /w Joram tests. -->
<groupId>org.eclipse.jetty.aggregate</groupId>
<artifactId>jetty-all-server</artifactId>
<artifactId>jetty-all</artifactId>
<scope>test</scope>
</dependency>
<dependency>

2
activemq-broker/src/main/java/org/apache/activemq/broker/BrokerService.java
View File

@ -2125,7 +2125,7 @@ public class BrokerService implements Service {
AnnotatedMBean.registerMBean(getManagementContext(), view, objectName);
return connector;
} catch (Throwable e) {
throw IOExceptionSupport.create("Transport Connector could not be registered in JMX: " + e.getMessage(), e);
throw IOExceptionSupport.create("Transport Connector could not be registered in JMX: " + e, e);
}
}

2
activemq-fileserver/pom.xml
View File

@ -90,7 +90,7 @@
</dependency>
<dependency>
<groupId>org.eclipse.jetty.aggregate</groupId>
<artifactId>jetty-all-server</artifactId>
<artifactId>jetty-all</artifactId>
<scope>test</scope>
</dependency>
<dependency>

7
activemq-http/pom.xml
View File

@ -53,12 +53,7 @@
</dependency>
<dependency>
<groupId>org.eclipse.jetty.aggregate</groupId>
<artifactId>jetty-all-server</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-websocket</artifactId>
<version>${jetty-version}</version>
<artifactId>jetty-all</artifactId>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>

44
activemq-leveldb-store/pom.xml
View File

@ -242,6 +242,26 @@
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-mapper-asl</artifactId>
</exclusion>
<exclusion>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty</artifactId>
</exclusion>
<exclusion>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty-util</artifactId>
</exclusion>
<exclusion>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty-api-2.1</artifactId>
</exclusion>
<exclusion>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jsp-2.1</artifactId>
</exclusion>
<exclusion>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jsp-api-2.1</artifactId>
</exclusion>
</exclusions>
</dependency>
@ -281,18 +301,6 @@
<version>2.6</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty</artifactId>
<version>6.1.26</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty-util</artifactId>
<version>6.1.26</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>tomcat</groupId>
<artifactId>jasper-runtime</artifactId>
@ -305,18 +313,6 @@
<version>5.5.12</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jsp-api-2.1</artifactId>
<version>6.1.14</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jsp-2.1</artifactId>
<version>6.1.14</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-math</artifactId>

9
activemq-unit-tests/pom.xml
View File

@ -222,13 +222,6 @@
<version>${jasypt-version}</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty-util</artifactId>
<version>6.1.26</version>
<scope>test</scope>
</dependency>
<!-- database testing -->
<dependency>
<groupId>commons-collections</groupId>
@ -268,7 +261,7 @@
<dependency>
<!-- using it for Jetty's JNDI context to work /w Joram tests. -->
<groupId>org.eclipse.jetty.aggregate</groupId>
<artifactId>jetty-all-server</artifactId>
<artifactId>jetty-all</artifactId>
<scope>test</scope>
</dependency>

8
activemq-unit-tests/src/test/java/org/apache/activemq/broker/region/cursors/StoreQueueCursorNoDuplicateTest.java
View File

@ -31,14 +31,16 @@ import org.apache.activemq.command.MessageId;
import org.apache.activemq.store.MessageStore;
import org.apache.activemq.store.PersistenceAdapter;
import org.apache.activemq.usage.SystemUsage;
import org.mortbay.log.Log;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
* @author gtully
* https://issues.apache.org/activemq/browse/AMQ-2020
**/
public class StoreQueueCursorNoDuplicateTest extends TestCase {
ActiveMQQueue destination = new ActiveMQQueue("queue-"
static final Logger LOG = LoggerFactory.getLogger(StoreQueueCursorNoDuplicateTest.class);
ActiveMQQueue destination = new ActiveMQQueue("queue-"
+ StoreQueueCursorNoDuplicateTest.class.getSimpleName());
BrokerService brokerService;
@ -107,7 +109,7 @@ public class StoreQueueCursorNoDuplicateTest extends TestCase {
MessageReference ref = underTest.next();
ref.decrementReferenceCount();
underTest.remove();
Log.info("Received message: {} with body: {}",
LOG.info("Received message: {} with body: {}",
ref.getMessageId(), ((ActiveMQTextMessage)ref.getMessage()).getText());
assertEquals(dequeueCount++, ref.getMessageId().getProducerSequenceId());
}

11
activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ3932Test.java
View File

@ -36,10 +36,11 @@ import org.apache.activemq.broker.TransportConnector;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.mortbay.log.Log;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class AMQ3932Test {
static final Logger LOG = LoggerFactory.getLogger(AMQ3932Test.class);
private Connection connection;
private BrokerService broker;
@ -85,7 +86,7 @@ public class AMQ3932Test {
public void run() {
try {
started.countDown();
Log.info("Entering into a Sync receive call");
LOG.info("Entering into a Sync receive call");
consumer.receive();
} catch (JMSException e) {
}
@ -114,7 +115,7 @@ public class AMQ3932Test {
public void run() {
try {
started.countDown();
Log.info("Entering into a Sync receiveNoWait call");
LOG.info("Entering into a Sync receiveNoWait call");
consumer.receiveNoWait();
} catch (JMSException e) {
}
@ -143,7 +144,7 @@ public class AMQ3932Test {
public void run() {
try {
started.countDown();
Log.info("Entering into a timed Sync receive call");
LOG.info("Entering into a timed Sync receive call");
consumer.receive(10);
} catch (JMSException e) {
}

8
activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4157Test.java
View File

@ -36,15 +36,17 @@ import javax.jms.Session;
import org.apache.activemq.ActiveMQConnection;
import org.apache.activemq.ActiveMQConnectionFactory;
import org.apache.activemq.TestSupport;
import org.apache.activemq.broker.BrokerService;
import org.apache.activemq.command.ActiveMQQueue;
import org.apache.activemq.command.ConnectionControl;
import org.junit.After;
import org.junit.Test;
import org.mortbay.log.Log;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class AMQ4157Test {
static final Logger LOG = LoggerFactory.getLogger(AMQ4157Test.class);
private BrokerService broker;
private ActiveMQConnectionFactory connectionFactory;
private final Destination destination = new ActiveMQQueue("Test");
@ -97,7 +99,7 @@ public class AMQ4157Test {
restartBroker(500);
Log.info("Attempting consume of {} messages", toSend);
LOG.info("Attempting consume of {} messages", toSend);
consumeMessages(toSend);
}

3
activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4413Test.java
View File

@ -38,7 +38,6 @@ import javax.jms.TopicSubscriber;
import org.apache.activemq.ActiveMQConnectionFactory;
import org.apache.activemq.broker.BrokerService;
import org.junit.Test;
import org.mortbay.log.Log;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@ -174,7 +173,7 @@ public class AMQ4413Test {
LOG.info("sub received msg: " + seq);
if (seqExpected != seq) {
Log.info("expected: " + seqExpected + ", actual: " + seq);
LOG.info("expected: " + seqExpected + ", actual: " + seq);
return Boolean.FALSE;
}

5
activemq-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverComplexClusterTest.java
View File

@ -17,7 +17,8 @@
package org.apache.activemq.transport.failover;
import org.apache.activemq.broker.TransportConnector;
import org.mortbay.log.Log;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
@ -229,7 +230,7 @@ public class FailoverComplexClusterTest extends FailoverClusterTestSupport {
Thread.sleep(5000);
// We stop broker A.
Log.info("Stopping broker A whose address is: {}", BROKER_A_CLIENT_TC_ADDRESS);
logger.info("Stopping broker A whose address is: {}", BROKER_A_CLIENT_TC_ADDRESS);
getBroker(BROKER_A_NAME).stop();
getBroker(BROKER_A_NAME).waitUntilStopped();
Thread.sleep(5000);

8
activemq-unit-tests/src/test/java/org/apache/activemq/transport/vm/VMTransportWaitForTest.java
View File

@ -32,9 +32,11 @@ import org.apache.activemq.broker.BrokerRegistry;
import org.apache.activemq.broker.BrokerService;
import org.junit.After;
import org.junit.Test;
import org.mortbay.log.Log;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class VMTransportWaitForTest {
static final Logger LOG = LoggerFactory.getLogger(VMTransportWaitForTest.class);
private static final int WAIT_TIME = 20000;
private static final int SHORT_WAIT_TIME = 5000;
@ -107,7 +109,7 @@ public class VMTransportWaitForTest {
long endTime = System.currentTimeMillis();
Log.info("Total wait time was: {}", endTime - startTime);
LOG.info("Total wait time was: {}", endTime - startTime);
assertTrue(endTime - startTime >= SHORT_WAIT_TIME - 100);
}
@ -129,7 +131,7 @@ public class VMTransportWaitForTest {
long endTime = System.currentTimeMillis();
Log.info("Total wait time was: {}", endTime - startTime);
LOG.info("Total wait time was: {}", endTime - startTime);
assertTrue(endTime - startTime >= SHORT_WAIT_TIME - 100);
}
}

10
activemq-web-console/pom.xml
View File

@ -222,14 +222,6 @@
<artifactId>activemq-spring</artifactId>
</dependency>
<!-- XMPP support -->
<!--
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>activemq-xmpp</artifactId>
<version>${project.version}</version>
</dependency>
-->
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>activemq-console</artifactId>
@ -249,7 +241,7 @@
<!-- web container -->
<dependency>
<groupId>org.eclipse.jetty.aggregate</groupId>
<artifactId>jetty-all-server</artifactId>
<artifactId>jetty-all</artifactId>
<scope>test</scope>
</dependency>
<dependency>

2
activemq-web-demo/pom.xml
View File

@ -193,7 +193,7 @@
<!-- web container -->
<dependency>
<groupId>org.eclipse.jetty.aggregate</groupId>
<artifactId>jetty-all-server</artifactId>
<artifactId>jetty-all</artifactId>
<scope>test</scope>
</dependency>

2
activemq-web/pom.xml
View File

@ -75,7 +75,7 @@
</dependency>
<dependency>
<groupId>org.eclipse.jetty.aggregate</groupId>
<artifactId>jetty-all-server</artifactId>
<artifactId>jetty-all</artifactId>
<scope>test</scope>
</dependency>
<dependency>

2
assembly/pom.xml
View File

@ -324,7 +324,7 @@
</dependency>
<dependency>
<groupId>org.eclipse.jetty.aggregate</groupId>
<artifactId>jetty-all-server</artifactId>
<artifactId>jetty-all</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.jdt</groupId>

4
assembly/src/main/descriptors/common-bin.xml
View File

@ -199,7 +199,6 @@
<include>org.jasypt:jasypt</include>
<include>org.jasypt:jasypt-spring3</include>
<include>javax.jmdns:jmdns</include>
<include>org.apache.qpid:proton</include>
<include>org.apache.qpid:proton-jms</include>
<include>org.apache.qpid:proton-j</include>
<include>${pom.groupId}:activemq-runtime-config</include>
@ -247,8 +246,7 @@
<includes>
<include>org.springframework:spring-web</include>
<include>org.springframework:spring-webmvc</include>
<include>org.eclipse.jetty.aggregate:jetty-all-server</include>
<include>org.eclipse.jetty:jetty-websocket</include>
<include>org.eclipse.jetty.aggregate:jetty-all</include>
<include>org.apache.geronimo.specs:geronimo-servlet_2.5_spec</include>
<!-- JSP support -->

6
pom.xml
View File

@ -936,7 +936,7 @@
<dependency>
<groupId>org.eclipse.jetty.aggregate</groupId>
<artifactId>jetty-all-server</artifactId>
<artifactId>jetty-all</artifactId>
<version>${jetty-version}</version>
</dependency>
@ -1188,8 +1188,8 @@
<version>${apache-rat-plugin-version}</version>
</plugin>
<plugin>
<groupId>org.eclipse.jetty</groupId>
<artifactId>maven-jetty-plugin</artifactId>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
<version>${jetty-version}</version>
</plugin>
<plugin>