[hornetq-commits] JBoss hornetq SVN: r9386 - in branches/maven-move: hornetq-bootstrap and 77 other directories.

do-not-reply at jboss.org do-not-reply at jboss.org
Thu Jul 8 23:10:47 EDT 2010


Author: bill.burke at jboss.com
Date: 2010-07-08 23:10:45 -0400 (Thu, 08 Jul 2010)
New Revision: 9386

Added:
   branches/maven-move/hornetq-bootstrap/
   branches/maven-move/hornetq-bootstrap/pom.xml
   branches/maven-move/hornetq-bootstrap/src/
   branches/maven-move/hornetq-bootstrap/src/main/
   branches/maven-move/hornetq-bootstrap/src/main/java/
   branches/maven-move/hornetq-bootstrap/src/main/java/org/
   branches/maven-move/hornetq-bootstrap/src/main/java/org/hornetq/
   branches/maven-move/hornetq-bootstrap/src/main/java/org/hornetq/integration/
   branches/maven-move/hornetq-bootstrap/src/main/java/org/hornetq/integration/bootstrap/
   branches/maven-move/hornetq-core-client/
   branches/maven-move/hornetq-core-client/pom.xml
   branches/maven-move/hornetq-core/
   branches/maven-move/hornetq-core/pom.xml
   branches/maven-move/hornetq-core/src/
   branches/maven-move/hornetq-core/src/main/
   branches/maven-move/hornetq-core/src/main/java/
   branches/maven-move/hornetq-core/src/main/java/org/
   branches/maven-move/hornetq-core/src/main/java/org/hornetq/
   branches/maven-move/hornetq-core/src/main/java/org/hornetq/api/
   branches/maven-move/hornetq-core/src/main/java/org/hornetq/api/core/
   branches/maven-move/hornetq-core/src/main/java/org/hornetq/core/
   branches/maven-move/hornetq-core/src/main/java/org/hornetq/spi/
   branches/maven-move/hornetq-core/src/main/java/org/hornetq/utils/
   branches/maven-move/hornetq-core/src/main/javacc/
   branches/maven-move/hornetq-core/src/main/javacc/FilterParser.jj
   branches/maven-move/hornetq-core/src/main/resources/
   branches/maven-move/hornetq-core/src/main/resources/hornetq-version.properties
   branches/maven-move/hornetq-core/src/main/resources/schema/
   branches/maven-move/hornetq-core/src/main/resources/schema/hornetq-configuration.xsd
   branches/maven-move/hornetq-core/src/main/resources/schema/hornetq-users.xsd
   branches/maven-move/hornetq-core/src/test/
   branches/maven-move/hornetq-jboss-as-integration/
   branches/maven-move/hornetq-jboss-as-integration/hornetq-jboss-as-integration.iml
   branches/maven-move/hornetq-jboss-as-integration/pom.xml
   branches/maven-move/hornetq-jboss-as-integration/src/
   branches/maven-move/hornetq-jboss-as-integration/src/main/
   branches/maven-move/hornetq-jboss-as-integration/src/main/java/
   branches/maven-move/hornetq-jboss-as-integration/src/main/java/org/
   branches/maven-move/hornetq-jboss-as-integration/src/main/java/org/hornetq/
   branches/maven-move/hornetq-jboss-as-integration/src/main/java/org/hornetq/integration/
   branches/maven-move/hornetq-jboss-as-integration/src/main/java/org/hornetq/integration/jboss/
   branches/maven-move/hornetq-jms-client/
   branches/maven-move/hornetq-jms-client/pom.xml
   branches/maven-move/hornetq-jms/
   branches/maven-move/hornetq-jms/pom.xml
   branches/maven-move/hornetq-jms/src/
   branches/maven-move/hornetq-jms/src/main/
   branches/maven-move/hornetq-jms/src/main/java/
   branches/maven-move/hornetq-jms/src/main/java/org/
   branches/maven-move/hornetq-jms/src/main/java/org/hornetq/
   branches/maven-move/hornetq-jms/src/main/java/org/hornetq/api/
   branches/maven-move/hornetq-jms/src/main/java/org/hornetq/api/jms/
   branches/maven-move/hornetq-jms/src/main/java/org/hornetq/jms/
   branches/maven-move/hornetq-jms/src/main/resources/
   branches/maven-move/hornetq-jms/src/main/resources/schema/
   branches/maven-move/hornetq-jms/src/main/resources/schema/hornetq-jms.xsd
   branches/maven-move/hornetq-jms/src/test/
   branches/maven-move/hornetq-logging/
   branches/maven-move/hornetq-logging/pom.xml
   branches/maven-move/hornetq-logging/src/
   branches/maven-move/hornetq-logging/src/main/
   branches/maven-move/hornetq-logging/src/main/java/
   branches/maven-move/hornetq-logging/src/main/java/org/
   branches/maven-move/hornetq-logging/src/main/java/org/hornetq/
   branches/maven-move/hornetq-logging/src/main/java/org/hornetq/integration/
   branches/maven-move/hornetq-logging/src/main/java/org/hornetq/integration/logging/
   branches/maven-move/hornetq-rar/
   branches/maven-move/hornetq-rar/hornetq-ra-jar/
   branches/maven-move/hornetq-rar/hornetq-ra-jar/pom.xml
   branches/maven-move/hornetq-rar/hornetq-ra-jar/src/
   branches/maven-move/hornetq-rar/hornetq-ra-jar/src/main/
   branches/maven-move/hornetq-rar/hornetq-ra-jar/src/main/java/
   branches/maven-move/hornetq-rar/hornetq-ra-jar/src/main/java/org/
   branches/maven-move/hornetq-rar/hornetq-ra-jar/src/main/java/org/hornetq/
   branches/maven-move/hornetq-rar/hornetq-ra-jar/src/main/java/org/hornetq/ra/
   branches/maven-move/hornetq-rar/hornetq-ra-rar/
   branches/maven-move/hornetq-rar/hornetq-ra-rar/pom.xml
   branches/maven-move/hornetq-rar/hornetq-ra-rar/src/
   branches/maven-move/hornetq-rar/hornetq-ra-rar/src/main/
   branches/maven-move/hornetq-rar/hornetq-ra-rar/src/main/resources/
   branches/maven-move/hornetq-rar/hornetq-ra-rar/src/main/resources/ra.xml
   branches/maven-move/hornetq-rar/pom.xml
   branches/maven-move/hornetq-service-sar/
   branches/maven-move/hornetq-service-sar/pom.xml
   branches/maven-move/hornetq-service-sar/src/
   branches/maven-move/hornetq-service-sar/src/main/
   branches/maven-move/hornetq-service-sar/src/main/java/
   branches/maven-move/hornetq-service-sar/src/main/java/org/
   branches/maven-move/hornetq-service-sar/src/main/java/org/hornetq/
   branches/maven-move/hornetq-service-sar/src/main/java/org/hornetq/service/
   branches/maven-move/hornetq-twitter-integration/
   branches/maven-move/hornetq-twitter-integration/pom.xml
   branches/maven-move/hornetq-twitter-integration/src/
   branches/maven-move/hornetq-twitter-integration/src/main/
   branches/maven-move/hornetq-twitter-integration/src/main/java/
   branches/maven-move/hornetq-twitter-integration/src/main/java/org/
   branches/maven-move/hornetq-twitter-integration/src/main/java/org/hornetq/
   branches/maven-move/hornetq-twitter-integration/src/main/java/org/hornetq/integration/
   branches/maven-move/hornetq-twitter-integration/src/main/java/org/hornetq/integration/twitter/
   branches/maven-move/tests/test-util-jar/
   branches/maven-move/tests/test-util-jar/pom.xml
   branches/maven-move/tests/test-util-jar/src/
   branches/maven-move/tests/test-util-jar/src/main/
   branches/maven-move/tests/test-util-jar/src/main/java/
Removed:
   branches/maven-move/hornetq-core/src/main/java/org/hornetq/core/filter/impl/FilterParser.jj
   branches/maven-move/src/config/common/hornetq-version.properties
   branches/maven-move/src/config/common/schema/hornetq-configuration.xsd
   branches/maven-move/src/config/common/schema/hornetq-jms.xsd
   branches/maven-move/src/config/common/schema/hornetq-users.xsd
   branches/maven-move/src/config/ra.xml
   branches/maven-move/src/main/org/hornetq/api/core/
   branches/maven-move/src/main/org/hornetq/api/jms/
   branches/maven-move/src/main/org/hornetq/core/
   branches/maven-move/src/main/org/hornetq/integration/bootstrap/
   branches/maven-move/src/main/org/hornetq/integration/jboss/
   branches/maven-move/src/main/org/hornetq/integration/logging/
   branches/maven-move/src/main/org/hornetq/integration/twitter/
   branches/maven-move/src/main/org/hornetq/jms/
   branches/maven-move/src/main/org/hornetq/ra/
   branches/maven-move/src/main/org/hornetq/service/
   branches/maven-move/src/main/org/hornetq/spi/
   branches/maven-move/src/main/org/hornetq/utils/
Modified:
   branches/maven-move/hornetq-core/src/main/java/org/hornetq/api/core/management/ObjectNameBuilder.java
   branches/maven-move/pom.xml
Log:


Added: branches/maven-move/hornetq-bootstrap/pom.xml
===================================================================
--- branches/maven-move/hornetq-bootstrap/pom.xml	                        (rev 0)
+++ branches/maven-move/hornetq-bootstrap/pom.xml	2010-07-09 03:10:45 UTC (rev 9386)
@@ -0,0 +1,44 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.hornetq</groupId>
+        <artifactId>hornetq-pom</artifactId>
+        <version>2.1.2-SNAPSHOT</version>
+    </parent>
+
+    <groupId>org.hornetq</groupId>
+    <artifactId>hornetq-bootstrap</artifactId>
+    <packaging>jar</packaging>
+    <name>HornetQ Bootstrap</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.hornetq</groupId>
+            <artifactId>hornetq-core</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.microcontainer</groupId>
+            <artifactId>jboss-kernel</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss</groupId>
+            <artifactId>jboss-common-core</artifactId>
+        </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>

