From f0d18816675197fc51c8f424cada2b60621adf28 Mon Sep 17 00:00:00 2001 From: jbertram Date: Fri, 19 Dec 2014 11:51:17 -0600 Subject: [PATCH 1/3] ACTIVEMQ6-62 Remove unneeded dependency on jackson --- activemq-dto/pom.xml | 5 ----- .../src/main/java/org/apache/activemq/dto/BrokerDTO.java | 3 --- .../src/main/java/org/apache/activemq/dto/SecurityDTO.java | 3 --- distribution/activemq/pom.xml | 5 ----- distribution/activemq/src/main/assembly/dep.xml | 1 - pom.xml | 1 - 6 files changed, 18 deletions(-) diff --git a/activemq-dto/pom.xml b/activemq-dto/pom.xml index f57a571126..6fea333871 100644 --- a/activemq-dto/pom.xml +++ b/activemq-dto/pom.xml @@ -22,11 +22,6 @@ activemq-commons ${project.version} - - com.fasterxml.jackson.core - jackson-databind - ${jackson-databind.version} - diff --git a/activemq-dto/src/main/java/org/apache/activemq/dto/BrokerDTO.java b/activemq-dto/src/main/java/org/apache/activemq/dto/BrokerDTO.java index c6f8974a49..252b050ef8 100644 --- a/activemq-dto/src/main/java/org/apache/activemq/dto/BrokerDTO.java +++ b/activemq-dto/src/main/java/org/apache/activemq/dto/BrokerDTO.java @@ -16,8 +16,6 @@ */ package org.apache.activemq.dto; -import com.fasterxml.jackson.annotation.JsonTypeInfo; - import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlElementRef; @@ -27,7 +25,6 @@ import java.util.List; @XmlRootElement(name = "broker") @XmlAccessorType(XmlAccessType.FIELD) -@JsonTypeInfo(use = JsonTypeInfo.Id.CUSTOM, include = JsonTypeInfo.As.PROPERTY, property = "@class") public class BrokerDTO { diff --git a/activemq-dto/src/main/java/org/apache/activemq/dto/SecurityDTO.java b/activemq-dto/src/main/java/org/apache/activemq/dto/SecurityDTO.java index 84e44fe4b7..723f92d01a 100644 --- a/activemq-dto/src/main/java/org/apache/activemq/dto/SecurityDTO.java +++ b/activemq-dto/src/main/java/org/apache/activemq/dto/SecurityDTO.java @@ -16,15 +16,12 @@ */ package org.apache.activemq.dto; -import com.fasterxml.jackson.annotation.JsonTypeInfo; - import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlType; @XmlType(name = "security") @XmlAccessorType(XmlAccessType.FIELD) -@JsonTypeInfo(use = JsonTypeInfo.Id.CUSTOM, include = JsonTypeInfo.As.PROPERTY, property = "@class") public class SecurityDTO { } diff --git a/distribution/activemq/pom.xml b/distribution/activemq/pom.xml index 9fd862e5a6..e99e202080 100644 --- a/distribution/activemq/pom.xml +++ b/distribution/activemq/pom.xml @@ -136,11 +136,6 @@ org.apache.activemq activemq-client - - com.fasterxml.jackson.core - jackson-databind - ${jackson-databind.version} - org.apache.activemq activemq-client diff --git a/distribution/activemq/src/main/assembly/dep.xml b/distribution/activemq/src/main/assembly/dep.xml index 0c2e3238f4..20770c095b 100644 --- a/distribution/activemq/src/main/assembly/dep.xml +++ b/distribution/activemq/src/main/assembly/dep.xml @@ -44,7 +44,6 @@ io.airlift:airline com.google.guava:guava javax.inject:javax.inject - com.fasterxml.jackson.core:jackson-* org.eclipse.jetty.aggregate:jetty-all-server org.apache.geronimo.specs:geronimo-servlet_3.0_spec diff --git a/pom.xml b/pom.xml index 1e2ba339bf..2e1c4162f9 100644 --- a/pom.xml +++ b/pom.xml @@ -41,7 +41,6 @@ (${activemq.version.versionName}, ${activemq.version.incrementingVersion}) 3.0.9.Final - 2.3.1 true true true From edd5adda7d1e40c720d51b750557d712bfc87230 Mon Sep 17 00:00:00 2001 From: jbertram Date: Fri, 19 Dec 2014 16:59:24 -0600 Subject: [PATCH 2/3] ACTIVEMQ6-11 Fix the distribution build --- activemq-native/pom.xml | 10 +- distribution/activemq/pom.xml | 43 +++-- .../activemq/src/main/assembly/dep.xml | 159 ++++++++++-------- .../main/resources/config/logging.properties | 2 +- pom.xml | 5 - 5 files changed, 120 insertions(+), 99 deletions(-) diff --git a/activemq-native/pom.xml b/activemq-native/pom.xml index 22a9515206..0d3d67c4ad 100644 --- a/activemq-native/pom.xml +++ b/activemq-native/pom.xml @@ -29,7 +29,9 @@ maven-resources-plugin - + + copy-resources-64 validate @@ -59,7 +61,7 @@ bin/ - libActiveMQAIO64.so + libactivemqAIO64.so diff --git a/distribution/activemq/pom.xml b/distribution/activemq/pom.xml index e99e202080..0be0644e15 100644 --- a/distribution/activemq/pom.xml +++ b/distribution/activemq/pom.xml @@ -33,6 +33,7 @@ ${project.build.directory}/${project.artifactId}-${project.version}-bin/${project.artifactId}-${project.version}/schema src/main/resources/config + ${project.basedir}/../.. @@ -117,17 +118,32 @@ activemq-openwire-protocol ${project.version} - - org.apache.activemq - activemq-native - ${project.version} - + + org.apache.activemq + activemq-native + ${project.version} + + + org.apache.activemq + activemq-website + ${project.version} + + + org.apache.activemq + activemq-website + ${project.version} + javadoc + - - org.apache.qpid - proton-jms - + + org.jboss.logmanager + jboss-logmanager + + + org.apache.qpid + proton-jms + io.airlift airline @@ -136,15 +152,6 @@ org.apache.activemq activemq-client - - org.apache.activemq - activemq-client - - - org.apache.activemq - activemq-website - 6.0.0-SNAPSHOT - org.eclipse.jetty.aggregate jetty-all-server diff --git a/distribution/activemq/src/main/assembly/dep.xml b/distribution/activemq/src/main/assembly/dep.xml index 20770c095b..25bc7d1717 100644 --- a/distribution/activemq/src/main/assembly/dep.xml +++ b/distribution/activemq/src/main/assembly/dep.xml @@ -15,27 +15,44 @@ ~ limitations under the License. --> - + - bin - - dir - zip - tar.gz - - true + bin + + dir + zip + tar.gz + + true - org.apache.activemq:* + org.apache.activemq:activemq-bootstrap + org.apache.activemq:activemq-commons + org.apache.activemq:activemq-core-client + org.apache.activemq:activemq-dto + org.apache.activemq:activemq-jms-client + org.apache.activemq:activemq-jms-server + org.apache.activemq:activemq-journal + org.apache.activemq:activemq-native + org.apache.activemq:activemq-amqp-protocol + org.apache.activemq:activemq-openwire-protocol + org.apache.activemq:activemq-proton-plug + org.apache.activemq:activemq-stomp-protocol + org.apache.activemq:activemq-ra + org.apache.activemq:activemq-selector + org.apache.activemq:activemq-server + org.apache.activemq:activemq-service-extensions + org.apache.activemq:activemq-tools + org.apache.activemq:activemq-web org.apache.activemq.rest:activemq-rest org.jboss.spec.javax.jms:jboss-jms-api_2.0_spec org.jboss.logmanager:jboss-logmanager org.jboss.logging:jboss-logging - org.jboss:jboss-common-core io.netty:netty-all org.apache.qpid:proton-j org.apache.qpid:proton-jms @@ -47,9 +64,9 @@ org.eclipse.jetty.aggregate:jetty-all-server org.apache.geronimo.specs:geronimo-servlet_3.0_spec - - org.apache.activemq:activemq-website - + lib false @@ -66,63 +83,63 @@ - - - org.apache.activemq:activemq-website - - - org.apache.activemq:activemq-website:jar:javadoc - - web - true - - - - org.apache.activemq:activemq-website:jar:javadoc - - web/api - true - - - - org.jolokia:jolokia-war:war - - web - false - + + + org.apache.activemq:activemq-website + + + org.apache.activemq:activemq-website:jar:javadoc + + web + true + + + + org.apache.activemq:activemq-website:jar:javadoc + + web/api + true + + + + org.jolokia:jolokia-war:war + + web + false + - - - ../../activemq-server/src/main/resources/schema/ - schema - keep - - - ../../activemq-jms-server/src/main/resources/schema/ - schema - keep - - - - src/main/resources - / - keep - - **/target/** - **/**/*.iml - **/**/*.dat - - - - ../../examples - web/examples - keep - - **/target/** - **/**/*.iml - **/**/*.dat - - - + + + ${activemq.basedir}/activemq-server/src/main/resources/schema/ + schema + keep + + + ${activemq.basedir}/activemq-jms-server/src/main/resources/schema/ + schema + keep + + + + src/main/resources + / + keep + + **/target/** + **/**/*.iml + **/**/*.dat + + + + ${activemq.basedir}/examples + web/examples + keep + + **/target/** + **/**/*.iml + **/**/*.dat + + + diff --git a/distribution/activemq/src/main/resources/config/logging.properties b/distribution/activemq/src/main/resources/config/logging.properties index 39d42faa98..f566d3611b 100644 --- a/distribution/activemq/src/main/resources/config/logging.properties +++ b/distribution/activemq/src/main/resources/config/logging.properties @@ -42,7 +42,7 @@ handler.FILE=org.jboss.logmanager.handlers.FileHandler handler.FILE.level=DEBUG handler.FILE.properties=autoFlush,fileName handler.FILE.autoFlush=true -handler.FILE.fileName=${actviemq.home}/logs/activemq.log +handler.FILE.fileName=${activemq.home}/logs/activemq.log handler.FILE.formatter=PATTERN # Formatter pattern configuration diff --git a/pom.xml b/pom.xml index 2e1c4162f9..4dadcf62cd 100644 --- a/pom.xml +++ b/pom.xml @@ -219,11 +219,6 @@ geronimo-jta_1.1_spec 1.1.1 - - org.apache.geronimo.specs - geronimo-jta_1.1_spec - 1.1.1 - From 1a5ea5a029bd55a99cbed92b8ef09170e302e5a3 Mon Sep 17 00:00:00 2001 From: jbertram Date: Tue, 30 Dec 2014 13:09:13 -0600 Subject: [PATCH 3/3] ACTIVEMQ6-63 add example links to site --- .../src/main/resources/index.html | 99 ++++++++++++++++++- 1 file changed, 98 insertions(+), 1 deletion(-) diff --git a/activemq-website/src/main/resources/index.html b/activemq-website/src/main/resources/index.html index edb547a856..160d1f4ef7 100644 --- a/activemq-website/src/main/resources/index.html +++ b/activemq-website/src/main/resources/index.html @@ -55,7 +55,104 @@