April 2011 - hornetq-commits - Jboss List Archives

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

by do-not-reply＠jboss.org

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>  @@ -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"/> +  </target> <target name="restdoc"> @@ -1442,8 +1419,8 @@ </target> <target name="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 @@ + + +<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>

13 years, 8 months

1
0
0 / 0

JBoss hornetq SVN: r10459 - in trunk: hornetq-twitter-integration/src/main/java/org/hornetq/integration and 1 other directories.

by do-not-reply＠jboss.org

Author: ataylor Date: 2011-04-07 10:48:58 -0400 (Thu, 07 Apr 2011) New Revision: 10459 Added: trunk/hornetq-twitter-integration/src/main/java/org/hornetq/integration/twitter/ Removed: trunk/src/main/org/hornetq/integration/twitter/ Modified: trunk/hornetq.iml Log: mavenized hornetq twitter integartion part 2 Modified: trunk/hornetq.iml =================================================================== --- trunk/hornetq.iml 2011-04-07 14:46:47 UTC (rev 10458) +++ trunk/hornetq.iml 2011-04-07 14:48:58 UTC (rev 10459) @@ -10,6 +10,7 @@ <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" /> + <sourceFolder url="file://$MODULE_DIR$/hornetq-twitter-integration/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" />

13 years, 8 months

1
0
0 / 0

JBoss hornetq SVN: r10458 - in trunk: hornetq-twitter-integration and 5 other directories.

by do-not-reply＠jboss.org

Author: ataylor Date: 2011-04-07 10:46:47 -0400 (Thu, 07 Apr 2011) New Revision: 10458 Added: trunk/hornetq-twitter-integration/ trunk/hornetq-twitter-integration/pom.xml trunk/hornetq-twitter-integration/src/ trunk/hornetq-twitter-integration/src/main/ trunk/hornetq-twitter-integration/src/main/java/ trunk/hornetq-twitter-integration/src/main/java/org/ trunk/hornetq-twitter-integration/src/main/java/org/hornetq/ trunk/hornetq-twitter-integration/src/main/java/org/hornetq/integration/ Modified: trunk/build-hornetq.xml Log: mavenized hornetq twitter integartion Modified: trunk/build-hornetq.xml =================================================================== --- trunk/build-hornetq.xml 2011-04-06 06:26:27 UTC (rev 10457) +++ trunk/build-hornetq.xml 2011-04-07 14:46:47 UTC (rev 10458) @@ -99,11 +99,13 @@ <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.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="target.twitter.jar.dir" value="${hornetq.twitter.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"/> @@ -609,25 +611,7 @@ <target name="compile-jboss-integration" depends="jar-jboss-integration"> </target> - <target name="compile-twitter-integration" depends="compile-core"> - <javac destdir="${build.twitter.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/twitter/**/*.java"/> - <classpath refid="twitter.integration.compilation.classpath"/> - </javac> + <target name="compile-twitter-integration" depends="jar-twitter-integration"> </target> <target name="compile-spring-integration" depends="compile-core"> @@ -899,12 +883,12 @@ </jar> </target> - <target name="jar-twitter-integration" depends="compile-twitter-integration"> - - <jar jarfile="${build.jars.dir}/${twitter.integration.jar.name}"> - <fileset dir="${build.twitter.integration.classes.dir}" includes="**"/> - </jar> - + <target name="jar-twitter-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-twitter-integration"/> + </ant> </target> <target name="jar-twitter-integration-sources"> @@ -1212,7 +1196,6 @@ <include name="${jms.client.java5.jar.name}"/> <include name="${jnp.client.jar.name}"/> <include name="${spring.integration.jar.name}"/> - <include name="${twitter.integration.jar.name}"/> </fileset> <fileset dir="${org.jboss.naming.lib}"> <include name="jnpserver.jar"/> @@ -1226,6 +1209,7 @@ <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="${target.twitter.jar.dir}/hornetq-twitter-integration-2.2.3-SNAPSHOT.jar" tofile="${build.distro.lib.dir}/hornetq-twitter-integration.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-twitter-integration/pom.xml =================================================================== --- trunk/hornetq-twitter-integration/pom.xml (rev 0) +++ trunk/hornetq-twitter-integration/pom.xml 2011-04-07 14:46:47 UTC (rev 10458) @@ -0,0 +1,37 @@ +<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-twitter-integration</artifactId> + <packaging>jar</packaging> + <version>2.2.3-SNAPSHOT</version> + <name>HornetQ Twitter Integration</name> + + <dependencies> + <dependency> + <groupId>org.hornetq</groupId> + <artifactId>hornetq-core</artifactId> + <version>2.2.3-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.twitter4j</groupId> + <artifactId>twitter4j-core</artifactId> + <version>2.1.6</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>

13 years, 8 months

1
0
0 / 0

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

by do-not-reply＠jboss.org

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" />

13 years, 8 months

1
0
0 / 0

JBoss hornetq SVN: r10456 - in branches/Branch_2_2_EAP: src/main/org/hornetq/core/transaction/impl and 2 other directories.

by do-not-reply＠jboss.org

Author: clebert.suconic(a)jboss.com Date: 2011-04-05 17:50:24 -0400 (Tue, 05 Apr 2011) New Revision: 10456 Added: branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/cluster/failover/AlmostLargeAsynchronousFailoverTest.java branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/cluster/failover/FailoverOnFlowControlTest.java Modified: branches/Branch_2_2_EAP/src/main/org/hornetq/core/client/impl/ClientProducerCreditsImpl.java branches/Branch_2_2_EAP/src/main/org/hornetq/core/transaction/impl/TransactionImpl.java branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/cluster/failover/AsynchronousFailoverTest.java branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/cluster/reattach/ReattachTest.java Log: https://issues.jboss.org/browse/JBPAPP-6252 - fixing failover during flow control Modified: branches/Branch_2_2_EAP/src/main/org/hornetq/core/client/impl/ClientProducerCreditsImpl.java =================================================================== --- branches/Branch_2_2_EAP/src/main/org/hornetq/core/client/impl/ClientProducerCreditsImpl.java 2011-04-05 16:17:19 UTC (rev 10455) +++ branches/Branch_2_2_EAP/src/main/org/hornetq/core/client/impl/ClientProducerCreditsImpl.java 2011-04-05 21:50:24 UTC (rev 10456) @@ -83,9 +83,13 @@ semaphore.drainPermits(); + int beforeFailure = arriving; + arriving = 0; - checkCredits(windowSize * 2); + // If we are waiting for more credits than what's configured, then we need to use what we tried before + // otherwise the client may starve as the credit will never arrive + checkCredits(Math.max(windowSize * 2, beforeFailure)); } public void close() Modified: branches/Branch_2_2_EAP/src/main/org/hornetq/core/transaction/impl/TransactionImpl.java =================================================================== --- branches/Branch_2_2_EAP/src/main/org/hornetq/core/transaction/impl/TransactionImpl.java 2011-04-05 16:17:19 UTC (rev 10455) +++ branches/Branch_2_2_EAP/src/main/org/hornetq/core/transaction/impl/TransactionImpl.java 2011-04-05 21:50:24 UTC (rev 10456) @@ -506,7 +506,7 @@ } } - public void afterRollback() + public synchronized void afterRollback() { if (operations != null) { @@ -517,7 +517,7 @@ } } - public void beforeCommit() throws Exception + public synchronized void beforeCommit() throws Exception { if (operations != null) { @@ -528,7 +528,7 @@ } } - public void beforePrepare() throws Exception + public synchronized void beforePrepare() throws Exception { if (operations != null) { @@ -539,7 +539,7 @@ } } - public void beforeRollback() throws Exception + public synchronized void beforeRollback() throws Exception { if (operations != null) { @@ -550,7 +550,7 @@ } } - public void afterPrepare() + public synchronized void afterPrepare() { if (operations != null) { Added: branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/cluster/failover/AlmostLargeAsynchronousFailoverTest.java =================================================================== --- branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/cluster/failover/AlmostLargeAsynchronousFailoverTest.java (rev 0) +++ branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/cluster/failover/AlmostLargeAsynchronousFailoverTest.java 2011-04-05 21:50:24 UTC (rev 10456) @@ -0,0 +1,67 @@ +/* + * Copyright 2010 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. + */ + +package org.hornetq.tests.integration.cluster.failover; + +import org.hornetq.api.core.client.ClientMessage; +import org.hornetq.core.client.impl.ServerLocatorInternal; + +/** + * Validating failover when the size of the message Size > flow Control && message Size < minLargeMessageSize + * + * @author clebertsuconic + * + * + */ +public class AlmostLargeAsynchronousFailoverTest extends AsynchronousFailoverTest +{ + + // Constants ----------------------------------------------------- + + // Attributes ---------------------------------------------------- + + // Static -------------------------------------------------------- + + // Constructors -------------------------------------------------- + + // Public -------------------------------------------------------- + + // Package protected --------------------------------------------- + + // Protected ----------------------------------------------------- + + protected void createConfigs() throws Exception + { + super.createConfigs(); + liveServer.getServer().getConfiguration().setJournalFileSize(1024 * 1024); + backupServer.getServer().getConfiguration().setJournalFileSize(1024 * 1024); + } + + protected ServerLocatorInternal getServerLocator() throws Exception + { + ServerLocatorInternal locator = super.getServerLocator(); + locator.setMinLargeMessageSize(1024 * 1024); + locator.setProducerWindowSize(10 * 1024); + return locator; + } + + protected void addPayload(ClientMessage message) + { + message.putBytesProperty("payload", new byte[20 * 1024]); + } + + // Private ------------------------------------------------------- + + // Inner classes ------------------------------------------------- + +} Modified: branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/cluster/failover/AsynchronousFailoverTest.java =================================================================== --- branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/cluster/failover/AsynchronousFailoverTest.java 2011-04-05 16:17:19 UTC (rev 10455) +++ branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/cluster/failover/AsynchronousFailoverTest.java 2011-04-05 21:50:24 UTC (rev 10456) @@ -243,6 +243,10 @@ DelegatingSession.debug = false; } } + + protected void addPayload(ClientMessage msg) + { + } private void doTestNonTransactional(final TestRunner runner) throws Exception { @@ -274,6 +278,8 @@ message.getBodyBuffer().writeString("message" + i); message.putIntProperty("counter", i); + + addPayload(message); producer.send(message); @@ -402,7 +408,10 @@ message.putStringProperty(Message.HDR_DUPLICATE_DETECTION_ID, new SimpleString("id:" + i + ",exec:" + executionId)); + + addPayload(message); + producer.send(message); } Added: branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/cluster/failover/FailoverOnFlowControlTest.java =================================================================== --- branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/cluster/failover/FailoverOnFlowControlTest.java (rev 0) +++ branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/cluster/failover/FailoverOnFlowControlTest.java 2011-04-05 21:50:24 UTC (rev 10456) @@ -0,0 +1,157 @@ +/* + * Copyright 2010 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. + */ + +package org.hornetq.tests.integration.cluster.failover; + +import java.util.ArrayList; +import java.util.concurrent.atomic.AtomicInteger; + +import org.hornetq.api.core.HornetQException; +import org.hornetq.api.core.Interceptor; +import org.hornetq.api.core.TransportConfiguration; +import org.hornetq.api.core.client.ClientMessage; +import org.hornetq.api.core.client.ClientProducer; +import org.hornetq.api.core.client.ClientSession; +import org.hornetq.api.core.client.ServerLocator; +import org.hornetq.core.client.impl.ClientSessionFactoryInternal; +import org.hornetq.core.client.impl.ServerLocatorInternal; +import org.hornetq.core.protocol.core.Packet; +import org.hornetq.core.protocol.core.impl.wireformat.SessionProducerCreditsMessage; +import org.hornetq.spi.core.protocol.RemotingConnection; + +/** + * A FailoverOnFlowControlTest + * + * @author clebertsuconic + * + * + */ +public class FailoverOnFlowControlTest extends FailoverTestBase +{ + + + // Constants ----------------------------------------------------- + + // Attributes ---------------------------------------------------- + + // Static -------------------------------------------------------- + + // Constructors -------------------------------------------------- + + // Public -------------------------------------------------------- + + + public void testOverflowSend() throws Exception + { + ServerLocator locator = getServerLocator(); + locator.setBlockOnNonDurableSend(true); + locator.setBlockOnDurableSend(true); + locator.setReconnectAttempts(-1); + locator.setProducerWindowSize(1000); + final ArrayList<ClientSession> sessionList = new ArrayList<ClientSession>(); + Interceptor interceptorClient = new Interceptor() + { + AtomicInteger count = new AtomicInteger(0); + public boolean intercept(Packet packet, RemotingConnection connection) throws HornetQException + { + System.out.println("Intercept..." + packet.getClass().getName()); + + if (packet instanceof SessionProducerCreditsMessage ) + { + SessionProducerCreditsMessage credit = (SessionProducerCreditsMessage)packet; + + System.out.println("Credits: " + credit.getCredits()); + if (count.incrementAndGet() == 2) + { + try + { + crash(sessionList.get(0)); + } + catch (Exception e) + { + e.printStackTrace(); + } + return false; + } + } + return true; + } + }; + + locator.addInterceptor(interceptorClient); + + ClientSessionFactoryInternal sf = createSessionFactoryAndWaitForTopology(locator, 2); + ClientSession session = sf.createSession(true, true); + sessionList.add(session); + + session.createQueue(FailoverTestBase.ADDRESS, FailoverTestBase.ADDRESS, null, true); + + ClientProducer producer = session.createProducer(FailoverTestBase.ADDRESS); + + + final int numMessages = 10; + + for (int i = 0; i < numMessages; i++) + { + ClientMessage message = session.createMessage(true); + + message.getBodyBuffer().writeBytes(new byte[5000]); + + message.putIntProperty("counter", i); + + producer.send(message); + } + + session.close(); + + locator.close(); + } + + + protected void createConfigs() throws Exception + { + super.createConfigs(); + liveServer.getServer().getConfiguration().setJournalFileSize(1024 * 1024); + backupServer.getServer().getConfiguration().setJournalFileSize(1024 * 1024); + } + + protected ServerLocatorInternal getServerLocator() throws Exception + { + ServerLocatorInternal locator = super.getServerLocator(); + locator.setMinLargeMessageSize(1024 * 1024); + locator.setProducerWindowSize(10 * 1024); + return locator; + } + + // Package protected --------------------------------------------- + + // Protected ----------------------------------------------------- + + @Override + protected TransportConfiguration getAcceptorTransportConfiguration(final boolean live) + { + return getInVMTransportAcceptorConfiguration(live); + } + + @Override + protected TransportConfiguration getConnectorTransportConfiguration(final boolean live) + { + return getInVMConnectorTransportConfiguration(live); + } + + + // Private ------------------------------------------------------- + + // Inner classes ------------------------------------------------- + +} Modified: branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/cluster/reattach/ReattachTest.java =================================================================== --- branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/cluster/reattach/ReattachTest.java 2011-04-05 16:17:19 UTC (rev 10455) +++ branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/cluster/reattach/ReattachTest.java 2011-04-05 21:50:24 UTC (rev 10456) @@ -16,15 +16,20 @@ import java.util.Timer; import java.util.TimerTask; import java.util.concurrent.CountDownLatch; +import java.util.concurrent.atomic.AtomicInteger; import junit.framework.Assert; import org.hornetq.api.core.HornetQException; +import org.hornetq.api.core.Interceptor; import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.client.*; import org.hornetq.core.client.impl.ClientSessionFactoryInternal; import org.hornetq.core.client.impl.ClientSessionInternal; import org.hornetq.core.logging.Logger; +import org.hornetq.core.protocol.core.Packet; +import org.hornetq.core.protocol.core.impl.wireformat.SessionProducerCreditsMessage; +import org.hornetq.core.protocol.core.impl.wireformat.SessionSendMessage; import org.hornetq.core.remoting.impl.invm.InVMConnector; import org.hornetq.core.remoting.impl.invm.InVMRegistry; import org.hornetq.core.server.HornetQServer; @@ -77,7 +82,7 @@ locator.setRetryIntervalMultiplier(retryMultiplier); locator.setReconnectAttempts(reconnectAttempts); locator.setConfirmationWindowSize(1024 * 1024); - ClientSessionFactoryInternal sf = (ClientSessionFactoryInternal) locator.createSessionFactory(); + ClientSessionFactoryInternal sf = (ClientSessionFactoryInternal)locator.createSessionFactory(); ClientSession session = sf.createSession(false, true, true); @@ -94,10 +99,10 @@ for (int i = 0; i < numMessages; i++) { ClientMessage message = session.createMessage(HornetQTextMessage.TYPE, - false, - 0, - System.currentTimeMillis(), - (byte)1); + false, + 0, + System.currentTimeMillis(), + (byte)1); message.putIntProperty(new SimpleString("count"), i); message.getBodyBuffer().writeString("aardvarks"); producer.send(message); @@ -139,6 +144,77 @@ } /* + * Test failure on connection, but server is still up so should immediately reconnect + */ + public void testOverflowCredits() throws Exception + { + final long retryInterval = 500; + + final double retryMultiplier = 1d; + + final int reconnectAttempts = 1; + + locator.setRetryInterval(retryInterval); + locator.setRetryIntervalMultiplier(retryMultiplier); + locator.setReconnectAttempts(reconnectAttempts); + locator.setConfirmationWindowSize(1024 * 1024); + locator.setProducerWindowSize(1000); + + final AtomicInteger count = new AtomicInteger(0); + + Interceptor intercept = new Interceptor() + { + + public boolean intercept(Packet packet, RemotingConnection connection) throws HornetQException + { + System.out.println("Intercept..." + packet.getClass().getName()); + + if (packet instanceof SessionProducerCreditsMessage ) + { + SessionProducerCreditsMessage credit = (SessionProducerCreditsMessage)packet; + + System.out.println("Credits: " + credit.getCredits()); + if (count.incrementAndGet() == 2) + { + System.out.println("Failing"); + connection.fail(new HornetQException(1, "bye")); + return false; + } + } + return true; + } + }; + + locator.addInterceptor(intercept); + + ClientSessionFactoryInternal sf = (ClientSessionFactoryInternal)locator.createSessionFactory(); + + ClientSession session = sf.createSession(false, true, true); + + session.createQueue(ReattachTest.ADDRESS, ReattachTest.ADDRESS, null, false); + + ClientProducer producer = session.createProducer(ReattachTest.ADDRESS); + + final int numMessages = 10; + + for (int i = 0; i < numMessages; i++) + { + ClientMessage message = session.createMessage(HornetQTextMessage.TYPE, + false, + 0, + System.currentTimeMillis(), + (byte)1); + message.putIntProperty(new SimpleString("count"), i); + message.getBodyBuffer().writeBytes(new byte[5000]); + producer.send(message); + } + + session.close(); + + sf.close(); + } + + /* * Test failure on connection, simulate failure to create connection for a while, then * allow connection to be recreated */ @@ -154,7 +230,7 @@ locator.setRetryIntervalMultiplier(retryMultiplier); locator.setReconnectAttempts(reconnectAttempts); locator.setConfirmationWindowSize(1024 * 1024); - ClientSessionFactoryInternal sf = (ClientSessionFactoryInternal) locator.createSessionFactory(); + ClientSessionFactoryInternal sf = (ClientSessionFactoryInternal)locator.createSessionFactory(); ClientSession session = sf.createSession(false, true, true); @@ -167,10 +243,10 @@ for (int i = 0; i < numMessages; i++) { ClientMessage message = session.createMessage(HornetQTextMessage.TYPE, - false, - 0, - System.currentTimeMillis(), - (byte)1); + false, + 0, + System.currentTimeMillis(), + (byte)1); message.putIntProperty(new SimpleString("count"), i); message.getBodyBuffer().writeString("aardvarks"); producer.send(message); @@ -244,7 +320,7 @@ locator.setRetryIntervalMultiplier(retryMultiplier); locator.setReconnectAttempts(reconnectAttempts); locator.setConfirmationWindowSize(1024 * 1024); - ClientSessionFactoryInternal sf = (ClientSessionFactoryInternal) locator.createSessionFactory(); + ClientSessionFactoryInternal sf = (ClientSessionFactoryInternal)locator.createSessionFactory(); ClientSession session = sf.createSession(false, true, true); @@ -277,10 +353,10 @@ for (int i = 0; i < numMessages; i++) { ClientMessage message = session.createMessage(HornetQTextMessage.TYPE, - false, - 0, - System.currentTimeMillis(), - (byte)1); + false, + 0, + System.currentTimeMillis(), + (byte)1); message.putIntProperty(new SimpleString("count"), i); message.getBodyBuffer().writeString("aardvarks"); producer.send(message); @@ -358,7 +434,7 @@ locator.setRetryIntervalMultiplier(retryMultiplier); locator.setReconnectAttempts(reconnectAttempts); locator.setConfirmationWindowSize(1024 * 1024); - ClientSessionFactoryInternal sf = (ClientSessionFactoryInternal) locator.createSessionFactory(); + ClientSessionFactoryInternal sf = (ClientSessionFactoryInternal)locator.createSessionFactory(); ClientSession session = sf.createSession(false, true, true); @@ -371,10 +447,10 @@ for (int i = 0; i < numMessages; i++) { ClientMessage message = session.createMessage(HornetQTextMessage.TYPE, - false, - 0, - System.currentTimeMillis(), - (byte)1); + false, + 0, + System.currentTimeMillis(), + (byte)1); message.putIntProperty(new SimpleString("count"), i); message.getBodyBuffer().writeString("aardvarks"); producer.send(message); @@ -448,7 +524,7 @@ locator.setRetryIntervalMultiplier(retryMultiplier); locator.setReconnectAttempts(reconnectAttempts); locator.setConfirmationWindowSize(1024 * 1024); - final ClientSessionFactoryInternal sf = (ClientSessionFactoryInternal) locator.createSessionFactory(); + final ClientSessionFactoryInternal sf = (ClientSessionFactoryInternal)locator.createSessionFactory(); session = sf.createSession(); @@ -558,7 +634,7 @@ locator.setRetryIntervalMultiplier(retryMultiplier); locator.setReconnectAttempts(reconnectAttempts); locator.setConfirmationWindowSize(1024 * 1024); - final ClientSessionFactoryInternal sf = (ClientSessionFactoryInternal) locator.createSessionFactory(); + final ClientSessionFactoryInternal sf = (ClientSessionFactoryInternal)locator.createSessionFactory(); InVMConnector.failOnCreateConnection = true; @@ -656,7 +732,7 @@ locator.setRetryIntervalMultiplier(retryMultiplier); locator.setReconnectAttempts(reconnectAttempts); locator.setConfirmationWindowSize(1024 * 1024); - ClientSessionFactoryInternal sf = (ClientSessionFactoryInternal) locator.createSessionFactory(); + ClientSessionFactoryInternal sf = (ClientSessionFactoryInternal)locator.createSessionFactory(); ClientSession session = sf.createSession(false, true, true); @@ -697,11 +773,11 @@ // // //Should throw exception since didn't reconnect - // + // // try // { // session.start(); - // + // // fail("Should throw exception"); // } // catch (HornetQException e) @@ -728,7 +804,7 @@ locator.setRetryIntervalMultiplier(retryMultiplier); locator.setReconnectAttempts(reconnectAttempts); locator.setConfirmationWindowSize(1024 * 1024); - ClientSessionFactoryInternal sf = (ClientSessionFactoryInternal) locator.createSessionFactory(); + ClientSessionFactoryInternal sf = (ClientSessionFactoryInternal)locator.createSessionFactory(); ClientSession session = sf.createSession(false, true, true); @@ -741,10 +817,10 @@ for (int i = 0; i < numMessages; i++) { ClientMessage message = session.createMessage(HornetQTextMessage.TYPE, - false, - 0, - System.currentTimeMillis(), - (byte)1); + false, + 0, + System.currentTimeMillis(), + (byte)1); message.putIntProperty(new SimpleString("count"), i); message.getBodyBuffer().writeString("aardvarks"); producer.send(message); @@ -791,12 +867,11 @@ final int reconnectAttempts = -1; - locator.setRetryInterval(retryInterval); locator.setRetryIntervalMultiplier(retryMultiplier); locator.setReconnectAttempts(reconnectAttempts); locator.setConfirmationWindowSize(1024 * 1024); - ClientSessionFactoryInternal sf = (ClientSessionFactoryInternal) locator.createSessionFactory(); + ClientSessionFactoryInternal sf = (ClientSessionFactoryInternal)locator.createSessionFactory(); ClientSession session = sf.createSession(false, true, true); @@ -809,10 +884,10 @@ for (int i = 0; i < numMessages; i++) { ClientMessage message = session.createMessage(HornetQTextMessage.TYPE, - false, - 0, - System.currentTimeMillis(), - (byte)1); + false, + 0, + System.currentTimeMillis(), + (byte)1); message.putIntProperty(new SimpleString("count"), i); message.getBodyBuffer().writeString("aardvarks"); producer.send(message); @@ -884,12 +959,11 @@ final int reconnectAttempts = -1; - locator.setRetryInterval(retryInterval); locator.setRetryIntervalMultiplier(retryMultiplier); locator.setReconnectAttempts(reconnectAttempts); locator.setConfirmationWindowSize(1024 * 1024); - ClientSessionFactoryInternal sf = (ClientSessionFactoryInternal) locator.createSessionFactory(); + ClientSessionFactoryInternal sf = (ClientSessionFactoryInternal)locator.createSessionFactory(); ClientSession session = sf.createSession(false, true, true); @@ -902,10 +976,10 @@ for (int i = 0; i < numMessages; i++) { ClientMessage message = session.createMessage(HornetQTextMessage.TYPE, - false, - 0, - System.currentTimeMillis(), - (byte)1); + false, + 0, + System.currentTimeMillis(), + (byte)1); message.putIntProperty(new SimpleString("count"), i); message.getBodyBuffer().writeString("aardvarks"); producer.send(message); @@ -967,7 +1041,7 @@ locator.setReconnectAttempts(reconnectAttempts); locator.setMaxRetryInterval(maxRetryInterval); locator.setConfirmationWindowSize(1024 * 1024); - ClientSessionFactoryInternal sf = (ClientSessionFactoryInternal) locator.createSessionFactory(); + ClientSessionFactoryInternal sf = (ClientSessionFactoryInternal)locator.createSessionFactory(); ClientSession session = sf.createSession(false, true, true); @@ -980,10 +1054,10 @@ for (int i = 0; i < numMessages; i++) { ClientMessage message = session.createMessage(HornetQTextMessage.TYPE, - false, - 0, - System.currentTimeMillis(), - (byte)1); + false, + 0, + System.currentTimeMillis(), + (byte)1); message.putIntProperty(new SimpleString("count"), i); message.getBodyBuffer().writeString("aardvarks"); producer.send(message); @@ -1045,7 +1119,7 @@ service.start(); - locator = createFactory(false); + locator = createFactory(false); } @Override @@ -1054,7 +1128,7 @@ InVMConnector.resetFailures(); locator.close(); - + service.stop(); Assert.assertEquals(0, InVMRegistry.instance.size());

