4:55 a.m.
Author: ataylor
Date: 2011-04-15 05:55:15 -0400 (Fri, 15 Apr 2011)
New Revision: 10516
Modified:
trunk/distribution/hornetq/hornetq (1).iml
trunk/distribution/hornetq/pom.xml
trunk/distribution/hornetq/src/main/assembly/dep.xml
trunk/distribution/jnp-client/jnp-client.iml
trunk/distribution/pom.xml
trunk/pom.xml
Log:
tweaks to fix build
Modified: trunk/distribution/hornetq/hornetq (1).iml
===================================================================
--- trunk/distribution/hornetq/hornetq (1).iml 2011-04-15 08:53:39 UTC (rev 10515)
+++ trunk/distribution/hornetq/hornetq (1).iml 2011-04-15 09:55:15 UTC (rev 10516)
@@ -3,7 +3,6 @@
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_5"
inherit-compiler-output="false">
<output url="file://$MODULE_DIR$/target/classes" />
<output-test url="file://$MODULE_DIR$/target/test-classes" />
- <exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/main/resources"
isTestSource="false" />
<excludeFolder url="file://$MODULE_DIR$/target" />
@@ -14,6 +13,7 @@
<orderEntry type="library" name="Maven:
org.jboss.naming:jnpserver:5.0.3.GA" level="project" />
<orderEntry type="library" name="Maven:
org.jboss:jboss-common-core:2.2.14.GA" level="project" />
<orderEntry type="library" name="Maven:
org.jboss.logging:jboss-logging-spi:2.1.0.GA" level="project" />
+ <orderEntry type="library" name="Maven:
org.jboss.netty:netty:3.2.3.Final" level="project" />
</component>
</module>
Modified: trunk/distribution/hornetq/pom.xml
===================================================================
--- trunk/distribution/hornetq/pom.xml 2011-04-15 08:53:39 UTC (rev 10515)
+++ trunk/distribution/hornetq/pom.xml 2011-04-15 09:55:15 UTC (rev 10516)
@@ -11,7 +11,7 @@
<groupId>org.hornetq</groupId>
<artifactId>hornetq</artifactId>
- <packaging>jar</packaging>
+ <packaging>pom</packaging>
<name>Actual HornetQ Distribution</name>
<build>
Modified: trunk/distribution/hornetq/src/main/assembly/dep.xml
===================================================================
--- trunk/distribution/hornetq/src/main/assembly/dep.xml 2011-04-15 08:53:39 UTC (rev
10515)
+++ trunk/distribution/hornetq/src/main/assembly/dep.xml 2011-04-15 09:55:15 UTC (rev
10516)
@@ -93,13 +93,8 @@
</includes>
<binaries>
<includeDependencies>false</includeDependencies>
- <outputDirectory></outputDirectory>
- <unpack>true</unpack>
- <unpackOptions>
- <includes>
- <include>**/*.xsd</include>
- </includes>
- </unpackOptions>
+ <outputDirectory>lib</outputDirectory>
+ <unpack>false</unpack>
<outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping>
</binaries>
</moduleSet>
@@ -200,6 +195,18 @@
<moduleSet>
<useAllReactorProjects>true</useAllReactorProjects>
<includes>
+ <include>org.hornetq:jboss-mc</include>
+ </includes>
+ <binaries>
+ <includeDependencies>false</includeDependencies>
+ <outputDirectory>lib</outputDirectory>
+ <unpack>false</unpack>
+
<outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping>
+ </binaries>
+ </moduleSet>
+ <moduleSet>
+ <useAllReactorProjects>true</useAllReactorProjects>
+ <includes>
<include>org.hornetq:hornetq-examples</include>
</includes> <sources>
<includeModuleDirectory>false</includeModuleDirectory>
@@ -242,6 +249,14 @@
<unpack>false</unpack>
<outputFileNameMapping>jnpserver.jar</outputFileNameMapping>
</dependencySet>
+ <dependencySet>
+ <includes>
+ <include>org.jboss.netty:netty</include>
+ </includes>
+ <outputDirectory>lib</outputDirectory>
+ <unpack>false</unpack>
+ <outputFileNameMapping>netty.jar</outputFileNameMapping>
+ </dependencySet>
</dependencySets>
<fileSets>
<fileSet>
Modified: trunk/distribution/jnp-client/jnp-client.iml
===================================================================
--- trunk/distribution/jnp-client/jnp-client.iml 2011-04-15 08:53:39 UTC (rev 10515)
+++ trunk/distribution/jnp-client/jnp-client.iml 2011-04-15 09:55:15 UTC (rev 10516)
@@ -13,6 +13,7 @@
<orderEntry type="library" name="Maven:
org.jboss:jboss-common-core:2.2.14.GA" level="project" />
<orderEntry type="library" name="Maven:
org.jboss.logging:jboss-logging-spi:2.1.0.GA" level="project" />
<orderEntry type="library" name="Maven:
org.jboss.javaee:jboss-jms-api:1.1.0.GA" level="project" />
+ <orderEntry type="library" name="Maven:
org.jboss.netty:netty:3.2.3.Final" level="project" />
</component>
</module>
Modified: trunk/distribution/pom.xml
===================================================================
--- trunk/distribution/pom.xml 2011-04-15 08:53:39 UTC (rev 10515)
+++ trunk/distribution/pom.xml 2011-04-15 09:55:15 UTC (rev 10516)
@@ -23,37 +23,17 @@
<groupId>org.jboss.naming</groupId>
<artifactId>jnpserver</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.jboss.netty</groupId>
+ <artifactId>netty</artifactId>
+ </dependency>
</dependencies>
<modules>
<module>jnp-client</module>
+ <module>jboss-mc</module>
<module>hornetq</module>
</modules>
- <!-- <build>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- <filtering>true</filtering>
- </resource>
- </resources>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>2.2</version>
- <configuration>
- <descriptor>src/main/assembly/dep.xml</descriptor>
- </configuration>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>-->
</project>
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2011-04-15 08:53:39 UTC (rev 10515)
+++ trunk/pom.xml 2011-04-15 09:55:15 UTC (rev 10516)
@@ -170,6 +170,32 @@
<artifactId>jboss-common-core</artifactId>
<version>2.2.14.GA</version>
</dependency>
+ <!--needed for microntainer deps in distro-->
+ <dependency>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-dependency</artifactId>
+ <version>2.0.6.GA</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-reflect</artifactId>
+ <version>2.0.2.GA</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-mdr</artifactId>
+ <version>2.0.1.GA</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jbossxb</artifactId>
+ <version>2.0.1.GA</version>
+ </dependency>
+ <dependency>
+ <groupId>sun-jaxb</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>2.1.9</version>
+ </dependency>
<!--needed to compile transport jar-->
<dependency>
<groupId>org.jboss.netty</groupId>