Author: ataylor Date: 2011-04-07 14:52:30 -0400 (Thu, 07 Apr 2011) New Revision: 10462 Added: trunk/hornetq-service-sar/ trunk/hornetq-service-sar/pom.xml trunk/hornetq-service-sar/src/ trunk/hornetq-service-sar/src/main/ trunk/hornetq-service-sar/src/main/java/ trunk/hornetq-service-sar/src/main/java/org/ trunk/hornetq-service-sar/src/main/java/org/hornetq/ trunk/hornetq-service-sar/src/main/java/org/hornetq/service/ Removed: trunk/src/main/org/hornetq/service/ Modified: trunk/build-hornetq.xml trunk/hornetq.iml Log: mavenized hornetq service Modified: trunk/build-hornetq.xml =================================================================== --- trunk/build-hornetq.xml 2011-04-07 18:30:50 UTC (rev 10461) +++ trunk/build-hornetq.xml 2011-04-07 18:52:30 UTC (rev 10462) @@ -102,6 +102,7 @@ <property name="hornetq.integration.as.module.jar" value="hornetq-jboss-as-integration"/> <property name="hornetq.bootstrap.module.jar" value="hornetq-bootstrap"/> <property name="hornetq.twitter.module.jar" value="hornetq-twitter-integration"/> + <property name="hornetq.service.module.jar" value="hornetq-service-sar"/> <property name="target.core.jar.dir" value="${hornetq.core.module.jar}/target"/> <property name="target.jms.jar.dir" value="${hornetq.jms.module.jar}/target"/> <property name="target.jms.client.jar.dir" value="${hornetq.jms.client.module.jar}/target"/> @@ -110,6 +111,7 @@ <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="target.twitter.jar.dir" value="${hornetq.twitter.module.jar}/target"/> + <property name="target.service.jar.dir" value="${hornetq.service.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"/> @@ -615,25 +617,7 @@ </target> <!-- author: Lucas Amador --> - <target name="compile-jboss-service" depends="compile-core"> - <javac destdir="${build.service.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/service/**/*.java"/> - <classpath refid="jboss.service.compilation.classpath"/> - </javac> + <target name="compile-jboss-service" depends="jar-jboss-service"> </target> <target name="compile-bootstrap" depends="jar-bootstrap"> @@ -890,12 +874,12 @@ </target> <!-- author: Lucas Amador --> - <target name="jar-jboss-service" depends="compile-jboss-service"> - - <jar jarfile="${build.jars.dir}/${service.sar.name}"> - <fileset dir="${build.service.classes.dir}" includes="**"/> - </jar> - + <target name="jar-jboss-service" depends="jar-core"> + <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-service-sar"/> + </ant> </target> <target name="jar-jboss-service-sources"> @@ -1162,15 +1146,11 @@ </copy> <copy todir="${build.distro.lib.dir}"> <fileset dir="${build.jars.dir}"> - <include name="${jms.jar.name}"/> - <include name="${service.sar.name}"/> <include name="${mc.jar.name}"/> <include name="${ra.rar.name}"/> <include name="${core.client.java5.jar.name}"/> - <include name="${jms.client.jar.name}"/> <include name="${jms.client.java5.jar.name}"/> <include name="${jnp.client.jar.name}"/> - <include name="${spring.integration.jar.name}"/> </fileset> <fileset dir="${org.jboss.naming.lib}"> <include name="jnpserver.jar"/> @@ -1187,6 +1167,7 @@ <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="${target.twitter.jar.dir}/hornetq-twitter-integration-2.2.3-SNAPSHOT.jar" tofile="${build.distro.lib.dir}/hornetq-twitter-integration.jar"/> + <copy file="${target.service.jar.dir}/hornetq-service-sar-2.2.3-SNAPSHOT.jar" tofile="${build.distro.lib.dir}/hornetq-service.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-service-sar/pom.xml =================================================================== --- trunk/hornetq-service-sar/pom.xml (rev 0) +++ trunk/hornetq-service-sar/pom.xml 2011-04-07 18:52:30 UTC (rev 10462) @@ -0,0 +1,48 @@ +<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-service-sar</artifactId> + <packaging>jar</packaging> + <version>2.2.3-SNAPSHOT</version> + <name>HornetQ JBoss AS4 Integration</name> + + <dependencies> + <dependency> + <groupId>org.hornetq</groupId> + <artifactId>hornetq-core</artifactId> + <version>2.2.3-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.hornetq</groupId> + <artifactId>hornetq-jms</artifactId> + <version>2.2.3-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.hornetq</groupId> + <artifactId>hornetq-jboss-as-integration</artifactId> + <version>2.2.3-SNAPSHOT</version> + </dependency> + </dependencies> + + <build> + <resources> + <resource> + <directory>src/main/resources</directory> + <filtering>true</filtering> + </resource> + </resources> + <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-07 18:30:50 UTC (rev 10461) +++ trunk/hornetq.iml 2011-04-07 18:52:30 UTC (rev 10462) @@ -13,6 +13,7 @@ <sourceFolder url="file://$MODULE_DIR$/hornetq-twitter-integration/src/main/java" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/hornetq-spring-integration/src/main/java" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/hornetq-jms/src/main/java" isTestSource="false" /> + <sourceFolder url="file://$MODULE_DIR$/hornetq-service-sar/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" />