[hornetq-commits] JBoss hornetq SVN: r10457 - in trunk: hornetq-bootstrap and 7 other directories.

Author: ataylor Date: 2011-04-06 02:26:27 -0400 (Wed, 06 Apr 2011) New Revision: 10457 Added: trunk/hornetq-bootstrap/ trunk/hornetq-bootstrap/pom.xml trunk/hornetq-bootstrap/src/ trunk/hornetq-bootstrap/src/main/ trunk/hornetq-bootstrap/src/main/java/ trunk/hornetq-bootstrap/src/main/java/org/ trunk/hornetq-bootstrap/src/main/java/org/hornetq/ trunk/hornetq-bootstrap/src/main/java/org/hornetq/integration/ trunk/hornetq-bootstrap/src/main/java/org/hornetq/integration/bootstrap/ Removed: trunk/src/main/org/hornetq/integration/bootstrap/ Modified: trunk/build-hornetq.xml trunk/hornetq.iml Log: mavenized hornetq bootstrap Modified: trunk/build-hornetq.xml =================================================================== --- trunk/build-hornetq.xml 2011-04-05 21:50:24 UTC (rev 10456) +++ trunk/build-hornetq.xml 2011-04-06 06:26:27 UTC (rev 10457) @@ -98,10 +98,12 @@ <property name="hornetq.core.client.module.jar" value="hornetq-core-client"/> <property name="hornetq.logging.module.jar" value="hornetq-logging"/> <property name="hornetq.integration.as.module.jar" value="hornetq-jboss-as-integration"/> + <property name="hornetq.bootstrap.module.jar" value="hornetq-bootstrap"/> <property name="target.core.jar.dir" value="${hornetq.core.module.jar}/target"/> <property name="target.core.client.jar.dir" value="${hornetq.core.client.module.jar}/target"/> <property name="target.logging.jar.dir" value="${hornetq.logging.module.jar}/target"/> <property name="target.integration.as.jar.dir" value="${hornetq.integration.as.module.jar}/target"/> + <property name="target.bootstrap.jar.dir" value="${hornetq.bootstrap.module.jar}/target"/> <property name="build.core.client.java5.classes.dir" value="${build.dir}/classes/core-client-java5"/> <property name="build.jms.classes.dir" value="${build.dir}/classes/jms"/> <property name="build.jms.java5.classes.dir" value="${build.dir}/classes/jms-java5"/> @@ -671,25 +673,7 @@ </javac> </target> - <target name="compile-bootstrap" depends="compile-core"> - <javac destdir="${build.bootstrap.classes.dir}" - target="${javac.target}" - source="${javac.source}" - optimize="${javac.optimize}" - debug="${javac.debug}" - depend="${javac.depend}" - verbose="${javac.verbose}" - deprecation="${javac.deprecation}" - includeAntRuntime="${javac.include.ant.runtime}" - includeJavaRuntime="${javac.include.java.runtime}" - encoding="${javac.encoding}" - failonerror="${javac.fail.onerror}"> - <src> - <pathelement path="${src.main.dir}"/> - </src> - <include name="org/hornetq/integration/bootstrap/**/*.java"/> - <classpath refid="bootstrap.compilation.classpath"/> - </javac> + <target name="compile-bootstrap" depends="jar-bootstrap"> </target> <target name="compile-logging" depends="jar-logging"> @@ -964,14 +948,13 @@ </jar> </target> - <target name="jar-bootstrap" depends="compile-bootstrap"> + <target name="jar-bootstrap"> + <ant antfile="build-thirdparty.xml" target="maven-install"> + <property name="maven.opts" value="-Dmaven.test.skip=true"/> + <property name="maven.goal" value="install"/> + <property name="working.dir" value="hornetq-bootstrap"/> + </ant> </target> - <jar jarfile="${build.jars.dir}/${bootstrap.jar.name}"> - <fileset dir="${build.bootstrap.classes.dir}" includes="**"/> - </jar> - - </target> - <target name="jar-bootstrap-sources"> <jar jarfile="${build.jars.dir}/${bootstrap.sources.jar.name}"> <fileset dir="${src.main.dir}"> @@ -1222,10 +1205,8 @@ <fileset dir="${build.jars.dir}"> <include name="${jms.jar.name}"/> <include name="${service.sar.name}"/> - <include name="${bootstrap.jar.name}"/> <include name="${mc.jar.name}"/> <include name="${ra.rar.name}"/> - <include name="${core.client.jar.name}"/> <include name="${core.client.java5.jar.name}"/> <include name="${jms.client.jar.name}"/> <include name="${jms.client.java5.jar.name}"/> @@ -1244,6 +1225,7 @@ <copy file="${target.core.client.jar.dir}/hornetq-core-client-2.2.3-SNAPSHOT.jar" tofile="${build.distro.lib.dir}/hornetq-core-client.jar"/> <copy file="${target.logging.jar.dir}/hornetq-logging-2.2.3-SNAPSHOT.jar" tofile="${build.distro.lib.dir}/hornetq-logging.jar"/> <copy file="${target.integration.as.jar.dir}/hornetq-jboss-as-integration-2.2.3-SNAPSHOT.jar" tofile="${build.distro.lib.dir}/hornetq-jboss-as-integration.jar"/> + <copy file="${target.bootstrap.jar.dir}/hornetq-bootstrap-2.2.3-SNAPSHOT.jar" tofile="${build.distro.lib.dir}/hornetq-bootstrap.jar"/> <copy file="${org.jboss.netty.lib}/${netty.jar.name}" tofile="${build.distro.lib.dir}/netty.jar"/> <copy file="${org.twitter4j.lib}/${twitter4j.jar.name}" tofile="${build.distro.lib.dir}/${twitter4j.jar.name}"/> <copy todir="${build.distro.config.dir}"> Added: trunk/hornetq-bootstrap/pom.xml =================================================================== --- trunk/hornetq-bootstrap/pom.xml (rev 0) +++ trunk/hornetq-bootstrap/pom.xml 2011-04-06 06:26:27 UTC (rev 10457) @@ -0,0 +1,42 @@ +<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> + + <groupId>org.hornetq</groupId> + <artifactId>hornetq-bootstrap</artifactId> + <packaging>jar</packaging> + <version>2.2.3-SNAPSHOT</version> + <name>HornetQ Bootstrap</name> + + <dependencies> + <dependency> + <groupId>org.hornetq</groupId> + <artifactId>hornetq-core</artifactId> + <version>2.2.3-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.jboss.microcontainer</groupId> + <artifactId>jboss-kernel</artifactId> + <version>2.0.6.GA</version> + </dependency> + <dependency> + <groupId>org.jboss</groupId> + <artifactId>jboss-common-core</artifactId> + <version>2.2.14.GA</version> + </dependency> + </dependencies> + + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <source>1.5</source> + <target>1.5</target> + </configuration> + </plugin> + </plugins> + </build> + +</project> Modified: trunk/hornetq.iml =================================================================== --- trunk/hornetq.iml 2011-04-05 21:50:24 UTC (rev 10456) +++ trunk/hornetq.iml 2011-04-06 06:26:27 UTC (rev 10457) @@ -9,6 +9,7 @@ <sourceFolder url="file://$MODULE_DIR$/hornetq-core/src/main/java" isTestSource="true" /> <sourceFolder url="file://$MODULE_DIR$/hornetq-logging/src/main/java" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/hornetq-jboss-as-integration/src/main/java" isTestSource="false" /> + <sourceFolder url="file://$MODULE_DIR$/hornetq-bootstrap/src/main/java" isTestSource="false" /> <excludeFolder url="file://$MODULE_DIR$/build/api" /> <excludeFolder url="file://$MODULE_DIR$/build/classes" /> <excludeFolder url="file://$MODULE_DIR$/build/jars" />