[hornetq-commits] JBoss hornetq SVN: r10515 - in trunk: distribution and 12 other directories.
do-not-reply at jboss.org
do-not-reply at jboss.org
Fri Apr 15 04:53:39 EDT 2011
Author: ataylor
Date: 2011-04-15 04:53:39 -0400 (Fri, 15 Apr 2011)
New Revision: 10515
Added:
trunk/distribution/hornetq/
trunk/distribution/hornetq/hornetq (1).iml
trunk/distribution/hornetq/pom.xml
trunk/distribution/hornetq/src/
Removed:
trunk/distribution/src/
Modified:
trunk/distribution/hornetq-distribution.iml
trunk/distribution/hornetq/src/main/assembly/dep.xml
trunk/distribution/jnp-client/jnp-client.iml
trunk/distribution/pom.xml
trunk/pom.xml
trunk/tests/concurrent-tests/concurrent-tests.iml
trunk/tests/integration-tests/integration-tests.iml
trunk/tests/jms-tests/jms-tests.iml
trunk/tests/joram-tests/joram-tests.iml
trunk/tests/performance-tests/performance-tests.iml
trunk/tests/soak-tests/soak-tests.iml
trunk/tests/stress-tests/stress-tests.iml
trunk/tests/timing-tests/timing-tests.iml
trunk/tests/unit-tests/unit-tests.iml
Log:
moved the actual hornetq distro module
Added: trunk/distribution/hornetq/hornetq (1).iml
===================================================================
--- trunk/distribution/hornetq/hornetq (1).iml (rev 0)
+++ trunk/distribution/hornetq/hornetq (1).iml 2011-04-15 08:53:39 UTC (rev 10515)
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+ <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" />
+ </content>
+ <orderEntry type="inheritedJdk" />
+ <orderEntry type="sourceFolder" forTests="false" />
+ <orderEntry type="library" name="Maven: org.jboss.javaee:jboss-jms-api:1.1.0.GA" level="project" />
+ <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" />
+ </component>
+</module>
+
Added: trunk/distribution/hornetq/pom.xml
===================================================================
--- trunk/distribution/hornetq/pom.xml (rev 0)
+++ trunk/distribution/hornetq/pom.xml 2011-04-15 08:53:39 UTC (rev 10515)
@@ -0,0 +1,43 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+
+ <parent>
+ <groupId>org.hornetq</groupId>
+ <artifactId>hornetq-distribution</artifactId>
+ <version>2.2.3-SNAPSHOT</version>
+ </parent>
+
+ <groupId>org.hornetq</groupId>
+ <artifactId>hornetq</artifactId>
+ <packaging>jar</packaging>
+ <name>Actual HornetQ Distribution</name>
+
+ <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/distribution/hornetq/src/main/assembly/dep.xml
===================================================================
--- trunk/distribution/src/main/assembly/dep.xml 2011-04-14 16:17:29 UTC (rev 10511)
+++ trunk/distribution/hornetq/src/main/assembly/dep.xml 2011-04-15 08:53:39 UTC (rev 10515)
@@ -1,3 +1,16 @@
+<!--
+ ~ Copyright 2009 Red Hat, Inc.
+ ~ Red Hat licenses this file to you under the Apache License, version
+ ~ 2.0 (the "License"); you may not use this file except in compliance
+ ~ with the License. You may obtain a copy of the License at
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ ~ implied. See the License for the specific language governing
+ ~ permissions and 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"
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
Modified: trunk/distribution/hornetq-distribution.iml
===================================================================
--- trunk/distribution/hornetq-distribution.iml 2011-04-15 05:17:26 UTC (rev 10514)
+++ trunk/distribution/hornetq-distribution.iml 2011-04-15 08:53:39 UTC (rev 10515)
@@ -4,7 +4,7 @@
<output url="file://$MODULE_DIR$/target/classes" />
<output-test url="file://$MODULE_DIR$/target/test-classes" />
<content url="file://$MODULE_DIR$">
- <sourceFolder url="file://$MODULE_DIR$/src/main/resources" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/hornetq/src/main/resources" isTestSource="false" />
<excludeFolder url="file://$MODULE_DIR$/target" />
</content>
<orderEntry type="inheritedJdk" />
Modified: trunk/distribution/jnp-client/jnp-client.iml
===================================================================
--- trunk/distribution/jnp-client/jnp-client.iml 2011-04-15 05:17:26 UTC (rev 10514)
+++ trunk/distribution/jnp-client/jnp-client.iml 2011-04-15 08:53:39 UTC (rev 10515)
@@ -12,6 +12,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.javaee:jboss-jms-api:1.1.0.GA" level="project" />
</component>
</module>
Modified: trunk/distribution/pom.xml
===================================================================
--- trunk/distribution/pom.xml 2011-04-15 05:17:26 UTC (rev 10514)
+++ trunk/distribution/pom.xml 2011-04-15 08:53:39 UTC (rev 10515)
@@ -27,9 +27,10 @@
<modules>
<module>jnp-client</module>
+ <module>hornetq</module>
</modules>
- <build>
+ <!-- <build>
<resources>
<resource>
<directory>src/main/resources</directory>
@@ -53,6 +54,6 @@
</executions>
</plugin>
</plugins>
- </build>
+ </build>-->
</project>
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2011-04-15 05:17:26 UTC (rev 10514)
+++ trunk/pom.xml 2011-04-15 08:53:39 UTC (rev 10515)
@@ -6,7 +6,7 @@
<packaging>pom</packaging>
<version>2.2.3-SNAPSHOT</version>
- <name>HornetQ</name>
+ <name>HornetQ Parent</name>
<url>http://hornetq.org</url>
<description>
Putting the buzz in messaging
Modified: trunk/tests/concurrent-tests/concurrent-tests.iml
===================================================================
--- trunk/tests/concurrent-tests/concurrent-tests.iml 2011-04-15 05:17:26 UTC (rev 10514)
+++ trunk/tests/concurrent-tests/concurrent-tests.iml 2011-04-15 08:53:39 UTC (rev 10515)
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false">
- <output url="file://$MODULE_DIR$/../target/classes" />
- <output-test url="file://$MODULE_DIR$/../target/test-classes" />
+ <output url="file://$MODULE_DIR$/target/classes" />
+ <output-test url="file://$MODULE_DIR$/target/test-classes" />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
<excludeFolder url="file://$MODULE_DIR$/target" />
Modified: trunk/tests/integration-tests/integration-tests.iml
===================================================================
--- trunk/tests/integration-tests/integration-tests.iml 2011-04-15 05:17:26 UTC (rev 10514)
+++ trunk/tests/integration-tests/integration-tests.iml 2011-04-15 08:53:39 UTC (rev 10515)
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false">
- <output url="file://$MODULE_DIR$/../target/classes" />
- <output-test url="file://$MODULE_DIR$/../target/test-classes" />
+ <output url="file://$MODULE_DIR$/target/classes" />
+ <output-test url="file://$MODULE_DIR$/target/test-classes" />
<content url="file://$MODULE_DIR$">
+ <sourceFolder url="file://$MODULE_DIR$/target/generated-sources/test-annotations" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
- <sourceFolder url="file://$MODULE_DIR$/target/generated-sources/test-annotations" isTestSource="true" />
<excludeFolder url="file://$MODULE_DIR$/target/classes" />
<excludeFolder url="file://$MODULE_DIR$/target/maven-archiver" />
<excludeFolder url="file://$MODULE_DIR$/target/test-classes" />
Modified: trunk/tests/jms-tests/jms-tests.iml
===================================================================
--- trunk/tests/jms-tests/jms-tests.iml 2011-04-15 05:17:26 UTC (rev 10514)
+++ trunk/tests/jms-tests/jms-tests.iml 2011-04-15 08:53:39 UTC (rev 10515)
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false">
- <output url="file://$MODULE_DIR$/../target/classes" />
- <output-test url="file://$MODULE_DIR$/../target/test-classes" />
+ <output url="file://$MODULE_DIR$/target/classes" />
+ <output-test url="file://$MODULE_DIR$/target/test-classes" />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/config" isTestSource="true" />
Modified: trunk/tests/joram-tests/joram-tests.iml
===================================================================
--- trunk/tests/joram-tests/joram-tests.iml 2011-04-15 05:17:26 UTC (rev 10514)
+++ trunk/tests/joram-tests/joram-tests.iml 2011-04-15 08:53:39 UTC (rev 10515)
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false">
- <output url="file://$MODULE_DIR$/../target/classes" />
- <output-test url="file://$MODULE_DIR$/../target/test-classes" />
+ <output url="file://$MODULE_DIR$/target/classes" />
+ <output-test url="file://$MODULE_DIR$/target/test-classes" />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/config" isTestSource="true" />
Modified: trunk/tests/performance-tests/performance-tests.iml
===================================================================
--- trunk/tests/performance-tests/performance-tests.iml 2011-04-15 05:17:26 UTC (rev 10514)
+++ trunk/tests/performance-tests/performance-tests.iml 2011-04-15 08:53:39 UTC (rev 10515)
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false">
- <output url="file://$MODULE_DIR$/../target/classes" />
- <output-test url="file://$MODULE_DIR$/../target/test-classes" />
+ <output url="file://$MODULE_DIR$/target/classes" />
+ <output-test url="file://$MODULE_DIR$/target/test-classes" />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
<excludeFolder url="file://$MODULE_DIR$/target" />
Modified: trunk/tests/soak-tests/soak-tests.iml
===================================================================
--- trunk/tests/soak-tests/soak-tests.iml 2011-04-15 05:17:26 UTC (rev 10514)
+++ trunk/tests/soak-tests/soak-tests.iml 2011-04-15 08:53:39 UTC (rev 10515)
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false">
- <output url="file://$MODULE_DIR$/../target/classes" />
- <output-test url="file://$MODULE_DIR$/../target/test-classes" />
+ <output url="file://$MODULE_DIR$/target/classes" />
+ <output-test url="file://$MODULE_DIR$/target/test-classes" />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
<excludeFolder url="file://$MODULE_DIR$/target" />
Modified: trunk/tests/stress-tests/stress-tests.iml
===================================================================
--- trunk/tests/stress-tests/stress-tests.iml 2011-04-15 05:17:26 UTC (rev 10514)
+++ trunk/tests/stress-tests/stress-tests.iml 2011-04-15 08:53:39 UTC (rev 10515)
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false">
- <output url="file://$MODULE_DIR$/../target/classes" />
- <output-test url="file://$MODULE_DIR$/../target/test-classes" />
+ <output url="file://$MODULE_DIR$/target/classes" />
+ <output-test url="file://$MODULE_DIR$/target/test-classes" />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
<excludeFolder url="file://$MODULE_DIR$/target" />
Modified: trunk/tests/timing-tests/timing-tests.iml
===================================================================
--- trunk/tests/timing-tests/timing-tests.iml 2011-04-15 05:17:26 UTC (rev 10514)
+++ trunk/tests/timing-tests/timing-tests.iml 2011-04-15 08:53:39 UTC (rev 10515)
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false">
- <output url="file://$MODULE_DIR$/../target/classes" />
- <output-test url="file://$MODULE_DIR$/../target/test-classes" />
+ <output url="file://$MODULE_DIR$/target/classes" />
+ <output-test url="file://$MODULE_DIR$/target/test-classes" />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
<excludeFolder url="file://$MODULE_DIR$/target" />
Modified: trunk/tests/unit-tests/unit-tests.iml
===================================================================
--- trunk/tests/unit-tests/unit-tests.iml 2011-04-15 05:17:26 UTC (rev 10514)
+++ trunk/tests/unit-tests/unit-tests.iml 2011-04-15 08:53:39 UTC (rev 10515)
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false">
- <output url="file://$MODULE_DIR$/../target/classes" />
- <output-test url="file://$MODULE_DIR$/../target/test-classes" />
+ <output url="file://$MODULE_DIR$/target/classes" />
+ <output-test url="file://$MODULE_DIR$/target/test-classes" />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
More information about the hornetq-commits
mailing list