ACTIVEMQ6-11 Fix the distribution build

activemq-native/pom.xml

@@ -29,7 +29,9 @@
          <plugin>
             <artifactId>maven-resources-plugin</artifactId>
             <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>
                   <phase>validate</phase>
                   <goals>
@@ -41,12 +43,12 @@
                         <resource>
                            <directory>bin/</directory>
                            <includes>
-                              <include>libActiveMQAIO32.so</include>
+                              <include>libactiveMQAIO32.so</include>
                            </includes>
                         </resource>
                      </resources>
                   </configuration>
-               </execution>
+               </execution-->
                <execution>
                   <id>copy-resources-64</id>
                   <phase>validate</phase>
@@ -59,7 +61,7 @@
                         <resource>
                            <directory>bin/</directory>
                            <includes>
-                              <include>libActiveMQAIO64.so</include>
+                              <include>libactivemqAIO64.so</include>
                            </includes>
                         </resource>
                      </resources>

distribution/activemq/pom.xml

@@ -33,6 +33,7 @@
    <properties>
       <schemaLocation>${project.build.directory}/${project.artifactId}-${project.version}-bin/${project.artifactId}-${project.version}/schema</schemaLocation>
       <configLocation>src/main/resources/config</configLocation>
+      <activemq.basedir>${project.basedir}/../..</activemq.basedir>
    </properties>
 
    <dependencies>
@@ -122,8 +123,23 @@
          <artifactId>activemq-native</artifactId>
          <version>${project.version}</version>
       </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 -->
+      <dependency>
+         <groupId>org.jboss.logmanager</groupId>
+         <artifactId>jboss-logmanager</artifactId>
+      </dependency>
       <dependency>
          <groupId>org.apache.qpid</groupId>
          <artifactId>proton-jms</artifactId>
@@ -136,15 +152,6 @@
            <groupId>org.apache.activemq</groupId>
            <artifactId>activemq-client</artifactId>
        </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>
           <groupId>org.eclipse.jetty.aggregate</groupId>
           <artifactId>jetty-all-server</artifactId>

distribution/activemq/src/main/assembly/dep.xml

@@ -15,7 +15,8 @@
   ~ 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">
 
    <id>bin</id>
@@ -29,13 +30,29 @@
       <dependencySet>
          <includes>
             <!-- 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>
             <!-- dependencies -->
             <include>org.jboss.spec.javax.jms:jboss-jms-api_2.0_spec</include>
             <include>org.jboss.logmanager:jboss-logmanager</include>
             <include>org.jboss.logging:jboss-logging</include>
-            <include>org.jboss:jboss-common-core</include>
             <include>io.netty:netty-all</include>
             <include>org.apache.qpid:proton-j</include>
             <include>org.apache.qpid:proton-jms</include>
@@ -47,9 +64,9 @@
             <include>org.eclipse.jetty.aggregate:jetty-all-server</include>
             <include>org.apache.geronimo.specs:geronimo-servlet_3.0_spec</include>
          </includes>
-         <excludes>
+         <!--excludes>
             <exclude>org.apache.activemq:activemq-website</exclude>
-         </excludes>
+         </excludes-->
          <outputDirectory>lib</outputDirectory>
          <unpack>false</unpack>
       </dependencySet>
@@ -94,12 +111,12 @@
    <fileSets>
       <!-- schema -->
       <fileSet>
-       <directory>../../activemq-server/src/main/resources/schema/</directory>
+         <directory>${activemq.basedir}/activemq-server/src/main/resources/schema/</directory>
          <outputDirectory>schema</outputDirectory>
          <lineEnding>keep</lineEnding>
       </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>
          <lineEnding>keep</lineEnding>
       </fileSet>
@@ -115,7 +132,7 @@
          </excludes>
       </fileSet>
       <fileSet>
-       <directory>../../examples</directory>
+         <directory>${activemq.basedir}/examples</directory>
          <outputDirectory>web/examples</outputDirectory>
          <lineEnding>keep</lineEnding>
          <excludes>

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

pom.xml

@@ -219,11 +219,6 @@
             <artifactId>geronimo-jta_1.1_spec</artifactId>
             <version>1.1.1</version>
          </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-->
          <dependency>