Copied: branches/maven-move/hornetq-bootstrap/src/main/java/org/hornetq/integration/bootstrap (from rev 9385, branches/maven-move/src/main/org/hornetq/integration/bootstrap)

Added: branches/maven-move/hornetq-core/pom.xml
===================================================================
--- branches/maven-move/hornetq-core/pom.xml	                        (rev 0)
+++ branches/maven-move/hornetq-core/pom.xml	2010-07-09 03:10:45 UTC (rev 9386)
@@ -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>
+    <parent>
+        <groupId>org.hornetq</groupId>
+        <artifactId>hornetq-pom</artifactId>
+        <version>2.1.2-SNAPSHOT</version>
+    </parent>
+
+    <groupId>org.hornetq</groupId>
+    <artifactId>hornetq-core</artifactId>
+    <packaging>jar</packaging>
+    <name>HornetQ Core</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.jboss.netty</groupId>
+            <artifactId>netty</artifactId>
+        </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>

Copied: branches/maven-move/hornetq-core/src/main/java/org/hornetq/api/core (from rev 9385, branches/maven-move/src/main/org/hornetq/api/core)

Modified: branches/maven-move/hornetq-core/src/main/java/org/hornetq/api/core/management/ObjectNameBuilder.java
===================================================================
--- branches/maven-move/src/main/org/hornetq/api/core/management/ObjectNameBuilder.java	2010-07-08 15:05:36 UTC (rev 9385)
+++ branches/maven-move/hornetq-core/src/main/java/org/hornetq/api/core/management/ObjectNameBuilder.java	2010-07-09 03:10:45 UTC (rev 9386)
@@ -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;
 
 /**

Copied: branches/maven-move/hornetq-core/src/main/java/org/hornetq/core (from rev 9385, branches/maven-move/src/main/org/hornetq/core)

Deleted: branches/maven-move/hornetq-core/src/main/java/org/hornetq/core/filter/impl/FilterParser.jj
===================================================================
--- branches/maven-move/src/main/org/hornetq/core/filter/impl/FilterParser.jj	2010-07-08 15:05:36 UTC (rev 9385)
+++ branches/maven-move/hornetq-core/src/main/java/org/hornetq/core/filter/impl/FilterParser.jj	2010-07-09 03:10:45 UTC (rev 9386)
@@ -1,646 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005-2008, Red Hat Middleware LLC, and individual contributors
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */ 
-
-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 at jboss.org
- * @author adrian at 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;
-   }
-}

Copied: branches/maven-move/hornetq-core/src/main/java/org/hornetq/spi (from rev 9385, branches/maven-move/src/main/org/hornetq/spi)

Copied: branches/maven-move/hornetq-core/src/main/java/org/hornetq/utils (from rev 9385, branches/maven-move/src/main/org/hornetq/utils)

Copied: branches/maven-move/hornetq-core/src/main/javacc/FilterParser.jj (from rev 9385, branches/maven-move/src/main/org/hornetq/core/filter/impl/FilterParser.jj)
===================================================================
--- branches/maven-move/hornetq-core/src/main/javacc/FilterParser.jj	                        (rev 0)
+++ branches/maven-move/hornetq-core/src/main/javacc/FilterParser.jj	2010-07-09 03:10:45 UTC (rev 9386)
@@ -0,0 +1,646 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005-2008, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */ 
+
+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 at jboss.org
+ * @author adrian at 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;
+   }
+}

Copied: branches/maven-move/hornetq-core/src/main/resources/hornetq-version.properties (from rev 9385, branches/maven-move/src/config/common/hornetq-version.properties)
===================================================================
--- branches/maven-move/hornetq-core/src/main/resources/hornetq-version.properties	                        (rev 0)
+++ branches/maven-move/hornetq-core/src/main/resources/hornetq-version.properties	2010-07-09 03:10:45 UTC (rev 9386)
@@ -0,0 +1,8 @@
+hornetq.version.versionName=${hornetq.version.versionName}
+hornetq.version.majorVersion=${hornetq.version.majorVersion}
+hornetq.version.minorVersion=${hornetq.version.minorVersion}
+hornetq.version.microVersion=${hornetq.version.microVersion}
+hornetq.version.incrementingVersion=${hornetq.version.incrementingVersion}
+hornetq.version.versionSuffix=${hornetq.version.versionSuffix}
+hornetq.version.versionTag=${hornetq.version.versionTag}
+hornetq.netty.version=${netty.version}

Copied: branches/maven-move/hornetq-core/src/main/resources/schema/hornetq-configuration.xsd (from rev 9385, branches/maven-move/src/config/common/schema/hornetq-configuration.xsd)
===================================================================
--- branches/maven-move/hornetq-core/src/main/resources/schema/hornetq-configuration.xsd	                        (rev 0)
+++ branches/maven-move/hornetq-core/src/main/resources/schema/hornetq-configuration.xsd	2010-07-09 03:10:45 UTC (rev 9386)
@@ -0,0 +1,525 @@
+<?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" 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="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="backup-connector-ref" type="backup-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="connector-ref" type="connector-refType">
+	</xsd:element>
+
+	<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" ref="connector-ref">
+				</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="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: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:complexType name="connector-refType">
+		<xsd:attribute name="connector-name" type="xsd:IDREF" use="required">
+		</xsd:attribute>
+		<xsd:attribute name="backup-connector-name" type="xsd:IDREF" use="optional">
+		</xsd:attribute>
+	</xsd:complexType>
+
+	<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="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="connector-ref" type="connector-refType">
+				</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="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="unbounded" minOccurs="1" name="connector-ref" type="connector-refType">
+				</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="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="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="backup-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>

Copied: branches/maven-move/hornetq-core/src/main/resources/schema/hornetq-users.xsd (from rev 9385, branches/maven-move/src/config/common/schema/hornetq-users.xsd)
===================================================================
--- branches/maven-move/hornetq-core/src/main/resources/schema/hornetq-users.xsd	                        (rev 0)
+++ branches/maven-move/hornetq-core/src/main/resources/schema/hornetq-users.xsd	2010-07-09 03:10:45 UTC (rev 9386)
@@ -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: branches/maven-move/hornetq-core-client/pom.xml
===================================================================
--- branches/maven-move/hornetq-core-client/pom.xml	                        (rev 0)
+++ branches/maven-move/hornetq-core-client/pom.xml	2010-07-09 03:10:45 UTC (rev 9386)
@@ -0,0 +1,94 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.hornetq</groupId>
+        <artifactId>hornetq-pom</artifactId>
+        <version>2.1.2-SNAPSHOT</version>
+    </parent>
+
+    <groupId>org.hornetq</groupId>
+    <artifactId>hornetq-core-client</artifactId>
+    <packaging>jar</packaging>
+    <name>HornetQ Core Client</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.hornetq</groupId>
+            <artifactId>hornetq-core</artifactId>
+            <version>${project.version}</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>
+
+                                        <!-- required by SessionSendMessage -->
+                                        <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>

Added: branches/maven-move/hornetq-jboss-as-integration/hornetq-jboss-as-integration.iml
===================================================================
--- branches/maven-move/hornetq-jboss-as-integration/hornetq-jboss-as-integration.iml	                        (rev 0)
+++ branches/maven-move/hornetq-jboss-as-integration/hornetq-jboss-as-integration.iml	2010-07-09 03:10:45 UTC (rev 9386)
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_5" inherit-compiler-output="false">
+    <output url="file://$MODULE_DIR$/target/classes" />
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <excludeFolder url="file://$MODULE_DIR$/target" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="hornetq-core" exported="" />
+    <orderEntry type="library" exported="" name="Maven: org.jboss.netty:netty:3.2.0.Final" level="project" />
+    <orderEntry type="library" exported="" name="Maven: org.jboss.security:jboss-security-spi:2.0.3.SP1" level="project" />
+    <orderEntry type="library" exported="" name="Maven: org.jboss.security:jbosssx:2.0.3.SP1" level="project" />
+    <orderEntry type="library" exported="" name="Maven: org.jboss.javaee:jboss-transaction-api:1.0.1.GA" level="project" />
+    <orderEntry type="library" exported="" name="Maven: org.jboss.integration:jboss-transaction-spi:5.1.0.GA" level="project" />
+    <orderEntry type="library" exported="" name="Maven: org.jboss.logging:jboss-logging-spi:2.1.0.GA" level="project" />
+    <orderEntry type="library" exported="" name="Maven: org.jboss.javaee:jboss-jca-api:1.5.0.GA" level="project" />
+    <orderEntry type="library" exported="" name="Maven: org.jboss:jboss-common-core:2.2.14.GA" level="project" />
+    <orderEntry type="library" exported="" name="Maven: jboss.jbossts:jbossjts:4.6.1.GA" level="project" />
+  </component>
+</module>
+

Added: branches/maven-move/hornetq-jboss-as-integration/pom.xml
===================================================================
--- branches/maven-move/hornetq-jboss-as-integration/pom.xml	                        (rev 0)
+++ branches/maven-move/hornetq-jboss-as-integration/pom.xml	2010-07-09 03:10:45 UTC (rev 9386)
@@ -0,0 +1,63 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.hornetq</groupId>
+        <artifactId>hornetq-pom</artifactId>
+        <version>2.1.2-SNAPSHOT</version>
+    </parent>
+
+    <groupId>org.hornetq</groupId>
+    <artifactId>hornetq-jboss-as-integration</artifactId>
+    <packaging>jar</packaging>
+    <name>HornetQ JBoss AS Integration</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.hornetq</groupId>
+            <artifactId>hornetq-core</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.security</groupId>
+            <artifactId>jboss-security-spi</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.security</groupId>
+            <artifactId>jbosssx</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.javaee</groupId>
+            <artifactId>jboss-transaction-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.integration</groupId>
+            <artifactId>jboss-transaction-spi</artifactId>
+        </dependency>
+        <!--this for xa recovery-->
+        <dependency>
+            <groupId>jboss.jbossts</groupId>
+            <artifactId>jbossjts</artifactId>
+        </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>

