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

merge #49 - couple of fixes

This commit is contained in:
Andy Taylor 2015-01-02 08:24:04 +00:00
parent 16d74b2bec 1a5ea5a029
commit df873e6909
9 changed files with 218 additions and 118 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
activemq-dto/pom.xml
View File

@ -22,11 +22,6 @@
<artifactId>activemq-commons</artifactId> <artifactId>activemq-commons</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>${jackson-databind.version}</version>
</dependency>
</dependencies> </dependencies>
<build> <build>

3
activemq-dto/src/main/java/org/apache/activemq/dto/BrokerDTO.java
View File

@ -16,8 +16,6 @@
*/ */
package org.apache.activemq.dto; package org.apache.activemq.dto;
import com.fasterxml.jackson.annotation.JsonTypeInfo;
import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlElementRef; import javax.xml.bind.annotation.XmlElementRef;
@ -27,7 +25,6 @@ import java.util.List;
@XmlRootElement(name = "broker") @XmlRootElement(name = "broker")
@XmlAccessorType(XmlAccessType.FIELD) @XmlAccessorType(XmlAccessType.FIELD)
@JsonTypeInfo(use = JsonTypeInfo.Id.CUSTOM, include = JsonTypeInfo.As.PROPERTY, property = "@class")
public class BrokerDTO public class BrokerDTO
{ {

3
activemq-dto/src/main/java/org/apache/activemq/dto/SecurityDTO.java
View File

@ -16,15 +16,12 @@
*/ */
package org.apache.activemq.dto; package org.apache.activemq.dto;
import com.fasterxml.jackson.annotation.JsonTypeInfo;
import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.XmlType;
@XmlType(name = "security") @XmlType(name = "security")
@XmlAccessorType(XmlAccessType.FIELD) @XmlAccessorType(XmlAccessType.FIELD)
@JsonTypeInfo(use = JsonTypeInfo.Id.CUSTOM, include = JsonTypeInfo.As.PROPERTY, property = "@class")
public class SecurityDTO public class SecurityDTO
{ {
} }

10
activemq-native/pom.xml
View File

@ -29,7 +29,9 @@
<plugin> <plugin>
<artifactId>maven-resources-plugin</artifactId> <artifactId>maven-resources-plugin</artifactId>
<executions> <executions>
<execution> <!-- We don't currently have a 32-bit shared object in the repo which means if this is enabled the 64-bit
shared object won't be copied properly. -->
<!--execution>
<id>copy-resources-32</id> <id>copy-resources-32</id>
<phase>validate</phase> <phase>validate</phase>
<goals> <goals>
@ -41,12 +43,12 @@
<resource> <resource>
<directory>bin/</directory> <directory>bin/</directory>
<includes> <includes>
<include>libActiveMQAIO32.so</include> <include>libactiveMQAIO32.so</include>
</includes> </includes>
</resource> </resource>
</resources> </resources>
</configuration> </configuration>
</execution> </execution-->
<execution> <execution>
<id>copy-resources-64</id> <id>copy-resources-64</id>
<phase>validate</phase> <phase>validate</phase>
@ -59,7 +61,7 @@
<resource> <resource>
<directory>bin/</directory> <directory>bin/</directory>
<includes> <includes>
<include>libActiveMQAIO64.so</include> <include>libactivemqAIO64.so</include>
</includes> </includes>
</resource> </resource>
</resources> </resources>

99
activemq-website/src/main/resources/index.html
View File

@ -55,7 +55,104 @@
<ul> <ul>
<li><a target="_blank" href="api/index.html">API</a></li> <li><a target="_blank" href="api/index.html">API</a></li>
<li><a target="_blank" href="user-manual/index.html">User Manual</a></li> <li><a target="_blank" href="user-manual/index.html">User Manual</a></li>
<li><a href="">Examples (to follow)</a></li> <li>Examples:</a></li>
<ul>
<li>JMS:</li>
<ol>
<li><a href="examples/jms/aerogear/readme.html">AeroGear Example</a></li>
<li><a href="examples/jms/applet/readme.html">Applet Example</a></li>
<li><a href="examples/jms/application-layer-failover/readme.html">Application-Layer Failover Example</a></li>
<li><a href="examples/jms/bridge/readme.html">Core Bridge Example</a></li>
<li><a href="examples/jms/browser/readme.html">JMS QueueBrowser Example</a></li>
<li><a href="examples/jms/client-kickoff/readme.html">Client Kickoff Example</a></li>
<li><a href="examples/jms/client-side-failoverlistener/readme.html">Client Side FailoverListener Example</a></li>
<li><a href="examples/jms/client-side-load-balancing/readme.html">JMS Client-Side Load-Balancing Example</a></li>
<li><a href="examples/jms/clustered-durable-subscription/readme.html">JMS Durable Subscription Example</a></li>
<li><a href="examples/jms/clustered-grouping/readme.html">JMS Clustered Grouping Example</a></li>
<li><a href="examples/jms/clustered-jgroups/readme.html">ActiveMQ Clustering with JGroups Example</a></li>
<li><a href="examples/jms/clustered-queue/readme.html">JMS Load Balanced Clustered Queue Example</a></li>
<li><a href="examples/jms/clustered-standalone/readme.html">JMS Clustered Stand-alone Example</a></li>
<li><a href="examples/jms/clustered-static-discovery/readme.html">JMS Load Balanced Static Clustered Queue Example</a></li>
<li><a href="examples/jms/clustered-static-oneway/readme.html">JMS Load Balanced Static Clustered One Way Queue Example</a></li>
<li><a href="examples/jms/clustered-topic/readme.html">JMS Clustered Topic Example</a></li>
<li><a href="examples/jms/colocated-failover/readme.html">JMS Colocated Failover Shared Store Example</a></li>
<li><a href="examples/jms/colocated-failover-scale-down/readme.html">JMS Colocated Failover Recover Only Example</a></li>
<li><a href="examples/jms/consumer-rate-limit/readme.html">JMS Message Consumer Rate Limiting Example</a></li>
<li><a href="examples/jms/dead-letter/readme.html">Dead Letter Example</a></li>
<li><a href="examples/jms/delayed-redelivery/readme.html">Delayed Redelivery Example</a></li>
<li><a href="examples/jms/divert/readme.html">Divert Example</a></li>
<li><a href="examples/jms/durable-subscription/readme.html">JMS Durable Subscription Example</a></li>
<li><a href="examples/jms/embedded/readme.html">Embedded JMS Server Example</a></li>
<li><a href="examples/jms/embedded-simple/readme.html">Embedded JMS Server Example</a></li>
<li><a href="examples/jms/expiry/readme.html">JMS Expiration Example</a></li>
<li><a href="examples/jms/ha-policy-autobackup/readme.html">Auto-backup Example</a></li>
<li><a href="examples/jms/http-transport/readme.html">JMS HTTP Example</a></li>
<li><a href="examples/jms/instantiate-connection-factory/readme.html">JMS Instantiate Connection Factory Example</a></li>
<li><a href="examples/jms/interceptor/readme.html">JMS Interceptor Example</a></li>
<li><a href="examples/jms/jaas/readme.html">JAAS Example</a></li>
<li><a href="examples/jms/jms-auto-closeable/readme.html">JMS Auto Closable Example</a></li>
<li><a href="examples/jms/jms-bridge/readme.html">JMS Bridge Example</a></li>
<li><a href="examples/jms/jms-completion-listener/readme.html">JMS Completion Listener Example</a></li>
<li><a href="examples/jms/jms-context/readme.html">JMS Context Example</a></li>
<li><a href="examples/jms/jms-shared-consumer/readme.html">JMS Shared Consumer Example</a></li>
<li><a href="examples/jms/jmx/readme.html">JMX Management Example</a></li>
<li><a href="examples/jms/large-message/readme.html">Large Message Example</a></li>
<li><a href="examples/jms/last-value-queue/readme.html">Last-Value Queue Example</a></li>
<li><a href="examples/jms/management/readme.html">Management Example</a></li>
<li><a href="examples/jms/management-notifications/readme.html">Management Notification Example</a></li>
<li><a href="examples/jms/message-counters/readme.html">JMS Message Counter Example</a></li>
<li><a href="examples/jms/message-group/readme.html">Message Group Example</a></li>
<li><a href="examples/jms/message-group2/readme.html">Message Group Example</a></li>
<li><a href="examples/jms/message-priority/readme.html">JMS Message Priority Example</a></li>
<li><a href="examples/jms/multiple-failover/readme.html">Multiple Fail-over Example</a></li>
<li><a href="examples/jms/multiple-failover-failback/readme.html">Multiple Fail-over/Fail-back Example</a></li>
<li><a href="examples/jms/no-consumer-buffering/readme.html">No Consumer Buffering Example</a></li>
<li><a href="examples/jms/non-transaction-failover/readme.html">JMS Failover Without Transactions Example</a></li>
<li><a href="examples/jms/openwire/readme.html">JMS OpenWire Example</a></li>
<li><a href="examples/jms/paging/readme.html">Paging Example</a></li>
<li><a href="examples/jms/perf/readme.html">JMS Simple Performance Example</a></li>
<li><a href="examples/jms/pre-acknowledge/readme.html">JMS Pre-Acknowledge Example</a></li>
<li><a href="examples/jms/producer-rate-limit/readme.html">JMS Message Producer Rate Example</a></li>
<li><a href="examples/jms/proton-cpp/readme.html">AMQP CPP Example</a></li>
<li><a href="examples/jms/proton-j/readme.html">Proton qpid java Example</a></li>
<li><a href="examples/jms/proton-ruby/readme.html">Proton Ruby Example</a></li>
<li><a href="examples/jms/queue/readme.html">JMS Queue Example</a></li>
<li><a href="examples/jms/queue-message-redistribution/readme.html">Message Redistribution Example</a></li>
<li><a href="examples/jms/queue-requestor/readme.html">JMS QueueRequestor Example</a></li>
<li><a href="examples/jms/queue-selector/readme.html">JMS Queue Selector Example</a></li>
<li><a href="examples/jms/reattach-node/readme.html">JMS Reattach Example</a></li>
<li><a href="examples/jms/replicated-failback/readme.html">JMS Multiple Failover using Replication Example</a></li>
<li><a href="examples/jms/replicated-failback-static/readme.html">JMS Multiple Failover using Replication Example</a></li>
<li><a href="examples/jms/replicated-multiple-failover/readme.html">JMS Multiple Failover using Replication Example</a></li>
<li><a href="examples/jms/replicated-transaction-failover/readme.html">JMS Failover With Transaction using Replication Example</a></li>
<li><a href="examples/jms/request-reply/readme.html">JMS Request-Reply Example</a></li>
<li><a href="examples/jms/scale-down/readme.html">JMS Colocated Failover Shared Store Example</a></li>
<li><a href="examples/jms/scheduled-message/readme.html">JMS Scheduled Message Example</a></li>
<li><a href="examples/jms/security/readme.html">JMS Security Example</a></li>
<li><a href="examples/jms/send-acknowledgements/readme.html">Asynchronous Send Acknowledgements Example</a></li>
<li><a href="examples/jms/spring-integration/readme.html">ActiveMQ Spring Example Example</a></li>
<li><a href="examples/jms/ssl-enabled/readme.html">JMS SSL Example</a></li>
<li><a href="examples/jms/static-selector/readme.html">Static Message Selector Example</a></li>
<li><a href="examples/jms/static-selector-jms/readme.html">Static Message Selector Example</a></li>
<li><a href="examples/jms/stomp/readme.html">Stomp Example</a></li>
<li><a href="examples/jms/stomp1.1/readme.html">Stomp 1.1 Example</a></li>
<li><a href="examples/jms/stomp1.2/readme.html">Stomp 1.2 Example</a></li>
<li><a href="examples/jms/stomp-websockets/readme.html">Stomp WebSockets Example</a></li>
<li><a href="examples/jms/stop-server-failover/readme.html">JMS Failover Without Transactions Example</a></li>
<li><a href="examples/jms/symmetric-cluster/readme.html">JMS Symmetric Cluster Example</a></li>
<li><a href="examples/jms/temp-queue/readme.html">JMS Temporary Queue Example</a></li>
<li><a href="examples/jms/topic/readme.html">JMS Topic Example</a></li>
<li><a href="examples/jms/topic-hierarchies/readme.html">Topic Hierarchy Example</a></li>
<li><a href="examples/jms/topic-selector-example1/readme.html">JMS Topic Selector Example 1 Example</a></li>
<li><a href="examples/jms/topic-selector-example2/readme.html">JMS Topic Selector Example 2 Example</a></li>
<li><a href="examples/jms/transaction-failover/readme.html">JMS Failover With Transaction Example</a></li>
<li><a href="examples/jms/transactional/readme.html">JMS Transactional Session Example</a></li>
<li><a href="examples/jms/xa-heuristic/readme.html">JMS XA Heuristic Example</a></li>
<li><a href="examples/jms/xa-receive/readme.html">JMS XA Receive Example</a></li>
<li><a href="examples/jms/xa-send/readme.html">JMS XA Send Example</a></li>
<li><a href="examples/jms/xa-with-jta/readme.html">JMS XA with JTA Example</a></li>
</ol>
</ul>
</ul> </ul>
<div></div> <div></div>
</div> </div>

30
distribution/activemq/pom.xml
View File

@ -33,6 +33,7 @@
<properties> <properties>
<schemaLocation>${project.build.directory}/${project.artifactId}-${project.version}-bin/${project.artifactId}-${project.version}/schema</schemaLocation> <schemaLocation>${project.build.directory}/${project.artifactId}-${project.version}-bin/${project.artifactId}-${project.version}/schema</schemaLocation>
<configLocation>src/main/resources/config</configLocation> <configLocation>src/main/resources/config</configLocation>
<activemq.basedir>${project.basedir}/../..</activemq.basedir>
</properties> </properties>
<dependencies> <dependencies>
@ -122,8 +123,23 @@
<artifactId>activemq-native</artifactId> <artifactId>activemq-native</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-website</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-website</artifactId>
<version>${project.version}</version>
<classifier>javadoc</classifier>
</dependency>
<!-- dependencies --> <!-- dependencies -->
<dependency>
<groupId>org.jboss.logmanager</groupId>
<artifactId>jboss-logmanager</artifactId>
</dependency>
<dependency> <dependency>
<groupId>org.apache.qpid</groupId> <groupId>org.apache.qpid</groupId>
<artifactId>proton-jms</artifactId> <artifactId>proton-jms</artifactId>
@ -136,20 +152,6 @@
<groupId>org.apache.activemq</groupId> <groupId>org.apache.activemq</groupId>
<artifactId>activemq-client</artifactId> <artifactId>activemq-client</artifactId>
</dependency> </dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>${jackson-databind.version}</version>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-client</artifactId>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-website</artifactId>
<version>6.0.0-SNAPSHOT</version>
</dependency>
<dependency> <dependency>
<groupId>org.eclipse.jetty.aggregate</groupId> <groupId>org.eclipse.jetty.aggregate</groupId>
<artifactId>jetty-all-server</artifactId> <artifactId>jetty-all-server</artifactId>

34
distribution/activemq/src/main/assembly/dep.xml
View File

@ -15,7 +15,8 @@
~ limitations under the License. ~ limitations under the License.
--> -->
<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd"> xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
<id>bin</id> <id>bin</id>
@ -29,13 +30,29 @@
<dependencySet> <dependencySet>
<includes> <includes>
<!-- modules --> <!-- modules -->
<include>org.apache.activemq:*</include> <include>org.apache.activemq:activemq-bootstrap</include>
<include>org.apache.activemq:activemq-commons</include>
<include>org.apache.activemq:activemq-core-client</include>
<include>org.apache.activemq:activemq-dto</include>
<include>org.apache.activemq:activemq-jms-client</include>
<include>org.apache.activemq:activemq-jms-server</include>
<include>org.apache.activemq:activemq-journal</include>
<include>org.apache.activemq:activemq-native</include>
<include>org.apache.activemq:activemq-amqp-protocol</include>
<include>org.apache.activemq:activemq-openwire-protocol</include>
<include>org.apache.activemq:activemq-proton-plug</include>
<include>org.apache.activemq:activemq-stomp-protocol</include>
<include>org.apache.activemq:activemq-ra</include>
<include>org.apache.activemq:activemq-selector</include>
<include>org.apache.activemq:activemq-server</include>
<include>org.apache.activemq:activemq-service-extensions</include>
<include>org.apache.activemq:activemq-tools</include>
<include>org.apache.activemq:activemq-web</include>
<include>org.apache.activemq.rest:activemq-rest</include> <include>org.apache.activemq.rest:activemq-rest</include>
<!-- dependencies --> <!-- dependencies -->
<include>org.jboss.spec.javax.jms:jboss-jms-api_2.0_spec</include> <include>org.jboss.spec.javax.jms:jboss-jms-api_2.0_spec</include>
<include>org.jboss.logmanager:jboss-logmanager</include> <include>org.jboss.logmanager:jboss-logmanager</include>
<include>org.jboss.logging:jboss-logging</include> <include>org.jboss.logging:jboss-logging</include>
<include>org.jboss:jboss-common-core</include>
<include>io.netty:netty-all</include> <include>io.netty:netty-all</include>
<include>org.apache.qpid:proton-j</include> <include>org.apache.qpid:proton-j</include>
<include>org.apache.qpid:proton-jms</include> <include>org.apache.qpid:proton-jms</include>
@ -44,13 +61,12 @@
<include>io.airlift:airline</include> <include>io.airlift:airline</include>
<include>com.google.guava:guava</include> <include>com.google.guava:guava</include>
<include>javax.inject:javax.inject</include> <include>javax.inject:javax.inject</include>
<include>com.fasterxml.jackson.core:jackson-*</include>
<include>org.eclipse.jetty.aggregate:jetty-all-server</include> <include>org.eclipse.jetty.aggregate:jetty-all-server</include>
<include>org.apache.geronimo.specs:geronimo-servlet_3.0_spec</include> <include>org.apache.geronimo.specs:geronimo-servlet_3.0_spec</include>
</includes> </includes>
<excludes> <!--excludes>
<exclude>org.apache.activemq:activemq-website</exclude> <exclude>org.apache.activemq:activemq-website</exclude>
</excludes> </excludes-->
<outputDirectory>lib</outputDirectory> <outputDirectory>lib</outputDirectory>
<unpack>false</unpack> <unpack>false</unpack>
</dependencySet> </dependencySet>
@ -95,12 +111,12 @@
<fileSets> <fileSets>
<!-- schema --> <!-- schema -->
<fileSet> <fileSet>
<directory>../../activemq-server/src/main/resources/schema/</directory> <directory>${activemq.basedir}/activemq-server/src/main/resources/schema/</directory>
<outputDirectory>schema</outputDirectory> <outputDirectory>schema</outputDirectory>
<lineEnding>keep</lineEnding> <lineEnding>keep</lineEnding>
</fileSet> </fileSet>
<fileSet> <fileSet>
<directory>../../activemq-jms-server/src/main/resources/schema/</directory> <directory>${activemq.basedir}/activemq-jms-server/src/main/resources/schema/</directory>
<outputDirectory>schema</outputDirectory> <outputDirectory>schema</outputDirectory>
<lineEnding>keep</lineEnding> <lineEnding>keep</lineEnding>
</fileSet> </fileSet>
@ -116,7 +132,7 @@
</excludes> </excludes>
</fileSet> </fileSet>
<fileSet> <fileSet>
<directory>../../examples</directory> <directory>${activemq.basedir}/examples</directory>
<outputDirectory>web/examples</outputDirectory> <outputDirectory>web/examples</outputDirectory>
<lineEnding>keep</lineEnding> <lineEnding>keep</lineEnding>
<excludes> <excludes>

2
distribution/activemq/src/main/resources/config/logging.properties
View File

@ -42,7 +42,7 @@ handler.FILE=org.jboss.logmanager.handlers.FileHandler
handler.FILE.level=DEBUG handler.FILE.level=DEBUG
handler.FILE.properties=autoFlush,fileName handler.FILE.properties=autoFlush,fileName
handler.FILE.autoFlush=true handler.FILE.autoFlush=true
handler.FILE.fileName=${actviemq.home}/logs/activemq.log handler.FILE.fileName=${activemq.home}/logs/activemq.log
handler.FILE.formatter=PATTERN handler.FILE.formatter=PATTERN
# Formatter pattern configuration # Formatter pattern configuration

6
pom.xml
View File

@ -41,7 +41,6 @@
(${activemq.version.versionName}, ${activemq.version.incrementingVersion}) (${activemq.version.versionName}, ${activemq.version.incrementingVersion})
</ActiveMQ-Version> </ActiveMQ-Version>
<resteasy.version>3.0.9.Final</resteasy.version> <resteasy.version>3.0.9.Final</resteasy.version>
<jackson-databind.version>2.3.1</jackson-databind.version>
<skipUnitTests>true</skipUnitTests> <skipUnitTests>true</skipUnitTests>
<skipJmsTests>true</skipJmsTests> <skipJmsTests>true</skipJmsTests>
<skipBytemanTests>true</skipBytemanTests> <skipBytemanTests>true</skipBytemanTests>
@ -220,11 +219,6 @@
<artifactId>geronimo-jta_1.1_spec</artifactId> <artifactId>geronimo-jta_1.1_spec</artifactId>
<version>1.1.1</version> <version>1.1.1</version>
</dependency> </dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jta_1.1_spec</artifactId>
<version>1.1.1</version>
</dependency>
<!--this for xa recovery--> <!--this for xa recovery-->
<dependency> <dependency>