13 years, 8 months

1
0
0 / 0

JBoss hornetq SVN: r10455 - in branches/Branch_2_2_EAP: src/main/org/hornetq/core/paging/cursor and 5 other directories.

by do-not-reply＠jboss.org

Author: clebert.suconic(a)jboss.com Date: 2011-04-05 12:17:19 -0400 (Tue, 05 Apr 2011) New Revision: 10455 Modified: branches/Branch_2_2_EAP/src/main/org/hornetq/core/paging/Page.java branches/Branch_2_2_EAP/src/main/org/hornetq/core/paging/PrintPages.java branches/Branch_2_2_EAP/src/main/org/hornetq/core/paging/cursor/PageCache.java branches/Branch_2_2_EAP/src/main/org/hornetq/core/paging/cursor/impl/LivePageCacheImpl.java branches/Branch_2_2_EAP/src/main/org/hornetq/core/paging/cursor/impl/PageCacheImpl.java branches/Branch_2_2_EAP/src/main/org/hornetq/core/paging/cursor/impl/PageCursorProviderImpl.java branches/Branch_2_2_EAP/src/main/org/hornetq/core/paging/impl/PageImpl.java branches/Branch_2_2_EAP/src/main/org/hornetq/core/paging/impl/PagedMessageImpl.java branches/Branch_2_2_EAP/src/main/org/hornetq/core/paging/impl/PagingStoreImpl.java branches/Branch_2_2_EAP/src/main/org/hornetq/core/replication/impl/ReplicationEndpointImpl.java branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/client/LargeMessageTest.java branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/unit/core/paging/impl/PageImplTest.java branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/unit/core/paging/impl/PagingManagerImplTest.java branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/unit/core/paging/impl/PagingStoreImplTest.java Log: JBPAPP-6237 - delaying delete of large messages when sent through paging Modified: branches/Branch_2_2_EAP/src/main/org/hornetq/core/paging/Page.java =================================================================== --- branches/Branch_2_2_EAP/src/main/org/hornetq/core/paging/Page.java 2011-04-05 14:47:00 UTC (rev 10454) +++ branches/Branch_2_2_EAP/src/main/org/hornetq/core/paging/Page.java 2011-04-05 16:17:19 UTC (rev 10455) @@ -16,6 +16,7 @@ import java.util.List; import org.hornetq.core.paging.cursor.LivePageCache; +import org.hornetq.core.persistence.StorageManager; /** * @@ -29,7 +30,7 @@ void write(PagedMessage message) throws Exception; - List<PagedMessage> read() throws Exception; + List<PagedMessage> read(StorageManager storage) throws Exception; void setLiveCache(LivePageCache pageCache); @@ -43,5 +44,5 @@ void close() throws Exception; - boolean delete() throws Exception; + boolean delete(PagedMessage[] messages) throws Exception; } Modified: branches/Branch_2_2_EAP/src/main/org/hornetq/core/paging/PrintPages.java =================================================================== --- branches/Branch_2_2_EAP/src/main/org/hornetq/core/paging/PrintPages.java 2011-04-05 14:47:00 UTC (rev 10454) +++ branches/Branch_2_2_EAP/src/main/org/hornetq/core/paging/PrintPages.java 2011-04-05 16:17:19 UTC (rev 10455) @@ -108,7 +108,7 @@ System.out.println("******* Page " + pgid); Page page = pgStore.createPage(pgid); page.open(); - List<PagedMessage> msgs = page.read(); + List<PagedMessage> msgs = page.read(sm); page.close(); int msgID = 0; Modified: branches/Branch_2_2_EAP/src/main/org/hornetq/core/paging/cursor/PageCache.java =================================================================== --- branches/Branch_2_2_EAP/src/main/org/hornetq/core/paging/cursor/PageCache.java 2011-04-05 14:47:00 UTC (rev 10454) +++ branches/Branch_2_2_EAP/src/main/org/hornetq/core/paging/cursor/PageCache.java 2011-04-05 16:17:19 UTC (rev 10455) @@ -34,6 +34,8 @@ void setMessages(PagedMessage[] messages); + PagedMessage[] getMessages(); + /** * If this cache is still being updated * @return Modified: branches/Branch_2_2_EAP/src/main/org/hornetq/core/paging/cursor/impl/LivePageCacheImpl.java =================================================================== --- branches/Branch_2_2_EAP/src/main/org/hornetq/core/paging/cursor/impl/LivePageCacheImpl.java 2011-04-05 14:47:00 UTC (rev 10454) +++ branches/Branch_2_2_EAP/src/main/org/hornetq/core/paging/cursor/impl/LivePageCacheImpl.java 2011-04-05 16:17:19 UTC (rev 10455) @@ -143,7 +143,15 @@ this.isLive = false; } + /* (non-Javadoc) + * @see org.hornetq.core.paging.cursor.PageCache#getMessages() + */ + public PagedMessage[] getMessages() + { + return messages.toArray(new PagedMessage[messages.size()]); + } + // Package protected --------------------------------------------- // Protected ----------------------------------------------------- Modified: branches/Branch_2_2_EAP/src/main/org/hornetq/core/paging/cursor/impl/PageCacheImpl.java =================================================================== --- branches/Branch_2_2_EAP/src/main/org/hornetq/core/paging/cursor/impl/PageCacheImpl.java 2011-04-05 14:47:00 UTC (rev 10454) +++ branches/Branch_2_2_EAP/src/main/org/hornetq/core/paging/cursor/impl/PageCacheImpl.java 2011-04-05 16:17:19 UTC (rev 10455) @@ -133,6 +133,14 @@ return "PageCacheImpl::page=" + page.getPageId() + " numberOfMessages = " + messages.length; } + /* (non-Javadoc) + * @see org.hornetq.core.paging.cursor.PageCache#getMessages() + */ + public PagedMessage[] getMessages() + { + return messages; + } + // Package protected --------------------------------------------- // Protected ----------------------------------------------------- Modified: branches/Branch_2_2_EAP/src/main/org/hornetq/core/paging/cursor/impl/PageCursorProviderImpl.java =================================================================== --- branches/Branch_2_2_EAP/src/main/org/hornetq/core/paging/cursor/impl/PageCursorProviderImpl.java 2011-04-05 14:47:00 UTC (rev 10454) +++ branches/Branch_2_2_EAP/src/main/org/hornetq/core/paging/cursor/impl/PageCursorProviderImpl.java 2011-04-05 16:17:19 UTC (rev 10455) @@ -143,6 +143,74 @@ return getPageCache(pos.getPageNr()); } + public PageCache getPageCache(final long pageId) + { + try + { + boolean needToRead = false; + PageCache cache = null; + synchronized (softCache) + { + if (pageId > pagingStore.getCurrentWritingPage()) + { + return null; + } + + cache = softCache.get(pageId); + if (cache == null) + { + if (!pagingStore.checkPage((int)pageId)) + { + return null; + } + + cache = createPageCache(pageId); + needToRead = true; + // anyone reading from this cache will have to wait reading to finish first + // we also want only one thread reading this cache + cache.lock(); + softCache.put(pageId, cache); + } + } + + // Reading is done outside of the synchronized block, however + // the page stays locked until the entire reading is finished + if (needToRead) + { + Page page = null; + try + { + page = pagingStore.createPage((int)pageId); + + page.open(); + + List<PagedMessage> pgdMessages = page.read(storageManager); + cache.setMessages(pgdMessages.toArray(new PagedMessage[pgdMessages.size()])); + } + finally + { + try + { + if (page != null) + { + page.close(); + } + } + catch (Throwable ignored) + { + } + cache.unlock(); + } + } + + return cache; + } + catch (Exception e) + { + throw new RuntimeException("Couldn't complete paging due to an IO Exception on Paging - " + e.getMessage(), e); + } + } + public void addPageCache(PageCache cache) { synchronized (softCache) @@ -337,9 +405,31 @@ { for (Page depagedPage : depagedPages) { - depagedPage.delete(); + PageCache cache; + PagedMessage[] pgdMessages; synchronized (softCache) { + cache = softCache.remove((long)depagedPage.getPageId()); + } + + if (cache == null) + { + // The page is not on cache any more + // We need to read the page-file before deleting it + // to make sure we remove any large-messages pending + depagedPage.open(); + List<PagedMessage> pgdMessagesList = depagedPage.read(storageManager); + depagedPage.close(); + pgdMessages = pgdMessagesList.toArray(new PagedMessage[pgdMessagesList.size()]); + } + else + { + pgdMessages = cache.getMessages(); + } + + depagedPage.delete(pgdMessages); + synchronized (softCache) + { softCache.remove((long)depagedPage.getPageId()); } } @@ -422,79 +512,6 @@ } - private PageCache getPageCache(final long pageId) - { - try - { - boolean needToRead = false; - PageCache cache = null; - synchronized (softCache) - { - if (pageId > pagingStore.getCurrentWritingPage()) - { - return null; - } - - cache = softCache.get(pageId); - if (cache == null) - { - if (!pagingStore.checkPage((int)pageId)) - { - return null; - } - - cache = createPageCache(pageId); - needToRead = true; - // anyone reading from this cache will have to wait reading to finish first - // we also want only one thread reading this cache - cache.lock(); - softCache.put(pageId, cache); - } - } - - // Reading is done outside of the synchronized block, however - // the page stays locked until the entire reading is finished - if (needToRead) - { - Page page = null; - try - { - page = pagingStore.createPage((int)pageId); - - page.open(); - - List<PagedMessage> pgdMessages = page.read(); - - for (PagedMessage pdgMessage : pgdMessages) - { - pdgMessage.initMessage(storageManager); - } - cache.setMessages(pgdMessages.toArray(new PagedMessage[pgdMessages.size()])); - } - finally - { - try - { - if (page != null) - { - page.close(); - } - } - catch (Throwable ignored) - { - } - cache.unlock(); - } - } - - return cache; - } - catch (Exception e) - { - throw new RuntimeException("Couldn't complete paging due to an IO Exception on Paging - " + e.getMessage(), e); - } - } - // Inner classes ------------------------------------------------- } Modified: branches/Branch_2_2_EAP/src/main/org/hornetq/core/paging/impl/PageImpl.java =================================================================== --- branches/Branch_2_2_EAP/src/main/org/hornetq/core/paging/impl/PageImpl.java 2011-04-05 14:47:00 UTC (rev 10454) +++ branches/Branch_2_2_EAP/src/main/org/hornetq/core/paging/impl/PageImpl.java 2011-04-05 16:17:19 UTC (rev 10455) @@ -28,6 +28,7 @@ import org.hornetq.core.paging.PagedMessage; import org.hornetq.core.paging.cursor.LivePageCache; import org.hornetq.core.persistence.StorageManager; +import org.hornetq.core.server.LargeServerMessage; import org.hornetq.utils.DataConstants; /** @@ -101,7 +102,7 @@ this.pageCache = pageCache; } - public List<PagedMessage> read() throws Exception + public List<PagedMessage> read(StorageManager storage) throws Exception { ArrayList<PagedMessage> messages = new ArrayList<PagedMessage>(); @@ -140,6 +141,7 @@ // constraint was already checked throw new IllegalStateException("Internal error, it wasn't possible to locate END_BYTE " + b); } + msg.initMessage(storage); messages.add(msg); } else @@ -218,13 +220,29 @@ file.close(); } - public boolean delete() throws Exception + public boolean delete(final PagedMessage[] messages) throws Exception { if (storageManager != null) { storageManager.pageDeleted(storeName, pageId); } + if (messages != null) + { + for (PagedMessage msg : messages) + { + if (msg.getMessage().isLargeMessage()) + { + LargeServerMessage lmsg = (LargeServerMessage)msg.getMessage(); + + // Remember, cannot call delete directly here + // Because the large-message may be linked to another message + // or it may still being delivered even though it has been acked already + lmsg.decrementDelayDeletionCount(); + } + } + } + try { if (suspiciousRecords) Modified: branches/Branch_2_2_EAP/src/main/org/hornetq/core/paging/impl/PagedMessageImpl.java =================================================================== --- branches/Branch_2_2_EAP/src/main/org/hornetq/core/paging/impl/PagedMessageImpl.java 2011-04-05 14:47:00 UTC (rev 10454) +++ branches/Branch_2_2_EAP/src/main/org/hornetq/core/paging/impl/PagedMessageImpl.java 2011-04-05 16:17:19 UTC (rev 10455) @@ -79,9 +79,11 @@ { if (largeMessageLazyData != null) { - message = storage.createLargeMessage(); + LargeServerMessage lgMessage = storage.createLargeMessage(); + message = lgMessage; HornetQBuffer buffer = HornetQBuffers.dynamicBuffer(largeMessageLazyData); message.decodeHeadersAndProperties(buffer); + lgMessage.incrementDelayDeletionCount(); largeMessageLazyData = null; } } Modified: branches/Branch_2_2_EAP/src/main/org/hornetq/core/paging/impl/PagingStoreImpl.java =================================================================== --- branches/Branch_2_2_EAP/src/main/org/hornetq/core/paging/impl/PagingStoreImpl.java 2011-04-05 14:47:00 UTC (rev 10454) +++ branches/Branch_2_2_EAP/src/main/org/hornetq/core/paging/impl/PagingStoreImpl.java 2011-04-05 16:17:19 UTC (rev 10455) @@ -462,13 +462,12 @@ currentPage = createPage(currentPageId); currentPage.open(); - List<PagedMessage> messages = currentPage.read(); + List<PagedMessage> messages = currentPage.read(storageManager); LivePageCache pageCache = new LivePageCacheImpl(currentPage); for (PagedMessage msg : messages) { - msg.initMessage(storageManager); pageCache.addLiveMessage(msg); } @@ -646,7 +645,7 @@ { stopPaging(); returnPage.open(); - returnPage.delete(); + returnPage.delete(null); // This will trigger this address to exit the page mode, // and this will make HornetQ start using the journal again Modified: branches/Branch_2_2_EAP/src/main/org/hornetq/core/replication/impl/ReplicationEndpointImpl.java =================================================================== --- branches/Branch_2_2_EAP/src/main/org/hornetq/core/replication/impl/ReplicationEndpointImpl.java 2011-04-05 14:47:00 UTC (rev 10454) +++ branches/Branch_2_2_EAP/src/main/org/hornetq/core/replication/impl/ReplicationEndpointImpl.java 2011-04-05 16:17:19 UTC (rev 10455) @@ -533,7 +533,7 @@ { if (deletePages) { - page.delete(); + page.delete(null); } } else Modified: branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/client/LargeMessageTest.java =================================================================== --- branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/client/LargeMessageTest.java 2011-04-05 14:47:00 UTC (rev 10454) +++ branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/client/LargeMessageTest.java 2011-04-05 16:17:19 UTC (rev 10455) @@ -13,6 +13,7 @@ package org.hornetq.tests.integration.client; +import java.io.ByteArrayOutputStream; import java.util.HashMap; import javax.transaction.xa.XAResource; @@ -139,17 +140,16 @@ } } - public void testLargeBufferTransacted() throws Exception { doTestLargeBuffer(true); } - + public void testLargeBufferNotTransacted() throws Exception { doTestLargeBuffer(false); } - + public void doTestLargeBuffer(boolean transacted) throws Exception { final int journalsize = 100 * 1024; @@ -162,10 +162,10 @@ { Configuration config = createDefaultConfig(isNetty()); config.setJournalFileSize(journalsize); - + config.setJournalBufferSize_AIO(10 * 1024); config.setJournalBufferSize_NIO(10 * 1024); - + server = createServer(true, config); server.start(); @@ -179,11 +179,10 @@ ClientProducer producer = session.createProducer(LargeMessageTest.ADDRESS); Message clientFile = session.createMessage(true); - for (int i = 0 ; i < messageSize; i++) + for (int i = 0; i < messageSize; i++) { clientFile.getBodyBuffer().writeByte(getSamplebyte(i)); } - producer.send(clientFile); @@ -197,26 +196,24 @@ ClientConsumer consumer = session.createConsumer(LargeMessageTest.ADDRESS); ClientMessage msg1 = consumer.receive(5000); assertNotNull(msg1); - + Assert.assertNotNull(msg1); - - for (int i = 0 ; i < messageSize; i++) + + for (int i = 0; i < messageSize; i++) { - //System.out.print(msg1.getBodyBuffer().readByte() + " "); - //if (i % 100 == 0) System.out.println(); - assertEquals("position = " + i, getSamplebyte(i), msg1.getBodyBuffer().readByte()); + // System.out.print(msg1.getBodyBuffer().readByte() + " "); + // if (i % 100 == 0) System.out.println(); + assertEquals("position = " + i, getSamplebyte(i), msg1.getBodyBuffer().readByte()); } - + msg1.acknowledge(); - + consumer.close(); - - + if (transacted) { session.commit(); } - session.close(); @@ -880,7 +877,6 @@ producer2.send(msg1); - session.commit(); ClientMessage msg2 = consumer2.receive(10000); @@ -939,9 +935,8 @@ server.start(); - locator.setMinLargeMessageSize(200); - + locator.setCacheLargeMessagesClient(true); ClientSessionFactory sf = locator.createSessionFactory(); @@ -968,19 +963,19 @@ session.commit(); compareString(messageSize, msgReceived); - + msgReceived.getBodyBuffer().readerIndex(0); - + producer.send(msgReceived); session.commit(); - + ClientMessage msgReceived2 = consumer.receive(10000); msgReceived2.acknowledge(); compareString(messageSize, msgReceived2); - + session.commit(); session.close(); @@ -1016,7 +1011,7 @@ assertNotNull(msg); for (long i = 0; i < messageSize; i++) { - Assert.assertEquals("position " + i, UnitTestCase.getSamplebyte(i), msg.getBodyBuffer().readByte()); + Assert.assertEquals("position " + i, UnitTestCase.getSamplebyte(i), msg.getBodyBuffer().readByte()); } } @@ -2365,7 +2360,6 @@ server.start(); - locator.setMinLargeMessageSize(1024); locator.setConsumerWindowSize(1024 * 1024); @@ -2469,7 +2463,6 @@ server.start(); - locator.setMinLargeMessageSize(100 * 1024); ClientSessionFactory sf = locator.createSessionFactory(); @@ -2629,18 +2622,17 @@ try { LargeServerMessageImpl fileMessage = new LargeServerMessageImpl((JournalStorageManager)server.getStorageManager()); - + fileMessage.setMessageID(1005); for (int i = 0; i < LARGE_MESSAGE_SIZE; i++) { fileMessage.addBytes(new byte[] { UnitTestCase.getSamplebyte(i) }); } - + // The server would be doing this fileMessage.putLongProperty(Message.HDR_LARGE_BODY_SIZE, LARGE_MESSAGE_SIZE); - fileMessage.releaseResources(); session.createQueue(LargeMessageTest.ADDRESS, LargeMessageTest.ADDRESS, true); @@ -2821,6 +2813,158 @@ } + public void testPageOnLargeMessageMultipleQueues() throws Exception + { + Configuration config = createDefaultConfig(isNetty()); + + final int PAGE_MAX = 20 * 1024; + + final int PAGE_SIZE = 10 * 1024; + + HashMap<String, AddressSettings> map = new HashMap<String, AddressSettings>(); + + AddressSettings value = new AddressSettings(); + map.put(LargeMessageTest.ADDRESS.toString(), value); + server = createServer(true, config, PAGE_SIZE, PAGE_MAX, map); + server.start(); + + final int numberOfBytes = 1024; + + final int numberOfBytesBigMessage = 400000; + + try + { + + locator.setBlockOnNonDurableSend(true); + locator.setBlockOnDurableSend(true); + locator.setBlockOnAcknowledge(true); + + ClientSessionFactory sf = locator.createSessionFactory(); + + ClientSession session = sf.createSession(null, null, false, true, true, false, 0); + + session.createQueue(LargeMessageTest.ADDRESS, LargeMessageTest.ADDRESS.concat("-0"), null, true); + session.createQueue(LargeMessageTest.ADDRESS, LargeMessageTest.ADDRESS.concat("-1"), null, true); + + ClientProducer producer = session.createProducer(LargeMessageTest.ADDRESS); + + ClientMessage message = null; + + for (int i = 0; i < 100; i++) + { + message = session.createMessage(true); + + message.getBodyBuffer().writerIndex(0); + + message.getBodyBuffer().writeBytes(new byte[numberOfBytes]); + + for (int j = 1; j <= numberOfBytes; j++) + { + message.getBodyBuffer().writeInt(j); + } + + producer.send(message); + } + + ClientMessage clientFile = createLargeClientMessage(session, numberOfBytesBigMessage); + clientFile.putBooleanProperty("TestLarge", true); + producer.send(clientFile); + + for (int i = 0; i < 100; i++) + { + message = session.createMessage(true); + + message.getBodyBuffer().writeBytes(new byte[numberOfBytes]); + + producer.send(message); + } + + session.close(); + + server.stop(); + + server = createServer(true, config, PAGE_SIZE, PAGE_MAX, map); + server.start(); + + sf = locator.createSessionFactory(); + + for (int ad = 0; ad < 2; ad++) + { + session = sf.createSession(false, false, false); + + ClientConsumer consumer = session.createConsumer(LargeMessageTest.ADDRESS.concat("-" + ad)); + + session.start(); + + for (int i = 0; i < 100; i++) + { + ClientMessage message2 = consumer.receive(LargeMessageTest.RECEIVE_WAIT_TIME); + + Assert.assertNotNull(message2); + + message2.acknowledge(); + + Assert.assertNotNull(message2); + } + + session.commit(); + + for (int i = 0; i < 5; i++) + { + ClientMessage messageLarge = consumer.receive(RECEIVE_WAIT_TIME); + + assertTrue(messageLarge.getBooleanProperty("TestLarge")); + + Assert.assertNotNull(messageLarge); + + ByteArrayOutputStream bout = new ByteArrayOutputStream(); + messageLarge.acknowledge(); + messageLarge.saveToOutputStream(bout); + byte[] body = bout.toByteArray(); + assertEquals(numberOfBytesBigMessage, body.length); + for (int bi = 0; bi < body.length; bi++) + { + assertEquals(getSamplebyte(bi), body[bi]); + } + + if (i < 4) + session.rollback(); + else + session.commit(); + } + + for (int i = 0; i < 100; i++) + { + ClientMessage message2 = consumer.receive(LargeMessageTest.RECEIVE_WAIT_TIME); + + Assert.assertNotNull(message2); + + message2.acknowledge(); + + Assert.assertNotNull(message2); + } + + session.commit(); + + consumer.close(); + + session.close(); + + } + } + finally + { + try + { + server.stop(); + } + catch (Throwable ignored) + { + } + } + + } + // Private ------------------------------------------------------- // Inner classes ------------------------------------------------- Modified: branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/unit/core/paging/impl/PageImplTest.java =================================================================== --- branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/unit/core/paging/impl/PageImplTest.java 2011-04-05 14:47:00 UTC (rev 10454) +++ branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/unit/core/paging/impl/PageImplTest.java 2011-04-05 16:17:19 UTC (rev 10455) @@ -98,7 +98,7 @@ file.open(); impl = new PageImpl(new SimpleString("something"), new NullStorageManager(), factory, file, 10); - List<PagedMessage> msgs = impl.read(); + List<PagedMessage> msgs = impl.read(new NullStorageManager()); Assert.assertEquals(numberOfElements, msgs.size()); @@ -115,7 +115,7 @@ .array()); } - impl.delete(); + impl.delete(null); Assert.assertEquals(0, factory.listFiles(".page").size()); @@ -170,7 +170,7 @@ file.open(); impl = new PageImpl(new SimpleString("something"), new NullStorageManager(), factory, file, 10); - List<PagedMessage> msgs = impl.read(); + List<PagedMessage> msgs = impl.read(new NullStorageManager()); Assert.assertEquals(numberOfElements, msgs.size()); @@ -187,7 +187,7 @@ .array()); } - impl.delete(); + impl.delete(null); Assert.assertEquals(0, factory.listFiles("page").size()); Modified: branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/unit/core/paging/impl/PagingManagerImplTest.java =================================================================== --- branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/unit/core/paging/impl/PagingManagerImplTest.java 2011-04-05 14:47:00 UTC (rev 10454) +++ branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/unit/core/paging/impl/PagingManagerImplTest.java 2011-04-05 16:17:19 UTC (rev 10455) @@ -93,7 +93,7 @@ page.open(); - List<PagedMessage> msgs = page.read(); + List<PagedMessage> msgs = page.read(new NullStorageManager()); page.close(); Modified: branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/unit/core/paging/impl/PagingStoreImplTest.java =================================================================== --- branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/unit/core/paging/impl/PagingStoreImplTest.java 2011-04-05 14:47:00 UTC (rev 10454) +++ branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/unit/core/paging/impl/PagingStoreImplTest.java 2011-04-05 16:17:19 UTC (rev 10455) @@ -13,7 +13,6 @@ package org.hornetq.tests.unit.core.paging.impl; -import java.io.File; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; @@ -58,6 +57,7 @@ import org.hornetq.core.persistence.StorageManager; import org.hornetq.core.persistence.config.PersistedAddressSetting; import org.hornetq.core.persistence.config.PersistedRoles; +import org.hornetq.core.persistence.impl.nullpm.NullStorageManager; import org.hornetq.core.postoffice.Binding; import org.hornetq.core.postoffice.PostOffice; import org.hornetq.core.replication.ReplicationManager; @@ -286,7 +286,7 @@ page.open(); - List<PagedMessage> msg = page.read(); + List<PagedMessage> msg = page.read(new NullStorageManager()); Assert.assertEquals(numMessages, msg.size()); Assert.assertEquals(1, storeImpl.getNumberOfPages()); @@ -374,7 +374,7 @@ page.open(); - List<PagedMessage> msg = page.read(); + List<PagedMessage> msg = page.read(new NullStorageManager()); page.close(); @@ -399,9 +399,9 @@ newPage.open(); - Assert.assertEquals(1, newPage.read().size()); + Assert.assertEquals(1, newPage.read(new NullStorageManager()).size()); - newPage.delete(); + newPage.delete(null); Assert.assertEquals(1, storeImpl.getNumberOfPages()); @@ -421,7 +421,7 @@ page.open(); - List<PagedMessage> msgs = page.read(); + List<PagedMessage> msgs = page.read(new NullStorageManager()); Assert.assertEquals(1, msgs.size()); @@ -603,7 +603,7 @@ for (Page page : readPages) { page.open(); - List<PagedMessage> msgs = page.read(); + List<PagedMessage> msgs = page.read(new NullStorageManager()); page.close(); for (PagedMessage msg : msgs) @@ -678,7 +678,7 @@ page.open(); - List<PagedMessage> msgs = page.read(); + List<PagedMessage> msgs = page.read(new NullStorageManager()); page.close(); @@ -696,7 +696,7 @@ } lastPage.open(); - List<PagedMessage> lastMessages = lastPage.read(); + List<PagedMessage> lastMessages = lastPage.read(new NullStorageManager()); lastPage.close(); Assert.assertEquals(1, lastMessages.size()); @@ -856,7 +856,7 @@ if (page != null) { page.open(); - List<PagedMessage> messages = page.read(); + List<PagedMessage> messages = page.read(new NullStorageManager()); for (PagedMessage pgmsg : messages) { @@ -868,7 +868,7 @@ } page.close(); - page.delete(); + page.delete(null); } else {

13 years, 8 months

1
0
0 / 0

JBoss hornetq SVN: r10454 - in trunk: hornetq-jboss-as-integration and 7 other directories.

by do-not-reply＠jboss.org

Author: ataylor Date: 2011-04-05 10:47:00 -0400 (Tue, 05 Apr 2011) New Revision: 10454 Added: trunk/hornetq-jboss-as-integration/ trunk/hornetq-jboss-as-integration/pom.xml trunk/hornetq-jboss-as-integration/src/ trunk/hornetq-jboss-as-integration/src/main/ trunk/hornetq-jboss-as-integration/src/main/java/ trunk/hornetq-jboss-as-integration/src/main/java/org/ trunk/hornetq-jboss-as-integration/src/main/java/org/hornetq/ trunk/hornetq-jboss-as-integration/src/main/java/org/hornetq/integration/ trunk/hornetq-jboss-as-integration/src/main/java/org/hornetq/integration/jboss/ Removed: trunk/src/main/org/hornetq/integration/jboss/ Modified: trunk/build-hornetq.xml trunk/hornetq.iml Log: mavenized hornetq as integration Modified: trunk/build-hornetq.xml =================================================================== --- trunk/build-hornetq.xml 2011-04-05 13:39:01 UTC (rev 10453) +++ trunk/build-hornetq.xml 2011-04-05 14:47:00 UTC (rev 10454) @@ -97,9 +97,11 @@ <property name="hornetq.core.module.jar" value="hornetq-core"/> <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="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="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"/> @@ -217,6 +219,12 @@ <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="org.jboss.netty.classpath"/> @@ -258,6 +266,7 @@ <path id="jboss.service.compilation.classpath"> <path refid="org.jboss.javaee.classpath"/> <path refid="core.target.jar"/> + <path refid="as.integration.target.jar"/> <path location="${build.jboss.integration.classes.dir}"/> </path> @@ -595,25 +604,7 @@ </javac> </target> - <target name="compile-jboss-integration" depends="compile-core"> - <javac destdir="${build.jboss.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/jboss/**/*.java"/> - <classpath refid="jboss.integration.compilation.classpath"/> - </javac> + <target name="compile-jboss-integration" depends="jar-jboss-integration"> </target> <target name="compile-twitter-integration" depends="compile-core"> @@ -908,12 +899,12 @@ </jar> </target> - <target name="jar-jboss-integration" depends="compile-jboss-integration"> - - <jar jarfile="${build.jars.dir}/${jboss.integration.jar.name}"> - <fileset dir="${build.jboss.integration.classes.dir}" includes="**"/> - </jar> - + <target name="jar-jboss-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-jboss-as-integration"/> + </ant> </target> <target name="jar-jboss-integration-sources"> @@ -1230,7 +1221,6 @@ <copy todir="${build.distro.lib.dir}"> <fileset dir="${build.jars.dir}"> <include name="${jms.jar.name}"/> - <include name="${jboss.integration.jar.name}"/> <include name="${service.sar.name}"/> <include name="${bootstrap.jar.name}"/> <include name="${mc.jar.name}"/> @@ -1253,6 +1243,7 @@ <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.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="${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-jboss-as-integration/pom.xml =================================================================== --- trunk/hornetq-jboss-as-integration/pom.xml (rev 0) +++ trunk/hornetq-jboss-as-integration/pom.xml 2011-04-05 14:47:00 UTC (rev 10454) @@ -0,0 +1,64 @@ +<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-jboss-as-integration</artifactId> + <packaging>jar</packaging> + <version>2.2.3-SNAPSHOT</version> + <name>HornetQ JBoss AS Integration</name> + + <dependencies> + <dependency> + <groupId>org.hornetq</groupId> + <artifactId>hornetq-core</artifactId> + <version>2.2.3-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.jboss.security</groupId> + <artifactId>jboss-security-spi</artifactId> + <version>2.0.3.SP1</version> + </dependency> + <dependency> + <groupId>org.jboss.security</groupId> + <artifactId>jbosssx</artifactId> + <version>2.0.3.SP1</version> + </dependency> + <dependency> + <groupId>org.jboss.javaee</groupId> + <artifactId>jboss-transaction-api</artifactId> + <version>1.0.1.GA</version> + </dependency> + <dependency> + <groupId>org.jboss.integration</groupId> + <artifactId>jboss-transaction-spi</artifactId> + <version>5.1.0.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> Modified: trunk/hornetq.iml =================================================================== --- trunk/hornetq.iml 2011-04-05 13:39:01 UTC (rev 10453) +++ trunk/hornetq.iml 2011-04-05 14:47:00 UTC (rev 10454) @@ -8,6 +8,7 @@ <sourceFolder url="file://$MODULE_DIR$/hornetq-core/src/java" isTestSource="false" /> <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" /> <excludeFolder url="file://$MODULE_DIR$/build/api" /> <excludeFolder url="file://$MODULE_DIR$/build/classes" /> <excludeFolder url="file://$MODULE_DIR$/build/jars" />

13 years, 8 months

1
0
0 / 0

JBoss hornetq SVN: r10453 - in trunk: hornetq-logging and 7 other directories.

by do-not-reply＠jboss.org

Author: ataylor Date: 2011-04-05 09:39:01 -0400 (Tue, 05 Apr 2011) New Revision: 10453 Added: trunk/hornetq-logging/ trunk/hornetq-logging/pom.xml trunk/hornetq-logging/src/ trunk/hornetq-logging/src/main/ trunk/hornetq-logging/src/main/java/ trunk/hornetq-logging/src/main/java/org/ trunk/hornetq-logging/src/main/java/org/hornetq/ trunk/hornetq-logging/src/main/java/org/hornetq/integration/ trunk/hornetq-logging/src/main/java/org/hornetq/integration/logging/ Removed: trunk/src/main/org/hornetq/integration/logging/ Modified: trunk/build-hornetq.xml trunk/hornetq.iml Log: mavenized hornetq logging Modified: trunk/build-hornetq.xml =================================================================== --- trunk/build-hornetq.xml 2011-04-05 12:59:20 UTC (rev 10452) +++ trunk/build-hornetq.xml 2011-04-05 13:39:01 UTC (rev 10453) @@ -96,8 +96,10 @@ <property name="build.classes.dir" value="${build.dir}/classes"/> <property name="hornetq.core.module.jar" value="hornetq-core"/> <property name="hornetq.core.client.module.jar" value="hornetq-core-client"/> + <property name="hornetq.logging.module.jar" value="hornetq-logging"/> <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="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"/> @@ -106,7 +108,6 @@ <property name="build.twitter.integration.classes.dir" value="${build.dir}/classes/twitter-integration"/> <property name="build.service.classes.dir" value="${build.dir}/classes/service"/> <property name="build.bootstrap.classes.dir" value="${build.dir}/classes/bootstrap"/> - <property name="build.logging.classes.dir" value="${build.dir}/classes/logging"/> <property name="build.ra.classes.dir" value="${build.dir}/classes/ra"/> <property name="build.jars.dir" value="${build.dir}/jars"/> <property name="build.src.dir" value="${build.dir}/src"/> @@ -425,7 +426,6 @@ <target name="init" depends="createthirdparty"> <mkdir dir="${build.dir}"/> <mkdir dir="${build.classes.dir}"/> - <mkdir dir="${build.core.classes.dir}"/> <mkdir dir="${build.core.client.java5.classes.dir}"/> <mkdir dir="${build.jms.classes.dir}"/> <mkdir dir="${build.jms.java5.classes.dir}"/> @@ -434,7 +434,6 @@ <mkdir dir="${build.twitter.integration.classes.dir}"/> <mkdir dir="${build.service.classes.dir}"/> <mkdir dir="${build.bootstrap.classes.dir}"/> - <mkdir dir="${build.logging.classes.dir}"/> <mkdir dir="${build.ra.classes.dir}"/> <mkdir dir="${build.jars.dir}"/> <mkdir dir="${build.src.dir}"/> @@ -702,25 +701,7 @@ </javac> </target> - <target name="compile-logging" depends="init"> - <javac destdir="${build.logging.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/logging/**/*.java"/> - <classpath refid="logging.compilation.classpath"/> - </javac> + <target name="compile-logging" depends="jar-logging"> </target> <target name="compile-ra" depends="init"> @@ -1008,12 +989,12 @@ </jar> </target> - <target name="jar-logging" depends="compile-logging"> - - <jar jarfile="${build.jars.dir}/${logging.jar.name}"> - <fileset dir="${build.logging.classes.dir}" includes="**"/> - </jar> - + <target name="jar-logging"> + <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-logging"/> + </ant> </target> <target name="jar-logging-sources"> @@ -1248,12 +1229,10 @@ </copy> <copy todir="${build.distro.lib.dir}"> <fileset dir="${build.jars.dir}"> - <include name="${core.jar.name}"/> <include name="${jms.jar.name}"/> <include name="${jboss.integration.jar.name}"/> <include name="${service.sar.name}"/> <include name="${bootstrap.jar.name}"/> - <include name="${logging.jar.name}"/> <include name="${mc.jar.name}"/> <include name="${ra.rar.name}"/> <include name="${core.client.jar.name}"/> @@ -1273,6 +1252,7 @@ </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.logging.jar.dir}/hornetq-logging-2.2.3-SNAPSHOT.jar" tofile="${build.distro.lib.dir}/hornetq-logging.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-logging/pom.xml =================================================================== --- trunk/hornetq-logging/pom.xml (rev 0) +++ trunk/hornetq-logging/pom.xml 2011-04-05 13:39:01 UTC (rev 10453) @@ -0,0 +1,37 @@ +<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-logging</artifactId> + <packaging>jar</packaging> + <version>2.2.3-SNAPSHOT</version> + <name>HornetQ Logging</name> + + <dependencies> + <dependency> + <groupId>org.hornetq</groupId> + <artifactId>hornetq-core</artifactId> + <version>2.2.3-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <version>1.2.14</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 12:59:20 UTC (rev 10452) +++ trunk/hornetq.iml 2011-04-05 13:39:01 UTC (rev 10453) @@ -7,6 +7,7 @@ <sourceFolder url="file://$MODULE_DIR$/src/main" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/hornetq-core/src/java" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/hornetq-core/src/main/java" isTestSource="true" /> + <sourceFolder url="file://$MODULE_DIR$/hornetq-logging/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" />

13 years, 8 months

1
0
0 / 0

JBoss hornetq SVN: r10452 - in trunk: hornetq-core and 18 other directories.

by do-not-reply＠jboss.org

Author: ataylor Date: 2011-04-05 08:59:20 -0400 (Tue, 05 Apr 2011) New Revision: 10452 Added: trunk/hornetq-core-client/ trunk/hornetq-core-client/pom.xml trunk/hornetq-core/ trunk/hornetq-core/pom.xml trunk/hornetq-core/src/ trunk/hornetq-core/src/main/ trunk/hornetq-core/src/main/java/ trunk/hornetq-core/src/main/java/org/ trunk/hornetq-core/src/main/java/org/hornetq/ trunk/hornetq-core/src/main/java/org/hornetq/api/ trunk/hornetq-core/src/main/java/org/hornetq/api/core/ trunk/hornetq-core/src/main/java/org/hornetq/core/ trunk/hornetq-core/src/main/java/org/hornetq/core/asyncio/ trunk/hornetq-core/src/main/java/org/hornetq/core/buffers/ trunk/hornetq-core/src/main/java/org/hornetq/core/client/ trunk/hornetq-core/src/main/java/org/hornetq/core/cluster/ trunk/hornetq-core/src/main/java/org/hornetq/core/config/ trunk/hornetq-core/src/main/java/org/hornetq/core/deployers/ trunk/hornetq-core/src/main/java/org/hornetq/core/exception/ trunk/hornetq-core/src/main/java/org/hornetq/core/filter/ trunk/hornetq-core/src/main/java/org/hornetq/core/journal/ trunk/hornetq-core/src/main/java/org/hornetq/core/list/ trunk/hornetq-core/src/main/java/org/hornetq/core/logging/ trunk/hornetq-core/src/main/java/org/hornetq/core/management/ trunk/hornetq-core/src/main/java/org/hornetq/core/message/ trunk/hornetq-core/src/main/java/org/hornetq/core/messagecounter/ trunk/hornetq-core/src/main/java/org/hornetq/core/paging/ trunk/hornetq-core/src/main/java/org/hornetq/core/persistence/ trunk/hornetq-core/src/main/java/org/hornetq/core/postoffice/ trunk/hornetq-core/src/main/java/org/hornetq/core/protocol/ trunk/hornetq-core/src/main/java/org/hornetq/core/registry/ trunk/hornetq-core/src/main/java/org/hornetq/core/remoting/ trunk/hornetq-core/src/main/java/org/hornetq/core/replication/ trunk/hornetq-core/src/main/java/org/hornetq/core/security/ trunk/hornetq-core/src/main/java/org/hornetq/core/server/ trunk/hornetq-core/src/main/java/org/hornetq/core/settings/ trunk/hornetq-core/src/main/java/org/hornetq/core/transaction/ trunk/hornetq-core/src/main/java/org/hornetq/core/version/ trunk/hornetq-core/src/main/java/org/hornetq/spi/ trunk/hornetq-core/src/main/java/org/hornetq/utils/ trunk/hornetq-core/src/main/javacc/ trunk/hornetq-core/src/main/javacc/FilterParser.jj trunk/hornetq-core/src/main/resources/ trunk/hornetq-core/src/main/resources/hornetq-version.properties trunk/hornetq-core/src/main/resources/schema/ trunk/hornetq-core/src/main/resources/schema/hornetq-configuration.xsd trunk/hornetq-core/src/main/resources/schema/hornetq-users.xsd Removed: trunk/src/config/common/hornetq-version.properties trunk/src/config/common/schema/hornetq-configuration.xsd trunk/src/config/common/schema/hornetq-users.xsd trunk/src/main/org/hornetq/api/core/ trunk/src/main/org/hornetq/core/asyncio/ trunk/src/main/org/hornetq/core/buffers/ trunk/src/main/org/hornetq/core/client/ trunk/src/main/org/hornetq/core/cluster/ trunk/src/main/org/hornetq/core/config/ trunk/src/main/org/hornetq/core/deployers/ trunk/src/main/org/hornetq/core/exception/ trunk/src/main/org/hornetq/core/filter/ trunk/src/main/org/hornetq/core/journal/ trunk/src/main/org/hornetq/core/list/ trunk/src/main/org/hornetq/core/logging/ trunk/src/main/org/hornetq/core/management/ trunk/src/main/org/hornetq/core/message/ trunk/src/main/org/hornetq/core/messagecounter/ trunk/src/main/org/hornetq/core/paging/ trunk/src/main/org/hornetq/core/persistence/ trunk/src/main/org/hornetq/core/postoffice/ trunk/src/main/org/hornetq/core/protocol/ trunk/src/main/org/hornetq/core/registry/ trunk/src/main/org/hornetq/core/remoting/ trunk/src/main/org/hornetq/core/replication/ trunk/src/main/org/hornetq/core/security/ trunk/src/main/org/hornetq/core/server/ trunk/src/main/org/hornetq/core/settings/ trunk/src/main/org/hornetq/core/transaction/ trunk/src/main/org/hornetq/core/version/ trunk/src/main/org/hornetq/spi/ trunk/src/main/org/hornetq/utils/ Modified: trunk/build-hornetq.xml trunk/hornetq-core/src/main/java/org/hornetq/api/core/management/ObjectNameBuilder.java trunk/hornetq-rest/pom.xml trunk/hornetq.iml trunk/hornetq.ipr trunk/pom.xml Log: mavenized hornetq-core Modified: trunk/build-hornetq.xml =================================================================== --- trunk/build-hornetq.xml 2011-04-04 22:11:03 UTC (rev 10451) +++ trunk/build-hornetq.xml 2011-04-05 12:59:20 UTC (rev 10452) @@ -41,8 +41,8 @@  <property name="module.name" value="hornetq"/> -  - <property file="src/config/common/hornetq-version.properties"/> +  + <property file="hornetq-core/src/main/resources/hornetq-version.properties"/> <property name="hornetq.version.revision" value="0" /> <property name="hornetq.version.svnurl" value="https://svn.jboss.org/repos/hornetq/trunk"/> <property name="hornetq.version.string" @@ -94,7 +94,10 @@  <property name="build.dir" value="build"/> <property name="build.classes.dir" value="${build.dir}/classes"/> - <property name="build.core.classes.dir" value="${build.dir}/classes/core"/> + <property name="hornetq.core.module.jar" value="hornetq-core"/> + <property name="hornetq.core.client.module.jar" value="hornetq-core-client"/> + <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="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"/> @@ -119,7 +122,7 @@ <property name="src.config.jbossas5.non-clustered.dir" value="${src.dir}/config/jboss-as-5/non-clustered"/> <property name="src.config.jbossas5.clustered.dir" value="${src.dir}/config/jboss-as-5/clustered"/> <property name="src.config.service.dir" value="${src.dir}/config/service"/> - <property name="src.schema.dir" value="${src.config.dir}/common/schema"/> + <property name="src.schema.dir" value="${hornetq.core.module.jar}/src/main/resources/schema"/> <property name="src.bin.dir" value="${src.dir}/bin"/> <property name="doc.dir" value="docs"/> <property name="logs.dir" value="logs"/> @@ -208,9 +211,14 @@ <path refid="org.jboss.netty.classpath"/> </path> + <path id="core.target.jar"> + <fileset dir="${target.core.jar.dir}"> + <include name="**/*.jar"/> + </fileset> + </path> <path id="jms.compilation.classpath"> - <path location="${build.core.classes.dir}"/> - <path refid="org.jboss.netty.classpath"/> + <path refid="core.target.jar"/> + <path refid="org.jboss.netty.classpath"/> <path refid="org.jboss.javaee.classpath"/> <path refid="org.jboss.integration.classpath"/> <path refid="jboss.jbossts.classpath"/> @@ -228,19 +236,19 @@ <path id="jboss.integration.compilation.classpath"> - <path location="${build.core.classes.dir}"/> + <path refid="core.target.jar"/> <path refid="org.jboss.security.classpath"/> <path refid="org.jboss.integration.classpath"/> <path refid="org.jboss.javaee.classpath"/> </path> <path id="twitter.integration.compilation.classpath"> - <path location="${build.core.classes.dir}"/> + <path refid="core.target.jar"/> <path refid="org.twitter4j.classpath"/> </path> <path id="spring.integration.compilation.classpath"> - <path location="${build.core.classes.dir}"/> + <path refid="core.target.jar"/> <path location="${build.jms.classes.dir}"/> <path refid="org.jboss.javaee.classpath"/> <path refid="org.springframework.classpath"/> @@ -248,17 +256,18 @@ <path id="jboss.service.compilation.classpath"> <path refid="org.jboss.javaee.classpath"/> - <path location="${build.core.classes.dir}"/> + <path refid="core.target.jar"/> <path location="${build.jboss.integration.classes.dir}"/> </path> <path id="bootstrap.compilation.classpath"> - <path location="${build.core.classes.dir}"/> + <path refid="core.target.jar"/> <path refid="org.jboss.microcontainer.classpath"/> <path refid="org.jboss.classpath"/> </path> <path id="logging.compilation.classpath"> + <path refid="core.target.jar"/> <path refid="log4j.log4j.classpath"/> </path> @@ -404,9 +413,13 @@ </delete> <ant antfile="${examples.dir}/build.xml" target="clean" inheritall="false"/> <ant antfile="build-thirdparty.xml" target="maven-install"> - <property name="maven.opts" value="-f hornetq-rest/pom.xml"/> - <property name="maven.goal" value="clean"/> + <property name="maven.opts" value="-f hornetq-rest/pom.xml"/> + <property name="maven.goal" value="clean"/> </ant> + <ant antfile="build-thirdparty.xml" target="maven-install"> + <property name="maven.opts" value="-f hornetq-core/pom.xml"/> + <property name="maven.goal" value="clean"/> + </ant> </target> <target name="init" depends="createthirdparty"> @@ -447,10 +460,13 @@   - <target name="compile" depends="compile-jms, compile-core-client-java5"/> + <target name="compile" depends="compile-jms"/> - <target name="compile-core" depends="init"> - <mkdir dir="${build.src.dir}/org/hornetq/core/filter/impl"/> + <target name="compile-core" depends="jar-core"> +  +  </target> @@ -778,7 +794,7 @@ </schemavalidate> <schemavalidate file="${conf.dir}/hornetq-jms.xml"> <schema namespace="urn:hornetq" - file="${src.schema.dir}/hornetq-jms.xsd"/> + file="src/config/common/schema/hornetq-jms.xsd"/> </schemavalidate> </target> @@ -791,7 +807,7 @@ </target> <target name="jar" - depends="jar-core, jar-core-client, jar-core-client-java5, jar-jms, jar-jms-client, jar-jms-client-java5, jar-jboss-integration, jar-jboss-service, jar-bootstrap, jar-logging, jar-ra, jar-mc, jar-jnp-client, jar-resources, sources-jar, jar-twitter-integration, jar-spring-integration, jar-rest, eap-examples"> + depends="jar-core, jar-core-client, jar-jms, jar-jms-client, jar-jboss-integration, jar-jboss-service, jar-bootstrap, jar-logging, jar-ra, jar-mc, jar-jnp-client, jar-resources, sources-jar, jar-twitter-integration, jar-spring-integration, jar-rest, eap-examples"> </target> <target name="jar-jnp-client" depends="init"> @@ -820,20 +836,12 @@ </jar> </target> - <target name="jar-core" depends="compile-core"> - - <jar jarfile="${build.jars.dir}/${core.jar.name}"> - <fileset dir="${build.core.classes.dir}" includes="**"/> - <fileset dir="${src.config.dir}/common"> - <include name="**/*.xsd"/> - <exclude name="**/hornetq-jms.xsd"/> - </fileset> - <manifest> - <attribute name="HornetQ-Version" value="${hornetq.version.string}"/> - <attribute name="HornetQ-SVN-URL" value="${hornetq.version.svnurl}"/> - </manifest> - </jar> - + <target name="jar-core" depends="init"> + <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-core"/> + </ant> </target> <target name="jar-core-sources"> @@ -1017,36 +1025,11 @@ </target> <target name="jar-core-client" depends="compile-core"> - <jar jarfile="${build.jars.dir}/${core.client.jar.name}"> - <fileset dir="${build.core.classes.dir}"> - <include name="hornetq-version.properties"/> - <include name="org/hornetq/api/**/*.class"/> - <include name="org/hornetq/*.class"/> - <include name="org/hornetq/core/buffers/**/*.class"/> - <include name="org/hornetq/core/client/**/*.class"/> - <include name="org/hornetq/core/filter/**/*.class"/> - <include name="org/hornetq/core/exception/**/*.class"/> - <include name="org/hornetq/core/remoting/impl/**/*.class"/> - <include name="org/hornetq/utils/**/*.class"/> - <include name="org/hornetq/core/cluster/**/*.class"/> - <include name="org/hornetq/core/list/**/*.class"/> - <include name="org/hornetq/core/logging/**/*.class"/> - <include name="org/hornetq/core/message/**/*.class"/> - <include name="org/hornetq/core/protocol/core/**/*.class"/> - <include name="org/hornetq/core/remoting/**/*.class"/> - <include name="org/hornetq/core/version/**/*.class"/> - <include name="org/hornetq/core/management/*.class"/> - <include name="org/hornetq/core/transaction/impl/XidImpl.class"/> - <include name="org/hornetq/spi/core/logging/*.class"/> - <include name="org/hornetq/spi/core/protocol/*.class"/> - <include name="org/hornetq/spi/core/remoting/*.class"/> - -  - <include name="org/hornetq/core/server/ServerMessage.class"/> - <include name="org/hornetq/core/journal/EncodingSupport.class"/> - </fileset> - </jar> - + <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-core-client"/> + </ant> </target> <target name="jar-core-client-sources"> @@ -1217,16 +1200,16 @@ <target name="jar-rest" depends="jar-rest-init"> <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-rest"/> + <property name="maven.opts" value="-Dmaven.test.skip=true"/> + <property name="maven.goal" value="install"/> + <property name="working.dir" value="hornetq-rest"/> </ant> </target> <target name="rest-tests" depends="jar-rest"> <ant antfile="build-thirdparty.xml" target="maven-install"> - <property name="maven.opts" value="-f hornetq-rest/pom.xml"/> - <property name="maven.goal" value="install"/> + <property name="maven.opts" value="-f hornetq-rest/pom.xml"/> + <property name="maven.goal" value="install"/> </ant> </target> @@ -1288,6 +1271,8 @@ <include name="jboss-jms-api.jar"/> </fileset> </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="${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-core/pom.xml =================================================================== --- trunk/hornetq-core/pom.xml (rev 0) +++ trunk/hornetq-core/pom.xml 2011-04-05 12:59:20 UTC (rev 10452) @@ -0,0 +1,82 @@ +<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-core</artifactId> + <packaging>jar</packaging> + <version>2.2.3-SNAPSHOT</version> + <name>HornetQ Core</name> + + + + <properties> + <netty.version>3.2.3.Final</netty.version> + <netty.version.string>3.2.3.Final</netty.version.string> + <hornetq.version.versionName>Stripey</hornetq.version.versionName> + <hornetq.version.majorVersion>2</hornetq.version.majorVersion> + <hornetq.version.minorVersion>2</hornetq.version.minorVersion> + <hornetq.version.microVersion>3</hornetq.version.microVersion> + <hornetq.version.incrementingVersion>122</hornetq.version.incrementingVersion> + <hornetq.version.versionSuffix>SNAPSHOT</hornetq.version.versionSuffix> + <hornetq.version.versionTag>SNAPSHOT</hornetq.version.versionTag> + <HornetQ-Version>${hornetq.version.majorVersion}.${hornetq.version.minorVersion}.${hornetq.version.microVersion}.${hornetq.version.versionSuffix} (${hornetq.version.versionName}, ${hornetq.version.incrementingVersion})</HornetQ-Version> + <HornetQ-SVN-URL>https://svn.jboss.org/repos/hornetq/trunk</HornetQ-SVN-URL> + </properties> + + <dependencies> + <dependency> + <groupId>org.jboss.netty</groupId> + <artifactId>netty</artifactId> + <version>3.2.3.Final</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-jar-plugin</artifactId> + <version>2.2</version> + <configuration> + <archive> + <manifestEntries> + <HornetQ-Version>${HornetQ-Version}</HornetQ-Version> + <HornetQ-SVN-URL>${HornetQ-SVN-URL}</HornetQ-SVN-URL> + </manifestEntries> + </archive> + </configuration> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>javacc-maven-plugin</artifactId> + <executions> + <execution> + <id>javacc</id> + <goals> + <goal>javacc</goal> + </goals> + <configuration> + <isStatic>false</isStatic> + </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> Modified: trunk/hornetq-core/src/main/java/org/hornetq/api/core/management/ObjectNameBuilder.java =================================================================== --- trunk/src/main/org/hornetq/api/core/management/ObjectNameBuilder.java 2011-04-04 22:11:03 UTC (rev 10451) +++ trunk/hornetq-core/src/main/java/org/hornetq/api/core/management/ObjectNameBuilder.java 2011-04-05 12:59:20 UTC (rev 10452) @@ -1,14 +1,14 @@ /* * 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. + * 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. */ package org.hornetq.api.core.management; @@ -16,10 +16,6 @@ import javax.management.ObjectName; import org.hornetq.api.core.SimpleString; -import org.hornetq.api.jms.management.ConnectionFactoryControl; -import org.hornetq.api.jms.management.JMSQueueControl; -import org.hornetq.api.jms.management.JMSServerControl; -import org.hornetq.api.jms.management.TopicControl; import org.hornetq.core.config.impl.ConfigurationImpl; /** Added: trunk/hornetq-core/src/main/javacc/FilterParser.jj =================================================================== --- trunk/hornetq-core/src/main/javacc/FilterParser.jj (rev 0) +++ trunk/hornetq-core/src/main/javacc/FilterParser.jj 2011-04-05 12:59:20 UTC (rev 10452) @@ -0,0 +1,637 @@ +/* + * 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. + */ + +options { + LOOKAHEAD=1; + UNICODE_INPUT=true; +/* + DEBUG_PARSER=true; + DEBUG_LOOKAHEAD=true; + DEBUG_TOKEN_MANAGER=true; +*/ +} + +PARSER_BEGIN(FilterParser) + +package org.hornetq.core.filter.impl; + +import java.io.StringReader; + +import java.util.HashSet; +import java.util.Map; +import java.util.Set; + +import org.hornetq.api.core.SimpleString; +import org.hornetq.core.filter.impl.SimpleStringReader; + +/** + * A JavaCC 2.0 grammar for HornetQ filters + * + * @author Scott.Stark(a)jboss.org + * @author adrian(a)jboss.org + * @version $Revision: 2681 $ + */ +public class FilterParser +{ + private static final String LOFFER_L = "l"; + private static final String UPPER_L = "L"; + private static final String OX = "0X"; + private static final String Ox = "0x"; + private static final String ZERRO = "0"; + + private Map identifierMap; + + public FilterParser() + { + // keep the parser from freaking out, init using one of + // the JavaCC generated constructor + this(new StringReader("")); + } + + public Object parse(SimpleString selector, Map identifierMap) + throws ParseException + { + return parse(selector, identifierMap, false); + } + + public Object parse(SimpleString selector, Map identifierMap, boolean trace) + throws ParseException + { + SimpleStringReader sr = new SimpleStringReader(selector); + ReInit(sr); + + // This will have no effect unless the debugging options are true + if (trace) + { + this.enable_tracing(); + } + else + { + this.disable_tracing(); + } + + this.identifierMap = identifierMap; + return this.expression(); + } + + /** + * Strip off the leading and trailing (quote) chars from the given string + * and return it. + */ + private SimpleString stripQuotes(String image) + { + StringBuffer result = new StringBuffer(image.length()-2); + int i = 1; + boolean escaped = false; + while (i < image.length() - 1) + { + if (escaped) + { + if (image.charAt(i) == '\'') + result.append('\''); + else + throw new RuntimeException("Invalid uses of quotes: " + image); + escaped = false; + } + else if (image.charAt(i) == '\'') + escaped = true; + else + result.append(image.charAt(i)); + ++i; + } + return new SimpleString(result.toString()); + } + + public static Object doParse(SimpleString selector, Map identifierMap) + throws ParseException + { + return doParse(selector, identifierMap, false); + } + + public static Object doParse(SimpleString selector, Map identifierMap, boolean trace) + throws ParseException + { + FilterParser parser = new FilterParser(); + return parser.parse(selector, identifierMap, trace); + } +} + +PARSER_END(FilterParser) + +/* IGNORE WHITESPACE */ + +SKIP : +{ + " " + | "\r" + | "\t" + | "\f" + | "\n" +} + + +/* RESERVED WORDS AND LITERALS */ + +TOKEN [IGNORE_CASE]: +{ + < TRUE: "TRUE" > + | < FALSE: "FALSE" > + | < NULL: "NULL" > + | < AND: "AND" > + | < NOT: "NOT" > + | < OR: "OR" > + | < BETWEEN: "BETWEEN" > + | < LIKE: "LIKE" > + | < IN: "IN" > + | < IS: "IS" > + | < ESCAPE: "ESCAPE" > + | < LPAREN: "(" > + | < RPAREN: ")" > + | < SEMICOLON: ";" > + | < COMMA: "," > + +} + +/* OPERATORS */ + +TOKEN : +{ + < MULT: "*" > + | < DIV: "/" > + | < MINUS: "-" > + | < PLUS: "+" > + | < GT: ">" > + | < GE: ">=" > + | < LT: "<" > + | < LE: "<=" > + | < NE: "<>" > + | < EQ: "=" > + +} + +/* Literals */ + +<DEFAULT> TOKEN : /* Numeric Literal */ +{ + < INTEGER_LITERAL: + "-9223372036854775808" + | "-9223372036854775808l" + | "-9223372036854775808L" + | <DECIMAL_LITERAL> (["l","L"])? + | <HEX_LITERAL> (["l","L"])? + | <OCTAL_LITERAL> (["l","L"])? + > +| + < #DECIMAL_LITERAL: ["1"-"9"] (["0"-"9"])* > +| + < #HEX_LITERAL: "0" ["x","X"] (["0"-"9","a"-"f","A"-"F"])+ > +| + < #OCTAL_LITERAL: "0" (["0"-"7"])* > +| + < FLOATING_POINT_LITERAL: + (["+","-"])? (["0"-"9"])+ "." (["0"-"9"])* (<EXPONENT>)? (["f","F","d","D"])? + | "." (["0"-"9"])+ (<EXPONENT>)? (["f","F","d","D"])? + | (["0"-"9"])+ <EXPONENT> (["f","F","d","D"])? + | (["0"-"9"])+ (<EXPONENT>)? ["f","F","d","D"] + > +| + < #EXPONENT: ["e","E"] (["+","-"])? (["0"-"9"])+ > +} + + +TOKEN : +{ + < SIMPLE_STRING: + "'" + ( (~["'","\n","\r"]) + | ("''") + )* + "'" + > +} + +/* Function names */ + +TOKEN : +{ + < IDENTIFIER: <LETTER> (<LETTER>|<DIGIT>)* > + | + < #LETTER: [ "_","$", "a"-"z", "A"-"Z" ] > + | + < #DIGIT: ["0" - "9"] > +} + +/** Start of the grammar */ + +Object expression() : +{ + Object exp1 = null; +} +{ + exp1=selectorExpression()<EOF> + { + return exp1; + } +} + +Object selectorExpression() : +{ + Object exp1 = null; + Object exp2 = null; +} +{ + exp1=selectorTerm() + ( + <OR> exp2=selectorTerm() + { + exp1 = new Operator(Operator.OR, exp1, exp2); + } + )* + { + return exp1; + } +} + +Object selectorTerm() : +{ + Object exp1 = null; + Object exp2 = null; +} +{ + exp1=selectorFactor() + ( + <AND> exp2=selectorFactor() + { + exp1 = new Operator(Operator.AND, exp1, exp2); + } + )* + { + return exp1; + } +} + +Object selectorFactor() : +{ + Object exp1 = null; +} +{ + exp1=conditionalExpression() + { + return exp1; + } + | <NOT> exp1=conditionalExpression() + { + exp1 = new Operator(Operator.NOT, exp1); + } + { + return exp1; + } +} + +Object conditionalExpression() : +{ + Object exp1 = null; +} +{ + LOOKAHEAD(3) + <LPAREN> exp1=selectorExpression() <RPAREN> + { + return exp1; + } + | + exp1 = comparisonExpression() + { + return exp1; + } +} + +Object comparisonExpression() : +{ + int op = -1; + Set set = null; + Object exp1 = null; + Object exp2 = null; + Object exp3 = null; + Object id = null; + Token not = null; +} +{ + LOOKAHEAD(2147483647) + exp1=identifier() <IS> [ not=<NOT> ] <NULL> + { + int opCode = not == null ? Operator.IS_NULL : Operator.IS_NOT_NULL; + return new Operator(opCode, exp1); + } + | + LOOKAHEAD(2147483647) + id=identifier() [ not=<NOT> ] <IN> <LPAREN> { set = new HashSet(); } stringList(set) <RPAREN> + { + if (not == null) + return new Operator(Operator.IN, id, set); + else + return new Operator(Operator.NOT_IN, id, set); + return exp1; + } + | + LOOKAHEAD(2147483647) + id=identifier() [ not=<NOT> ] <LIKE> exp1=patternExpression(id) + { + if (not != null) + exp1 = new Operator(Operator.NOT, exp1); + return exp1; + } + | + LOOKAHEAD(2147483647) + exp1=stringExpression() + ( + <EQ>{ op = Operator.EQUAL;} + | <NE>{ op = Operator.DIFFERENT;} + ) exp2=stringExpression() + { + return new Operator(op, exp1, exp2); + } + | + LOOKAHEAD(2147483647) + exp1=booleanExpression() + ( + <EQ>{ op = Operator.EQUAL;} + | <NE>{ op = Operator.DIFFERENT;} + ) exp2=booleanExpression() + { + return new Operator(op, exp1, exp2); + } + | + LOOKAHEAD(2147483647) + exp1=arithExpression() + ( + <EQ>{ op = Operator.EQUAL;} + | <NE>{ op = Operator.DIFFERENT;} + | <GT>{ op = Operator.GT;} + | <GE>{ op = Operator.GE;} + | <LT>{ op = Operator.LT;} + | <LE>{ op = Operator.LE;} + ) exp2=arithExpression() + { + return new Operator(op, exp1, exp2); + } + | + LOOKAHEAD(2147483647) + exp1=arithExpression() [ not=<NOT> ] <BETWEEN> exp2=arithExpression() <AND> exp3=arithExpression() + { + exp1 = new Operator(Operator.BETWEEN, exp1, exp2, exp3); + if (not != null) + exp1 = new Operator(Operator.NOT, exp1); + return exp1; + } + | exp1=booleanExpression() + { + return exp1; + } +} + +void stringList(Set set) : +{ +} +{ + stringToken(set) ( <COMMA> stringToken(set))* +} + +void stringToken(Set set) : +{ + Token t = null; +} +{ + [ t=<SIMPLE_STRING> ] + { + if (t != null) + set.add(stripQuotes(t.image)); + } +} + +Object patternExpression(Object exp1) : +{ + Object exp2 = null; + Token esc = null; + Object escChar = null; +} +{ + exp2=stringLiteral() [ esc=<ESCAPE> escChar=stringLiteral() ] + { + Operator op = null; + if (esc == null) + op = new Operator(Operator.LIKE, exp1, exp2); + else + op = new Operator(Operator.LIKE_ESCAPE, exp1, exp2, escChar); + return op; + } +} + +Object arithExpression() : +{ + Object exp1 = null; + Object exp2 = null; +} +{ + exp1=arithTerm() + ( + <PLUS> exp2=arithTerm() + { + exp1 = new Operator(Operator.ADD, exp1, exp2); + } + | <MINUS> exp2=arithTerm() + { + exp1 = new Operator(Operator.SUB, exp1, exp2); + } + )* + { + return exp1; + } +} + +Object arithTerm() : +{ + Object exp1 = null; + Object exp2 = null; +} +{ + exp1=arithFactor() + ( + <MULT> exp2=arithFactor() + { + exp1 = new Operator(Operator.MUL, exp1, exp2); + } + | <DIV> exp2=arithFactor() + { + exp1 = new Operator(Operator.DIV, exp1, exp2); + } + )* + { + return exp1; + } +} + +Object arithFactor() : +{ + Object exp1 = null; + boolean negate = false; +} +{ + [<PLUS>|<MINUS>{ negate = true; }] exp1=numericExpression() + { + if (negate) + exp1 = new Operator(Operator.NEG, exp1); + return exp1; + } +} + +Object booleanExpression() : +{ + Object exp1 = null; +} +{ + ( + exp1=identifier() + | exp1=booleanLiteral() + ) + { + return exp1; + } +} + +Object booleanLiteral() : +{ + boolean isTrue = true; +} +{ + (<TRUE>|<FALSE>{ isTrue = false; }) + { + if (isTrue) + return Boolean.TRUE; + else + return Boolean.FALSE; + } +} + +Object stringExpression() : +{ + Object exp1 = null; +} +{ + ( + exp1=identifier() + | exp1=stringLiteral() + ) + { + return exp1; + } +} + +Object stringLiteral() : +{ + Token string = null; +} +{ + string=<SIMPLE_STRING> + { + return stripQuotes(string.image); + } +} + +Object numericExpression() : +{ + Object exp1 = null; +} +{ + ( + exp1 = numericLiteral() + | (<LPAREN> exp1=arithExpression() <RPAREN>) + | exp1 = identifier() + ) + { + return exp1; + } +} +Object numericLiteral() : +{ + Token literal = null; +} +{ + literal=<FLOATING_POINT_LITERAL> + { + return new Double(literal.image); + } + | + literal=<INTEGER_LITERAL> + { + String number = literal.image; + + // long suffix + if (number.endsWith(LOFFER_L) || number.endsWith(UPPER_L)) + { + // chop off the suffix + return new Long(number.substring(0, number.length() - 1)); + } + + // hex + if (number.startsWith(OX) || number.startsWith(Ox)) + { + // handle literals from 0x8000000000000000L to 0xffffffffffffffffL: + // remove sign bit, parse as positive, then calculate the negative + // value with the sign bit + if(number.length() == 18) + { + byte first = Byte.decode(number.substring(0, 3)).byteValue(); + if (first >= 8) + { + number = Ox + (first - 8) + number.substring(3); + return new Long(Long.decode(number).longValue() - Long.MAX_VALUE - 1); + } + } + } + else if (number.startsWith(ZERRO)) + { + // octal + // handle literals + // from 01000000000000000000000L to 01777777777777777777777L + // remove sign bit, parse as positive, then calculate the + // negative value with the sign bit + if (number.length() == 23) + { + if (number.charAt(1) == '1') + { + number = ZERRO + number.substring(2); + return new Long(Long.decode(number).longValue() - Long.MAX_VALUE - 1); + } + } + } + return Long.decode(number); + } +} + +Object identifier() : +{ + Token id = null; +} +{ + id=<IDENTIFIER> + { + SimpleString simage = new SimpleString(id.image); + Identifier identifier = (Identifier) identifierMap.get(simage); + if (identifier == null) + { + identifier = new Identifier(simage); + identifierMap.put(simage, identifier); + } + return identifier; + } +} Added: trunk/hornetq-core/src/main/resources/hornetq-version.properties =================================================================== --- trunk/hornetq-core/src/main/resources/hornetq-version.properties (rev 0) +++ trunk/hornetq-core/src/main/resources/hornetq-version.properties 2011-04-05 12:59:20 UTC (rev 10452) @@ -0,0 +1,9 @@ +hornetq.version.versionName=super-hornetq-fighter +hornetq.version.majorVersion=2 +hornetq.version.minorVersion=2 +hornetq.version.microVersion=2 +hornetq.version.incrementingVersion=122 +hornetq.version.versionSuffix=Final +hornetq.version.versionTag=Final +hornetq.netty.version=3.2.3.Final +hornetq.version.compatibleVersionList=121,122 Added: trunk/hornetq-core/src/main/resources/schema/hornetq-configuration.xsd =================================================================== --- trunk/hornetq-core/src/main/resources/schema/hornetq-configuration.xsd (rev 0) +++ trunk/hornetq-core/src/main/resources/schema/hornetq-configuration.xsd 2011-04-05 12:59:20 UTC (rev 10452) @@ -0,0 +1,544 @@ +<?xml version="1.0" encoding="UTF-8"?> +<xsd:schema xmlns="urn:hornetq" xmlns:xsd="http://www.w3.org/2001/XMLSchema" attributeFormDefault="unqualified" elementFormDefault="qualified" targetNamespace="urn:hornetq" version="1.0"> + + <xsd:element name="configuration"> + <xsd:complexType> + <xsd:all> + <xsd:element maxOccurs="1" minOccurs="0" name="name" type="xsd:string"> + </xsd:element> + <xsd:element maxOccurs="1" minOccurs="0" ref="clustered"/> + <xsd:element maxOccurs="1" minOccurs="0" ref="file-deployment-enabled"/> + <xsd:element maxOccurs="1" minOccurs="0" ref="persistence-enabled"/> + <xsd:element maxOccurs="1" minOccurs="0" name="scheduled-thread-pool-max-size" type="xsd:int"> + <xsd:annotation> + <xsd:documentation> + Maximum number of threads to use for the scheduled thread pool + </xsd:documentation> + </xsd:annotation> + </xsd:element> + <xsd:element maxOccurs="1" minOccurs="0" name="thread-pool-max-size" type="xsd:int"> + <xsd:annotation> + <xsd:documentation> + Maximum number of threads to use for the thread pool + </xsd:documentation> + </xsd:annotation> + </xsd:element> + <xsd:element maxOccurs="1" minOccurs="0" name="security-enabled" type="xsd:boolean"> + </xsd:element> + <xsd:element maxOccurs="1" minOccurs="0" name="security-invalidation-interval" type="xsd:long"> + </xsd:element> + <xsd:element maxOccurs="1" minOccurs="0" name="wild-card-routing-enabled" type="xsd:boolean"> + </xsd:element> + <xsd:element maxOccurs="1" minOccurs="0" name="management-address" type="xsd:string"> + </xsd:element> + <xsd:element maxOccurs="1" minOccurs="0" name="management-notification-address" type="xsd:string"> + </xsd:element> + <xsd:element maxOccurs="1" minOccurs="0" name="cluster-user" type="xsd:string"> + </xsd:element> + <xsd:element maxOccurs="1" minOccurs="0" name="cluster-password" type="xsd:string"> + </xsd:element> + <xsd:element maxOccurs="1" minOccurs="0" name="log-delegate-factory-class-name" type="xsd:string"> + </xsd:element> + <xsd:element maxOccurs="1" minOccurs="0" name="jmx-management-enabled" type="xsd:boolean"> + </xsd:element> + <xsd:element maxOccurs="1" minOccurs="0" name="jmx-domain" type="xsd:string"> + </xsd:element> + <xsd:element maxOccurs="1" minOccurs="0" name="message-counter-enabled" type="xsd:boolean"> + </xsd:element> + <xsd:element maxOccurs="1" minOccurs="0" name="message-counter-sample-period" type="xsd:long"> + </xsd:element> + <xsd:element maxOccurs="1" minOccurs="0" name="message-counter-max-day-history" type="xsd:int"> + </xsd:element> + <xsd:element maxOccurs="1" minOccurs="0" name="connection-ttl-override" type="xsd:long"> + </xsd:element> + <xsd:element maxOccurs="1" minOccurs="0" name="async-connection-execution-enabled" type="xsd:boolean"> + </xsd:element> + <xsd:element maxOccurs="1" minOccurs="0" name="transaction-timeout" type="xsd:long"> + </xsd:element> + <xsd:element maxOccurs="1" minOccurs="0" name="transaction-timeout-scan-period" type="xsd:long"> + </xsd:element> + <xsd:element maxOccurs="1" minOccurs="0" name="message-expiry-scan-period" type="xsd:long"> + </xsd:element> + <xsd:element maxOccurs="1" minOccurs="0" name="message-expiry-thread-priority" type="xsd:int"> + </xsd:element> + <xsd:element maxOccurs="1" minOccurs="0" name="id-cache-size" type="xsd:int"> + </xsd:element> + <xsd:element maxOccurs="1" minOccurs="0" name="persist-id-cache" type="xsd:boolean"> + </xsd:element> + <xsd:element maxOccurs="1" minOccurs="0" ref="remoting-interceptors"> + </xsd:element> + <xsd:element maxOccurs="1" minOccurs="0" name="backup" type="xsd:boolean"> + </xsd:element> + <xsd:element maxOccurs="1" minOccurs="0" name="allow-failback" type="xsd:boolean"> + </xsd:element> + <xsd:element maxOccurs="1" minOccurs="0" name="failback-delay" type="xsd:long"> + </xsd:element> + <xsd:element maxOccurs="1" minOccurs="0" name="failover-on-shutdown" type="xsd:boolean"> + </xsd:element> + <xsd:element maxOccurs="1" minOccurs="0" name="shared-store" type="xsd:boolean"> + </xsd:element> + <xsd:element maxOccurs="1" minOccurs="0" name="persist-delivery-count-before-delivery" type="xsd:boolean"> + </xsd:element> + <xsd:element maxOccurs="1" minOccurs="0" name="live-connector-ref" type="live-connectorType"> + </xsd:element> + <xsd:element maxOccurs="1" minOccurs="0" name="connectors"> + <xsd:complexType> + <xsd:sequence> + <xsd:element maxOccurs="unbounded" minOccurs="0" name="connector" type="connectorType"/> + </xsd:sequence> + </xsd:complexType> + </xsd:element> + <xsd:element maxOccurs="1" minOccurs="0" name="acceptors"> + <xsd:complexType> + <xsd:sequence> + <xsd:element maxOccurs="unbounded" minOccurs="1" name="acceptor" type="acceptorType"> + </xsd:element> + </xsd:sequence> + </xsd:complexType> + </xsd:element> + <xsd:element maxOccurs="1" minOccurs="0" name="broadcast-groups"> + <xsd:complexType> + <xsd:sequence> + <xsd:element maxOccurs="unbounded" minOccurs="0" ref="broadcast-group"> + </xsd:element> + </xsd:sequence> + </xsd:complexType> + </xsd:element> + <xsd:element maxOccurs="1" minOccurs="0" name="discovery-groups"> + <xsd:complexType> + <xsd:sequence> + <xsd:element maxOccurs="unbounded" minOccurs="0" ref="discovery-group"> + </xsd:element> + </xsd:sequence> + </xsd:complexType> + </xsd:element> + <xsd:element maxOccurs="1" minOccurs="0" name="diverts"> + <xsd:complexType> + <xsd:sequence> + <xsd:element maxOccurs="unbounded" minOccurs="0" name="divert" type="divertType"> + </xsd:element> + </xsd:sequence> + </xsd:complexType> + </xsd:element> + <xsd:element maxOccurs="1" minOccurs="0" name="queues"> + </xsd:element> + <xsd:element maxOccurs="1" minOccurs="0" name="bridges"> + <xsd:complexType> + <xsd:sequence> + <xsd:element maxOccurs="unbounded" minOccurs="0" name="bridge" type="bridgeType"> + </xsd:element> + </xsd:sequence> + </xsd:complexType> + </xsd:element> + <xsd:element maxOccurs="1" minOccurs="0" name="cluster-connections"> + <xsd:complexType> + <xsd:sequence> + <xsd:element maxOccurs="unbounded" minOccurs="0" name="cluster-connection" type="clusterConnectionType"> + </xsd:element> + </xsd:sequence> + </xsd:complexType> + </xsd:element> + <xsd:element maxOccurs="1" minOccurs="0" name="grouping-handler" type="groupingHandlerType"> + </xsd:element> + <xsd:element maxOccurs="1" minOccurs="0" name="paging-directory" type="xsd:string"> + </xsd:element> + <xsd:element maxOccurs="1" minOccurs="0" name="bindings-directory" type="xsd:string"> + </xsd:element> + <xsd:element maxOccurs="1" minOccurs="0" name="create-bindings-dir" type="xsd:boolean"> + </xsd:element> + <xsd:element maxOccurs="1" minOccurs="0" name="journal-directory" type="xsd:string"> + </xsd:element> + <xsd:element maxOccurs="1" minOccurs="0" name="create-journal-dir" type="xsd:boolean"> + </xsd:element> + <xsd:element maxOccurs="1" minOccurs="0" name="journal-type" type="journalType"> + </xsd:element> + <xsd:element maxOccurs="1" minOccurs="0" name="journal-buffer-timeout" type="xsd:long"> + </xsd:element> + <xsd:element maxOccurs="1" minOccurs="0" name="journal-buffer-size" type="xsd:long"> + </xsd:element> + <xsd:element maxOccurs="1" minOccurs="0" name="journal-sync-transactional" type="xsd:boolean"> + </xsd:element> + <xsd:element maxOccurs="1" minOccurs="0" name="journal-sync-non-transactional" type="xsd:boolean"> + </xsd:element> + <xsd:element maxOccurs="1" minOccurs="0" name="log-journal-write-rate" type="xsd:boolean"> + </xsd:element> + <xsd:element maxOccurs="1" minOccurs="0" name="journal-file-size" type="xsd:long"> + </xsd:element> + <xsd:element maxOccurs="1" minOccurs="0" name="journal-min-files" type="xsd:int"> + </xsd:element> + <xsd:element maxOccurs="1" minOccurs="0" name="journal-compact-percentage" type="xsd:int"> + </xsd:element> + <xsd:element maxOccurs="1" minOccurs="0" name="journal-compact-min-files" type="xsd:int"> + </xsd:element> + <xsd:element maxOccurs="1" minOccurs="0" name="journal-max-io" type="xsd:int"> + </xsd:element> + <xsd:element maxOccurs="1" minOccurs="0" name="perf-blast-pages" type="xsd:int"> + </xsd:element> + <xsd:element maxOccurs="1" minOccurs="0" name="run-sync-speed-test" type="xsd:boolean"> + </xsd:element> + <xsd:element maxOccurs="1" minOccurs="0" name="server-dump-interval" type="xsd:long"> + </xsd:element> + <xsd:element maxOccurs="1" minOccurs="0" name="memory-warning-threshold" type="xsd:int"> + </xsd:element> + <xsd:element maxOccurs="1" minOccurs="0" name="memory-measure-interval" type="xsd:long"> + </xsd:element> + <xsd:element maxOccurs="1" minOccurs="0" name="large-messages-directory" type="xsd:string"> + </xsd:element> + <xsd:element maxOccurs="1" minOccurs="0" name="security-settings"> + </xsd:element> + <xsd:element maxOccurs="1" minOccurs="0" name="address-settings"> + </xsd:element> + <xsd:element maxOccurs="1" minOccurs="0" name="connector-services"> + <xsd:complexType> + <xsd:sequence> + <xsd:element maxOccurs="unbounded" minOccurs="0" name="connector-service" type="connectorServiceType"/> + </xsd:sequence> + </xsd:complexType> + </xsd:element> + </xsd:all> + </xsd:complexType> + </xsd:element> + + <xsd:element name="clustered" type="xsd:boolean"/> + + <xsd:element name="file-deployment-enabled" type="xsd:boolean"/> + + <xsd:element name="persistence-enabled" type="xsd:boolean"/> + + <xsd:element name="local-bind-address" type="xsd:string"/> + + <xsd:element name="local-bind-port" type="xsd:int"/> + + <xsd:element name="group-address" type="xsd:string"/> + + <xsd:element name="group-port" type="xsd:int"/> + + <xsd:element name="broadcast-period" type="xsd:long"/> + + <xsd:element name="broadcast-group"> + <xsd:complexType> + <xsd:sequence> + <xsd:element maxOccurs="1" minOccurs="0" ref="local-bind-address"> + </xsd:element> + <xsd:element maxOccurs="1" minOccurs="0" ref="local-bind-port"> + </xsd:element> + <xsd:element maxOccurs="1" minOccurs="1" ref="group-address"> + </xsd:element> + <xsd:element maxOccurs="1" minOccurs="1" ref="group-port"> + </xsd:element> + <xsd:element maxOccurs="1" minOccurs="0" ref="broadcast-period"> + </xsd:element> + <xsd:element maxOccurs="unbounded" minOccurs="0" name="connector-ref" type="xsd:string"> + </xsd:element> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:ID" use="required"/> + </xsd:complexType> + </xsd:element> + + <xsd:element name="refresh-timeout" type="xsd:int"/> + + <xsd:element name="initial-wait-timeout" type="xsd:int"/> + + <xsd:element name="discovery-group"> + <xsd:complexType> + <xsd:sequence> + <xsd:element maxOccurs="1" minOccurs="0" ref="local-bind-address"> + </xsd:element> + <xsd:element maxOccurs="1" minOccurs="1" ref="group-address"> + </xsd:element> + <xsd:element maxOccurs="1" minOccurs="1" ref="group-port"> + </xsd:element> + <xsd:element maxOccurs="1" minOccurs="0" ref="refresh-timeout"> + </xsd:element> + <xsd:element maxOccurs="1" minOccurs="0" ref="initial-wait-timeout"> + </xsd:element> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:ID" use="required"/> + </xsd:complexType> + </xsd:element> + + <xsd:element name="discovery-group-ref"> + <xsd:complexType> + <xsd:attribute name="discovery-group-name" type="xsd:IDREF"> + </xsd:attribute> + </xsd:complexType> + </xsd:element> + + <xsd:element name="remoting-interceptors"> + <xsd:complexType> + <xsd:sequence> + <xsd:element maxOccurs="unbounded" minOccurs="1" name="class-name" type="xsd:string"> + </xsd:element> + </xsd:sequence> + </xsd:complexType> + </xsd:element> + + <xsd:complexType name="paramType"> + <xsd:attribute name="key" type="xsd:string" use="required"/> + <xsd:attribute name="value" type="xsd:string" use="required"/> + </xsd:complexType> + + <xsd:complexType name="connectorType"> + <xsd:sequence> + <xsd:element maxOccurs="1" minOccurs="1" name="factory-class" type="xsd:string"> + </xsd:element> + <xsd:element maxOccurs="unbounded" minOccurs="0" name="param" type="paramType"> + </xsd:element> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:ID" use="required"/> + </xsd:complexType> + + <xsd:complexType name="acceptorType"> + <xsd:sequence> + <xsd:element maxOccurs="1" minOccurs="1" name="factory-class" type="xsd:string"> + </xsd:element> + <xsd:element maxOccurs="unbounded" minOccurs="0" name="param" type="paramType"> + </xsd:element> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="optional"/> + </xsd:complexType> + + <xsd:complexType name="bridgeType"> + <xsd:sequence> + <xsd:element maxOccurs="1" minOccurs="1" name="queue-name" type="xsd:IDREF"> + </xsd:element> + <xsd:element maxOccurs="1" minOccurs="0" name="forwarding-address" type="xsd:string"> + </xsd:element> + <xsd:element maxOccurs="1" minOccurs="0" name="ha" type="xsd:boolean"> + </xsd:element> + <xsd:element maxOccurs="1" minOccurs="0" name="filter"> + <xsd:complexType> + <xsd:attribute name="string" type="xsd:string" use="required"/> + </xsd:complexType> + </xsd:element> + <xsd:element maxOccurs="1" minOccurs="0" name="transformer-class-name" type="xsd:string"> + </xsd:element> + <xsd:element maxOccurs="1" minOccurs="0" name="retry-interval" type="xsd:long"> + </xsd:element> + <xsd:element maxOccurs="1" minOccurs="0" name="retry-interval-multiplier" type="xsd:double"> + </xsd:element> + <xsd:element maxOccurs="1" minOccurs="0" name="reconnect-attempts" type="xsd:int"> + </xsd:element> + <xsd:element maxOccurs="1" minOccurs="0" name="failover-on-server-shutdown" type="xsd:boolean"> + </xsd:element> + <xsd:element maxOccurs="1" minOccurs="0" name="use-duplicate-detection" type="xsd:boolean"> + </xsd:element> + <xsd:element maxOccurs="1" minOccurs="0" name="confirmation-window-size" type="xsd:int"> + </xsd:element> + <xsd:element maxOccurs="1" minOccurs="0" name="user" type="xsd:string"> + </xsd:element> + <xsd:element maxOccurs="1" minOccurs="0" name="password" type="xsd:string"> + </xsd:element> + <xsd:choice> + <xsd:element maxOccurs="1" minOccurs="1" name="static-connectors"> + <xsd:complexType> + <xsd:sequence> + <xsd:element maxOccurs="unbounded" minOccurs="1" name="connector-ref" type="xsd:string"/> + </xsd:sequence> + </xsd:complexType> + </xsd:element> + <xsd:element maxOccurs="1" minOccurs="1" name="discovery-group-ref"> + <xsd:complexType> + <xsd:attribute name="discovery-group-name" type="xsd:IDREF" use="required"> + </xsd:attribute> + </xsd:complexType> + </xsd:element> + </xsd:choice> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required"/> + </xsd:complexType> + + <xsd:complexType name="clusterConnectionType"> + <xsd:sequence> + <xsd:element maxOccurs="1" minOccurs="1" name="address" type="xsd:string"> + </xsd:element> + <xsd:element maxOccurs="1" minOccurs="1" name="connector-ref" type="xsd:string"> + </xsd:element> + <xsd:element maxOccurs="1" minOccurs="0" name="retry-interval" type="xsd:long"> + </xsd:element> + <xsd:element maxOccurs="1" minOccurs="0" name="use-duplicate-detection" type="xsd:boolean"> + </xsd:element> + <xsd:element maxOccurs="1" minOccurs="0" name="forward-when-no-consumers" type="xsd:boolean"> + </xsd:element> + <xsd:element maxOccurs="1" minOccurs="0" name="max-hops" type="xsd:int"> + </xsd:element> + <xsd:element maxOccurs="1" minOccurs="0" name="confirmation-window-size" type="xsd:int"> + </xsd:element> + <xsd:choice> + <xsd:element maxOccurs="1" minOccurs="0" name="static-connectors"> + <xsd:complexType> + <xsd:sequence> + <xsd:element maxOccurs="unbounded" minOccurs="0" name="connector-ref" type="xsd:string"/> + </xsd:sequence> + <xsd:attribute name="allow-direct-connections-only" type="xsd:boolean" use="optional"/> + </xsd:complexType> + </xsd:element> + <xsd:element maxOccurs="1" minOccurs="0" name="discovery-group-ref"> + <xsd:complexType> + <xsd:attribute name="discovery-group-name" type="xsd:IDREF" use="required"> + </xsd:attribute> + </xsd:complexType> + </xsd:element> + </xsd:choice> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required"/> + </xsd:complexType> + + <xsd:complexType name="divertType"> + <xsd:sequence> + <xsd:element maxOccurs="1" minOccurs="0" name="routing-name" type="xsd:string"> + </xsd:element> + <xsd:element maxOccurs="1" minOccurs="1" name="address" type="xsd:string"> + </xsd:element> + <xsd:element maxOccurs="1" minOccurs="1" name="forwarding-address" type="xsd:string"> + </xsd:element> + <xsd:element maxOccurs="1" minOccurs="0" name="filter"> + <xsd:complexType> + <xsd:attribute name="string" type="xsd:string" use="required"/> + </xsd:complexType> + </xsd:element> + <xsd:element maxOccurs="1" minOccurs="0" name="transformer-class-name" type="xsd:string"> + </xsd:element> + <xsd:element maxOccurs="1" minOccurs="0" name="exclusive" type="xsd:boolean"> + </xsd:element> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required"/> + </xsd:complexType> + + <xsd:simpleType name="journalType"> + <xsd:restriction base="xsd:string"> + <xsd:enumeration value="ASYNCIO"/> + <xsd:enumeration value="NIO"/> + </xsd:restriction> + </xsd:simpleType> + + <xsd:complexType name="groupingHandlerType"> + <xsd:sequence> + <xsd:element maxOccurs="1" minOccurs="1" name="type" type="groupingHandlerTypeType"/> + <xsd:element maxOccurs="1" minOccurs="1" name="address" type="xsd:string"/> + <xsd:element maxOccurs="1" minOccurs="0" name="timeout" type="xsd:int"/> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required"/> + </xsd:complexType> + + <xsd:simpleType name="groupingHandlerTypeType"> + <xsd:restriction base="xsd:string"> + <xsd:enumeration value="LOCAL"/> + <xsd:enumeration value="REMOTE"/> + </xsd:restriction> + </xsd:simpleType> + + <xsd:element name="security-settings"> + <xsd:complexType> + <xsd:sequence> + <xsd:element maxOccurs="unbounded" minOccurs="0" name="security-setting"> + </xsd:element> + </xsd:sequence> + </xsd:complexType> + </xsd:element> + + <xsd:element name="security-setting"> + <xsd:complexType> + <xsd:sequence> + <xsd:element maxOccurs="unbounded" minOccurs="0" name="permission"> + <xsd:complexType> + <xsd:attribute name="type" type="xsd:string" use="required"/> + <xsd:attribute name="roles" type="xsd:string" use="required"/> + </xsd:complexType> + </xsd:element> + </xsd:sequence> + <xsd:attribute name="match" type="xsd:string" use="required"/> + </xsd:complexType> + </xsd:element> + + <xsd:element name="address-settings"> + <xsd:complexType> + <xsd:sequence> + <xsd:element maxOccurs="unbounded" minOccurs="0" name="address-setting"> + </xsd:element> + </xsd:sequence> + </xsd:complexType> + </xsd:element> + + <xsd:element name="address-setting"> + <xsd:complexType> + <xsd:all> + <xsd:element maxOccurs="1" minOccurs="0" name="dead-letter-address" type="xsd:string"> + </xsd:element> + <xsd:element maxOccurs="1" minOccurs="0" name="expiry-address" type="xsd:string"> + </xsd:element> + <xsd:element maxOccurs="1" minOccurs="0" name="redelivery-delay" type="xsd:long"> + </xsd:element> + <xsd:element maxOccurs="1" minOccurs="0" name="max-delivery-attempts" type="xsd:int"> + </xsd:element> + <xsd:element maxOccurs="1" minOccurs="0" name="max-size-bytes" type="xsd:long"> + </xsd:element> + <xsd:element maxOccurs="1" minOccurs="0" name="page-size-bytes" type="xsd:long"> + </xsd:element> + <xsd:element maxOccurs="1" minOccurs="0" name="page-max-cache-size" type="xsd:int"> + </xsd:element> + <xsd:element maxOccurs="1" minOccurs="0" name="address-full-policy" type="addressFullMessagePolicyType"> + </xsd:element> + <xsd:element maxOccurs="1" minOccurs="0" name="message-counter-history-day-limit" type="xsd:int"> + </xsd:element> + <xsd:element maxOccurs="1" minOccurs="0" name="last-value-queue" type="xsd:boolean"> + </xsd:element> + <xsd:element maxOccurs="1" minOccurs="0" name="redistribution-delay" type="xsd:long"> + </xsd:element> + <xsd:element maxOccurs="1" minOccurs="0" name="send-to-dla-on-no-route" type="xsd:boolean"> + </xsd:element> + </xsd:all> + <xsd:attribute name="match" type="xsd:string" use="required"/> + </xsd:complexType> + </xsd:element> + + <xsd:element name="queues"> + <xsd:complexType> + <xsd:sequence> + <xsd:element maxOccurs="unbounded" minOccurs="0" name="queue"> + </xsd:element> + </xsd:sequence> + </xsd:complexType> + </xsd:element> + + <xsd:element name="queue"> + <xsd:complexType> + <xsd:all> + <xsd:element maxOccurs="1" minOccurs="1" name="address" type="xsd:string"> + </xsd:element> + <xsd:element maxOccurs="1" minOccurs="0" name="filter"> + <xsd:complexType> + <xsd:attribute name="string" type="xsd:string" use="required"/> + </xsd:complexType> + </xsd:element> + <xsd:element maxOccurs="1" minOccurs="0" name="durable" type="xsd:boolean"> + </xsd:element> + </xsd:all> + <xsd:attribute name="name" type="xsd:ID" use="required"/> + </xsd:complexType> + </xsd:element> + + <xsd:complexType name="live-connectorType"> + <xsd:attribute name="connector-name" type="xsd:IDREF" use="required"> + </xsd:attribute> + </xsd:complexType> + + <xsd:simpleType name="addressFullMessagePolicyType"> + <xsd:restriction base="xsd:string"> + <xsd:enumeration value="DROP"/> + <xsd:enumeration value="PAGE"/> + <xsd:enumeration value="BLOCK"/> + </xsd:restriction> + </xsd:simpleType> + + <xsd:complexType name="connectorServiceType"> + <xsd:sequence> + <xsd:element maxOccurs="1" minOccurs="1" name="factory-class" type="xsd:string"> + </xsd:element> + <xsd:element maxOccurs="unbounded" minOccurs="0" name="param" type="paramType"> + </xsd:element> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="optional"/> + </xsd:complexType> + +</xsd:schema> Added: trunk/hornetq-core/src/main/resources/schema/hornetq-users.xsd =================================================================== --- trunk/hornetq-core/src/main/resources/schema/hornetq-users.xsd (rev 0) +++ trunk/hornetq-core/src/main/resources/schema/hornetq-users.xsd 2011-04-05 12:59:20 UTC (rev 10452) @@ -0,0 +1,32 @@ +<?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 name="defaultuser" type="userType" maxOccurs="1" minOccurs="0"></xsd:element> + <xsd:element name="user" type="userType" maxOccurs="unbounded" minOccurs="0"></xsd:element> + </xsd:sequence> + </xsd:complexType> + </xsd:element> + + <xsd:element name="role"> + <xsd:complexType> + <xsd:attribute name="name" type="xsd:string" use="required"></xsd:attribute> + </xsd:complexType> + </xsd:element> + + <xsd:complexType name="userType"> + <xsd:sequence> + <xsd:element ref="role" maxOccurs="unbounded" minOccurs="1"></xsd:element> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:ID" use="required"></xsd:attribute> + <xsd:attribute name="password" type="xsd:string"></xsd:attribute> + </xsd:complexType> +</xsd:schema> Added: trunk/hornetq-core-client/pom.xml =================================================================== --- trunk/hornetq-core-client/pom.xml (rev 0) +++ trunk/hornetq-core-client/pom.xml 2011-04-05 12:59:20 UTC (rev 10452) @@ -0,0 +1,90 @@ +<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-core-client</artifactId> + <packaging>jar</packaging> + <version>2.2.3-SNAPSHOT</version> + <name>HornetQ Core Client</name> + + <dependencies> + <dependency> + <groupId>org.hornetq</groupId> + <artifactId>hornetq-core</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> + </excludes> + </artifactSet> + <filters> + <filter> + <artifact>org.hornetq:hornetq-core</artifact> + <includes> + <include>hornetq-version.properties</include> + <include>org/hornetq/api/**/*.class</include> + <include>org/hornetq/*.class</include> + <include>org/hornetq/core/buffers/**/*.class</include> + <include>org/hornetq/core/client/**/*.class</include> + <include>org/hornetq/core/filter/**/*.class</include> + <include>org/hornetq/core/exception/**/*.class</include> + <include>org/hornetq/core/remoting/impl/**/*.class</include> + <include>org/hornetq/utils/**/*.class</include> + <include>org/hornetq/core/cluster/**/*.class</include> + <include>org/hornetq/core/list/**/*.class</include> + <include>org/hornetq/core/logging/**/*.class</include> + <include>org/hornetq/core/message/**/*.class</include> + <include>org/hornetq/core/protocol/core/**/*.class</include> + <include>org/hornetq/core/remoting/**/*.class</include> + <include>org/hornetq/core/version/**/*.class</include> + <include>org/hornetq/core/management/*.class</include> + <include>org/hornetq/core/transaction/impl/XidImpl.class</include> + <include>org/hornetq/spi/core/logging/*.class</include> + <include>org/hornetq/spi/core/protocol/*.class</include> + <include>org/hornetq/spi/core/remoting/*.class</include> + +  + <include>org/hornetq/core/server/ServerMessage.class</include> + <include>org/hornetq/core/journal/EncodingSupport.class</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> Modified: trunk/hornetq-rest/pom.xml =================================================================== --- trunk/hornetq-rest/pom.xml 2011-04-04 22:11:03 UTC (rev 10451) +++ trunk/hornetq-rest/pom.xml 2011-04-05 12:59:20 UTC (rev 10452) @@ -5,9 +5,10 @@ <name>HornetQ REST Interface Parent POM</name> <groupId>org.hornetq.rest</groupId> <artifactId>hornetq-rest-all</artifactId> - <version>2.2.2.Final</version> + <version>2.2.3.-SNAPSHOT</version> <packaging>pom</packaging> + <properties> <resteasy.version>2.1.0.GA</resteasy.version> <hornetq.version>2.2.2.Final</hornetq.version> Modified: trunk/hornetq.iml =================================================================== --- trunk/hornetq.iml 2011-04-04 22:11:03 UTC (rev 10451) +++ trunk/hornetq.iml 2011-04-05 12:59:20 UTC (rev 10452) @@ -5,6 +5,8 @@ <sourceFolder url="file://$MODULE_DIR$/build/src" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/native/src" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/src/main" isTestSource="false" /> + <sourceFolder url="file://$MODULE_DIR$/hornetq-core/src/java" isTestSource="false" /> + <sourceFolder url="file://$MODULE_DIR$/hornetq-core/src/main/java" isTestSource="true" /> <excludeFolder url="file://$MODULE_DIR$/build/api" /> <excludeFolder url="file://$MODULE_DIR$/build/classes" /> <excludeFolder url="file://$MODULE_DIR$/build/jars" /> Modified: trunk/hornetq.ipr =================================================================== --- trunk/hornetq.ipr 2011-04-04 22:11:03 UTC (rev 10451) +++ trunk/hornetq.ipr 2011-04-05 12:59:20 UTC (rev 10452) @@ -246,14 +246,6 @@ <maximumStackSize value="32" /> <properties /> </buildFile> - <buildFile url="file://$PROJECT_DIR$/examples/soak/normal/build.xml"> - <additionalClassPath /> - <antReference projectDefault="true" /> - <customJdkName value="" /> - <maximumHeapSize value="128" /> - <maximumStackSize value="32" /> - <properties /> - </buildFile> </component> <component name="BuildJarProjectSettings"> <option name="BUILD_JARS_ON_MAKE" value="false" /> @@ -273,6 +265,7 @@ <option name="SMART_TABS" value="false" /> <option name="LABEL_INDENT_SIZE" value="0" /> <option name="LABEL_INDENT_ABSOLUTE" value="false" /> + <option name="USE_RELATIVE_INDENTS" value="false" /> </ADDITIONAL_INDENT_OPTIONS> <ADDITIONAL_INDENT_OPTIONS fileType="jsp"> <option name="INDENT_SIZE" value="4" /> @@ -282,6 +275,7 @@ <option name="SMART_TABS" value="false" /> <option name="LABEL_INDENT_SIZE" value="0" /> <option name="LABEL_INDENT_ABSOLUTE" value="false" /> + <option name="USE_RELATIVE_INDENTS" value="false" /> </ADDITIONAL_INDENT_OPTIONS> <ADDITIONAL_INDENT_OPTIONS fileType="xml"> <option name="INDENT_SIZE" value="4" /> @@ -291,6 +285,7 @@ <option name="SMART_TABS" value="false" /> <option name="LABEL_INDENT_SIZE" value="0" /> <option name="LABEL_INDENT_ABSOLUTE" value="false" /> + <option name="USE_RELATIVE_INDENTS" value="false" /> </ADDITIONAL_INDENT_OPTIONS> </value> </option> @@ -365,22 +360,22 @@ </facet-type> <facet-type id="javaeeApplication"> <modules> - <module name="messaging" /> <module name="hornetq-javaee-examples"> <files> <file url="file://$PROJECT_DIR$/examples/javaee/servlet-transport/config/META-INF/application.xml" /> </files> </module> + <module name="messaging" /> </modules> </facet-type> <facet-type id="web"> <modules> - <module name="messaging" /> <module name="hornetq-javaee-examples"> <files> <file url="file://$PROJECT_DIR$/examples/javaee/servlet-transport/config/WEB-INF/web.xml" /> </files> </module> + <module name="messaging" /> </modules> </facet-type> </autodetection-disabled> @@ -631,6 +626,9 @@ <module fileurl="file://$PROJECT_DIR$/tests/hornetq-tests.iml" filepath="$PROJECT_DIR$/tests/hornetq-tests.iml" /> </modules> </component> + <component name="ProjectResources"> + <default-html-doctype>http://www.w3.org/1999/xhtml</default-html-doctype> + </component> <component name="ProjectRootManager" version="2" languageLevel="JDK_1_5" assert-keyword="true" jdk-15="true" project-jdk-name="1.6" project-jdk-type="JavaSDK"> <output url="file://$PROJECT_DIR$/classes" /> </component> @@ -701,6 +699,52 @@ </option> </component> <component name="libraryTable"> + <library name="ant 1.7.1"> + <CLASSES> + <root url="jar://$USER_HOME$/devtools/apache-ant-1.7.1/lib/ant-contrib/lib/commons-logging-1.0.4.jar!/" /> + <root url="jar://$USER_HOME$/devtools/apache-ant-1.7.1/lib/ant-commons-logging.jar!/" /> + <root url="jar://$USER_HOME$/devtools/apache-ant-1.7.1/lib/ant-contrib/ant-contrib-1.0b3.jar!/" /> + <root url="jar://$USER_HOME$/devtools/apache-ant-1.7.1/lib/ant-jai.jar!/" /> + <root url="jar://$USER_HOME$/devtools/apache-ant-1.7.1/lib/ant-apache-log4j.jar!/" /> + <root url="jar://$USER_HOME$/devtools/apache-ant-1.7.1/lib/ant-javamail.jar!/" /> + <root url="jar://$USER_HOME$/devtools/apache-ant-1.7.1/lib/ant-trax.jar!/" /> + <root url="jar://$USER_HOME$/devtools/apache-ant-1.7.1/lib/ant-antlr.jar!/" /> + <root url="jar://$USER_HOME$/devtools/apache-ant-1.7.1/lib/ant-jmf.jar!/" /> + <root url="jar://$USER_HOME$/devtools/apache-ant-1.7.1/lib/ant-apache-resolver.jar!/" /> + <root url="jar://$USER_HOME$/devtools/apache-ant-1.7.1/lib/ant-jdepend.jar!/" /> + <root url="jar://$USER_HOME$/devtools/apache-ant-1.7.1/lib/ant-nodeps.jar!/" /> + <root url="jar://$USER_HOME$/devtools/apache-ant-1.7.1/lib/ant-contrib.jar!/" /> + <root url="jar://$USER_HOME$/devtools/apache-ant-1.7.1/lib/ant-starteam.jar!/" /> + <root url="jar://$USER_HOME$/devtools/apache-ant-1.7.1/lib/ant-apache-bsf.jar!/" /> + <root url="jar://$USER_HOME$/devtools/apache-ant-1.7.1/lib/ant-stylebook.jar!/" /> + <root url="jar://$USER_HOME$/devtools/apache-ant-1.7.1/lib/ant-apache-oro.jar!/" /> + <root url="jar://$USER_HOME$/devtools/apache-ant-1.7.1/lib/ant-contrib/lib/commons-httpclient-3.0.1.jar!/" /> + <root url="jar://$USER_HOME$/devtools/apache-ant-1.7.1/lib/ant-jsch.jar!/" /> + <root url="jar://$USER_HOME$/devtools/apache-ant-1.7.1/lib/ant-commons-net.jar!/" /> + <root url="jar://$USER_HOME$/devtools/apache-ant-1.7.1/lib/xml-apis.jar!/" /> + <root url="jar://$USER_HOME$/devtools/apache-ant-1.7.1/lib/ant-junit.jar!/" /> + <root url="jar://$USER_HOME$/devtools/apache-ant-1.7.1/lib/ant-contrib/lib/ivy-1.3.1.jar!/" /> + <root url="jar://$USER_HOME$/devtools/apache-ant-1.7.1/lib/ant-swing.jar!/" /> + <root url="jar://$USER_HOME$/devtools/apache-ant-1.7.1/lib/ant-launcher.jar!/" /> + <root url="jar://$USER_HOME$/devtools/apache-ant-1.7.1/lib/ant.jar!/" /> + <root url="jar://$USER_HOME$/devtools/apache-ant-1.7.1/lib/ant-testutil.jar!/" /> + <root url="jar://$USER_HOME$/devtools/apache-ant-1.7.1/lib/ant-contrib/lib/bcel-5.1.jar!/" /> + <root url="jar://$USER_HOME$/devtools/apache-ant-1.7.1/lib/ant-apache-regexp.jar!/" /> + <root url="jar://$USER_HOME$/devtools/apache-ant-1.7.1/lib/ant-weblogic.jar!/" /> + <root url="jar://$USER_HOME$/devtools/apache-ant-1.7.1/lib/xercesImpl.jar!/" /> + <root url="jar://$USER_HOME$/devtools/apache-ant-1.7.1/lib/ant-apache-bcel.jar!/" /> + <root url="jar://$USER_HOME$/devtools/apache-ant-1.7.1/lib/ant-netrexx.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + <library name="etc"> + <CLASSES> + <root url="file://$PROJECT_DIR$/../etc" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> <library name="messaging"> <CLASSES> <root url="file://$PROJECT_DIR$/src/config/common" /> @@ -712,6 +756,42 @@ <jarDirectory url="file://$PROJECT_DIR$/tests/etc" recursive="false" /> <jarDirectory url="file://$PROJECT_DIR$/tests/jms-tests/etc" recursive="false" /> </library> + <library name="messaging-javaee-examples"> + <CLASSES> + <root url="file://$PROJECT_DIR$/src/config/common" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + <library name="messaging-jms-examples"> + <CLASSES> + <root url="file://$PROJECT_DIR$/examples/jms/common/config" /> + <root url="file://$PROJECT_DIR$/src/config/common" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + <library name="messaging-jms-tests"> + <CLASSES> + <root url="file://$PROJECT_DIR$/tests/jms-tests/config" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + <library name="messaging-joram-tests"> + <CLASSES> + <root url="file://$PROJECT_DIR$/tests/joram-tests/config" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + <library name="messaging-tests"> + <CLASSES> + <root url="file://$PROJECT_DIR$/tests/config" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> <library name="messaging_jars"> <CLASSES> <root url="jar://$PROJECT_DIR$/thirdparty/org/jboss/lib/jboss-mdr.jar!/" /> @@ -746,88 +826,6 @@ <JAVADOC /> <SOURCES /> </library> - <library name="messaging-tests"> - <CLASSES> - <root url="file://$PROJECT_DIR$/tests/config" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - <library name="messaging-joram-tests"> - <CLASSES> - <root url="file://$PROJECT_DIR$/tests/joram-tests/config" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - <library name="messaging-jms-tests"> - <CLASSES> - <root url="file://$PROJECT_DIR$/tests/jms-tests/config" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - <library name="messaging-jms-examples"> - <CLASSES> - <root url="file://$PROJECT_DIR$/examples/jms/common/config" /> - <root url="file://$PROJECT_DIR$/src/config/common" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - <library name="messaging-javaee-examples"> - <CLASSES> - <root url="file://$PROJECT_DIR$/src/config/common" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - <library name="ant 1.7.1"> - <CLASSES> - <root url="jar://$PROJECT_DIR$/../../devtools/apache-ant-1.7.1/lib/ant-contrib/lib/commons-logging-1.0.4.jar!/" /> - <root url="jar://$PROJECT_DIR$/../../devtools/apache-ant-1.7.1/lib/ant-commons-logging.jar!/" /> - <root url="jar://$PROJECT_DIR$/../../devtools/apache-ant-1.7.1/lib/ant-contrib/ant-contrib-1.0b3.jar!/" /> - <root url="jar://$PROJECT_DIR$/../../devtools/apache-ant-1.7.1/lib/ant-jai.jar!/" /> - <root url="jar://$PROJECT_DIR$/../../devtools/apache-ant-1.7.1/lib/ant-apache-log4j.jar!/" /> - <root url="jar://$PROJECT_DIR$/../../devtools/apache-ant-1.7.1/lib/ant-javamail.jar!/" /> - <root url="jar://$PROJECT_DIR$/../../devtools/apache-ant-1.7.1/lib/ant-trax.jar!/" /> - <root url="jar://$PROJECT_DIR$/../../devtools/apache-ant-1.7.1/lib/ant-antlr.jar!/" /> - <root url="jar://$PROJECT_DIR$/../../devtools/apache-ant-1.7.1/lib/ant-jmf.jar!/" /> - <root url="jar://$PROJECT_DIR$/../../devtools/apache-ant-1.7.1/lib/ant-apache-resolver.jar!/" /> - <root url="jar://$PROJECT_DIR$/../../devtools/apache-ant-1.7.1/lib/ant-jdepend.jar!/" /> - <root url="jar://$PROJECT_DIR$/../../devtools/apache-ant-1.7.1/lib/ant-nodeps.jar!/" /> - <root url="jar://$PROJECT_DIR$/../../devtools/apache-ant-1.7.1/lib/ant-contrib.jar!/" /> - <root url="jar://$PROJECT_DIR$/../../devtools/apache-ant-1.7.1/lib/ant-starteam.jar!/" /> - <root url="jar://$PROJECT_DIR$/../../devtools/apache-ant-1.7.1/lib/ant-apache-bsf.jar!/" /> - <root url="jar://$PROJECT_DIR$/../../devtools/apache-ant-1.7.1/lib/ant-stylebook.jar!/" /> - <root url="jar://$PROJECT_DIR$/../../devtools/apache-ant-1.7.1/lib/ant-apache-oro.jar!/" /> - <root url="jar://$PROJECT_DIR$/../../devtools/apache-ant-1.7.1/lib/ant-contrib/lib/commons-httpclient-3.0.1.jar!/" /> - <root url="jar://$PROJECT_DIR$/../../devtools/apache-ant-1.7.1/lib/ant-jsch.jar!/" /> - <root url="jar://$PROJECT_DIR$/../../devtools/apache-ant-1.7.1/lib/ant-commons-net.jar!/" /> - <root url="jar://$PROJECT_DIR$/../../devtools/apache-ant-1.7.1/lib/xml-apis.jar!/" /> - <root url="jar://$PROJECT_DIR$/../../devtools/apache-ant-1.7.1/lib/ant-junit.jar!/" /> - <root url="jar://$PROJECT_DIR$/../../devtools/apache-ant-1.7.1/lib/ant-contrib/lib/ivy-1.3.1.jar!/" /> - <root url="jar://$PROJECT_DIR$/../../devtools/apache-ant-1.7.1/lib/ant-swing.jar!/" /> - <root url="jar://$PROJECT_DIR$/../../devtools/apache-ant-1.7.1/lib/ant-launcher.jar!/" /> - <root url="jar://$PROJECT_DIR$/../../devtools/apache-ant-1.7.1/lib/ant.jar!/" /> - <root url="jar://$PROJECT_DIR$/../../devtools/apache-ant-1.7.1/lib/ant-testutil.jar!/" /> - <root url="jar://$PROJECT_DIR$/../../devtools/apache-ant-1.7.1/lib/ant-contrib/lib/bcel-5.1.jar!/" /> - <root url="jar://$PROJECT_DIR$/../../devtools/apache-ant-1.7.1/lib/ant-apache-regexp.jar!/" /> - <root url="jar://$PROJECT_DIR$/../../devtools/apache-ant-1.7.1/lib/ant-weblogic.jar!/" /> - <root url="jar://$PROJECT_DIR$/../../devtools/apache-ant-1.7.1/lib/xercesImpl.jar!/" /> - <root url="jar://$PROJECT_DIR$/../../devtools/apache-ant-1.7.1/lib/ant-apache-bcel.jar!/" /> - <root url="jar://$PROJECT_DIR$/../../devtools/apache-ant-1.7.1/lib/ant-netrexx.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - <library name="etc"> - <CLASSES> - <root url="file://$PROJECT_DIR$/../etc" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> </component> </project> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-04-04 22:11:03 UTC (rev 10451) +++ trunk/pom.xml 2011-04-05 12:59:20 UTC (rev 10452) @@ -19,7 +19,7 @@ <groupId>org.hornetq</groupId> <artifactId>messaging</artifactId> <packaging>pom</packaging> - <version>2.2.1.GA</version> + <version>2.2.3-SNAPSHOT</version> <properties> <resteasy.version>2.1.0.GA</resteasy.version> @@ -40,6 +40,10 @@ <connection>scm:svn:http://anonsvn.jboss.org/repos/messaging/trunk</connection> <developerConnection>scm:svn:https://svn.jboss.org/repos/messaging/trunk</developerConnection> </scm> + + <modules> + <module>hornetq-core</module> + </modules> <build> <plugins> Deleted: trunk/src/config/common/hornetq-version.properties =================================================================== --- trunk/src/config/common/hornetq-version.properties 2011-04-04 22:11:03 UTC (rev 10451) +++ trunk/src/config/common/hornetq-version.properties 2011-04-05 12:59:20 UTC (rev 10452) @@ -1,9 +0,0 @@ -hornetq.version.versionName=super-hornetq-fighter -hornetq.version.majorVersion=2 -hornetq.version.minorVersion=2 -hornetq.version.microVersion=2 -hornetq.version.incrementingVersion=122 -hornetq.version.versionSuffix=Final -hornetq.version.versionTag=Final -hornetq.netty.version=(a)NETTY.VERSION@ -hornetq.version.compatibleVersionList=121,122 Deleted: trunk/src/config/common/schema/hornetq-configuration.xsd =================================================================== --- trunk/src/config/common/schema/hornetq-configuration.xsd 2011-04-04 22:11:03 UTC (rev 10451) +++ trunk/src/config/common/schema/hornetq-configuration.xsd 2011-04-05 12:59:20 UTC (rev 10452) @@ -1,544 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<xsd:schema xmlns="urn:hornetq" xmlns:xsd="http://www.w3.org/2001/XMLSchema" attributeFormDefault="unqualified" elementFormDefault="qualified" targetNamespace="urn:hornetq" version="1.0"> - - <xsd:element name="configuration"> - <xsd:complexType> - <xsd:all> - <xsd:element maxOccurs="1" minOccurs="0" name="name" type="xsd:string"> - </xsd:element> - <xsd:element maxOccurs="1" minOccurs="0" ref="clustered"/> - <xsd:element maxOccurs="1" minOccurs="0" ref="file-deployment-enabled"/> - <xsd:element maxOccurs="1" minOccurs="0" ref="persistence-enabled"/> - <xsd:element maxOccurs="1" minOccurs="0" name="scheduled-thread-pool-max-size" type="xsd:int"> - <xsd:annotation> - <xsd:documentation> - Maximum number of threads to use for the scheduled thread pool - </xsd:documentation> - </xsd:annotation> - </xsd:element> - <xsd:element maxOccurs="1" minOccurs="0" name="thread-pool-max-size" type="xsd:int"> - <xsd:annotation> - <xsd:documentation> - Maximum number of threads to use for the thread pool - </xsd:documentation> - </xsd:annotation> - </xsd:element> - <xsd:element maxOccurs="1" minOccurs="0" name="security-enabled" type="xsd:boolean"> - </xsd:element> - <xsd:element maxOccurs="1" minOccurs="0" name="security-invalidation-interval" type="xsd:long"> - </xsd:element> - <xsd:element maxOccurs="1" minOccurs="0" name="wild-card-routing-enabled" type="xsd:boolean"> - </xsd:element> - <xsd:element maxOccurs="1" minOccurs="0" name="management-address" type="xsd:string"> - </xsd:element> - <xsd:element maxOccurs="1" minOccurs="0" name="management-notification-address" type="xsd:string"> - </xsd:element> - <xsd:element maxOccurs="1" minOccurs="0" name="cluster-user" type="xsd:string"> - </xsd:element> - <xsd:element maxOccurs="1" minOccurs="0" name="cluster-password" type="xsd:string"> - </xsd:element> - <xsd:element maxOccurs="1" minOccurs="0" name="log-delegate-factory-class-name" type="xsd:string"> - </xsd:element> - <xsd:element maxOccurs="1" minOccurs="0" name="jmx-management-enabled" type="xsd:boolean"> - </xsd:element> - <xsd:element maxOccurs="1" minOccurs="0" name="jmx-domain" type="xsd:string"> - </xsd:element> - <xsd:element maxOccurs="1" minOccurs="0" name="message-counter-enabled" type="xsd:boolean"> - </xsd:element> - <xsd:element maxOccurs="1" minOccurs="0" name="message-counter-sample-period" type="xsd:long"> - </xsd:element> - <xsd:element maxOccurs="1" minOccurs="0" name="message-counter-max-day-history" type="xsd:int"> - </xsd:element> - <xsd:element maxOccurs="1" minOccurs="0" name="connection-ttl-override" type="xsd:long"> - </xsd:element> - <xsd:element maxOccurs="1" minOccurs="0" name="async-connection-execution-enabled" type="xsd:boolean"> - </xsd:element> - <xsd:element maxOccurs="1" minOccurs="0" name="transaction-timeout" type="xsd:long"> - </xsd:element> - <xsd:element maxOccurs="1" minOccurs="0" name="transaction-timeout-scan-period" type="xsd:long"> - </xsd:element> - <xsd:element maxOccurs="1" minOccurs="0" name="message-expiry-scan-period" type="xsd:long"> - </xsd:element> - <xsd:element maxOccurs="1" minOccurs="0" name="message-expiry-thread-priority" type="xsd:int"> - </xsd:element> - <xsd:element maxOccurs="1" minOccurs="0" name="id-cache-size" type="xsd:int"> - </xsd:element> - <xsd:element maxOccurs="1" minOccurs="0" name="persist-id-cache" type="xsd:boolean"> - </xsd:element> - <xsd:element maxOccurs="1" minOccurs="0" ref="remoting-interceptors"> - </xsd:element> - <xsd:element maxOccurs="1" minOccurs="0" name="backup" type="xsd:boolean"> - </xsd:element> - <xsd:element maxOccurs="1" minOccurs="0" name="allow-failback" type="xsd:boolean"> - </xsd:element> - <xsd:element maxOccurs="1" minOccurs="0" name="failback-delay" type="xsd:long"> - </xsd:element> - <xsd:element maxOccurs="1" minOccurs="0" name="failover-on-shutdown" type="xsd:boolean"> - </xsd:element> - <xsd:element maxOccurs="1" minOccurs="0" name="shared-store" type="xsd:boolean"> - </xsd:element> - <xsd:element maxOccurs="1" minOccurs="0" name="persist-delivery-count-before-delivery" type="xsd:boolean"> - </xsd:element> - <xsd:element maxOccurs="1" minOccurs="0" name="live-connector-ref" type="live-connectorType"> - </xsd:element> - <xsd:element maxOccurs="1" minOccurs="0" name="connectors"> - <xsd:complexType> - <xsd:sequence> - <xsd:element maxOccurs="unbounded" minOccurs="0" name="connector" type="connectorType"/> - </xsd:sequence> - </xsd:complexType> - </xsd:element> - <xsd:element maxOccurs="1" minOccurs="0" name="acceptors"> - <xsd:complexType> - <xsd:sequence> - <xsd:element maxOccurs="unbounded" minOccurs="1" name="acceptor" type="acceptorType"> - </xsd:element> - </xsd:sequence> - </xsd:complexType> - </xsd:element> - <xsd:element maxOccurs="1" minOccurs="0" name="broadcast-groups"> - <xsd:complexType> - <xsd:sequence> - <xsd:element maxOccurs="unbounded" minOccurs="0" ref="broadcast-group"> - </xsd:element> - </xsd:sequence> - </xsd:complexType> - </xsd:element> - <xsd:element maxOccurs="1" minOccurs="0" name="discovery-groups"> - <xsd:complexType> - <xsd:sequence> - <xsd:element maxOccurs="unbounded" minOccurs="0" ref="discovery-group"> - </xsd:element> - </xsd:sequence> - </xsd:complexType> - </xsd:element> - <xsd:element maxOccurs="1" minOccurs="0" name="diverts"> - <xsd:complexType> - <xsd:sequence> - <xsd:element maxOccurs="unbounded" minOccurs="0" name="divert" type="divertType"> - </xsd:element> - </xsd:sequence> - </xsd:complexType> - </xsd:element> - <xsd:element maxOccurs="1" minOccurs="0" name="queues"> - </xsd:element> - <xsd:element maxOccurs="1" minOccurs="0" name="bridges"> - <xsd:complexType> - <xsd:sequence> - <xsd:element maxOccurs="unbounded" minOccurs="0" name="bridge" type="bridgeType"> - </xsd:element> - </xsd:sequence> - </xsd:complexType> - </xsd:element> - <xsd:element maxOccurs="1" minOccurs="0" name="cluster-connections"> - <xsd:complexType> - <xsd:sequence> - <xsd:element maxOccurs="unbounded" minOccurs="0" name="cluster-connection" type="clusterConnectionType"> - </xsd:element> - </xsd:sequence> - </xsd:complexType> - </xsd:element> - <xsd:element maxOccurs="1" minOccurs="0" name="grouping-handler" type="groupingHandlerType"> - </xsd:element> - <xsd:element maxOccurs="1" minOccurs="0" name="paging-directory" type="xsd:string"> - </xsd:element> - <xsd:element maxOccurs="1" minOccurs="0" name="bindings-directory" type="xsd:string"> - </xsd:element> - <xsd:element maxOccurs="1" minOccurs="0" name="create-bindings-dir" type="xsd:boolean"> - </xsd:element> - <xsd:element maxOccurs="1" minOccurs="0" name="journal-directory" type="xsd:string"> - </xsd:element> - <xsd:element maxOccurs="1" minOccurs="0" name="create-journal-dir" type="xsd:boolean"> - </xsd:element> - <xsd:element maxOccurs="1" minOccurs="0" name="journal-type" type="journalType"> - </xsd:element> - <xsd:element maxOccurs="1" minOccurs="0" name="journal-buffer-timeout" type="xsd:long"> - </xsd:element> - <xsd:element maxOccurs="1" minOccurs="0" name="journal-buffer-size" type="xsd:long"> - </xsd:element> - <xsd:element maxOccurs="1" minOccurs="0" name="journal-sync-transactional" type="xsd:boolean"> - </xsd:element> - <xsd:element maxOccurs="1" minOccurs="0" name="journal-sync-non-transactional" type="xsd:boolean"> - </xsd:element> - <xsd:element maxOccurs="1" minOccurs="0" name="log-journal-write-rate" type="xsd:boolean"> - </xsd:element> - <xsd:element maxOccurs="1" minOccurs="0" name="journal-file-size" type="xsd:long"> - </xsd:element> - <xsd:element maxOccurs="1" minOccurs="0" name="journal-min-files" type="xsd:int"> - </xsd:element> - <xsd:element maxOccurs="1" minOccurs="0" name="journal-compact-percentage" type="xsd:int"> - </xsd:element> - <xsd:element maxOccurs="1" minOccurs="0" name="journal-compact-min-files" type="xsd:int"> - </xsd:element> - <xsd:element maxOccurs="1" minOccurs="0" name="journal-max-io" type="xsd:int"> - </xsd:element> - <xsd:element maxOccurs="1" minOccurs="0" name="perf-blast-pages" type="xsd:int"> - </xsd:element> - <xsd:element maxOccurs="1" minOccurs="0" name="run-sync-speed-test" type="xsd:boolean"> - </xsd:element> - <xsd:element maxOccurs="1" minOccurs="0" name="server-dump-interval" type="xsd:long"> - </xsd:element> - <xsd:element maxOccurs="1" minOccurs="0" name="memory-warning-threshold" type="xsd:int"> - </xsd:element> - <xsd:element maxOccurs="1" minOccurs="0" name="memory-measure-interval" type="xsd:long"> - </xsd:element> - <xsd:element maxOccurs="1" minOccurs="0" name="large-messages-directory" type="xsd:string"> - </xsd:element> - <xsd:element maxOccurs="1" minOccurs="0" name="security-settings"> - </xsd:element> - <xsd:element maxOccurs="1" minOccurs="0" name="address-settings"> - </xsd:element> - <xsd:element maxOccurs="1" minOccurs="0" name="connector-services"> - <xsd:complexType> - <xsd:sequence> - <xsd:element maxOccurs="unbounded" minOccurs="0" name="connector-service" type="connectorServiceType"/> - </xsd:sequence> - </xsd:complexType> - </xsd:element> - </xsd:all> - </xsd:complexType> - </xsd:element> - - <xsd:element name="clustered" type="xsd:boolean"/> - - <xsd:element name="file-deployment-enabled" type="xsd:boolean"/> - - <xsd:element name="persistence-enabled" type="xsd:boolean"/> - - <xsd:element name="local-bind-address" type="xsd:string"/> - - <xsd:element name="local-bind-port" type="xsd:int"/> - - <xsd:element name="group-address" type="xsd:string"/> - - <xsd:element name="group-port" type="xsd:int"/> - - <xsd:element name="broadcast-period" type="xsd:long"/> - - <xsd:element name="broadcast-group"> - <xsd:complexType> - <xsd:sequence> - <xsd:element maxOccurs="1" minOccurs="0" ref="local-bind-address"> - </xsd:element> - <xsd:element maxOccurs="1" minOccurs="0" ref="local-bind-port"> - </xsd:element> - <xsd:element maxOccurs="1" minOccurs="1" ref="group-address"> - </xsd:element> - <xsd:element maxOccurs="1" minOccurs="1" ref="group-port"> - </xsd:element> - <xsd:element maxOccurs="1" minOccurs="0" ref="broadcast-period"> - </xsd:element> - <xsd:element maxOccurs="unbounded" minOccurs="0" name="connector-ref" type="xsd:string"> - </xsd:element> - </xsd:sequence> - <xsd:attribute name="name" type="xsd:ID" use="required"/> - </xsd:complexType> - </xsd:element> - - <xsd:element name="refresh-timeout" type="xsd:int"/> - - <xsd:element name="initial-wait-timeout" type="xsd:int"/> - - <xsd:element name="discovery-group"> - <xsd:complexType> - <xsd:sequence> - <xsd:element maxOccurs="1" minOccurs="0" ref="local-bind-address"> - </xsd:element> - <xsd:element maxOccurs="1" minOccurs="1" ref="group-address"> - </xsd:element> - <xsd:element maxOccurs="1" minOccurs="1" ref="group-port"> - </xsd:element> - <xsd:element maxOccurs="1" minOccurs="0" ref="refresh-timeout"> - </xsd:element> - <xsd:element maxOccurs="1" minOccurs="0" ref="initial-wait-timeout"> - </xsd:element> - </xsd:sequence> - <xsd:attribute name="name" type="xsd:ID" use="required"/> - </xsd:complexType> - </xsd:element> - - <xsd:element name="discovery-group-ref"> - <xsd:complexType> - <xsd:attribute name="discovery-group-name" type="xsd:IDREF"> - </xsd:attribute> - </xsd:complexType> - </xsd:element> - - <xsd:element name="remoting-interceptors"> - <xsd:complexType> - <xsd:sequence> - <xsd:element maxOccurs="unbounded" minOccurs="1" name="class-name" type="xsd:string"> - </xsd:element> - </xsd:sequence> - </xsd:complexType> - </xsd:element> - - <xsd:complexType name="paramType"> - <xsd:attribute name="key" type="xsd:string" use="required"/> - <xsd:attribute name="value" type="xsd:string" use="required"/> - </xsd:complexType> - - <xsd:complexType name="connectorType"> - <xsd:sequence> - <xsd:element maxOccurs="1" minOccurs="1" name="factory-class" type="xsd:string"> - </xsd:element> - <xsd:element maxOccurs="unbounded" minOccurs="0" name="param" type="paramType"> - </xsd:element> - </xsd:sequence> - <xsd:attribute name="name" type="xsd:ID" use="required"/> - </xsd:complexType> - - <xsd:complexType name="acceptorType"> - <xsd:sequence> - <xsd:element maxOccurs="1" minOccurs="1" name="factory-class" type="xsd:string"> - </xsd:element> - <xsd:element maxOccurs="unbounded" minOccurs="0" name="param" type="paramType"> - </xsd:element> - </xsd:sequence> - <xsd:attribute name="name" type="xsd:string" use="optional"/> - </xsd:complexType> - - <xsd:complexType name="bridgeType"> - <xsd:sequence> - <xsd:element maxOccurs="1" minOccurs="1" name="queue-name" type="xsd:IDREF"> - </xsd:element> - <xsd:element maxOccurs="1" minOccurs="0" name="forwarding-address" type="xsd:string"> - </xsd:element> - <xsd:element maxOccurs="1" minOccurs="0" name="ha" type="xsd:boolean"> - </xsd:element> - <xsd:element maxOccurs="1" minOccurs="0" name="filter"> - <xsd:complexType> - <xsd:attribute name="string" type="xsd:string" use="required"/> - </xsd:complexType> - </xsd:element> - <xsd:element maxOccurs="1" minOccurs="0" name="transformer-class-name" type="xsd:string"> - </xsd:element> - <xsd:element maxOccurs="1" minOccurs="0" name="retry-interval" type="xsd:long"> - </xsd:element> - <xsd:element maxOccurs="1" minOccurs="0" name="retry-interval-multiplier" type="xsd:double"> - </xsd:element> - <xsd:element maxOccurs="1" minOccurs="0" name="reconnect-attempts" type="xsd:int"> - </xsd:element> - <xsd:element maxOccurs="1" minOccurs="0" name="failover-on-server-shutdown" type="xsd:boolean"> - </xsd:element> - <xsd:element maxOccurs="1" minOccurs="0" name="use-duplicate-detection" type="xsd:boolean"> - </xsd:element> - <xsd:element maxOccurs="1" minOccurs="0" name="confirmation-window-size" type="xsd:int"> - </xsd:element> - <xsd:element maxOccurs="1" minOccurs="0" name="user" type="xsd:string"> - </xsd:element> - <xsd:element maxOccurs="1" minOccurs="0" name="password" type="xsd:string"> - </xsd:element> - <xsd:choice> - <xsd:element maxOccurs="1" minOccurs="1" name="static-connectors"> - <xsd:complexType> - <xsd:sequence> - <xsd:element maxOccurs="unbounded" minOccurs="1" name="connector-ref" type="xsd:string"/> - </xsd:sequence> - </xsd:complexType> - </xsd:element> - <xsd:element maxOccurs="1" minOccurs="1" name="discovery-group-ref"> - <xsd:complexType> - <xsd:attribute name="discovery-group-name" type="xsd:IDREF" use="required"> - </xsd:attribute> - </xsd:complexType> - </xsd:element> - </xsd:choice> - </xsd:sequence> - <xsd:attribute name="name" type="xsd:string" use="required"/> - </xsd:complexType> - - <xsd:complexType name="clusterConnectionType"> - <xsd:sequence> - <xsd:element maxOccurs="1" minOccurs="1" name="address" type="xsd:string"> - </xsd:element> - <xsd:element maxOccurs="1" minOccurs="1" name="connector-ref" type="xsd:string"> - </xsd:element> - <xsd:element maxOccurs="1" minOccurs="0" name="retry-interval" type="xsd:long"> - </xsd:element> - <xsd:element maxOccurs="1" minOccurs="0" name="use-duplicate-detection" type="xsd:boolean"> - </xsd:element> - <xsd:element maxOccurs="1" minOccurs="0" name="forward-when-no-consumers" type="xsd:boolean"> - </xsd:element> - <xsd:element maxOccurs="1" minOccurs="0" name="max-hops" type="xsd:int"> - </xsd:element> - <xsd:element maxOccurs="1" minOccurs="0" name="confirmation-window-size" type="xsd:int"> - </xsd:element> - <xsd:choice> - <xsd:element maxOccurs="1" minOccurs="0" name="static-connectors"> - <xsd:complexType> - <xsd:sequence> - <xsd:element maxOccurs="unbounded" minOccurs="0" name="connector-ref" type="xsd:string"/> - </xsd:sequence> - <xsd:attribute name="allow-direct-connections-only" type="xsd:boolean" use="optional"/> - </xsd:complexType> - </xsd:element> - <xsd:element maxOccurs="1" minOccurs="0" name="discovery-group-ref"> - <xsd:complexType> - <xsd:attribute name="discovery-group-name" type="xsd:IDREF" use="required"> - </xsd:attribute> - </xsd:complexType> - </xsd:element> - </xsd:choice> - </xsd:sequence> - <xsd:attribute name="name" type="xsd:string" use="required"/> - </xsd:complexType> - - <xsd:complexType name="divertType"> - <xsd:sequence> - <xsd:element maxOccurs="1" minOccurs="0" name="routing-name" type="xsd:string"> - </xsd:element> - <xsd:element maxOccurs="1" minOccurs="1" name="address" type="xsd:string"> - </xsd:element> - <xsd:element maxOccurs="1" minOccurs="1" name="forwarding-address" type="xsd:string"> - </xsd:element> - <xsd:element maxOccurs="1" minOccurs="0" name="filter"> - <xsd:complexType> - <xsd:attribute name="string" type="xsd:string" use="required"/> - </xsd:complexType> - </xsd:element> - <xsd:element maxOccurs="1" minOccurs="0" name="transformer-class-name" type="xsd:string"> - </xsd:element> - <xsd:element maxOccurs="1" minOccurs="0" name="exclusive" type="xsd:boolean"> - </xsd:element> - </xsd:sequence> - <xsd:attribute name="name" type="xsd:string" use="required"/> - </xsd:complexType> - - <xsd:simpleType name="journalType"> - <xsd:restriction base="xsd:string"> - <xsd:enumeration value="ASYNCIO"/> - <xsd:enumeration value="NIO"/> - </xsd:restriction> - </xsd:simpleType> - - <xsd:complexType name="groupingHandlerType"> - <xsd:sequence> - <xsd:element maxOccurs="1" minOccurs="1" name="type" type="groupingHandlerTypeType"/> - <xsd:element maxOccurs="1" minOccurs="1" name="address" type="xsd:string"/> - <xsd:element maxOccurs="1" minOccurs="0" name="timeout" type="xsd:int"/> - </xsd:sequence> - <xsd:attribute name="name" type="xsd:string" use="required"/> - </xsd:complexType> - - <xsd:simpleType name="groupingHandlerTypeType"> - <xsd:restriction base="xsd:string"> - <xsd:enumeration value="LOCAL"/> - <xsd:enumeration value="REMOTE"/> - </xsd:restriction> - </xsd:simpleType> - - <xsd:element name="security-settings"> - <xsd:complexType> - <xsd:sequence> - <xsd:element maxOccurs="unbounded" minOccurs="0" name="security-setting"> - </xsd:element> - </xsd:sequence> - </xsd:complexType> - </xsd:element> - - <xsd:element name="security-setting"> - <xsd:complexType> - <xsd:sequence> - <xsd:element maxOccurs="unbounded" minOccurs="0" name="permission"> - <xsd:complexType> - <xsd:attribute name="type" type="xsd:string" use="required"/> - <xsd:attribute name="roles" type="xsd:string" use="required"/> - </xsd:complexType> - </xsd:element> - </xsd:sequence> - <xsd:attribute name="match" type="xsd:string" use="required"/> - </xsd:complexType> - </xsd:element> - - <xsd:element name="address-settings"> - <xsd:complexType> - <xsd:sequence> - <xsd:element maxOccurs="unbounded" minOccurs="0" name="address-setting"> - </xsd:element> - </xsd:sequence> - </xsd:complexType> - </xsd:element> - - <xsd:element name="address-setting"> - <xsd:complexType> - <xsd:all> - <xsd:element maxOccurs="1" minOccurs="0" name="dead-letter-address" type="xsd:string"> - </xsd:element> - <xsd:element maxOccurs="1" minOccurs="0" name="expiry-address" type="xsd:string"> - </xsd:element> - <xsd:element maxOccurs="1" minOccurs="0" name="redelivery-delay" type="xsd:long"> - </xsd:element> - <xsd:element maxOccurs="1" minOccurs="0" name="max-delivery-attempts" type="xsd:int"> - </xsd:element> - <xsd:element maxOccurs="1" minOccurs="0" name="max-size-bytes" type="xsd:long"> - </xsd:element> - <xsd:element maxOccurs="1" minOccurs="0" name="page-size-bytes" type="xsd:long"> - </xsd:element> - <xsd:element maxOccurs="1" minOccurs="0" name="page-max-cache-size" type="xsd:int"> - </xsd:element> - <xsd:element maxOccurs="1" minOccurs="0" name="address-full-policy" type="addressFullMessagePolicyType"> - </xsd:element> - <xsd:element maxOccurs="1" minOccurs="0" name="message-counter-history-day-limit" type="xsd:int"> - </xsd:element> - <xsd:element maxOccurs="1" minOccurs="0" name="last-value-queue" type="xsd:boolean"> - </xsd:element> - <xsd:element maxOccurs="1" minOccurs="0" name="redistribution-delay" type="xsd:long"> - </xsd:element> - <xsd:element maxOccurs="1" minOccurs="0" name="send-to-dla-on-no-route" type="xsd:boolean"> - </xsd:element> - </xsd:all> - <xsd:attribute name="match" type="xsd:string" use="required"/> - </xsd:complexType> - </xsd:element> - - <xsd:element name="queues"> - <xsd:complexType> - <xsd:sequence> - <xsd:element maxOccurs="unbounded" minOccurs="0" name="queue"> - </xsd:element> - </xsd:sequence> - </xsd:complexType> - </xsd:element> - - <xsd:element name="queue"> - <xsd:complexType> - <xsd:all> - <xsd:element maxOccurs="1" minOccurs="1" name="address" type="xsd:string"> - </xsd:element> - <xsd:element maxOccurs="1" minOccurs="0" name="filter"> - <xsd:complexType> - <xsd:attribute name="string" type="xsd:string" use="required"/> - </xsd:complexType> - </xsd:element> - <xsd:element maxOccurs="1" minOccurs="0" name="durable" type="xsd:boolean"> - </xsd:element> - </xsd:all> - <xsd:attribute name="name" type="xsd:ID" use="required"/> - </xsd:complexType> - </xsd:element> - - <xsd:complexType name="live-connectorType"> - <xsd:attribute name="connector-name" type="xsd:IDREF" use="required"> - </xsd:attribute> - </xsd:complexType> - - <xsd:simpleType name="addressFullMessagePolicyType"> - <xsd:restriction base="xsd:string"> - <xsd:enumeration value="DROP"/> - <xsd:enumeration value="PAGE"/> - <xsd:enumeration value="BLOCK"/> - </xsd:restriction> - </xsd:simpleType> - - <xsd:complexType name="connectorServiceType"> - <xsd:sequence> - <xsd:element maxOccurs="1" minOccurs="1" name="factory-class" type="xsd:string"> - </xsd:element> - <xsd:element maxOccurs="unbounded" minOccurs="0" name="param" type="paramType"> - </xsd:element> - </xsd:sequence> - <xsd:attribute name="name" type="xsd:string" use="optional"/> - </xsd:complexType> - -</xsd:schema> Deleted: trunk/src/config/common/schema/hornetq-users.xsd =================================================================== --- trunk/src/config/common/schema/hornetq-users.xsd 2011-04-04 22:11:03 UTC (rev 10451) +++ trunk/src/config/common/schema/hornetq-users.xsd 2011-04-05 12:59:20 UTC (rev 10452) @@ -1,32 +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 name="defaultuser" type="userType" maxOccurs="1" minOccurs="0"></xsd:element> - <xsd:element name="user" type="userType" maxOccurs="unbounded" minOccurs="0"></xsd:element> - </xsd:sequence> - </xsd:complexType> - </xsd:element> - - <xsd:element name="role"> - <xsd:complexType> - <xsd:attribute name="name" type="xsd:string" use="required"></xsd:attribute> - </xsd:complexType> - </xsd:element> - - <xsd:complexType name="userType"> - <xsd:sequence> - <xsd:element ref="role" maxOccurs="unbounded" minOccurs="1"></xsd:element> - </xsd:sequence> - <xsd:attribute name="name" type="xsd:ID" use="required"></xsd:attribute> - <xsd:attribute name="password" type="xsd:string"></xsd:attribute> - </xsd:complexType> -</xsd:schema>

13 years, 8 months

1
0
0 / 0

JBoss hornetq SVN: r10451 - branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/unit/core/journal/impl/fakes.

by do-not-reply＠jboss.org

Author: clebert.suconic(a)jboss.com Date: 2011-04-04 18:11:03 -0400 (Mon, 04 Apr 2011) New Revision: 10451 Modified: branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/unit/core/journal/impl/fakes/FakeSequentialFileFactory.java Log: tweak on tests Modified: branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/unit/core/journal/impl/fakes/FakeSequentialFileFactory.java =================================================================== --- branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/unit/core/journal/impl/fakes/FakeSequentialFileFactory.java 2011-04-04 21:19:27 UTC (rev 10450) +++ branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/unit/core/journal/impl/fakes/FakeSequentialFileFactory.java 2011-04-04 22:11:03 UTC (rev 10451) @@ -348,7 +348,7 @@ public void delete() throws Exception { - if (!open) + if (open) { close(); }

13 years, 8 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

hornetq-commits April 2011