Copied: branches/maven-move/hornetq-jboss-as-integration/src/main/java/org/hornetq/integration/jboss (from rev 9385, branches/maven-move/src/main/org/hornetq/integration/jboss)

Added: branches/maven-move/hornetq-jms/pom.xml
===================================================================
--- branches/maven-move/hornetq-jms/pom.xml	                        (rev 0)
+++ branches/maven-move/hornetq-jms/pom.xml	2010-07-09 03:10:45 UTC (rev 9386)
@@ -0,0 +1,54 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.hornetq</groupId>
+        <artifactId>hornetq-pom</artifactId>
+        <version>2.1.2-SNAPSHOT</version>
+    </parent>
+
+    <groupId>org.hornetq</groupId>
+    <artifactId>hornetq-jms</artifactId>
+    <packaging>jar</packaging>
+    <name>HornetQ JMS</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.hornetq</groupId>
+            <artifactId>hornetq-core</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.javaee</groupId>
+            <artifactId>jboss-jms-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.javaee</groupId>
+            <artifactId>jboss-transaction-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>jboss.jbossts</groupId>
+            <artifactId>jbossjts</artifactId>
+        </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>

Copied: branches/maven-move/hornetq-jms/src/main/java/org/hornetq/api/jms (from rev 9385, branches/maven-move/src/main/org/hornetq/api/jms)

Copied: branches/maven-move/hornetq-jms/src/main/java/org/hornetq/jms (from rev 9385, branches/maven-move/src/main/org/hornetq/jms)

Copied: branches/maven-move/hornetq-jms/src/main/resources/schema/hornetq-jms.xsd (from rev 9385, branches/maven-move/src/config/common/schema/hornetq-jms.xsd)
===================================================================
--- branches/maven-move/hornetq-jms/src/main/resources/schema/hornetq-jms.xsd	                        (rev 0)
+++ branches/maven-move/hornetq-jms/src/main/resources/schema/hornetq-jms.xsd	2010-07-09 03:10:45 UTC (rev 9386)
@@ -0,0 +1,177 @@
+<?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="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="connection-factory">
+   	<xsd:complexType>
+   		<xsd:all>
+           	<xsd:element name="discovery-group-ref" type="discovery-group-refType" maxOccurs="1" minOccurs="0"></xsd:element>
+           	<xsd:element name="discovery-initial-wait-timeout" type="xsd:long" 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="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:all>
+   		<xsd:attribute name="name" 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:attribute name="backup-connector-name" type="xsd:string" use="optional"></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: branches/maven-move/hornetq-jms-client/pom.xml
===================================================================
--- branches/maven-move/hornetq-jms-client/pom.xml	                        (rev 0)
+++ branches/maven-move/hornetq-jms-client/pom.xml	2010-07-09 03:10:45 UTC (rev 9386)
@@ -0,0 +1,73 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.hornetq</groupId>
+        <artifactId>hornetq-pom</artifactId>
+        <version>2.1.2-SNAPSHOT</version>
+    </parent>
+
+    <groupId>org.hornetq</groupId>
+    <artifactId>hornetq-jms-client</artifactId>
+    <packaging>jar</packaging>
+    <name>HornetQ JMS Client</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.hornetq</groupId>
+            <artifactId>hornetq-jms</artifactId>
+            <version>${project.version}</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>

Added: branches/maven-move/hornetq-logging/pom.xml
===================================================================
--- branches/maven-move/hornetq-logging/pom.xml	                        (rev 0)
+++ branches/maven-move/hornetq-logging/pom.xml	2010-07-09 03:10:45 UTC (rev 9386)
@@ -0,0 +1,40 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.hornetq</groupId>
+        <artifactId>hornetq-pom</artifactId>
+        <version>2.1.2-SNAPSHOT</version>
+    </parent>
+
+    <groupId>org.hornetq</groupId>
+    <artifactId>hornetq-logging</artifactId>
+    <packaging>jar</packaging>
+    <name>HornetQ Logging</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.hornetq</groupId>
+            <artifactId>hornetq-core</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>log4j</groupId>
+            <artifactId>log4j</artifactId>
+        </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>

Copied: branches/maven-move/hornetq-logging/src/main/java/org/hornetq/integration/logging (from rev 9385, branches/maven-move/src/main/org/hornetq/integration/logging)

Added: branches/maven-move/hornetq-rar/hornetq-ra-jar/pom.xml
===================================================================
--- branches/maven-move/hornetq-rar/hornetq-ra-jar/pom.xml	                        (rev 0)
+++ branches/maven-move/hornetq-rar/hornetq-ra-jar/pom.xml	2010-07-09 03:10:45 UTC (rev 9386)
@@ -0,0 +1,54 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.hornetq</groupId>
+        <artifactId>hornetq-pom</artifactId>
+        <version>2.1.2-SNAPSHOT</version>
+    </parent>
+
+    <groupId>org.hornetq</groupId>
+    <artifactId>hornetq-ra</artifactId>
+    <packaging>jar</packaging>
+    <name>HornetQ RAR JAR</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.hornetq</groupId>
+            <artifactId>hornetq-core</artifactId>
+            <version>${project.version}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.hornetq</groupId>
+            <artifactId>hornetq-jms</artifactId>
+            <version>${project.version}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.javaee</groupId>
+            <artifactId>jboss-jca-api</artifactId>
+            <scope>provided</scope>
+        </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>

Copied: branches/maven-move/hornetq-rar/hornetq-ra-jar/src/main/java/org/hornetq/ra (from rev 9385, branches/maven-move/src/main/org/hornetq/ra)

