mirror of https://github.com/apache/activemq.git
Refactored the classes needed to run an ActiveMQ JMS client out from the activemq-core module to the activemq-client module.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1406466 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
8bae15a2a2
commit
9a8f6e415d
|
@ -35,7 +35,6 @@ import org.apache.qpid.proton.type.messaging.Released;
|
||||||
import org.apache.qpid.proton.type.transaction.*;
|
import org.apache.qpid.proton.type.transaction.*;
|
||||||
import org.apache.qpid.proton.type.transport.DeliveryState;
|
import org.apache.qpid.proton.type.transport.DeliveryState;
|
||||||
import org.apache.qpid.proton.type.transport.SenderSettleMode;
|
import org.apache.qpid.proton.type.transport.SenderSettleMode;
|
||||||
import org.apache.qpid.proton.type.transport.Source;
|
|
||||||
import org.fusesource.hawtbuf.Buffer;
|
import org.fusesource.hawtbuf.Buffer;
|
||||||
import org.fusesource.hawtbuf.ByteArrayOutputStream;
|
import org.fusesource.hawtbuf.ByteArrayOutputStream;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
|
|
|
@ -25,11 +25,9 @@ import org.apache.activemq.transport.amqp.transform.InboundTransformer;
|
||||||
import org.apache.activemq.transport.tcp.SslTransport;
|
import org.apache.activemq.transport.tcp.SslTransport;
|
||||||
import org.apache.activemq.util.IOExceptionSupport;
|
import org.apache.activemq.util.IOExceptionSupport;
|
||||||
import org.apache.activemq.wireformat.WireFormat;
|
import org.apache.activemq.wireformat.WireFormat;
|
||||||
import org.fusesource.hawtbuf.Buffer;
|
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
|
||||||
import javax.jms.JMSException;
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.security.cert.X509Certificate;
|
import java.security.cert.X509Certificate;
|
||||||
|
|
||||||
|
|
|
@ -16,10 +16,8 @@
|
||||||
*/
|
*/
|
||||||
package org.apache.activemq.transport.amqp;
|
package org.apache.activemq.transport.amqp;
|
||||||
|
|
||||||
import junit.framework.TestCase;
|
|
||||||
import org.apache.activemq.AutoFailTestSupport;
|
import org.apache.activemq.AutoFailTestSupport;
|
||||||
import org.apache.activemq.broker.BrokerService;
|
import org.apache.activemq.broker.BrokerService;
|
||||||
import org.apache.activemq.broker.SslContext;
|
|
||||||
import org.apache.activemq.broker.TransportConnector;
|
import org.apache.activemq.broker.TransportConnector;
|
||||||
import org.apache.activemq.spring.SpringSslContext;
|
import org.apache.activemq.spring.SpringSslContext;
|
||||||
import org.junit.After;
|
import org.junit.After;
|
||||||
|
|
|
@ -27,14 +27,11 @@ import org.apache.activemq.util.ByteSequence;
|
||||||
import org.apache.camel.CamelExchangeException;
|
import org.apache.camel.CamelExchangeException;
|
||||||
import org.apache.camel.Consumer;
|
import org.apache.camel.Consumer;
|
||||||
import org.apache.camel.Exchange;
|
import org.apache.camel.Exchange;
|
||||||
import org.apache.camel.NoTypeConversionAvailableException;
|
|
||||||
import org.apache.camel.Processor;
|
import org.apache.camel.Processor;
|
||||||
import org.apache.camel.Producer;
|
import org.apache.camel.Producer;
|
||||||
import org.apache.camel.RuntimeCamelException;
|
import org.apache.camel.RuntimeCamelException;
|
||||||
import org.apache.camel.ExchangePattern;
|
|
||||||
import org.apache.camel.impl.DefaultConsumer;
|
import org.apache.camel.impl.DefaultConsumer;
|
||||||
import org.apache.camel.impl.DefaultEndpoint;
|
import org.apache.camel.impl.DefaultEndpoint;
|
||||||
import org.apache.camel.impl.DefaultExchange;
|
|
||||||
import org.apache.camel.impl.DefaultProducer;
|
import org.apache.camel.impl.DefaultProducer;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
|
|
@ -0,0 +1,501 @@
|
||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<!--
|
||||||
|
Licensed to the Apache Software Foundation (ASF) under one or more
|
||||||
|
contributor license agreements. See the NOTICE file distributed with
|
||||||
|
this work for additional information regarding copyright ownership.
|
||||||
|
The ASF licenses this file to You under the Apache License, Version 2.0
|
||||||
|
(the "License"); you may not use this file except in compliance with
|
||||||
|
the License. You may obtain a copy of the License at
|
||||||
|
|
||||||
|
http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
|
||||||
|
Unless required by applicable law or agreed to in writing, 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">
|
||||||
|
|
||||||
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
|
||||||
|
<parent>
|
||||||
|
<groupId>org.apache.activemq</groupId>
|
||||||
|
<artifactId>activemq-parent</artifactId>
|
||||||
|
<version>5.8-SNAPSHOT</version>
|
||||||
|
</parent>
|
||||||
|
|
||||||
|
<artifactId>activemq-client</artifactId>
|
||||||
|
<packaging>jar</packaging>
|
||||||
|
<name>ActiveMQ :: Client</name>
|
||||||
|
<description>The ActiveMQ Client implementation</description>
|
||||||
|
|
||||||
|
<properties>
|
||||||
|
<surefire.argLine>-Xmx512M</surefire.argLine>
|
||||||
|
</properties>
|
||||||
|
|
||||||
|
<dependencies>
|
||||||
|
<!-- =============================== -->
|
||||||
|
<!-- Required Dependencies -->
|
||||||
|
<!-- =============================== -->
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.slf4j</groupId>
|
||||||
|
<artifactId>slf4j-api</artifactId>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.apache.geronimo.specs</groupId>
|
||||||
|
<artifactId>geronimo-jms_1.1_spec</artifactId>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>${project.groupId}</groupId>
|
||||||
|
<artifactId>activeio-core</artifactId>
|
||||||
|
<optional>true</optional>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.apache.activemq.protobuf</groupId>
|
||||||
|
<artifactId>activemq-protobuf</artifactId>
|
||||||
|
<optional>false</optional>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.fusesource.mqtt-client</groupId>
|
||||||
|
<artifactId>mqtt-client</artifactId>
|
||||||
|
</dependency>
|
||||||
|
|
||||||
|
<!-- =============================== -->
|
||||||
|
<!-- Optional Dependencies -->
|
||||||
|
<!-- =============================== -->
|
||||||
|
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.osgi</groupId>
|
||||||
|
<artifactId>org.osgi.core</artifactId>
|
||||||
|
<scope>provided</scope>
|
||||||
|
<optional>true</optional>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.apache.activemq</groupId>
|
||||||
|
<artifactId>activemq-jaas</artifactId>
|
||||||
|
<optional>true</optional>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.apache.geronimo.specs</groupId>
|
||||||
|
<artifactId>geronimo-jta_1.0.1B_spec</artifactId>
|
||||||
|
<optional>true</optional>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.apache.geronimo.specs</groupId>
|
||||||
|
<artifactId>geronimo-j2ee-management_1.1_spec</artifactId>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.apache.geronimo.specs</groupId>
|
||||||
|
<artifactId>geronimo-annotation_1.0_spec</artifactId>
|
||||||
|
<optional>true</optional>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.apache.geronimo.specs</groupId>
|
||||||
|
<artifactId>geronimo-jacc_1.1_spec</artifactId>
|
||||||
|
<optional>true</optional>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>com.thoughtworks.xstream</groupId>
|
||||||
|
<artifactId>xstream</artifactId>
|
||||||
|
<optional>true</optional>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.codehaus.jettison</groupId>
|
||||||
|
<artifactId>jettison</artifactId>
|
||||||
|
<optional>true</optional>
|
||||||
|
</dependency>
|
||||||
|
|
||||||
|
<!-- for XML parsing -->
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.apache.xbean</groupId>
|
||||||
|
<artifactId>xbean-spring</artifactId>
|
||||||
|
<optional>true</optional>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.springframework</groupId>
|
||||||
|
<artifactId>spring-context</artifactId>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.apache.derby</groupId>
|
||||||
|
<artifactId>derby</artifactId>
|
||||||
|
<optional>true</optional>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>xalan</groupId>
|
||||||
|
<artifactId>xalan</artifactId>
|
||||||
|
<optional>true</optional>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>commons-net</groupId>
|
||||||
|
<artifactId>commons-net</artifactId>
|
||||||
|
</dependency>
|
||||||
|
|
||||||
|
<!-- not really a dependency at all - just added optionally to get the generator working -->
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.apache.activemq</groupId>
|
||||||
|
<artifactId>activemq-openwire-generator</artifactId>
|
||||||
|
<optional>true</optional>
|
||||||
|
</dependency>
|
||||||
|
|
||||||
|
<!-- =============================== -->
|
||||||
|
<!-- Testing Dependencies -->
|
||||||
|
<!-- =============================== -->
|
||||||
|
<dependency>
|
||||||
|
<groupId>junit</groupId>
|
||||||
|
<artifactId>junit</artifactId>
|
||||||
|
<scope>test</scope>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.hamcrest</groupId>
|
||||||
|
<artifactId>hamcrest-all</artifactId>
|
||||||
|
<scope>test</scope>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.slf4j</groupId>
|
||||||
|
<artifactId>slf4j-log4j12</artifactId>
|
||||||
|
<scope>test</scope>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>log4j</groupId>
|
||||||
|
<artifactId>log4j</artifactId>
|
||||||
|
<scope>test</scope>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.springframework</groupId>
|
||||||
|
<artifactId>spring-jms</artifactId>
|
||||||
|
<scope>test</scope>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.springframework</groupId>
|
||||||
|
<artifactId>spring-test</artifactId>
|
||||||
|
<scope>test</scope>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>commons-io</groupId>
|
||||||
|
<artifactId>commons-io</artifactId>
|
||||||
|
<scope>test</scope>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>javax.jmdns</groupId>
|
||||||
|
<artifactId>jmdns</artifactId>
|
||||||
|
<optional>true</optional>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.jasypt</groupId>
|
||||||
|
<artifactId>jasypt</artifactId>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.jasypt</groupId>
|
||||||
|
<artifactId>jasypt-spring3</artifactId>
|
||||||
|
<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>
|
||||||
|
<artifactId>commons-collections</artifactId>
|
||||||
|
<scope>test</scope>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>commons-primitives</groupId>
|
||||||
|
<artifactId>commons-primitives</artifactId>
|
||||||
|
<scope>test</scope>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>axion</groupId>
|
||||||
|
<artifactId>axion</artifactId>
|
||||||
|
<scope>test</scope>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>regexp</groupId>
|
||||||
|
<artifactId>regexp</artifactId>
|
||||||
|
<scope>test</scope>
|
||||||
|
</dependency>
|
||||||
|
|
||||||
|
<!-- Joram JMS conformance tests -->
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.fusesource.joram-jms-tests</groupId>
|
||||||
|
<artifactId>joram-jms-tests</artifactId>
|
||||||
|
<version>1.0</version>
|
||||||
|
<scope>test</scope>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<!-- using it for Jetty's JNDI context to work /w Joram tests. -->
|
||||||
|
<groupId>org.eclipse.jetty.aggregate</groupId>
|
||||||
|
<artifactId>jetty-all-server</artifactId>
|
||||||
|
<scope>test</scope>
|
||||||
|
</dependency>
|
||||||
|
|
||||||
|
<!-- LDAP tests -->
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.apache.directory.server</groupId>
|
||||||
|
<artifactId>apacheds-core-integ</artifactId>
|
||||||
|
<version>${directory-version}</version>
|
||||||
|
<scope>test</scope>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.apache.directory.server</groupId>
|
||||||
|
<artifactId>apacheds-server-integ</artifactId>
|
||||||
|
<version>${directory-version}</version>
|
||||||
|
<scope>test</scope>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.jmock</groupId>
|
||||||
|
<artifactId>jmock-junit4</artifactId>
|
||||||
|
<scope>test</scope>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.jmock</groupId>
|
||||||
|
<artifactId>jmock-legacy</artifactId>
|
||||||
|
<scope>test</scope>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.apache.ftpserver</groupId>
|
||||||
|
<artifactId>ftpserver-core</artifactId>
|
||||||
|
<version>${ftpserver-version}</version>
|
||||||
|
<scope>test</scope>
|
||||||
|
</dependency>
|
||||||
|
</dependencies>
|
||||||
|
|
||||||
|
<reporting>
|
||||||
|
<plugins>
|
||||||
|
<plugin>
|
||||||
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
|
<artifactId>maven-javadoc-plugin</artifactId>
|
||||||
|
<configuration>
|
||||||
|
<links>
|
||||||
|
<link>${javase-javadoc-url}</link>
|
||||||
|
<link>${javaee-javadoc-url}</link>
|
||||||
|
<link>${slf4j-javadoc-url}</link>
|
||||||
|
<link>http://junit.sourceforge.net/javadoc/</link>
|
||||||
|
</links>
|
||||||
|
<stylesheetfile>${basedir}/../etc/css/stylesheet.css</stylesheetfile>
|
||||||
|
<linksource>true</linksource>
|
||||||
|
<maxmemory>256m</maxmemory>
|
||||||
|
<source>${source-version}</source>
|
||||||
|
<groups>
|
||||||
|
<group>
|
||||||
|
<title>JMS Client</title>
|
||||||
|
<packages>org.apache.activemq:org.apache.activemq.command</packages>
|
||||||
|
</group>
|
||||||
|
<group>
|
||||||
|
<title>JMS Client support classes for working with BLOBs and JNDI</title>
|
||||||
|
<packages>org.apache.activemq.blob:org.apache.activemq.jndi</packages>
|
||||||
|
</group>
|
||||||
|
<group>
|
||||||
|
<title>Enterprise Integration Pattern support via Camel</title>
|
||||||
|
<packages>org.apache.activemq.camel:org.apache.activemq.camel.*</packages>
|
||||||
|
</group>
|
||||||
|
<group>
|
||||||
|
<title>Spring support</title>
|
||||||
|
<packages>org.apache.activemq.spring:org.apache.activemq.xbean:org.apache.activemq.pool</packages>
|
||||||
|
</group>
|
||||||
|
<group>
|
||||||
|
<title>JMS Client Implementation classes</title>
|
||||||
|
<packages>org.apache.activemq.filter:org.apache.activemq.management:org.apache.activemq.selector:org.apache.activemq.thread</packages>
|
||||||
|
</group>
|
||||||
|
<group>
|
||||||
|
<title>Broker implementation</title>
|
||||||
|
<packages>org.apache.activemq.advisory:org.apache.activemq.broker:org.apache.activemq.broker.*:org.apache.activemq.state:org.apache.activemq.security:org.apache.activemq.transaction</packages>
|
||||||
|
</group>
|
||||||
|
<group>
|
||||||
|
<title>Broker Persistent Store</title>
|
||||||
|
<packages>org.apache.activemq.store:org.apache.activemq.store.*</packages>
|
||||||
|
</group>
|
||||||
|
<group>
|
||||||
|
<title>Kaha fast file based storage</title>
|
||||||
|
<packages>org.apache.activemq.kaha:org.apache.activemq.kaha.*</packages>
|
||||||
|
</group>
|
||||||
|
<group>
|
||||||
|
<title>Transports</title>
|
||||||
|
<packages>org.apache.activemq.transport:org.apache.activemq.transport.*</packages>
|
||||||
|
</group>
|
||||||
|
<group>
|
||||||
|
<title>Memory handling</title>
|
||||||
|
<packages>org.apache.activemq.memory:org.apache.activemq.memory.*</packages>
|
||||||
|
</group>
|
||||||
|
<group>
|
||||||
|
<title>Networks of Brokers</title>
|
||||||
|
<packages>org.apache.activemq.network:org.apache.activemq.network.*</packages>
|
||||||
|
</group>
|
||||||
|
<group>
|
||||||
|
<title>OpenWire support</title>
|
||||||
|
<packages>org.apache.activemq.openwire:org.apache.activemq.openwire.*</packages>
|
||||||
|
</group>
|
||||||
|
<group>
|
||||||
|
<title>Utility classes</title>
|
||||||
|
<packages>org.apache.activemq.util:org.apache.activemq.wireformat:org.apache.activemq.proxy</packages>
|
||||||
|
</group>
|
||||||
|
</groups>
|
||||||
|
</configuration>
|
||||||
|
</plugin>
|
||||||
|
<plugin>
|
||||||
|
<groupId>org.codehaus.mojo</groupId>
|
||||||
|
<artifactId>findbugs-maven-plugin</artifactId>
|
||||||
|
<version>${findbugs-maven-plugin-version}</version>
|
||||||
|
<configuration>
|
||||||
|
<threshold>Normal</threshold>
|
||||||
|
<effort>Default</effort>
|
||||||
|
</configuration>
|
||||||
|
</plugin>
|
||||||
|
</plugins>
|
||||||
|
</reporting>
|
||||||
|
|
||||||
|
<build>
|
||||||
|
<resources>
|
||||||
|
<resource>
|
||||||
|
<directory>${project.basedir}/src/main/resources</directory>
|
||||||
|
<includes>
|
||||||
|
<include>**/*</include>
|
||||||
|
</includes>
|
||||||
|
</resource>
|
||||||
|
<resource>
|
||||||
|
<directory>${project.basedir}/src/main/filtered-resources</directory>
|
||||||
|
<filtering>true</filtering>
|
||||||
|
<includes>
|
||||||
|
<include>**/*</include>
|
||||||
|
</includes>
|
||||||
|
</resource>
|
||||||
|
</resources>
|
||||||
|
|
||||||
|
<pluginManagement>
|
||||||
|
<plugins>
|
||||||
|
<!--This plugin's configuration is used to store Eclipse m2e settings only.
|
||||||
|
It has no influence on the Maven build itself.-->
|
||||||
|
<!-- <plugin>
|
||||||
|
<groupId>org.eclipse.m2e</groupId>
|
||||||
|
<artifactId>lifecycle-mapping</artifactId>
|
||||||
|
<version>1.0.0</version>
|
||||||
|
<configuration>
|
||||||
|
<lifecycleMappingMetadata>
|
||||||
|
<pluginExecutions>
|
||||||
|
<pluginExecution>
|
||||||
|
<pluginExecutionFilter>
|
||||||
|
<groupId>org.apache.activemq.protobuf</groupId>
|
||||||
|
<artifactId>activemq-protobuf</artifactId>
|
||||||
|
<versionRange>[0.0.0,)</versionRange>
|
||||||
|
<goals>
|
||||||
|
<goal>compile</goal>
|
||||||
|
</goals>
|
||||||
|
</pluginExecutionFilter>
|
||||||
|
<action>
|
||||||
|
<ignore />
|
||||||
|
</action>
|
||||||
|
</pluginExecution>
|
||||||
|
</pluginExecutions>
|
||||||
|
</lifecycleMappingMetadata>
|
||||||
|
</configuration>
|
||||||
|
</plugin> -->
|
||||||
|
</plugins>
|
||||||
|
</pluginManagement>
|
||||||
|
|
||||||
|
<plugins>
|
||||||
|
|
||||||
|
<plugin>
|
||||||
|
<artifactId>maven-surefire-plugin</artifactId>
|
||||||
|
<configuration>
|
||||||
|
<forkMode>always</forkMode>
|
||||||
|
<argLine>${surefire.argLine}</argLine>
|
||||||
|
<runOrder>alphabetical</runOrder>
|
||||||
|
|
||||||
|
<systemProperties>
|
||||||
|
<property>
|
||||||
|
<name>org.apache.activemq.default.directory.prefix</name>
|
||||||
|
<value>target/</value>
|
||||||
|
</property>
|
||||||
|
<!-- Uncomment the following if you want to configure custom logging (using src/test/resources/log4j.properties)
|
||||||
|
while running mvn:test
|
||||||
|
Note: if you want to see log messages on the console window remove
|
||||||
|
"redirectTestOutputToFile" from the parent pom
|
||||||
|
-->
|
||||||
|
<!--
|
||||||
|
<property>
|
||||||
|
<name>log4j.configuration</name>
|
||||||
|
<value>file:target/test-classes/log4j.properties</value>
|
||||||
|
</property>
|
||||||
|
-->
|
||||||
|
</systemProperties>
|
||||||
|
<includes>
|
||||||
|
<include>**/*Test.*</include>
|
||||||
|
</includes>
|
||||||
|
</configuration>
|
||||||
|
</plugin>
|
||||||
|
|
||||||
|
<plugin>
|
||||||
|
<groupId>org.codehaus.mojo</groupId>
|
||||||
|
<artifactId>javacc-maven-plugin</artifactId>
|
||||||
|
<executions>
|
||||||
|
<execution>
|
||||||
|
<phase>generate-sources</phase>
|
||||||
|
<configuration>
|
||||||
|
<sourceDirectory>${basedir}/src/main/grammar</sourceDirectory>
|
||||||
|
<outputDirectory>${basedir}/target/generated-javacc</outputDirectory>
|
||||||
|
<packageName>org.apache.activemq.selector</packageName>
|
||||||
|
</configuration>
|
||||||
|
<goals>
|
||||||
|
<goal>javacc</goal>
|
||||||
|
</goals>
|
||||||
|
</execution>
|
||||||
|
</executions>
|
||||||
|
</plugin>
|
||||||
|
<plugin>
|
||||||
|
<groupId>org.codehaus.mojo</groupId>
|
||||||
|
<artifactId>cobertura-maven-plugin</artifactId>
|
||||||
|
<configuration>
|
||||||
|
<check>
|
||||||
|
<branchRate>50</branchRate>
|
||||||
|
<lineRate>50</lineRate>
|
||||||
|
<haltOnFailure>true</haltOnFailure>
|
||||||
|
<totalBranchRate>50</totalBranchRate>
|
||||||
|
<totalLineRate>50</totalLineRate>
|
||||||
|
</check>
|
||||||
|
</configuration>
|
||||||
|
</plugin>
|
||||||
|
</plugins>
|
||||||
|
</build>
|
||||||
|
<profiles>
|
||||||
|
<profile>
|
||||||
|
<id>openwire-generate</id>
|
||||||
|
<dependencies>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.apache.activemq</groupId>
|
||||||
|
<artifactId>activemq-openwire-generator</artifactId>
|
||||||
|
<version>${project.version}</version>
|
||||||
|
<optional>true</optional>
|
||||||
|
</dependency>
|
||||||
|
</dependencies>
|
||||||
|
<build>
|
||||||
|
<plugins>
|
||||||
|
<plugin>
|
||||||
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
|
<artifactId>maven-antrun-plugin</artifactId>
|
||||||
|
<executions>
|
||||||
|
<execution>
|
||||||
|
<id>default</id>
|
||||||
|
<phase>generate-sources</phase>
|
||||||
|
<configuration>
|
||||||
|
<tasks>
|
||||||
|
<echo>Running OpenWire Generator</echo>
|
||||||
|
<taskdef name="generate" classname="org.apache.activemq.openwire.tool.JavaGeneratorTask" classpathref="maven.compile.classpath" />
|
||||||
|
<generate version="9" basedir="${basedir}" />
|
||||||
|
</tasks>
|
||||||
|
</configuration>
|
||||||
|
<goals>
|
||||||
|
<goal>run</goal>
|
||||||
|
</goals>
|
||||||
|
</execution>
|
||||||
|
</executions>
|
||||||
|
</plugin>
|
||||||
|
</plugins>
|
||||||
|
</build>
|
||||||
|
</profile>
|
||||||
|
</profiles>
|
||||||
|
</project>
|
|
@ -1135,7 +1135,7 @@ public class ActiveMQConnectionFactory extends JNDIBaseStorable implements Conne
|
||||||
* Sets the amount of time between scheduled sends of any outstanding Message Acks for consumers that
|
* Sets the amount of time between scheduled sends of any outstanding Message Acks for consumers that
|
||||||
* have been configured with optimizeAcknowledge enabled.
|
* have been configured with optimizeAcknowledge enabled.
|
||||||
*
|
*
|
||||||
* @param scheduledOptimizedAckInterval the scheduledOptimizedAckInterval to set
|
* @param optimizedAckScheduledAckInterval the scheduledOptimizedAckInterval to set
|
||||||
*/
|
*/
|
||||||
public void setOptimizedAckScheduledAckInterval(long optimizedAckScheduledAckInterval) {
|
public void setOptimizedAckScheduledAckInterval(long optimizedAckScheduledAckInterval) {
|
||||||
this.optimizedAckScheduledAckInterval = optimizedAckScheduledAckInterval;
|
this.optimizedAckScheduledAckInterval = optimizedAckScheduledAckInterval;
|
|
@ -0,0 +1,63 @@
|
||||||
|
/**
|
||||||
|
* Licensed to the Apache Software Foundation (ASF) under one or more
|
||||||
|
* contributor license agreements. See the NOTICE file distributed with
|
||||||
|
* this work for additional information regarding copyright ownership.
|
||||||
|
* The ASF licenses this file to You under the Apache License, Version 2.0
|
||||||
|
* (the "License"); you may not use this file except in compliance with
|
||||||
|
* the License. You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, 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.
|
||||||
|
*/
|
||||||
|
package org.apache.activemq;
|
||||||
|
|
||||||
|
import org.apache.activemq.transport.Transport;
|
||||||
|
|
||||||
|
import java.io.IOException;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @author <a href="http://hiramchirino.com">Hiram Chirino</a>
|
||||||
|
*/
|
||||||
|
public class TransportLoggerSupport {
|
||||||
|
|
||||||
|
public static String defaultLogWriterName = "default";
|
||||||
|
|
||||||
|
public static interface SPI {
|
||||||
|
public Transport createTransportLogger(Transport transport) throws IOException;
|
||||||
|
public Transport createTransportLogger(Transport transport, String logWriterName, boolean dynamicManagement, boolean startLogging, int jmxPort) throws IOException;
|
||||||
|
}
|
||||||
|
|
||||||
|
final static public SPI spi;
|
||||||
|
static {
|
||||||
|
SPI temp;
|
||||||
|
try {
|
||||||
|
temp = (SPI) TransportLoggerSupport.class.getClassLoader().loadClass("org.apache.activemq.transport.TransportLoggerFactorySPI").newInstance();
|
||||||
|
} catch (Throwable e) {
|
||||||
|
temp = null;
|
||||||
|
e.printStackTrace(); //To change body of catch statement use File | Settings | File Templates.
|
||||||
|
}
|
||||||
|
spi = temp;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static Transport createTransportLogger(Transport transport) throws IOException {
|
||||||
|
if( spi!=null ) {
|
||||||
|
return spi.createTransportLogger(transport);
|
||||||
|
} else {
|
||||||
|
return transport;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public static Transport createTransportLogger(Transport transport, String logWriterName, boolean dynamicManagement, boolean startLogging, int jmxPort) throws IOException {
|
||||||
|
if( spi!=null ) {
|
||||||
|
return spi.createTransportLogger(transport, logWriterName, dynamicManagement, startLogging, jmxPort);
|
||||||
|
} else {
|
||||||
|
return transport;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
|
@ -18,9 +18,6 @@ package org.apache.activemq.advisory;
|
||||||
|
|
||||||
import java.util.EventObject;
|
import java.util.EventObject;
|
||||||
|
|
||||||
import javax.jms.Destination;
|
|
||||||
|
|
||||||
import org.apache.activemq.command.ConsumerId;
|
|
||||||
import org.apache.activemq.command.DestinationInfo;
|
import org.apache.activemq.command.DestinationInfo;
|
||||||
import org.apache.activemq.command.ActiveMQDestination;
|
import org.apache.activemq.command.ActiveMQDestination;
|
||||||
|
|
|
@ -27,7 +27,6 @@ import javax.jms.MessageConsumer;
|
||||||
import javax.jms.MessageListener;
|
import javax.jms.MessageListener;
|
||||||
import javax.jms.Session;
|
import javax.jms.Session;
|
||||||
|
|
||||||
import org.apache.activemq.Service;
|
|
||||||
import org.apache.activemq.command.ActiveMQDestination;
|
import org.apache.activemq.command.ActiveMQDestination;
|
||||||
import org.apache.activemq.command.ActiveMQMessage;
|
import org.apache.activemq.command.ActiveMQMessage;
|
||||||
import org.apache.activemq.command.ActiveMQQueue;
|
import org.apache.activemq.command.ActiveMQQueue;
|
|
@ -34,7 +34,7 @@ public interface MessageReference {
|
||||||
Message getMessage();
|
Message getMessage();
|
||||||
boolean isPersistent();
|
boolean isPersistent();
|
||||||
|
|
||||||
Destination getRegionDestination();
|
Message.MessageDestination getRegionDestination();
|
||||||
|
|
||||||
int getRedeliveryCounter();
|
int getRedeliveryCounter();
|
||||||
void incrementRedeliveryCounter();
|
void incrementRedeliveryCounter();
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue