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

ACTIVEMQ6-11 Fix the distribution build

This commit is contained in:
jbertram 2014-12-19 16:59:24 -06:00
parent f0d1881667
commit edd5adda7d
5 changed files with 120 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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>

43
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>
@ -117,17 +118,32 @@
<artifactId>activemq-openwire-protocol</artifactId> <artifactId>activemq-openwire-protocol</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.activemq</groupId> <groupId>org.apache.activemq</groupId>
<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> <dependency>
<groupId>org.apache.qpid</groupId> <groupId>org.jboss.logmanager</groupId>
<artifactId>proton-jms</artifactId> <artifactId>jboss-logmanager</artifactId>
</dependency> </dependency>
<dependency>
<groupId>org.apache.qpid</groupId>
<artifactId>proton-jms</artifactId>
</dependency>
<dependency> <dependency>
<groupId>io.airlift</groupId> <groupId>io.airlift</groupId>
<artifactId>airline</artifactId> <artifactId>airline</artifactId>
@ -136,15 +152,6 @@
<groupId>org.apache.activemq</groupId> <groupId>org.apache.activemq</groupId>
<artifactId>activemq-client</artifactId> <artifactId>activemq-client</artifactId>
</dependency> </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>

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

@ -15,27 +15,44 @@
~ 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"
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd"> 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> <id>bin</id>
<formats> <formats>
<format>dir</format> <format>dir</format>
<format>zip</format> <format>zip</format>
<format>tar.gz</format> <format>tar.gz</format>
</formats> </formats>
<includeBaseDirectory>true</includeBaseDirectory> <includeBaseDirectory>true</includeBaseDirectory>
<dependencySets> <dependencySets>
<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>
@ -47,9 +64,9 @@
<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>
@ -66,63 +83,63 @@
</includes> </includes>
</unpackOptions> </unpackOptions>
</dependencySet> </dependencySet>
<dependencySet> <dependencySet>
<includes> <includes>
<include>org.apache.activemq:activemq-website</include> <include>org.apache.activemq:activemq-website</include>
</includes> </includes>
<excludes> <excludes>
<exclude>org.apache.activemq:activemq-website:jar:javadoc</exclude> <exclude>org.apache.activemq:activemq-website:jar:javadoc</exclude>
</excludes> </excludes>
<outputDirectory>web</outputDirectory> <outputDirectory>web</outputDirectory>
<unpack>true</unpack> <unpack>true</unpack>
</dependencySet> </dependencySet>
<dependencySet> <dependencySet>
<includes> <includes>
<include>org.apache.activemq:activemq-website:jar:javadoc</include> <include>org.apache.activemq:activemq-website:jar:javadoc</include>
</includes> </includes>
<outputDirectory>web/api</outputDirectory> <outputDirectory>web/api</outputDirectory>
<unpack>true</unpack> <unpack>true</unpack>
</dependencySet> </dependencySet>
<dependencySet> <dependencySet>
<includes> <includes>
<include>org.jolokia:jolokia-war:war</include> <include>org.jolokia:jolokia-war:war</include>
</includes> </includes>
<outputDirectory>web</outputDirectory> <outputDirectory>web</outputDirectory>
<unpack>false</unpack> <unpack>false</unpack>
</dependencySet> </dependencySet>
</dependencySets> </dependencySets>
<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>
<!-- resources --> <!-- resources -->
<fileSet> <fileSet>
<directory>src/main/resources</directory> <directory>src/main/resources</directory>
<outputDirectory>/</outputDirectory> <outputDirectory>/</outputDirectory>
<lineEnding>keep</lineEnding> <lineEnding>keep</lineEnding>
<excludes> <excludes>
<exclude>**/target/**</exclude> <exclude>**/target/**</exclude>
<exclude>**/**/*.iml</exclude> <exclude>**/**/*.iml</exclude>
<exclude>**/**/*.dat</exclude> <exclude>**/**/*.dat</exclude>
</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>
<exclude>**/target/**</exclude> <exclude>**/target/**</exclude>
<exclude>**/**/*.iml</exclude> <exclude>**/**/*.iml</exclude>
<exclude>**/**/*.dat</exclude> <exclude>**/**/*.dat</exclude>
</excludes> </excludes>
</fileSet> </fileSet>
</fileSets> </fileSets>
</assembly> </assembly>

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

5
pom.xml
View File

@ -219,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>