Added: branches/maven-move/hornetq-rar/hornetq-ra-rar/pom.xml
===================================================================
--- branches/maven-move/hornetq-rar/hornetq-ra-rar/pom.xml	                        (rev 0)
+++ branches/maven-move/hornetq-rar/hornetq-ra-rar/pom.xml	2010-07-09 03:10:45 UTC (rev 9386)
@@ -0,0 +1,79 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.hornetq</groupId>
+        <artifactId>hornetq-pom</artifactId>
+        <version>2.1.2-SNAPSHOT</version>
+    </parent>
+
+    <groupId>org.hornetq</groupId>
+    <artifactId>hornetq-rar</artifactId>
+    <packaging>rar</packaging>
+    <name>HornetQ JMS Client</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.hornetq</groupId>
+            <artifactId>hornetq-jms</artifactId>
+            <version>${project.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.hornetq</groupId>
+                    <artifactId>hornetq-core</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.jboss.javaee</groupId>
+                    <artifactId>jboss-jms-api</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.jboss.javaee</groupId>
+                    <artifactId>jboss-transaction-api</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>jboss.jbossts</groupId>
+                    <artifactId>jbossjts</artifactId>
+                </exclusion>
+
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.hornetq</groupId>
+            <artifactId>hornetq-ra</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.hornetq</groupId>
+            <artifactId>hornetq-core-client</artifactId>
+            <version>${project.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.hornetq</groupId>
+                    <artifactId>hornetq-core</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+              <groupId>org.apache.maven.plugins</groupId>
+              <artifactId>maven-rar-plugin</artifactId>
+                <configuration>
+                   <raXmlFile>src/main/resources/ra.xml</raXmlFile>
+                </configuration>
+            </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: branches/maven-move/hornetq-rar/hornetq-ra-rar/src/main/resources/ra.xml (from rev 9385, branches/maven-move/src/config/ra.xml)
===================================================================
--- branches/maven-move/hornetq-rar/hornetq-ra-rar/src/main/resources/ra.xml	                        (rev 0)
+++ branches/maven-move/hornetq-rar/hornetq-ra-rar/src/main/resources/ra.xml	2010-07-09 03:10:45 UTC (rev 9386)
@@ -0,0 +1,280 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- $Id: ra.xml 76819 2008-08-08 11:04:20Z jesper.pedersen $ -->
+
+<connector xmlns="http://java.sun.com/xml/ns/j2ee"
+           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+           xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
+           http://java.sun.com/xml/ns/j2ee/connector_1_5.xsd"
+           version="1.5">
+
+   <description>HornetQ 2.0 Resource Adapter</description>
+   <display-name>HornetQ 2.0 Resource Adapter</display-name>
+
+   <vendor-name>Red Hat Middleware LLC</vendor-name>
+   <eis-type>JMS 1.1 Server</eis-type>
+   <resourceadapter-version>1.0</resourceadapter-version>
+
+   <license>
+      <description>
+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.  
+      </description>
+      <license-required>true</license-required>
+   </license>
+
+   <resourceadapter>
+      <resourceadapter-class>org.hornetq.ra.HornetQResourceAdapter</resourceadapter-class>
+      <config-property>
+         <description>The transport type</description>
+         <config-property-name>ConnectorClassName</config-property-name>
+         <config-property-type>java.lang.String</config-property-type>
+         <config-property-value>org.hornetq.core.remoting.impl.invm.InVMConnectorFactory</config-property-value>
+      </config-property>
+      <config-property>
+         <description>The transport configuration. These values must be in the form of key=val;key=val;</description>
+         <config-property-name>ConnectionParameters</config-property-name>
+         <config-property-type>java.lang.String</config-property-type>
+         <config-property-value>server-id=0</config-property-value>
+      </config-property>
+      <!--
+      <config-property>
+        <description>The method to use for locating the transactionmanager</description>
+        <config-property-name>TransactionManagerLocatorMethod</config-property-name>
+        <config-property-type>java.lang.String</config-property-type>
+        <config-property-value>getTm</config-property-value>
+      </config-property>
+      <config-property>
+        <description>Use A local Transaction instead of XA?</description>
+        <config-property-name>UseLocalTx</config-property-name>
+        <config-property-type>java.lang.Boolean</config-property-type>
+        <config-property-value>false</config-property-value>
+      </config-property>
+      <config-property>
+        <description>The user name used to login to the JMS server</description>
+        <config-property-name>UserName</config-property-name>
+        <config-property-type>java.lang.String</config-property-type>
+        <config-property-value></config-property-value>
+      </config-property>
+      <config-property>
+        <description>The password used to login to the JMS server</description>
+        <config-property-name>Password</config-property-name>
+        <config-property-type>java.lang.String</config-property-type>
+        <config-property-value></config-property-value>
+      </config-property>
+      <config-property>
+         <description>The Backup transport type</description>
+         <config-property-name>BackUpTransportType</config-property-name>
+         <config-property-type>java.lang.String</config-property-type>
+         <config-property-value></config-property-value>
+      </config-property>
+      <config-property>
+         <description>The Backup transport configuration. These values must be in the form of key=val;key=val;</description>
+         <config-property-name>TransportConfiguration</config-property-name>
+         <config-property-type>java.lang.String</config-property-type>
+         <config-property-value></config-property-value>
+      </config-property>
+      <config-property>
+        <description>The discovery group address</description>
+        <config-property-name>DiscoveryGroupAddress</config-property-name>
+        <config-property-type>java.lang.String</config-property-type>
+        <config-property-value></config-property-value>
+      </config-property>
+      <config-property>
+        <description>The discovery group port</description>
+        <config-property-name>DiscoveryGroupPort</config-property-name>
+        <config-property-type>java.lang.Integer</config-property-type>
+        <config-property-value></config-property-value>
+      </config-property>
+      <config-property>
+        <description>The discovery refresh timeout</description>
+        <config-property-name>DiscoveryRefreshTimeout</config-property-name>
+        <config-property-type>java.lang.Long</config-property-type>
+        <config-property-value></config-property-value>
+      </config-property>
+      <config-property>
+        <description>The discovery initial wait timeout</description>
+        <config-property-name>DiscoveryInitialWaitTimeout</config-property-name>
+        <config-property-type>java.lang.Long</config-property-type>
+        <config-property-value></config-property-value>
+      </config-property>
+      <config-property>
+        <description>The load balancing policy class name</description>
+        <config-property-name>LoadBalancingPolicyClassName</config-property-name>
+        <config-property-type>java.lang.String</config-property-type>
+        <config-property-value></config-property-value>
+      </config-property>
+      <config-property>
+        <description>The client failure check period</description>
+        <config-property-name>ClientFailureCheckPeriod</config-property-name>
+        <config-property-type>java.lang.Long</config-property-type>
+        <config-property-value></config-property-value>
+      </config-property>
+      <config-property>
+        <description>The connection TTL</description>
+        <config-property-name>ConnectionTTL</config-property-name>
+        <config-property-type>java.lang.Long</config-property-type>
+        <config-property-value></config-property-value>
+      </config-property>
+      <config-property>
+        <description>The call timeout</description>
+        <config-property-name>CallTimeout</config-property-name>
+        <config-property-type>java.lang.Long</config-property-type>
+        <config-property-value></config-property-value>
+      </config-property>
+      <config-property>
+        <description>The dups ok batch size</description>
+        <config-property-name>DupsOKBatchSize</config-property-name>
+        <config-property-type>java.lang.Integer</config-property-type>
+        <config-property-value></config-property-value>
+      </config-property>
+      <config-property>
+        <description>The transaction batch size</description>
+        <config-property-name>TransactionBatchSize</config-property-name>
+        <config-property-type>java.lang.Integer</config-property-type>
+        <config-property-value></config-property-value>
+      </config-property>
+      <config-property>
+        <description>The consumer window size</description>
+        <config-property-name>ConsumerWindowSize</config-property-name>
+        <config-property-type>java.lang.Integer</config-property-type>
+        <config-property-value></config-property-value>
+      </config-property>
+      <config-property>
+        <description>The consumer max rate</description>
+        <config-property-name>ConsumerMaxRate</config-property-name>
+        <config-property-type>java.lang.Integer</config-property-type>
+        <config-property-value></config-property-value>
+      </config-property>
+      <config-property>
+        <description>The confirmation window size</description>
+        <config-property-name>ConfirmationWindowSize</config-property-name>
+        <config-property-type>java.lang.Integer</config-property-type>
+        <config-property-value></config-property-value>
+      </config-property>
+      <config-property>
+        <description>The producer max rate</description>
+        <config-property-name>ProducerMaxRate</config-property-name>
+        <config-property-type>java.lang.Integer</config-property-type>
+        <config-property-value></config-property-value>
+      </config-property>
+      <config-property>
+        <description>The min large message size</description>
+        <config-property-name>MinLargeMessageSize</config-property-name>
+        <config-property-type>java.lang.Integer</config-property-type>
+        <config-property-value></config-property-value>
+      </config-property>
+      <config-property>
+        <description>The block on acknowledge</description>
+        <config-property-name>BlockOnAcknowledge</config-property-name>
+        <config-property-type>java.lang.Boolean</config-property-type>
+        <config-property-value></config-property-value>
+      </config-property>
+      <config-property>
+        <description>The block on non durable send</description>
+        <config-property-name>BlockOnNonDurableSend</config-property-name>
+        <config-property-type>java.lang.Boolean</config-property-type>
+        <config-property-value></config-property-value>
+      </config-property>
+      <config-property>
+        <description>The block on durable send</description>
+        <config-property-name>BlockOnDurableSend</config-property-name>
+        <config-property-type>java.lang.Boolean</config-property-type>
+        <config-property-value></config-property-value>
+      </config-property>
+      <config-property>
+        <description>The auto group</description>
+        <config-property-name>AutoGroup</config-property-name>
+        <config-property-type>java.lang.Boolean</config-property-type>
+        <config-property-value></config-property-value>
+      </config-property>
+      <config-property>
+        <description>The max connections</description>        
+        <config-property-type>java.lang.Integer</config-property-type>
+        <config-property-value></config-property-value>
+      </config-property>
+      <config-property>
+        <description>The pre acknowledge</description>
+        <config-property-name>PreAcknowledge</config-property-name>
+        <config-property-type>java.lang.Boolean</config-property-type>
+        <config-property-value></config-property-value>
+      </config-property>
+      <config-property>
+        <description>The retry interval</description>
+        <config-property-name>RetryInterval</config-property-name>
+        <config-property-type>java.lang.Long</config-property-type>
+        <config-property-value></config-property-value>
+      </config-property>
+      <config-property>
+        <description>The retry interval multiplier</description>
+        <config-property-name>RetryIntervalMultiplier</config-property-name>
+        <config-property-type>java.lang.Double</config-property-type>
+        <config-property-value></config-property-value>
+      </config-property>
+      <config-property>
+        <description>Should clean server shutdown trigger failover?</description>
+        <config-property-name>FailoverOnServerShutdown</config-property-name>
+        <config-property-type>java.lang.Boolean</config-property-type>
+        <config-property-value></config-property-value>
+      </config-property>
+      <config-property>
+        <description>The client id</description>
+        <config-property-name>ClientID</config-property-name>
+        <config-property-type>java.lang.String</config-property-type>
+        <config-property-value></config-property-value>
+      </config-property>-->
+
+      <outbound-resourceadapter>
+         <connection-definition>
+            <managedconnectionfactory-class>org.hornetq.ra.HornetQRAManagedConnectionFactory</managedconnectionfactory-class>
+
+            <config-property>
+               <description>The default session type</description>
+               <config-property-name>SessionDefaultType</config-property-name>
+               <config-property-type>java.lang.String</config-property-type>
+               <config-property-value>javax.jms.Queue</config-property-value>
+            </config-property>
+            <config-property>
+               <description>Try to obtain a lock within specified number of seconds; less than or equal to 0 disable this functionality</description>
+               <config-property-name>UseTryLock</config-property-name>
+               <config-property-type>java.lang.Integer</config-property-type>
+               <config-property-value>0</config-property-value>
+            </config-property>
+
+            <connectionfactory-interface>org.hornetq.ra.HornetQRAConnectionFactory</connectionfactory-interface>
+            <connectionfactory-impl-class>org.hornetq.ra.HornetQRAConnectionFactoryImpl</connectionfactory-impl-class>
+            <connection-interface>javax.jms.Session</connection-interface>
+            <connection-impl-class>org.hornetq.ra.HornetQRASession</connection-impl-class>
+         </connection-definition>
+         <transaction-support>XATransaction</transaction-support>
+         <authentication-mechanism>
+            <authentication-mechanism-type>BasicPassword</authentication-mechanism-type>
+            <credential-interface>javax.resource.spi.security.PasswordCredential</credential-interface>
+         </authentication-mechanism>
+         <reauthentication-support>false</reauthentication-support>
+      </outbound-resourceadapter>
+
+      <inbound-resourceadapter>
+         <messageadapter>
+            <messagelistener>
+               <messagelistener-type>javax.jms.MessageListener</messagelistener-type>
+               <activationspec>
+                  <activationspec-class>org.hornetq.ra.inflow.HornetQActivationSpec</activationspec-class>
+                  <required-config-property>
+                      <config-property-name>destination</config-property-name>
+                  </required-config-property>
+               </activationspec>
+            </messagelistener>
+         </messageadapter>
+      </inbound-resourceadapter>
+
+   </resourceadapter>
+</connector>

Added: branches/maven-move/hornetq-rar/pom.xml
===================================================================
--- branches/maven-move/hornetq-rar/pom.xml	                        (rev 0)
+++ branches/maven-move/hornetq-rar/pom.xml	2010-07-09 03:10:45 UTC (rev 9386)
@@ -0,0 +1,30 @@
+<project>
+    <parent>
+       <groupId>org.hornetq</groupId>
+       <artifactId>hornetq-pom</artifactId>
+       <version>2.1.2-SNAPSHOT</version>
+    </parent>
+    <name>HornetQ RAR POM</name>
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>org.hornetq</groupId>
+    <artifactId>hornetq-rar-pom</artifactId>
+    <packaging>pom</packaging>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-deploy-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <modules>
+        <module>hornetq-ra-jar</module>
+        <module>hornetq-ra-rar</module>
+    </modules>
+</project>

Added: branches/maven-move/hornetq-service-sar/pom.xml
===================================================================
--- branches/maven-move/hornetq-service-sar/pom.xml	                        (rev 0)
+++ branches/maven-move/hornetq-service-sar/pom.xml	2010-07-09 03:10:45 UTC (rev 9386)
@@ -0,0 +1,60 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.hornetq</groupId>
+        <artifactId>hornetq-pom</artifactId>
+        <version>2.1.2-SNAPSHOT</version>
+    </parent>
+
+    <groupId>org.hornetq</groupId>
+    <artifactId>hornetq-service-sar</artifactId>
+    <packaging>jar</packaging>
+    <name>HornetQ JBoss AS Integration</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.hornetq</groupId>
+            <artifactId>hornetq-core</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.hornetq</groupId>
+            <artifactId>hornetq-jms</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.hornetq</groupId>
+            <artifactId>hornetq-jboss-as-integration</artifactId>
+            <version>${project.version}</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>
+                  <finalName>hornetq-service</finalName>
+              </configuration>
+            </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: branches/maven-move/hornetq-service-sar/src/main/java/org/hornetq/service (from rev 9385, branches/maven-move/src/main/org/hornetq/service)

Added: branches/maven-move/hornetq-twitter-integration/pom.xml
===================================================================
--- branches/maven-move/hornetq-twitter-integration/pom.xml	                        (rev 0)
+++ branches/maven-move/hornetq-twitter-integration/pom.xml	2010-07-09 03:10:45 UTC (rev 9386)
@@ -0,0 +1,40 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.hornetq</groupId>
+        <artifactId>hornetq-pom</artifactId>
+        <version>2.1.2-SNAPSHOT</version>
+    </parent>
+
+    <groupId>org.hornetq</groupId>
+    <artifactId>hornetq-twittter-integration</artifactId>
+    <packaging>jar</packaging>
+    <name>HornetQ Twitter Integration</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.hornetq</groupId>
+            <artifactId>hornetq-core</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.twitter4j</groupId>
+            <artifactId>twitter4j-core</artifactId>
+        </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>

Copied: branches/maven-move/hornetq-twitter-integration/src/main/java/org/hornetq/integration/twitter (from rev 9385, branches/maven-move/src/main/org/hornetq/integration/twitter)

Modified: branches/maven-move/pom.xml
===================================================================
--- branches/maven-move/pom.xml	2010-07-08 15:05:36 UTC (rev 9385)
+++ branches/maven-move/pom.xml	2010-07-09 03:10:45 UTC (rev 9386)
@@ -1,339 +1,470 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright 2009 Red Hat, Inc.
- Red Hat licenses this file to you under the Apache License, version
- 2.0 (the "License"); you may not use this file except in compliance
- with the License.  You may obtain a copy of the License at
-   http://www.apache.org/licenses/LICENSE-2.0
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied.  See the License for the specific language governing
- permissions and limitations under the License.  
-  -->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<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-pom</artifactId>
+    <packaging>pom</packaging>
+    <version>2.1.2-SNAPSHOT</version>
 
-   <modelVersion>4.0.0</modelVersion>
-   <groupId>org.hornetq</groupId>
-   <artifactId>messaging</artifactId>
-   <packaging>pom</packaging>
-   <version>2.1.1.Final</version>
+    <name>HornetQ</name>
+    <url>http://hornetq.org</url>
+    <description>
+        Putting the buzz in messaging
+    </description>
 
-   <name>HornetQ</name>
-   <url>http://hornetq.org</url>
-   <description>
-      Putting the buzz in messaging
-   </description>
+    <organization>
+        <name>JBoss, a division of Red Hat</name>
+        <url>http://www.jboss.org/</url>
+    </organization>
 
-   <organization>
-      <name>JBoss, a division of Red Hat</name>
-      <url>http://www.jboss.org/</url>
-   </organization>
+    <licenses>
+        <license>
+            <name>ASL 2.0</name>
+            <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+            <distribution>repo</distribution>
+        </license>
+    </licenses>
 
-   <scm>
-      <connection>scm:svn:http://anonsvn.jboss.org/repos/messaging/trunk</connection>
-      <developerConnection>scm:svn:https://svn.jboss.org/repos/messaging/trunk</developerConnection>
-   </scm>
-   <build>
+    <properties>
+        <netty.version>3.2.0.Final</netty.version>
+        <hornetq.version.versionName>Stripey</hornetq.version.versionName>
+        <hornetq.version.majorVersion>2</hornetq.version.majorVersion>
+        <hornetq.version.minorVersion>1</hornetq.version.minorVersion>
+        <hornetq.version.microVersion>2</hornetq.version.microVersion>
+        <hornetq.version.incrementingVersion>1</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>
 
-      <plugins>
-         <plugin>
-            <groupId>org.jboss.maven.plugins</groupId>
-            <artifactId>maven-buildmagic-thirdparty-plugin</artifactId>
-            <executions>
-               <execution>
-                  <id>build-thirdparty</id>
-                  <phase>initialize</phase>
-                  <goals>
-                     <goal>build-thirdparty</goal>
-                  </goals>
-                  <configuration>
-                     <outputDirectory>thirdparty</outputDirectory>
-                     <librariesEnt>thirdparty/libraries.ent</librariesEnt>
-                     <includedScopes>
-                        <scope>compile</scope>
-                     </includedScopes>
-                  </configuration>
-               </execution>
-            </executions>
-            <configuration>
-               <!--without this dummy entry we get a npe, just ignore-->
-               <mappedDependencies>
-                  <dependency>
-                     <groupId>id</groupId>
-                     <artifactId>art-id</artifactId>
-                     <mapping>
-                        <artifactId>1.0.0</artifactId>
-                     </mapping>
-                  </dependency>
-               </mappedDependencies>
-            </configuration>
-         </plugin>
-         <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-antrun-plugin</artifactId>
-            <version>1.3</version>
-            <executions>
-               <execution>
-                  <id>clean</id>
-                  <phase>pre-clean</phase>
-                  <configuration>
-                     <tasks name="distro"/>
-                  </configuration>
-                  <goals>
-                     <goal>run</goal>
-                  </goals>
-               </execution>
-               <execution>
-                  <id>distro</id>
-                  <phase>package</phase>
-                  <configuration>
-                     <tasks>
-                        <property name="maven.build"  value="true"/>
-                        <ant target="distro"/>
-                     </tasks>
-                  </configuration>
-                  <goals>
-                     <goal>run</goal>
-                  </goals>
-               </execution>
-            </executions>
-            <dependencies>
-               <dependency>
-                  <groupId>org.apache.ant</groupId>
-                  <artifactId>ant</artifactId>
-                  <version>1.7.1</version>
-               </dependency>
-               <dependency>
-                  <groupId>org.apache.ant</groupId>
-                  <artifactId>ant-launcher</artifactId>
-                  <version>1.7.1</version>
-               </dependency>
-                <dependency>
-                  <groupId>org.apache.ant</groupId>
-                  <artifactId>ant-nodeps</artifactId>
-                  <version>1.7.1</version>
-               </dependency>
-               <dependency>
-                  <groupId>ant-contrib</groupId>
-                  <artifactId>ant-contrib</artifactId>
-                  <version>1.0b3</version>
-                  <exclusions>
-                     <exclusion>
-                        <groupId>ant</groupId>
-                        <artifactId>ant</artifactId>
-                     </exclusion>
-                  </exclusions>
-               </dependency>
-               <dependency>
-                  <groupId>sun.jdk</groupId>
-                  <artifactId>tools</artifactId>
-                  <version>1.5</version>
-                  <scope>system</scope>
-                  <systemPath>${java.home}/../lib/tools.jar</systemPath>
-               </dependency>
-               <dependency>
-                 <groupId>net.java.dev.javacc</groupId>
-                 <artifactId>javacc</artifactId>
-                 <version>4.0</version>
-               </dependency>
-               <dependency>
-                 <groupId>apache-xerces</groupId>
-                 <artifactId>xercesImpl</artifactId>
-                 <version>2.9.1</version>
-               </dependency>
-               <dependency>
-                 <groupId>apache-xerces</groupId>
-                 <artifactId>resolver</artifactId>
-                 <version>2.9.1</version>
-               </dependency>
-               <dependency>
-                 <groupId>apache-xerces</groupId>
-                 <artifactId>xml-apis</artifactId>
-                 <version>2.9.1</version>
-               </dependency>
-            </dependencies>
-         </plugin>
+    <scm>
+        <connection>scm:svn:http://anonsvn.jboss.org/repos/hornetq/trunk</connection>
+        <developerConnection>scm:svn:https://svn.jboss.org/repos/hornetq/trunk</developerConnection>
+    </scm>
 
-      </plugins>
+    <distributionManagement>
+        <repository>
+            <id>jboss-releases-repository</id>
+            <name>JBoss Releases Repository</name>
+            <url>https://repository.jboss.org/nexus/service/local/staging/deploy/maven2/</url>
+        </repository>
+    </distributionManagement>
 
-   </build>
-   <dependencies>
-      <!--needed for the filters-->
-      <dependency>
-        <groupId>net.java.dev.javacc</groupId>
-        <artifactId>javacc</artifactId>
-        <version>4.0</version>
-      </dependency>
-      <!-- needed to compile JMS-->
-      <dependency>
-        <groupId>org.jboss.javaee</groupId>
-        <artifactId>jboss-jms-api</artifactId>
-        <version>1.1.0.GA</version>
-      </dependency>
-      <!-- needed to compile JavaEE examples-->
-      <dependency>
-        <groupId>org.jboss.javaee</groupId>
-        <artifactId>jboss-ejb-api</artifactId>
-        <version>3.0.0.GA</version>
-      </dependency>
-      <dependency>
-        <groupId>org.jboss.javaee</groupId>
-        <artifactId>jboss-transaction-api</artifactId>
-        <version>1.0.1.GA</version>
-      </dependency>
-      <!--this specifically for the JMS Bridge-->
-      <dependency>
-        <groupId>org.jboss.integration</groupId>
-        <artifactId>jboss-transaction-spi</artifactId>
-        <version>5.1.0.GA</version>
-      </dependency>
-      <!--this for xa recovery-->
-      <dependency>
-        <groupId>jboss.jbossts</groupId>
-        <artifactId>jbossjts</artifactId>
-        <version>4.6.1.GA</version>
-      </dependency>
-      <!--needed to compile security-->
-      <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>
-      <!--needed to compile the bootstrap jar-->
-      <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>
-      <!--needed to compile transport jar-->
-      <dependency>
-         <groupId>org.jboss.netty</groupId>
-         <artifactId>netty</artifactId>
-         <version>3.2.0.Final</version>
-      </dependency>
-      <!--needed to compile the logging jar-->
-      <dependency>
-         <groupId>log4j</groupId>
-         <artifactId>log4j</artifactId>
-         <version>1.2.14</version>
-      </dependency>
-      <dependency>
-         <groupId>org.jboss.logging</groupId>
-         <artifactId>jboss-logging-spi</artifactId>
-         <version>2.1.0.GA</version>
-      </dependency>
-      <!--needed to compile twitter support-->
-      <dependency>
-         <groupId>org.twitter4j</groupId>
-           <artifactId>twitter4j-core</artifactId>
-           <version>2.1.2</version>
-       </dependency>
-      <!-- needed to compile the tests-->
-      <dependency>
-        <groupId>junit</groupId>
-        <artifactId>junit</artifactId>
-        <version>3.8.2</version>
-      </dependency>
-      <!--needed to compile the jms tests-->
-      <dependency>
-        <groupId>org.jboss.javaee</groupId>
-        <artifactId>jboss-jaspi-api</artifactId>
-        <version>1.0.0.GA</version>
-      </dependency>
+    <issueManagement>
+        <system>JIRA</system>
+        <url>http://jira.jboss.com/jira/browse/HORNETQ</url>
+    </issueManagement>
 
-      <!--needed to run the jms tests-->
-      <dependency>
-        <groupId>org.jboss.naming</groupId>
-        <artifactId>jnpserver</artifactId>
-        <version>5.0.3.GA</version>
-      </dependency>
-      <dependency>
-        <groupId>jboss.jbossts</groupId>
-        <artifactId>jbossts-common</artifactId>
-        <version>4.6.1.GA</version>
-      </dependency>
-      <dependency>
-        <groupId>apache-logging</groupId>
-        <artifactId>commons-logging</artifactId>
-        <version>1.1.0.jboss</version>
-      </dependency>
-      
-      <!-- needed for javaee examples-->
-      <dependency>
-        <groupId>org.jboss.ejb3</groupId>
-        <artifactId>jboss-ejb3-ext-api</artifactId>
-        <version>1.0.0</version>
-      </dependency>
-      
-     <!-- needed for javadoc graphics-->
-      <dependency>
-        <groupId>org.jboss.apiviz</groupId>
-        <artifactId>apiviz</artifactId>
-        <version>1.3.0.GA</version>
-      </dependency>
-   </dependencies>
+    <developers>
+        <developer>
+            <id>timfox</id>
+            <name>Tim Fox</name>
+            <email>tim.fox at redhat.com</email>
+            <url>http://hornetq.com</url>
+            <roles>
+                <role>project-owner</role>
+            </roles>
+            <timezone>0</timezone>
+        </developer>
+    </developers>
 
+    <contributors>
+        <contributor>
+            <name>Jeff Mesnil</name>
+        </contributor>
+        <contributor>
+            <name>Clebert Suconic</name>
+        </contributor>
+        <contributor>
+            <name>Andy Taylor</name>
+        </contributor>
+    </contributors>
 
-   <repositories>
-      <repository>
-         <snapshots>
-            <enabled>false</enabled>
-            <updatePolicy>never</updatePolicy>
-         </snapshots>
-         <releases>
-            <enabled>true</enabled>
-            <updatePolicy>interval:10080</updatePolicy>
-         </releases>
-         <id>jboss.release</id>
-         <name>JBoss releases</name>
-         <url>https://repository.jboss.org/nexus/content/groups/public/</url>
-      </repository>
-   </repositories>
+    <modules>
+        <module>hornetq-core</module>
+        <module>hornetq-core-client</module>
+        <module>hornetq-jms</module>
+        <module>hornetq-jms-client</module>
+        <module>hornetq-rar</module>
+        <module>hornetq-logging</module>
+        <module>hornetq-bootstrap</module>
+        <module>hornetq-jboss-as-integration</module>
+        <module>hornetq-twitter-integration</module>
+        <module>hornetq-service-sar</module>
+    </modules>
 
-   <pluginRepositories>
-      <pluginRepository>
-         <snapshots>
-            <enabled>false</enabled>
-            <updatePolicy>never</updatePolicy>
-         </snapshots>
-         <releases>
-            <enabled>true</enabled>
-            <updatePolicy>interval:10080</updatePolicy>
-         </releases>
-         <id>jboss.release</id>
-         <name>JBoss releases</name>
-         <url>https://repository.jboss.org/nexus/content/groups/public</url>
-      </pluginRepository>
-   </pluginRepositories>                     
-   <!--<profiles>
-      --><!-- This profile is used by the ant/buildmagic build --><!--
-      <profile>
-         <id>integrated-build</id>
-         <activation>
-            <property>
-               <name>integrated-build</name>
-            </property>
-         </activation>
-         <modules>
-            <module>thirdparty</module>
-         </modules>
-      </profile>
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>net.java.dev.javacc</groupId>
+                <artifactId>javacc</artifactId>
+                <version>4.0</version>
+            </dependency>
+            <!-- needed to compile JMS-->
+            <dependency>
+                <groupId>org.jboss.javaee</groupId>
+                <artifactId>jboss-jms-api</artifactId>
+                <version>1.1.0.GA</version>
+            </dependency>
+            <!-- needed to compile JavaEE examples-->
+            <dependency>
+                <groupId>org.jboss.javaee</groupId>
+                <artifactId>jboss-ejb-api</artifactId>
+                <version>3.0.0.GA</version>
+            </dependency>
+            <dependency>
+                <groupId>org.jboss.javaee</groupId>
+                <artifactId>jboss-transaction-api</artifactId>
+                <version>1.0.1.GA</version>
+            </dependency>
+            <!--this specifically for the JMS Bridge-->
+            <dependency>
+                <groupId>org.jboss.integration</groupId>
+                <artifactId>jboss-transaction-spi</artifactId>
+                <version>5.1.0.GA</version>
+            </dependency>
+            <!--this for xa recovery-->
+            <dependency>
+                <groupId>jboss.jbossts</groupId>
+                <artifactId>jbossjts</artifactId>
+                <version>4.6.1.GA</version>
+            </dependency>
+            <!--needed to compile security-->
+            <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>
+            <!--needed to compile the bootstrap jar-->
+            <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>
+            <!--needed to compile transport jar-->
+            <dependency>
+                <groupId>org.jboss.netty</groupId>
+                <artifactId>netty</artifactId>
+                <version>${netty.version}</version>
+            </dependency>
+            <!--needed to compile the logging jar-->
+            <dependency>
+                <groupId>log4j</groupId>
+                <artifactId>log4j</artifactId>
+                <version>1.2.14</version>
+            </dependency>
+            <dependency>
+                <groupId>org.jboss.logging</groupId>
+                <artifactId>jboss-logging-spi</artifactId>
+                <version>2.1.0.GA</version>
+            </dependency>
+            <!--needed to compile twitter support-->
+            <dependency>
+                <groupId>org.twitter4j</groupId>
+                <artifactId>twitter4j-core</artifactId>
+                <version>2.1.2</version>
+            </dependency>
+            <!-- needed to compile the tests-->
+            <dependency>
+                <groupId>junit</groupId>
+                <artifactId>junit</artifactId>
+                <version>3.8.2</version>
+            </dependency>
+            <!--needed to compile the jms tests-->
+            <dependency>
+                <groupId>org.jboss.javaee</groupId>
+                <artifactId>jboss-jaspi-api</artifactId>
+                <version>1.0.0.GA</version>
+            </dependency>
 
-   </profiles>-->
+            <!--needed to run the jms tests-->
+            <dependency>
+                <groupId>org.jboss.naming</groupId>
+                <artifactId>jnpserver</artifactId>
+                <version>5.0.3.GA</version>
+            </dependency>
+            <dependency>
+                <groupId>jboss.jbossts</groupId>
+                <artifactId>jbossts-common</artifactId>
+                <version>4.6.1.GA</version>
+            </dependency>
+            <dependency>
+                <groupId>apache-logging</groupId>
+                <artifactId>commons-logging</artifactId>
+                <version>1.1.0.jboss</version>
+            </dependency>
 
+            <!-- needed for javaee examples-->
+            <dependency>
+                <groupId>org.jboss.ejb3</groupId>
+                <artifactId>jboss-ejb3-ext-api</artifactId>
+                <version>1.0.0</version>
+            </dependency>
 
+            <dependency>
+                <groupId>org.jboss.javaee</groupId>
+                <artifactId>jboss-jca-api</artifactId>
+                <version>1.5.0.GA</version>
+            </dependency>
+
+            <!-- needed for javadoc graphics-->
+            <dependency>
+                <groupId>org.jboss.apiviz</groupId>
+                <artifactId>apiviz</artifactId>
+                <version>1.3.0.GA</version>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
+    <repositories>
+        <repository>
+            <snapshots>
+                <enabled>false</enabled>
+                <updatePolicy>never</updatePolicy>
+            </snapshots>
+            <releases>
+                <enabled>true</enabled>
+                <updatePolicy>interval:10080</updatePolicy>
+            </releases>
+            <id>jboss.release</id>
+            <name>JBoss releases</name>
+            <url>https://repository.jboss.org/nexus/content/groups/public/</url>
+        </repository>
+    </repositories>
+    <pluginRepositories>
+        <pluginRepository>
+            <snapshots>
+                <enabled>false</enabled>
+                <updatePolicy>never</updatePolicy>
+            </snapshots>
+            <releases>
+                <enabled>true</enabled>
+                <updatePolicy>interval:10080</updatePolicy>
+            </releases>
+            <id>jboss.release</id>
+            <name>JBoss releases</name>
+            <url>https://repository.jboss.org/nexus/content/groups/public</url>
+        </pluginRepository>
+    </pluginRepositories>
+    <build>
+        <pluginManagement>
+            <plugins>
+                <!--
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-javadoc-plugin</artifactId>
+                    <version>2.4</version>
+                    <configuration>
+                        <minmemory>128m</minmemory>
+                        <maxmemory>512m</maxmemory>
+                        <quiet>false</quiet>
+                        <aggregate>true</aggregate>
+                    </configuration>
+                    <executions>
+                        <execution>
+                            <id>javadocs</id>
+                            <goals>
+                                <goal>jar</goal>
+                            </goals>
+                        </execution>
+                    </executions>
+                </plugin>
+                -->
+
+                <plugin>
+                  <groupId>org.codehaus.mojo</groupId>
+                  <artifactId>javacc-maven-plugin</artifactId>
+                  <version>2.6</version>
+                  <executions>
+                    <execution>
+                      <id>javacc</id>
+                      <goals>
+                        <goal>javacc</goal>
+                      </goals>
+                    </execution>
+                  </executions>
+                </plugin>
+                <plugin>
+                  <groupId>org.apache.maven.plugins</groupId>
+                  <artifactId>maven-rar-plugin</artifactId>
+                    <version>2.2</version>
+                </plugin>
+                <plugin>
+                    <groupId>net.sf.maven-sar</groupId>
+                    <artifactId>maven-sar-plugin</artifactId>
+                    <version>1.0</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-site-plugin</artifactId>
+                    <version>2.0-beta-5</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-shade-plugin</artifactId>
+                    <version>1.3.3</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.mortbay.jetty</groupId>
+                    <artifactId>maven-jetty-plugin</artifactId>
+                    <version>6.1.15</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-deploy-plugin</artifactId>
+                    <version>2.4</version>
+                </plugin>
+
+                <plugin>
+                    <inherited>true</inherited>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-source-plugin</artifactId>
+                    <version>2.0.3</version>
+                    <executions>
+                        <execution>
+                            <id>attach-sources</id>
+                            <goals>
+                                <goal>jar</goal>
+                            </goals>
+                        </execution>
+                    </executions>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-surefire-plugin</artifactId>
+                    <version>2.4</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-install-plugin</artifactId>
+                    <version>2.3</version>
+                    <configuration>
+                        <createChecksum>true</createChecksum>
+                    </configuration>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-pmd-plugin</artifactId>
+                    <configuration>
+                        <linkXref>true</linkXref>
+                        <sourceEncoding>utf-8</sourceEncoding>
+                        <minimumTokens>100</minimumTokens>
+                        <targetJdk>1.5</targetJdk>
+                    </configuration>
+                </plugin>
+                <plugin>
+                    <groupId>org.codehaus.mojo</groupId>
+                    <artifactId>cobertura-maven-plugin</artifactId>
+                    <configuration/>
+                    <executions>
+                        <execution>
+                            <goals>
+                                <goal>clean</goal>
+                            </goals>
+                        </execution>
+                    </executions>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>1.5</source>
+                    <target>1.5</target>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-install-plugin</artifactId>
+                <configuration>
+                    <createChecksum>true</createChecksum>
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-source-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>verify</phase>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+
+    </build>
+
+    <reporting>
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>cobertura-maven-plugin</artifactId>
+                <configuration>
+                    <formats>
+                        <format>html</format>
+                        <format>xml</format>
+                    </formats>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-checkstyle-plugin</artifactId>
+                <configuration>
+                    <configLocation>
+                        config/jboss_checks.xml
+                    </configLocation>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>findbugs-maven-plugin</artifactId>
+                <version>1.1.1</version>
+                <configuration>
+                    <xmlOutput>true</xmlOutput>
+                    <effort>Max</effort>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <configuration>
+                    <minmemory>128m</minmemory>
+                    <maxmemory>1024m</maxmemory>
+                    <quiet>false</quiet>
+                    <aggregate>true</aggregate>
+                    <excludePackageNames>com.restfully.*:org.jboss.resteasy.examples.*:org.jboss.resteasy.tests.*
+                    </excludePackageNames>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>
+                    maven-project-info-reports-plugin
+                </artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-report-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </reporting>
 </project>
-

Deleted: branches/maven-move/src/config/common/hornetq-version.properties
===================================================================
--- branches/maven-move/src/config/common/hornetq-version.properties	2010-07-08 15:05:36 UTC (rev 9385)
+++ branches/maven-move/src/config/common/hornetq-version.properties	2010-07-09 03:10:45 UTC (rev 9386)
@@ -1,8 +0,0 @@
-hornetq.version.versionName=Stripey
-hornetq.version.majorVersion=2
-hornetq.version.minorVersion=1
-hornetq.version.microVersion=1
-hornetq.version.incrementingVersion=119
-hornetq.version.versionSuffix=Final
-hornetq.version.versionTag=Final
-hornetq.netty.version=@NETTY.VERSION@

Deleted: branches/maven-move/src/config/common/schema/hornetq-configuration.xsd
===================================================================
--- branches/maven-move/src/config/common/schema/hornetq-configuration.xsd	2010-07-08 15:05:36 UTC (rev 9385)
+++ branches/maven-move/src/config/common/schema/hornetq-configuration.xsd	2010-07-09 03:10:45 UTC (rev 9386)
@@ -1,525 +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" 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="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="backup-connector-ref" type="backup-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="connector-ref" type="connector-refType">
-	</xsd:element>
-
-	<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" ref="connector-ref">
-				</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="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: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:complexType name="connector-refType">
-		<xsd:attribute name="connector-name" type="xsd:IDREF" use="required">
-		</xsd:attribute>
-		<xsd:attribute name="backup-connector-name" type="xsd:IDREF" use="optional">
-		</xsd:attribute>
-	</xsd:complexType>
-
-	<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="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="connector-ref" type="connector-refType">
-				</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="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="unbounded" minOccurs="1" name="connector-ref" type="connector-refType">
-				</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="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="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="backup-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: branches/maven-move/src/config/common/schema/hornetq-jms.xsd
===================================================================
--- branches/maven-move/src/config/common/schema/hornetq-jms.xsd	2010-07-08 15:05:36 UTC (rev 9385)
+++ branches/maven-move/src/config/common/schema/hornetq-jms.xsd	2010-07-09 03:10:45 UTC (rev 9386)
@@ -1,177 +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="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="connection-factory">
-   	<xsd:complexType>
-   		<xsd:all>
-           	<xsd:element name="discovery-group-ref" type="discovery-group-refType" maxOccurs="1" minOccurs="0"></xsd:element>
-           	<xsd:element name="discovery-initial-wait-timeout" type="xsd:long" 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="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:all>
-   		<xsd:attribute name="name" 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:attribute name="backup-connector-name" type="xsd:string" use="optional"></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>

Deleted: branches/maven-move/src/config/common/schema/hornetq-users.xsd
===================================================================
--- branches/maven-move/src/config/common/schema/hornetq-users.xsd	2010-07-08 15:05:36 UTC (rev 9385)
+++ branches/maven-move/src/config/common/schema/hornetq-users.xsd	2010-07-09 03:10:45 UTC (rev 9386)
@@ -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>

Deleted: branches/maven-move/src/config/ra.xml
===================================================================
--- branches/maven-move/src/config/ra.xml	2010-07-08 15:05:36 UTC (rev 9385)
+++ branches/maven-move/src/config/ra.xml	2010-07-09 03:10:45 UTC (rev 9386)
@@ -1,280 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- $Id: ra.xml 76819 2008-08-08 11:04:20Z jesper.pedersen $ -->
-
-<connector xmlns="http://java.sun.com/xml/ns/j2ee"
-           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-           xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
-           http://java.sun.com/xml/ns/j2ee/connector_1_5.xsd"
-           version="1.5">
-
-   <description>HornetQ 2.0 Resource Adapter</description>
-   <display-name>HornetQ 2.0 Resource Adapter</display-name>
-
-   <vendor-name>Red Hat Middleware LLC</vendor-name>
-   <eis-type>JMS 1.1 Server</eis-type>
-   <resourceadapter-version>1.0</resourceadapter-version>
-
-   <license>
-      <description>
-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.  
-      </description>
-      <license-required>true</license-required>
-   </license>
-
-   <resourceadapter>
-      <resourceadapter-class>org.hornetq.ra.HornetQResourceAdapter</resourceadapter-class>
-      <config-property>
-         <description>The transport type</description>
-         <config-property-name>ConnectorClassName</config-property-name>
-         <config-property-type>java.lang.String</config-property-type>
-         <config-property-value>org.hornetq.core.remoting.impl.invm.InVMConnectorFactory</config-property-value>
-      </config-property>
-      <config-property>
-         <description>The transport configuration. These values must be in the form of key=val;key=val;</description>
-         <config-property-name>ConnectionParameters</config-property-name>
-         <config-property-type>java.lang.String</config-property-type>
-         <config-property-value>server-id=0</config-property-value>
-      </config-property>
-      <!--
-      <config-property>
-        <description>The method to use for locating the transactionmanager</description>
-        <config-property-name>TransactionManagerLocatorMethod</config-property-name>
-        <config-property-type>java.lang.String</config-property-type>
-        <config-property-value>getTm</config-property-value>
-      </config-property>
-      <config-property>
-        <description>Use A local Transaction instead of XA?</description>
-        <config-property-name>UseLocalTx</config-property-name>
-        <config-property-type>java.lang.Boolean</config-property-type>
-        <config-property-value>false</config-property-value>
-      </config-property>
-      <config-property>
-        <description>The user name used to login to the JMS server</description>
-        <config-property-name>UserName</config-property-name>
-        <config-property-type>java.lang.String</config-property-type>
-        <config-property-value></config-property-value>
-      </config-property>
-      <config-property>
-        <description>The password used to login to the JMS server</description>
-        <config-property-name>Password</config-property-name>
-        <config-property-type>java.lang.String</config-property-type>
-        <config-property-value></config-property-value>
-      </config-property>
-      <config-property>
-         <description>The Backup transport type</description>
-         <config-property-name>BackUpTransportType</config-property-name>
-         <config-property-type>java.lang.String</config-property-type>
-         <config-property-value></config-property-value>
-      </config-property>
-      <config-property>
-         <description>The Backup transport configuration. These values must be in the form of key=val;key=val;</description>
-         <config-property-name>TransportConfiguration</config-property-name>
-         <config-property-type>java.lang.String</config-property-type>
-         <config-property-value></config-property-value>
-      </config-property>
-      <config-property>
-        <description>The discovery group address</description>
-        <config-property-name>DiscoveryGroupAddress</config-property-name>
-        <config-property-type>java.lang.String</config-property-type>
-        <config-property-value></config-property-value>
-      </config-property>
-      <config-property>
-        <description>The discovery group port</description>
-        <config-property-name>DiscoveryGroupPort</config-property-name>
-        <config-property-type>java.lang.Integer</config-property-type>
-        <config-property-value></config-property-value>
-      </config-property>
-      <config-property>
-        <description>The discovery refresh timeout</description>
-        <config-property-name>DiscoveryRefreshTimeout</config-property-name>
-        <config-property-type>java.lang.Long</config-property-type>
-        <config-property-value></config-property-value>
-      </config-property>
-      <config-property>
-        <description>The discovery initial wait timeout</description>
-        <config-property-name>DiscoveryInitialWaitTimeout</config-property-name>
-        <config-property-type>java.lang.Long</config-property-type>
-        <config-property-value></config-property-value>
-      </config-property>
-      <config-property>
-        <description>The load balancing policy class name</description>
-        <config-property-name>LoadBalancingPolicyClassName</config-property-name>
-        <config-property-type>java.lang.String</config-property-type>
-        <config-property-value></config-property-value>
-      </config-property>
-      <config-property>
-        <description>The client failure check period</description>
-        <config-property-name>ClientFailureCheckPeriod</config-property-name>
-        <config-property-type>java.lang.Long</config-property-type>
-        <config-property-value></config-property-value>
-      </config-property>
-      <config-property>
-        <description>The connection TTL</description>
-        <config-property-name>ConnectionTTL</config-property-name>
-        <config-property-type>java.lang.Long</config-property-type>
-        <config-property-value></config-property-value>
-      </config-property>
-      <config-property>
-        <description>The call timeout</description>
-        <config-property-name>CallTimeout</config-property-name>
-        <config-property-type>java.lang.Long</config-property-type>
-        <config-property-value></config-property-value>
-      </config-property>
-      <config-property>
-        <description>The dups ok batch size</description>
-        <config-property-name>DupsOKBatchSize</config-property-name>
-        <config-property-type>java.lang.Integer</config-property-type>
-        <config-property-value></config-property-value>
-      </config-property>
-      <config-property>
-        <description>The transaction batch size</description>
-        <config-property-name>TransactionBatchSize</config-property-name>
-        <config-property-type>java.lang.Integer</config-property-type>
-        <config-property-value></config-property-value>
-      </config-property>
-      <config-property>
-        <description>The consumer window size</description>
-        <config-property-name>ConsumerWindowSize</config-property-name>
-        <config-property-type>java.lang.Integer</config-property-type>
-        <config-property-value></config-property-value>
-      </config-property>
-      <config-property>
-        <description>The consumer max rate</description>
-        <config-property-name>ConsumerMaxRate</config-property-name>
-        <config-property-type>java.lang.Integer</config-property-type>
-        <config-property-value></config-property-value>
-      </config-property>
-      <config-property>
-        <description>The confirmation window size</description>
-        <config-property-name>ConfirmationWindowSize</config-property-name>
-        <config-property-type>java.lang.Integer</config-property-type>
-        <config-property-value></config-property-value>
-      </config-property>
-      <config-property>
-        <description>The producer max rate</description>
-        <config-property-name>ProducerMaxRate</config-property-name>
-        <config-property-type>java.lang.Integer</config-property-type>
-        <config-property-value></config-property-value>
-      </config-property>
-      <config-property>
-        <description>The min large message size</description>
-        <config-property-name>MinLargeMessageSize</config-property-name>
-        <config-property-type>java.lang.Integer</config-property-type>
-        <config-property-value></config-property-value>
-      </config-property>
-      <config-property>
-        <description>The block on acknowledge</description>
-        <config-property-name>BlockOnAcknowledge</config-property-name>
-        <config-property-type>java.lang.Boolean</config-property-type>
-        <config-property-value></config-property-value>
-      </config-property>
-      <config-property>
-        <description>The block on non durable send</description>
-        <config-property-name>BlockOnNonDurableSend</config-property-name>
-        <config-property-type>java.lang.Boolean</config-property-type>
-        <config-property-value></config-property-value>
-      </config-property>
-      <config-property>
-        <description>The block on durable send</description>
-        <config-property-name>BlockOnDurableSend</config-property-name>
-        <config-property-type>java.lang.Boolean</config-property-type>
-        <config-property-value></config-property-value>
-      </config-property>
-      <config-property>
-        <description>The auto group</description>
-        <config-property-name>AutoGroup</config-property-name>
-        <config-property-type>java.lang.Boolean</config-property-type>
-        <config-property-value></config-property-value>
-      </config-property>
-      <config-property>
-        <description>The max connections</description>        
-        <config-property-type>java.lang.Integer</config-property-type>
-        <config-property-value></config-property-value>
-      </config-property>
-      <config-property>
-        <description>The pre acknowledge</description>
-        <config-property-name>PreAcknowledge</config-property-name>
-        <config-property-type>java.lang.Boolean</config-property-type>
-        <config-property-value></config-property-value>
-      </config-property>
-      <config-property>
-        <description>The retry interval</description>
-        <config-property-name>RetryInterval</config-property-name>
-        <config-property-type>java.lang.Long</config-property-type>
-        <config-property-value></config-property-value>
-      </config-property>
-      <config-property>
-        <description>The retry interval multiplier</description>
-        <config-property-name>RetryIntervalMultiplier</config-property-name>
-        <config-property-type>java.lang.Double</config-property-type>
-        <config-property-value></config-property-value>
-      </config-property>
-      <config-property>
-        <description>Should clean server shutdown trigger failover?</description>
-        <config-property-name>FailoverOnServerShutdown</config-property-name>
-        <config-property-type>java.lang.Boolean</config-property-type>
-        <config-property-value></config-property-value>
-      </config-property>
-      <config-property>
-        <description>The client id</description>
-        <config-property-name>ClientID</config-property-name>
-        <config-property-type>java.lang.String</config-property-type>
-        <config-property-value></config-property-value>
-      </config-property>-->
-
-      <outbound-resourceadapter>
-         <connection-definition>
-            <managedconnectionfactory-class>org.hornetq.ra.HornetQRAManagedConnectionFactory</managedconnectionfactory-class>
-
-            <config-property>
-               <description>The default session type</description>
-               <config-property-name>SessionDefaultType</config-property-name>
-               <config-property-type>java.lang.String</config-property-type>
-               <config-property-value>javax.jms.Queue</config-property-value>
-            </config-property>
-            <config-property>
-               <description>Try to obtain a lock within specified number of seconds; less than or equal to 0 disable this functionality</description>
-               <config-property-name>UseTryLock</config-property-name>
-               <config-property-type>java.lang.Integer</config-property-type>
-               <config-property-value>0</config-property-value>
-            </config-property>
-
-            <connectionfactory-interface>org.hornetq.ra.HornetQRAConnectionFactory</connectionfactory-interface>
-            <connectionfactory-impl-class>org.hornetq.ra.HornetQRAConnectionFactoryImpl</connectionfactory-impl-class>
-            <connection-interface>javax.jms.Session</connection-interface>
-            <connection-impl-class>org.hornetq.ra.HornetQRASession</connection-impl-class>
-         </connection-definition>
-         <transaction-support>XATransaction</transaction-support>
-         <authentication-mechanism>
-            <authentication-mechanism-type>BasicPassword</authentication-mechanism-type>
-            <credential-interface>javax.resource.spi.security.PasswordCredential</credential-interface>
-         </authentication-mechanism>
-         <reauthentication-support>false</reauthentication-support>
-      </outbound-resourceadapter>
-
-      <inbound-resourceadapter>
-         <messageadapter>
-            <messagelistener>
-               <messagelistener-type>javax.jms.MessageListener</messagelistener-type>
-               <activationspec>
-                  <activationspec-class>org.hornetq.ra.inflow.HornetQActivationSpec</activationspec-class>
-                  <required-config-property>
-                      <config-property-name>destination</config-property-name>
-                  </required-config-property>
-               </activationspec>
-            </messagelistener>
-         </messageadapter>
-      </inbound-resourceadapter>
-
-   </resourceadapter>
-</connector>

Added: branches/maven-move/tests/test-util-jar/pom.xml
===================================================================
--- branches/maven-move/tests/test-util-jar/pom.xml	                        (rev 0)
+++ branches/maven-move/tests/test-util-jar/pom.xml	2010-07-09 03:10:45 UTC (rev 9386)
@@ -0,0 +1,35 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.hornetq</groupId>
+        <artifactId>hornetq-pom</artifactId>
+        <version>2.1.2-SNAPSHOT</version>
+    </parent>
+
+    <groupId>org.hornetq</groupId>
+    <artifactId>hornetq-core</artifactId>
+    <packaging>jar</packaging>
+    <name>HornetQ Core</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+        </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>



More information about the hornetq-commits mailing list