[hornetq-commits] JBoss hornetq SVN: r10460 - in trunk: hornetq-jms and 21 other directories.

Author: ataylor Date: 2011-04-07 14:26:07 -0400 (Thu, 07 Apr 2011) New Revision: 10460 Added: trunk/hornetq-jms-client/ trunk/hornetq-jms-client/pom.xml trunk/hornetq-jms/ trunk/hornetq-jms/pom.xml trunk/hornetq-jms/src/ trunk/hornetq-jms/src/main/ trunk/hornetq-jms/src/main/java/ trunk/hornetq-jms/src/main/java/org/ trunk/hornetq-jms/src/main/java/org/hornetq/ trunk/hornetq-jms/src/main/java/org/hornetq/api/ trunk/hornetq-jms/src/main/java/org/hornetq/api/jms/ trunk/hornetq-jms/src/main/java/org/hornetq/jms/ trunk/hornetq-jms/src/main/java/org/hornetq/jms/bridge/ trunk/hornetq-jms/src/main/java/org/hornetq/jms/client/ trunk/hornetq-jms/src/main/java/org/hornetq/jms/management/ trunk/hornetq-jms/src/main/java/org/hornetq/jms/persistence/ trunk/hornetq-jms/src/main/java/org/hornetq/jms/referenceable/ trunk/hornetq-jms/src/main/java/org/hornetq/jms/server/ trunk/hornetq-jms/src/main/java/org/hornetq/jms/transaction/ trunk/hornetq-jms/src/main/resources/ trunk/hornetq-jms/src/main/resources/schema/ trunk/hornetq-jms/src/main/resources/schema/hornetq-jms.xsd trunk/hornetq-spring-integration/ trunk/hornetq-spring-integration/pom.xml trunk/hornetq-spring-integration/src/ trunk/hornetq-spring-integration/src/main/ trunk/hornetq-spring-integration/src/main/java/ trunk/hornetq-spring-integration/src/main/java/org/ trunk/hornetq-spring-integration/src/main/java/org/hornetq/ trunk/hornetq-spring-integration/src/main/java/org/hornetq/integration/ trunk/hornetq-spring-integration/src/main/java/org/hornetq/integration/spring/ Removed: trunk/src/config/common/schema/hornetq-jms.xsd trunk/src/main/org/hornetq/api/jms/ trunk/src/main/org/hornetq/integration/spring/ trunk/src/main/org/hornetq/jms/bridge/ trunk/src/main/org/hornetq/jms/client/ trunk/src/main/org/hornetq/jms/management/ trunk/src/main/org/hornetq/jms/persistence/ trunk/src/main/org/hornetq/jms/referenceable/ trunk/src/main/org/hornetq/jms/server/ trunk/src/main/org/hornetq/jms/transaction/ Modified: trunk/build-hornetq.xml trunk/hornetq.iml Log: mavenized hornetq jms and spring part 2 Modified: trunk/build-hornetq.xml =================================================================== --- trunk/build-hornetq.xml 2011-04-07 14:48:58 UTC (rev 10459) +++ trunk/build-hornetq.xml 2011-04-07 18:26:07 UTC (rev 10460) @@ -95,12 +95,16 @@ <property name="build.dir" value="build"/> <property name="build.classes.dir" value="${build.dir}/classes"/> <property name="hornetq.core.module.jar" value="hornetq-core"/> + <property name="hornetq.jms.module.jar" value="hornetq-jms"/> + <property name="hornetq.jms.client.module.jar" value="hornetq-jms-client"/> <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="hornetq.twitter.module.jar" value="hornetq-twitter-integration"/> <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"/> <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"/> @@ -224,13 +228,22 @@ </fileset> </path> + + <path id="jms.target.jar"> + <fileset dir="${target.jms.jar.dir}"> + <include name="**/*.jar"/> + </fileset> + </path> + <path id="as.integration.target.jar"> <fileset dir="${target.integration.as.jar.dir}"> <include name="**/*.jar"/> </fileset> </path> + <path id="jms.compilation.classpath"> <path refid="core.target.jar"/> + <path refid="jms.target.jar"/> <path refid="org.jboss.netty.classpath"/> <path refid="org.jboss.javaee.classpath"/> <path refid="org.jboss.integration.classpath"/> @@ -270,6 +283,7 @@ <path id="jboss.service.compilation.classpath"> <path refid="org.jboss.javaee.classpath"/> <path refid="core.target.jar"/> + <path refid="jms.target.jar"/> <path refid="as.integration.target.jar"/> <path location="${build.jboss.integration.classes.dir}"/> </path> @@ -566,25 +580,7 @@ </target> - <target name="compile-jms" depends="compile-core"> - <javac destdir="${build.jms.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="**/jms/**/*.java"/> - <classpath refid="jms.compilation.classpath"/> - </javac> + <target name="compile-jms" depends="jar-jms"> </target> <target name="compile-jms-java5" depends="compile-core-client-java5"> @@ -614,25 +610,8 @@ <target name="compile-twitter-integration" depends="jar-twitter-integration"> </target> - <target name="compile-spring-integration" depends="compile-core"> - <javac destdir="${build.spring.integration.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/spring/**/*.java"/> - <classpath refid="spring.integration.compilation.classpath"/> - </javac> + <target name="compile-spring-integration" depends="jar-spring-integration"> + </target> <!-- author: Lucas Amador --> @@ -734,7 +713,7 @@ </schemavalidate> <schemavalidate file="${conf.dir}/hornetq-jms.xml"> <schema namespace="urn:hornetq" - file="src/config/common/schema/hornetq-jms.xsd"/> + file="hornetq-jms/src/main/resources/schema/hornetq-jms.xsd"/> </schemavalidate> </target> @@ -805,15 +784,12 @@ </jar> </target> - <target name="jar-jms" depends="compile-jms"> - - <jar jarfile="${build.jars.dir}/${jms.jar.name}"> - <fileset dir="${build.jms.classes.dir}" includes="**"/> - <fileset dir="${src.config.dir}/common"> - <include name="**/hornetq-jms.xsd"/> - </fileset> - </jar> - + <target name="jar-jms"> + <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-jms"/> + </ant> </target> <target name="jar-jms-sources"> @@ -827,14 +803,12 @@ </jar> </target> - <target name="jar-jms-client" depends="compile-jms"> - - <jar jarfile="${build.jars.dir}/${jms.client.jar.name}"> - <fileset dir="${build.jms.classes.dir}" includes="org/hornetq/api/jms/**/*.class"/> - <fileset dir="${build.jms.classes.dir}" includes="org/hornetq/jms/client/*.class"/> - <fileset dir="${build.jms.classes.dir}" includes="org/hornetq/jms/referenceable/*.class"/> - </jar> - + <target name="jar-jms-client" depends="jar-jms"> + <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-jms-client"/> + </ant> </target> <target name="jar-jms-client-sources"> @@ -899,14 +873,14 @@ </jar> </target> - <target name="jar-spring-integration" depends="compile-spring-integration"> + <target name="jar-spring-integration"> + <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-spring-integration"/> + </ant> + </target> - <jar jarfile="${build.jars.dir}/${spring.integration.jar.name}"> - <fileset dir="${build.spring.integration.classes.dir}" includes="**"/> - </jar> - - </target> - <target name="jar-spring-integration-sources"> <jar jarfile="${build.jars.dir}/${spring.integration.sources.jar.name}"> <fileset dir="${src.main.dir}"> @@ -937,7 +911,8 @@ <property name="maven.opts" value="-Dmaven.test.skip=true"/> <property name="maven.goal" value="install"/> <property name="working.dir" value="hornetq-bootstrap"/> - </ant> </target> + </ant> + </target> <target name="jar-bootstrap-sources"> <jar jarfile="${build.jars.dir}/${bootstrap.sources.jar.name}"> @@ -1206,6 +1181,8 @@ </copy> <copy file="${target.core.jar.dir}/hornetq-core-2.2.3-SNAPSHOT.jar" tofile="${build.distro.lib.dir}/hornetq-core.jar"/> <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.jms.jar.dir}/hornetq-jms-2.2.3-SNAPSHOT.jar" tofile="${build.distro.lib.dir}/hornetq-jms.jar"/> + <copy file="${target.jms.client.jar.dir}/hornetq-jms-client-2.2.3-SNAPSHOT.jar" tofile="${build.distro.lib.dir}/hornetq-jms-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"/> @@ -1415,12 +1392,12 @@ <include name="**"/> </fileset> </copy> - <antcall target="javadoc"/> + <!-- <antcall target="javadoc"/> <copy todir="${build.distro.api.dir}/"> <fileset dir="${build.api.dir}"> <include name="**"/> </fileset> - </copy> + </copy>--> </target> <target name="restdoc"> @@ -1442,8 +1419,8 @@ </target> <target name="javadoc"> - - <javadoc + <!--//todo--> + <!--<javadoc doclet="org.jboss.apiviz.APIviz" docletpath="${thirdparty.dir}/org/jboss/apiviz/lib/apiviz.jar" destdir="${build.api.dir}" @@ -1462,7 +1439,7 @@ <group title="HornetQ SPI" packages="org.hornetq.spi.*"/> <link href="http://java.sun.com/j2se/1.5.0/docs/api"/> <link href="http://java.sun.com/javaee/5/docs/api/"/> - </javadoc> + </javadoc>--> </target> <target name="artifacts" depends="jar"> Added: trunk/hornetq-jms/pom.xml =================================================================== --- trunk/hornetq-jms/pom.xml (rev 0) +++ trunk/hornetq-jms/pom.xml 2011-04-07 18:26:07 UTC (rev 10460) @@ -0,0 +1,53 @@ +<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-jms</artifactId> + <packaging>jar</packaging> + <version>2.2.3-SNAPSHOT</version> + <name>HornetQ JMS</name> + + <dependencies> + <dependency> + <groupId>org.hornetq</groupId> + <artifactId>hornetq-core</artifactId> + <version>2.2.3-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.jboss.javaee</groupId> + <artifactId>jboss-jms-api</artifactId> + <version>1.1.0.GA</version> + </dependency> + <dependency> + <groupId>org.jboss.javaee</groupId> + <artifactId>jboss-transaction-api</artifactId> + <version>1.0.1.GA</version> + </dependency> + <dependency> + <groupId>jboss.jbossts</groupId> + <artifactId>jbossjts</artifactId> + <version>4.6.1.GA</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> Added: trunk/hornetq-jms/src/main/resources/schema/hornetq-jms.xsd =================================================================== --- trunk/hornetq-jms/src/main/resources/schema/hornetq-jms.xsd (rev 0) +++ trunk/hornetq-jms/src/main/resources/schema/hornetq-jms.xsd 2011-04-07 18:26:07 UTC (rev 10460) @@ -0,0 +1,187 @@ +<?xml version='1.0' encoding='UTF-8'?> + +<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" + targetNamespace="urn:hornetq" + xmlns="urn:hornetq" + elementFormDefault="qualified" + attributeFormDefault="unqualified" + version="1.0"> + + <xsd:element name="configuration"> + <xsd:complexType> + <xsd:sequence> + <xsd:element ref="jmx-domain" minOccurs="0" maxOccurs="1"/> + <xsd:element ref="connection-factory" + maxOccurs="unbounded" minOccurs="0"> + </xsd:element> + <xsd:choice maxOccurs="unbounded" minOccurs="0"> + <xsd:element ref="queue" maxOccurs="1" + minOccurs="1"> + </xsd:element> + <xsd:element ref="topic" maxOccurs="1" minOccurs="1"></xsd:element> + </xsd:choice> + </xsd:sequence> + </xsd:complexType> + </xsd:element> + + <xsd:element name="jmx-domain" type="xsd:string"/> + + <xsd:element name="connection-factory"> + <xsd:complexType> + <xsd:all> + <xsd:element name="xa" type="xsd:boolean" maxOccurs="1" minOccurs="0"></xsd:element> + <xsd:element name="discovery-group-ref" type="discovery-group-refType" maxOccurs="1" minOccurs="0"></xsd:element> + + <xsd:element name="connectors" maxOccurs="1" minOccurs="0"> + <xsd:complexType> + <xsd:sequence> + <xsd:element name="connector-ref" type="connector-refType" + maxOccurs="unbounded" minOccurs="1"></xsd:element> + </xsd:sequence> + </xsd:complexType> + </xsd:element> + <xsd:element name="entries" maxOccurs="1" minOccurs="0"> + <xsd:complexType> + <xsd:sequence> + <xsd:element name="entry" type="entryType" + maxOccurs="unbounded" minOccurs="1"> + </xsd:element> + </xsd:sequence> + </xsd:complexType> + </xsd:element> + <xsd:element name="client-failure-check-period" type="xsd:long" + maxOccurs="1" minOccurs="0"> + </xsd:element> + <xsd:element name="connection-ttl" type="xsd:long" + maxOccurs="1" minOccurs="0"> + </xsd:element> + <xsd:element name="call-timeout" type="xsd:long" + maxOccurs="1" minOccurs="0"> + </xsd:element> + <xsd:element name="consumer-window-size" type="xsd:int" + maxOccurs="1" minOccurs="0"> + </xsd:element> + <xsd:element name="consumer-max-rate" type="xsd:int" + maxOccurs="1" minOccurs="0"> + </xsd:element> + <xsd:element name="confirmation-window-size" type="xsd:int" + maxOccurs="1" minOccurs="0"> + </xsd:element> + <xsd:element name="producer-window-size" type="xsd:int" + maxOccurs="1" minOccurs="0"> + </xsd:element> + <xsd:element name="producer-max-rate" type="xsd:int" + maxOccurs="1" minOccurs="0"> + </xsd:element> + <xsd:element name="cache-large-message-client" type="xsd:boolean" + maxOccurs="1" minOccurs="0"> + </xsd:element> + <xsd:element name="min-large-message-size" type="xsd:long" + maxOccurs="1" minOccurs="0"> + </xsd:element> + <xsd:element name="compress-large-messages" type="xsd:boolean" + maxOccurs="1" minOccurs="0"> + </xsd:element> + + <xsd:element name="client-id" type="xsd:string" + maxOccurs="1" minOccurs="0"> + </xsd:element> + <xsd:element name="dups-ok-batch-size" type="xsd:int" + maxOccurs="1" minOccurs="0"> + </xsd:element> + <xsd:element name="transaction-batch-size" type="xsd:int" + maxOccurs="1" minOccurs="0"> + </xsd:element> + <xsd:element name="block-on-acknowledge" type="xsd:boolean" + maxOccurs="1" minOccurs="0"> + </xsd:element> + <xsd:element name="block-on-non-durable-send" type="xsd:boolean" + maxOccurs="1" minOccurs="0"> + </xsd:element> + <xsd:element name="block-on-durable-send" type="xsd:boolean" + maxOccurs="1" minOccurs="0"> + </xsd:element> + <xsd:element name="auto-group" type="xsd:boolean" + maxOccurs="1" minOccurs="0"> + </xsd:element> + <xsd:element name="pre-acknowledge" type="xsd:boolean" + maxOccurs="1" minOccurs="0"> + </xsd:element> + <xsd:element name="retry-interval" type="xsd:long" + maxOccurs="1" minOccurs="0"> + </xsd:element> + <xsd:element name="retry-interval-multiplier" type="xsd:float" + maxOccurs="1" minOccurs="0"> + </xsd:element> + <xsd:element name="max-retry-interval" type="xsd:long" + maxOccurs="1" minOccurs="0"> + </xsd:element> + <xsd:element name="reconnect-attempts" type="xsd:int" + maxOccurs="1" minOccurs="0"> + </xsd:element> + <xsd:element name="failover-on-initial-connection" type="xsd:boolean" + maxOccurs="1" minOccurs="0"> + </xsd:element> + <xsd:element name="failover-on-server-shutdown" type="xsd:boolean" + maxOccurs="1" minOccurs="0"> + </xsd:element> + <xsd:element name="connection-load-balancing-policy-class-name" type="xsd:string" + maxOccurs="1" minOccurs="0"> + </xsd:element> + <xsd:element name="use-global-pools" type="xsd:boolean" + maxOccurs="1" minOccurs="0"> + </xsd:element> + <xsd:element name="scheduled-thread-pool-max-size" type="xsd:int" + maxOccurs="1" minOccurs="0"> + </xsd:element> + <xsd:element name="thread-pool-max-size" type="xsd:int" + maxOccurs="1" minOccurs="0"> + </xsd:element> + <xsd:element name="group-id" type="xsd:string" + maxOccurs="1" minOccurs="0"> + </xsd:element> + <xsd:element name="ha" type="xsd:boolean" + maxOccurs="1" minOccurs="0"> + </xsd:element> + </xsd:all> + <xsd:attribute name="name" type="xsd:string"></xsd:attribute> + <xsd:attribute name="signature" type="xsd:string"></xsd:attribute> + </xsd:complexType> + </xsd:element> + + <xsd:complexType name="connector-refType"> + <xsd:attribute name="connector-name" type="xsd:string" use="required"></xsd:attribute> + </xsd:complexType> + + <xsd:complexType name="entryType"> + <xsd:attribute name="name" type="xsd:string" use="required"></xsd:attribute> + </xsd:complexType> + + <xsd:complexType name="discovery-group-refType"> + <xsd:attribute name="discovery-group-name" type="xsd:string" use="required"></xsd:attribute> + </xsd:complexType> + + <xsd:element name="queue" type="queueType"></xsd:element> + + <xsd:element name="topic" type="topicType"></xsd:element> + + <xsd:complexType name="queueType"> + <xsd:sequence> + <xsd:element name="entry" type="entryType" maxOccurs="unbounded" minOccurs="1"></xsd:element> + <xsd:element name="selector" maxOccurs="1" minOccurs="0"> + <xsd:complexType> + <xsd:attribute name="string" type="xsd:string" use="required"></xsd:attribute> + </xsd:complexType> + </xsd:element> + <xsd:element name="durable" type="xsd:boolean" maxOccurs="1" minOccurs="0"></xsd:element> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required"></xsd:attribute> + </xsd:complexType> + + <xsd:complexType name="topicType"> + <xsd:sequence> + <xsd:element name="entry" type="entryType" maxOccurs="unbounded" minOccurs="1"></xsd:element> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required"></xsd:attribute> + </xsd:complexType> +</xsd:schema> Added: trunk/hornetq-jms-client/pom.xml =================================================================== --- trunk/hornetq-jms-client/pom.xml (rev 0) +++ trunk/hornetq-jms-client/pom.xml 2011-04-07 18:26:07 UTC (rev 10460) @@ -0,0 +1,69 @@ +<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-jms-client</artifactId> + <packaging>jar</packaging> + <version>2.2.3-SNAPSHOT</version> + <name>HornetQ JMS Client</name> + + <dependencies> + <dependency> + <groupId>org.hornetq</groupId> + <artifactId>hornetq-jms</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-shade-plugin</artifactId> + <executions> + <execution> + <phase>package</phase> + <goals> + <goal>shade</goal> + </goals> + <configuration> + <artifactSet> + <excludes> + <exclude>org.jboss.netty:netty</exclude> + <exclude>org.hornetq:hornetq-core</exclude> + </excludes> + </artifactSet> + <filters> + <filter> + <artifact>org.hornetq:hornetq-jms</artifact> + <includes> + <include>org/hornetq/api/jms/**/*.class</include> + <include>org/hornetq/jms/client/**/*.*</include> + <include>org/hornetq/jms/referenceable/**/*.*</include> + </includes> + </filter> + </filters> + </configuration> + </execution> + + </executions> + </plugin> + <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> Copied: trunk/hornetq-spring-integration/pom.xml (from rev 10458, trunk/hornetq-twitter-integration/pom.xml) =================================================================== --- trunk/hornetq-spring-integration/pom.xml (rev 0) +++ trunk/hornetq-spring-integration/pom.xml 2011-04-07 18:26:07 UTC (rev 10460) @@ -0,0 +1,70 @@ +<!-- + ~ 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. + --> + +<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-spring-integration</artifactId> + <packaging>jar</packaging> + <version>2.2.3-SNAPSHOT</version> + <name>HornetQ Spring 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.springframework</groupId> + <artifactId>spring-core</artifactId> + <version>3.0.3.RELEASE</version> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-beans</artifactId> + <version>3.0.3.RELEASE</version> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-context</artifactId> + <version>3.0.3.RELEASE</version> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-jms</artifactId> + <version>3.0.3.RELEASE</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-07 14:48:58 UTC (rev 10459) +++ trunk/hornetq.iml 2011-04-07 18:26:07 UTC (rev 10460) @@ -11,6 +11,8 @@ <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" /> <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" /> <excludeFolder url="file://$MODULE_DIR$/build/api" /> <excludeFolder url="file://$MODULE_DIR$/build/classes" /> <excludeFolder url="file://$MODULE_DIR$/build/jars" /> Deleted: trunk/src/config/common/schema/hornetq-jms.xsd =================================================================== --- trunk/src/config/common/schema/hornetq-jms.xsd 2011-04-07 14:48:58 UTC (rev 10459) +++ trunk/src/config/common/schema/hornetq-jms.xsd 2011-04-07 18:26:07 UTC (rev 10460) @@ -1,187 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?> - -<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" - targetNamespace="urn:hornetq" - xmlns="urn:hornetq" - elementFormDefault="qualified" - attributeFormDefault="unqualified" - version="1.0"> - - <xsd:element name="configuration"> - <xsd:complexType> - <xsd:sequence> - <xsd:element ref="jmx-domain" minOccurs="0" maxOccurs="1"/> - <xsd:element ref="connection-factory" - maxOccurs="unbounded" minOccurs="0"> - </xsd:element> - <xsd:choice maxOccurs="unbounded" minOccurs="0"> - <xsd:element ref="queue" maxOccurs="1" - minOccurs="1"> - </xsd:element> - <xsd:element ref="topic" maxOccurs="1" minOccurs="1"></xsd:element> - </xsd:choice> - </xsd:sequence> - </xsd:complexType> - </xsd:element> - - <xsd:element name="jmx-domain" type="xsd:string"/> - - <xsd:element name="connection-factory"> - <xsd:complexType> - <xsd:all> - <xsd:element name="xa" type="xsd:boolean" maxOccurs="1" minOccurs="0"></xsd:element> - <xsd:element name="discovery-group-ref" type="discovery-group-refType" maxOccurs="1" minOccurs="0"></xsd:element> - - <xsd:element name="connectors" maxOccurs="1" minOccurs="0"> - <xsd:complexType> - <xsd:sequence> - <xsd:element name="connector-ref" type="connector-refType" - maxOccurs="unbounded" minOccurs="1"></xsd:element> - </xsd:sequence> - </xsd:complexType> - </xsd:element> - <xsd:element name="entries" maxOccurs="1" minOccurs="0"> - <xsd:complexType> - <xsd:sequence> - <xsd:element name="entry" type="entryType" - maxOccurs="unbounded" minOccurs="1"> - </xsd:element> - </xsd:sequence> - </xsd:complexType> - </xsd:element> - <xsd:element name="client-failure-check-period" type="xsd:long" - maxOccurs="1" minOccurs="0"> - </xsd:element> - <xsd:element name="connection-ttl" type="xsd:long" - maxOccurs="1" minOccurs="0"> - </xsd:element> - <xsd:element name="call-timeout" type="xsd:long" - maxOccurs="1" minOccurs="0"> - </xsd:element> - <xsd:element name="consumer-window-size" type="xsd:int" - maxOccurs="1" minOccurs="0"> - </xsd:element> - <xsd:element name="consumer-max-rate" type="xsd:int" - maxOccurs="1" minOccurs="0"> - </xsd:element> - <xsd:element name="confirmation-window-size" type="xsd:int" - maxOccurs="1" minOccurs="0"> - </xsd:element> - <xsd:element name="producer-window-size" type="xsd:int" - maxOccurs="1" minOccurs="0"> - </xsd:element> - <xsd:element name="producer-max-rate" type="xsd:int" - maxOccurs="1" minOccurs="0"> - </xsd:element> - <xsd:element name="cache-large-message-client" type="xsd:boolean" - maxOccurs="1" minOccurs="0"> - </xsd:element> - <xsd:element name="min-large-message-size" type="xsd:long" - maxOccurs="1" minOccurs="0"> - </xsd:element> - <xsd:element name="compress-large-messages" type="xsd:boolean" - maxOccurs="1" minOccurs="0"> - </xsd:element> - - <xsd:element name="client-id" type="xsd:string" - maxOccurs="1" minOccurs="0"> - </xsd:element> - <xsd:element name="dups-ok-batch-size" type="xsd:int" - maxOccurs="1" minOccurs="0"> - </xsd:element> - <xsd:element name="transaction-batch-size" type="xsd:int" - maxOccurs="1" minOccurs="0"> - </xsd:element> - <xsd:element name="block-on-acknowledge" type="xsd:boolean" - maxOccurs="1" minOccurs="0"> - </xsd:element> - <xsd:element name="block-on-non-durable-send" type="xsd:boolean" - maxOccurs="1" minOccurs="0"> - </xsd:element> - <xsd:element name="block-on-durable-send" type="xsd:boolean" - maxOccurs="1" minOccurs="0"> - </xsd:element> - <xsd:element name="auto-group" type="xsd:boolean" - maxOccurs="1" minOccurs="0"> - </xsd:element> - <xsd:element name="pre-acknowledge" type="xsd:boolean" - maxOccurs="1" minOccurs="0"> - </xsd:element> - <xsd:element name="retry-interval" type="xsd:long" - maxOccurs="1" minOccurs="0"> - </xsd:element> - <xsd:element name="retry-interval-multiplier" type="xsd:float" - maxOccurs="1" minOccurs="0"> - </xsd:element> - <xsd:element name="max-retry-interval" type="xsd:long" - maxOccurs="1" minOccurs="0"> - </xsd:element> - <xsd:element name="reconnect-attempts" type="xsd:int" - maxOccurs="1" minOccurs="0"> - </xsd:element> - <xsd:element name="failover-on-initial-connection" type="xsd:boolean" - maxOccurs="1" minOccurs="0"> - </xsd:element> - <xsd:element name="failover-on-server-shutdown" type="xsd:boolean" - maxOccurs="1" minOccurs="0"> - </xsd:element> - <xsd:element name="connection-load-balancing-policy-class-name" type="xsd:string" - maxOccurs="1" minOccurs="0"> - </xsd:element> - <xsd:element name="use-global-pools" type="xsd:boolean" - maxOccurs="1" minOccurs="0"> - </xsd:element> - <xsd:element name="scheduled-thread-pool-max-size" type="xsd:int" - maxOccurs="1" minOccurs="0"> - </xsd:element> - <xsd:element name="thread-pool-max-size" type="xsd:int" - maxOccurs="1" minOccurs="0"> - </xsd:element> - <xsd:element name="group-id" type="xsd:string" - maxOccurs="1" minOccurs="0"> - </xsd:element> - <xsd:element name="ha" type="xsd:boolean" - maxOccurs="1" minOccurs="0"> - </xsd:element> - </xsd:all> - <xsd:attribute name="name" type="xsd:string"></xsd:attribute> - <xsd:attribute name="signature" type="xsd:string"></xsd:attribute> - </xsd:complexType> - </xsd:element> - - <xsd:complexType name="connector-refType"> - <xsd:attribute name="connector-name" type="xsd:string" use="required"></xsd:attribute> - </xsd:complexType> - - <xsd:complexType name="entryType"> - <xsd:attribute name="name" type="xsd:string" use="required"></xsd:attribute> - </xsd:complexType> - - <xsd:complexType name="discovery-group-refType"> - <xsd:attribute name="discovery-group-name" type="xsd:string" use="required"></xsd:attribute> - </xsd:complexType> - - <xsd:element name="queue" type="queueType"></xsd:element> - - <xsd:element name="topic" type="topicType"></xsd:element> - - <xsd:complexType name="queueType"> - <xsd:sequence> - <xsd:element name="entry" type="entryType" maxOccurs="unbounded" minOccurs="1"></xsd:element> - <xsd:element name="selector" maxOccurs="1" minOccurs="0"> - <xsd:complexType> - <xsd:attribute name="string" type="xsd:string" use="required"></xsd:attribute> - </xsd:complexType> - </xsd:element> - <xsd:element name="durable" type="xsd:boolean" maxOccurs="1" minOccurs="0"></xsd:element> - </xsd:sequence> - <xsd:attribute name="name" type="xsd:string" use="required"></xsd:attribute> - </xsd:complexType> - - <xsd:complexType name="topicType"> - <xsd:sequence> - <xsd:element name="entry" type="entryType" maxOccurs="unbounded" minOccurs="1"></xsd:element> - </xsd:sequence> - <xsd:attribute name="name" type="xsd:string" use="required"></xsd:attribute> - </xsd:complexType> -</xsd:schema>