[jboss-cvs] JBossAS SVN: r99325 - in branches/Branch_Hornet_Temporary: client and 5 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Tue Jan 12 23:04:00 EST 2010


Author: clebert.suconic at jboss.com
Date: 2010-01-12 23:03:59 -0500 (Tue, 12 Jan 2010)
New Revision: 99325

Removed:
   branches/Branch_Hornet_Temporary/messaging/src/main/java/org/jboss/jms/server/ServerPeerMO.java
   branches/Branch_Hornet_Temporary/messaging/src/main/java/org/jboss/jms/server/ServerPeerMODefinition.java
   branches/Branch_Hornet_Temporary/messaging/src/main/java/org/jboss/jms/server/destination/
   branches/Branch_Hornet_Temporary/messaging/src/main/java/org/jboss/jms/server/jbosssx/
   branches/Branch_Hornet_Temporary/messaging/src/main/java/org/jboss/mq/server/jmx/
Modified:
   branches/Branch_Hornet_Temporary/build/build.xml
   branches/Branch_Hornet_Temporary/build/pom.xml
   branches/Branch_Hornet_Temporary/client/pom.xml
   branches/Branch_Hornet_Temporary/component-matrix/pom.xml
   branches/Branch_Hornet_Temporary/management/.project
   branches/Branch_Hornet_Temporary/messaging/pom.xml
Log:
simple backup of branch

Modified: branches/Branch_Hornet_Temporary/build/build.xml
===================================================================
--- branches/Branch_Hornet_Temporary/build/build.xml	2010-01-13 04:03:39 UTC (rev 99324)
+++ branches/Branch_Hornet_Temporary/build/build.xml	2010-01-13 04:03:59 UTC (rev 99325)
@@ -439,7 +439,7 @@
       <include name="jmx-connector-client-factory.jar"/>
       <include name="namespace.jar"/>
       <include name="xmlsec.jar"/>
-      <include name="jboss-messaging.jar"/>
+      <!-- <include name="jboss-messaging.jar"/> -->
       <include name="jboss-mdr.jar"/>
       <include name="jboss-deployers-core.jar"/>
       <include name="jboss-deployers-core-spi.jar"/>
@@ -1098,121 +1098,23 @@
     <mkdir dir="${install.all.deploy}/messaging"/>
      <!--<copy tofile="${install.all.deploy}/messaging/hsqldb-persistence-service.xml"
          file="${jboss.messaging.resources}/clustered-hsqldb-persistence-service.xml"/>-->
-    <unzip src="${jboss.messaging:resources:jar}" dest="${install.all.deploy}/messaging/">
-      <patternset>
-        <include name="resources/clustered-hsqldb-persistence-service.xml"/>
-      </patternset>
-      <mapper type="glob" from="resources/clustered-hsqldb-persistence-service.xml" to="hsqldb-persistence-service.xml"/>
+    <unzip src="${org.hornetq:hornetq-resources:jar}" dest="${install.all.deploy}/messaging">
+    	  <patternset>
+    	    <include name="jboss-as/clustered/*"/>
+    	  </patternset>
     </unzip>
-    <copy todir="${install.all.deploy}/messaging">
-      <fileset dir="${messaging.module.output}/etc/deploy/common">
-        <include name="*-service.xml"/>
-        <include name="*-jboss-beans.xml"/>
-        <include name="jms-ds.xml"/>
-        <include name="destinations-service.xml"/>
-      </fileset>
-      <!--<fileset dir="${jboss.messaging.resources}/">
-        <include name="connection-factories-service.xml"/>
-        <include name="remoting-bisocket-service.xml"/>
-      </fileset>-->
-    </copy>
 
-    <unzip src="${jboss.messaging:resources:jar}" dest="${install.all.deploy}/messaging">
-      <patternset>
-        <include name="resources/connection-factories-service.xml"/>
-        <include name="resources/remoting-bisocket-service.xml"/>
-      </patternset>
-      <mapper type="flatten"/>
-    </unzip>
-
-    <!-- 
-		The messaging profileservice definitions, to default and all
-  	-->
-	<copy todir="${install.default.deployers}">
-		<fileset dir="${messaging.module.output}/etc/deployers">
-			<include name="*-jboss-beans.xml"/>
-		</fileset>
-	</copy>
-  	<copy todir="${install.all.deployers}">
-  		<fileset dir="${messaging.module.output}/etc/deployers">
-			<include name="*-jboss-beans.xml"/>
-  		</fileset>
-  	</copy>
-  	
-     <!--
+  	 <!--
           Default configuration
      -->
     <mkdir dir="${install.default.deploy}/messaging"/>
-    <copy todir="${install.default.deploy}/messaging">
-      <fileset dir="${messaging.module.output}/etc/deploy/common">
-        <include name="*-service.xml"/>
-        <include name="*-jboss-beans.xml"/>
-        <include name="jms-ds.xml"/>
-      </fileset>
-    	
-      <!--<fileset dir="${jboss.messaging.resources}/">
-         <include name="connection-factories-service.xml"/>
-         <include name="hsqldb-persistence-service.xml"/>
-         <include name="remoting-bisocket-service.xml"/>
-      </fileset>-->
-    </copy>
-    <unzip src="${jboss.messaging:resources:jar}" dest="${install.default.deploy}/messaging">
-      <patternset>
-        <include name="resources/connection-factories-service.xml"/>
-        <include name="resources/hsqldb-persistence-service.xml"/>
-        <include name="resources/remoting-bisocket-service.xml"/>
-      </patternset>
-      <mapper type="flatten"/>
+    <unzip src="${org.hornetq:hornetq-resources:jar}" dest="${install.default.deploy}/messaging">
+    	  <patternset>
+    	    <include name="jboss-as/non-clustered/*"/>
+    	  </patternset>
     </unzip>
-    
-     <!-- copy example jms configs -->
-     <!-- we don't need them anymore, they are all in examples/config now
-     <mkdir dir="${install.examples.jms}"/>
-     <copy todir="${install.examples.jms}" filtering="no">
-       <fileset dir="${jboss.messaging.resources}">
-         <include name="*-persistence-service.xml"/>
-         <include name="remoting-*-service.xml"/>
-       </fileset>
-     </copy>
-     -->
-
-     <!-- the JBM bundled destinations-service.xml comes with many examples -->
-    <unzip src="${jboss.messaging:resources:jar}" dest="${install.examples.jms}">
-      <patternset>
-        <include name="resources/destinations-service.xml"/>
-      </patternset>
-      <mapper type="glob" from="resources/destinations-service.xml" to="example-destinations-service.xml"/>
-    </unzip>
-    <!-- <copy file="${jboss.messaging.resources}/destinations-service.xml"
-       tofile="${install.examples.jms}/example-destinations-service.xml"/>-->
-
-     <!-- JBM examples for JBoss 5 -->
-     <mkdir dir="${install.examples.jms}"/>
-     <copy todir="${install.examples.jms}" filtering="no">
-       <fileset dir="${messaging.module.output}/etc/">
-       </fileset>
-     </copy>
-     <!-- need to copy the following files as AS5 build while change the contents of them -->
-     <copy todir="${install.examples.jms}/examples/secure-socket/etc/" overwrite="yes">
-       <fileset dir="${project.root}/${messaging.module.name}/src/etc/examples/secure-socket/etc">
-         <include name="messaging.keystore"/>
-         <include name="messaging.truststore"/>
-       </fileset>
-     </copy>
-
   </target>
 
-  <target name="module-messaging-all" depends="module-messaging">
-
-    <!-- Copy the generated javadocs -->
-    <mkdir dir="${install.api}/${messaging.module.name}"/>
-    <copy todir="${install.api}/${messaging.module.name}" filtering="no">
-      <fileset dir="${messaging.module.output}/api">
-        <include name="**/*"/>
-      </fileset>
-    </copy>
-  </target>
-
   <!-- ======== -->
   <!-- Security -->
   <!-- ======== -->
@@ -2025,7 +1927,7 @@
       <fileset refid="javax.mail:mail:jar"/>
       <fileset refid="javax.validation:validation-api:jar"/>
       <fileset refid="org.jboss.mc-int:jboss-mc-int-servlet:jar"/>
-      <fileset refid="jboss.messaging:jboss-messaging:jar"/>
+      <!-- <fileset refid="jboss.messaging:jboss-messaging:jar"/> -->
       <fileset refid="org.beanshell:bsh:jar"/>
       <fileset refid="joesnmp:joesnmp:jar"/>
       <fileset refid="wutka-dtdparser:dtdparser:jar"/>
@@ -2201,7 +2103,7 @@
       <fileset refid="log4j:log4j:jar"/>
       <fileset refid="gnu-getopt:getopt:jar"/>
       <fileset refid="oswego-concurrent:concurrent:jar"/>
-      <fileset refid="jboss.messaging:jboss-messaging-client:jar"/>
+      <!-- <fileset refid="jboss.messaging:jboss-messaging-client:jar"/> -->
       <fileset refid="org.jboss.security:jbosssx-client:jar"/>
       <fileset refid="apache-scout:scout:jar"/>
       <fileset refid="jacorb:jacorb:jar"/>

Modified: branches/Branch_Hornet_Temporary/build/pom.xml
===================================================================
--- branches/Branch_Hornet_Temporary/build/pom.xml	2010-01-13 04:03:39 UTC (rev 99324)
+++ branches/Branch_Hornet_Temporary/build/pom.xml	2010-01-13 04:03:59 UTC (rev 99325)
@@ -316,22 +316,43 @@
       <scope>runtime</scope>
       <optional>true</optional>
     </dependency>
+      <dependency>
+        <groupId>org.hornetq</groupId>
+        <artifactId>hornetq-resources</artifactId>
+      </dependency>
+      <dependency>
+        <groupId>org.hornetq</groupId>
+        <artifactId>hornetq-bootstrap</artifactId>
+      </dependency>
+      <dependency>
+        <groupId>org.hornetq</groupId>
+        <artifactId>hornetq-core-client</artifactId>
+      </dependency>
+      <dependency>
+        <groupId>org.hornetq</groupId>
+        <artifactId>hornetq-core</artifactId>
+      </dependency>
+      <dependency>
+        <groupId>org.hornetq</groupId>
+        <artifactId>hornetq-jms-client</artifactId>
+      </dependency>
+      <dependency>
+        <groupId>org.hornetq</groupId>
+        <artifactId>hornetq-logging</artifactId>
+      </dependency>
+      <dependency>
+        <groupId>org.hornetq</groupId>
+        <artifactId>hornetq-ra</artifactId>
+      </dependency>
+      <dependency>
+        <groupId>org.hornetq</groupId>
+        <artifactId>hornetq-resources</artifactId>
+      </dependency>
+      <dependency>
+        <groupId>org.hornetq</groupId>
+        <artifactId>hornetq-transports</artifactId>
+      </dependency>
     <dependency>
-      <groupId>jboss.messaging</groupId>
-      <artifactId>jboss-messaging</artifactId>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>jboss.messaging</groupId>
-      <artifactId>jboss-messaging-client</artifactId>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>jboss.messaging</groupId>
-      <artifactId>resources</artifactId>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
       <groupId>jboss.web</groupId>
       <artifactId>el-api</artifactId>
       <optional>true</optional>

Modified: branches/Branch_Hornet_Temporary/client/pom.xml
===================================================================
--- branches/Branch_Hornet_Temporary/client/pom.xml	2010-01-13 04:03:39 UTC (rev 99324)
+++ branches/Branch_Hornet_Temporary/client/pom.xml	2010-01-13 04:03:59 UTC (rev 99325)
@@ -175,11 +175,6 @@
     </dependency>
     
     <dependency>
-      <groupId>jboss.messaging</groupId>
-      <artifactId>jboss-messaging</artifactId>
-    </dependency>
-    
-    <dependency>
       <groupId>org.jboss.remoting</groupId>
       <artifactId>jboss-remoting</artifactId>
     </dependency>

Modified: branches/Branch_Hornet_Temporary/component-matrix/pom.xml
===================================================================
--- branches/Branch_Hornet_Temporary/component-matrix/pom.xml	2010-01-13 04:03:39 UTC (rev 99324)
+++ branches/Branch_Hornet_Temporary/component-matrix/pom.xml	2010-01-13 04:03:59 UTC (rev 99325)
@@ -48,7 +48,7 @@
     <version.commons.beanutils>1.8.0</version.commons.beanutils>
     <version.fastinfoset>1.2.2</version.fastinfoset>
     <version.jboss.jms-integration-tests>1.0.1.GA</version.jboss.jms-integration-tests>
-    <version.jboss.messaging>1.4.1.GA</version.jboss.messaging>
+    <version.hornetq>2.0.0.CR3</version.hornetq>
     <version.jboss.web>3.0.0-beta-1</version.jboss.web>
     <version.jgroups>2.6.13.GA</version.jgroups>
     <version.junit>3.8.2</version.junit>
@@ -518,8 +518,57 @@
         <artifactId>jaxen</artifactId>
         <version>1.1-brew</version>
       </dependency>
-      
       <dependency>
+        <groupId>org.hornetq</groupId>
+        <artifactId>hornetq-resources</artifactId>
+        <version>${version.hornetq}</version> 
+      </dependency>
+      <dependency>
+        <groupId>org.hornetq</groupId>
+        <artifactId>hornetq-bootstrap</artifactId>
+        <version>${version.hornetq}</version> 
+      </dependency>
+      <dependency>
+        <groupId>org.hornetq</groupId>
+        <artifactId>hornetq-core-client</artifactId>
+        <version>${version.hornetq}</version> 
+      </dependency>
+      <dependency>
+        <groupId>org.hornetq</groupId>
+        <artifactId>hornetq-core</artifactId>
+        <version>${version.hornetq}</version> 
+      </dependency>
+      <dependency>
+        <groupId>org.hornetq</groupId>
+        <artifactId>hornetq-jboss-as-integration</artifactId>
+        <version>${version.hornetq}</version> 
+      </dependency>
+      <dependency>
+        <groupId>org.hornetq</groupId>
+        <artifactId>hornetq-jms-client</artifactId>
+        <version>${version.hornetq}</version> 
+      </dependency>
+      <dependency>
+        <groupId>org.hornetq</groupId>
+        <artifactId>hornetq-logging</artifactId>
+        <version>${version.hornetq}</version> 
+      </dependency>
+      <dependency>
+        <groupId>org.hornetq</groupId>
+        <artifactId>hornetq-ra</artifactId>
+        <version>${version.hornetq}</version> 
+      </dependency>
+      <dependency>
+        <groupId>org.hornetq</groupId>
+        <artifactId>hornetq-resources</artifactId>
+        <version>${version.hornetq}</version> 
+      </dependency>
+      <dependency>
+        <groupId>org.hornetq</groupId>
+        <artifactId>hornetq-transports</artifactId>
+        <version>${version.hornetq}</version> 
+      </dependency>
+      <dependency>
         <groupId>org.jboss.aspects</groupId>
         <artifactId>jboss-current-invocation-aspects</artifactId>
         <version>${version.org.jboss.aspects.currentinvocation}</version>
@@ -999,179 +1048,135 @@
       </dependency>
       
       <dependency>
-        <groupId>jboss.messaging</groupId>
-        <artifactId>jboss-messaging</artifactId>
-        <version>${version.jboss.messaging}</version>
-      </dependency>
-      
-      <dependency>
-        <groupId>jboss.messaging</groupId>
-        <artifactId>jboss-messaging-client</artifactId>
-        <version>${version.jboss.messaging}</version>
-      </dependency>
-      
-      <dependency>
-        <groupId>jboss.messaging</groupId>
-        <artifactId>resources</artifactId>
-        <version>${version.jboss.messaging}</version>
-      </dependency>
-      
-      <dependency>
         <groupId>jboss.profiler.jvmti</groupId>
         <artifactId>jboss-profiler-jvmti</artifactId>
         <version>1.0.0.CR5</version>
       </dependency>
-      
       <dependency>
         <groupId>org.jboss.remoting</groupId>
         <artifactId>jboss-remoting</artifactId>
         <version>${version.org.jboss.remoting}</version>
       </dependency>
-      
       <dependency>
         <groupId>jboss.web</groupId>
         <artifactId>el-api</artifactId>
         <version>${version.jboss.web}</version>
       </dependency>
-      
       <dependency>
         <groupId>jboss.web</groupId>
         <artifactId>jasper-jdt</artifactId>
         <version>${version.jboss.web}</version>
       </dependency>
-      
       <dependency>
         <groupId>jboss.web</groupId>
         <artifactId>jbossweb</artifactId>
         <version>${version.jboss.web}</version>
       </dependency>
-      
       <dependency>
         <groupId>jboss.web</groupId>
         <artifactId>jsp-api</artifactId>
         <version>${version.jboss.web}</version>
       </dependency>
-      
       <dependency>
         <groupId>jboss.web</groupId>
         <artifactId>servlet-api</artifactId>
         <version>${version.jboss.web}</version>
       </dependency>
-      
       <dependency>
         <groupId>jfree</groupId>
         <artifactId>jfreechart</artifactId>
         <version>1.0.2</version>
       </dependency>
-      
       <dependency>
         <groupId>jfree</groupId>
         <artifactId>jcommon</artifactId>
         <version>1.0.2</version>
       </dependency>
-      
       <dependency>
         <groupId>jgroups</groupId>
         <artifactId>jgroups</artifactId>
         <version>${version.jgroups}</version>
       </dependency>
-      
       <dependency>
         <groupId>joesnmp</groupId>
         <artifactId>joesnmp</artifactId>
         <version>0.3.4</version>
       </dependency>
-      
       <dependency>
         <groupId>juddi</groupId>
         <artifactId>juddi</artifactId>
         <version>0.9RC4</version>
       </dependency>
-      
       <dependency>
         <groupId>junit</groupId>
         <artifactId>junit</artifactId>
         <version>${version.junit}</version>
       </dependency>
-      
       <dependency>
         <groupId>nekohtml</groupId>
         <artifactId>nekohtml</artifactId>
         <version>0.9.1</version>
       </dependency>
-      
       <dependency>
         <groupId>net.jcip</groupId>
         <artifactId>jcip-annotations</artifactId>
         <version>1.0</version>
       </dependency>
-      
       <dependency>
         <groupId>objectweb-joramtests</groupId>
         <artifactId>joramtests</artifactId>
         <version>1.5</version>
       </dependency>
-      
       <dependency>
         <groupId>odmg</groupId>
         <artifactId>odmg</artifactId>
         <version>3.0</version>
       </dependency>
-      
       <dependency>
         <groupId>opensaml</groupId>
         <artifactId>opensaml</artifactId>
         <version>1.1b</version>
       </dependency>
-      
       <dependency>
         <groupId>org.beanshell</groupId>
         <artifactId>bsh</artifactId>
         <version>1.3.0</version>
       </dependency>
-      
       <dependency>
         <groupId>org.codehaus.woodstox</groupId>
         <artifactId>wstx-lgpl</artifactId>
         <version>3.2.6</version>
       </dependency>
-      
       <dependency>
         <groupId>org.codehaus.jettison</groupId>
         <artifactId>jettison</artifactId>
         <version>1.0-RC2</version>
       </dependency>
-      
       <dependency>
         <groupId>org.jboss.netty</groupId>
         <artifactId>netty</artifactId>
         <version>3.1.0.GA</version>
       </dependency>
-      
       <dependency>
         <groupId>org.slf4j</groupId>
         <artifactId>slf4j-api</artifactId>
         <version>${version.org.slf4j}</version>
       </dependency>
-      
       <dependency>
          <groupId>org.slf4j</groupId>
          <artifactId>jcl-over-slf4j</artifactId>
          <version>${version.org.slf4j}</version>
       </dependency>
-
       <dependency>
         <groupId>org.jboss.slf4j</groupId>
         <artifactId>slf4j-jboss-logging</artifactId>
         <version>${version.org.jboss.slf4j}</version>
       </dependency>
-
       <dependency>
         <groupId>org.jboss.slf4j</groupId>
         <artifactId>slf4j-jboss-logmanager</artifactId>
         <version>1.0.0.CR2</version>
       </dependency>
-
       <dependency>
         <groupId>org.hibernate</groupId>
         <artifactId>hibernate-core</artifactId>
@@ -1191,7 +1196,6 @@
           </exclusion>
         </exclusions>
       </dependency>
-
       <dependency>
         <groupId>org.hibernate</groupId>
         <artifactId>hibernate-jmx</artifactId>
@@ -1207,7 +1211,6 @@
           </exclusion>
         </exclusions>
       </dependency>
-
       <dependency>
         <groupId>org.hibernate</groupId>
         <artifactId>hibernate-jbosscache</artifactId>
@@ -1219,7 +1222,6 @@
           </exclusion>
         </exclusions>
       </dependency>
-      
       <dependency>
         <groupId>org.hibernate</groupId>
         <artifactId>hibernate-annotations</artifactId>
@@ -1231,13 +1233,11 @@
           </exclusion>
         </exclusions>
       </dependency>
-      
       <dependency>
         <groupId>org.hibernate</groupId>
         <artifactId>hibernate-commons-annotations</artifactId>
         <version>${version.org.hibernate.commons.annotations}</version>
       </dependency>
-      
       <dependency>
         <groupId>org.hibernate</groupId>
         <artifactId>hibernate-entitymanager</artifactId>
@@ -1257,13 +1257,11 @@
           </exclusion>
         </exclusions>
       </dependency>
-      
       <dependency>
         <groupId>org.hibernate.java-persistence</groupId>
         <artifactId>jpa-api</artifactId>
         <version>${version.org.hibernate.java-persistence}</version>
       </dependency>
-      
       <dependency>
         <groupId>org.hibernate</groupId>
         <artifactId>hibernate-validator</artifactId>
@@ -1287,13 +1285,11 @@
  	  </exclusion>
         </exclusions>
       </dependency>
-
       <dependency>
         <groupId>org.hibernate</groupId>
         <artifactId>hibernate-validator-legacy</artifactId>
         <version>${version.org.hibernate.validator}</version>
       </dependency>
-
       <dependency>
         <groupId>org.hibernate</groupId>
         <artifactId>hibernate-testing</artifactId>
@@ -1306,45 +1302,36 @@
           </exclusion>
         </exclusions>
       </dependency>
-      
       <dependency>
         <groupId>javassist</groupId>
         <artifactId>javassist</artifactId>
         <version>${version.javassist}</version>
       </dependency>
-      
       <dependency>
         <groupId>org.jboss</groupId>
         <artifactId>jboss-common-core</artifactId>
         <version>${version.org.jboss.common.core}</version>
       </dependency>
-      
       <dependency>
         <groupId>org.jboss.integration</groupId>
         <artifactId>jboss-classloading-spi</artifactId>
         <version>${version.org.jboss.integration}</version>
       </dependency>
-      
       <dependency>
         <groupId>org.jboss.integration</groupId>
         <artifactId>jboss-corba-ots-spi</artifactId>
         <version>${version.org.jboss.integration}</version>
       </dependency>
-      
       <dependency>
         <groupId>org.jboss.integration</groupId>
         <artifactId>jboss-deployment-spi</artifactId>
         <version>${version.org.jboss.integration}</version>
       </dependency>
-      
-      <!-- Combined integration jar.  Maybe this can be removed when we just use the 
-        -  individual compoennts -->
       <dependency>
         <groupId>org.jboss.integration</groupId>
         <artifactId>jboss-integration</artifactId>
         <version>${version.org.jboss.integration}</version>
       </dependency>
-      
       <dependency>
         <groupId>org.jboss.metadata</groupId>
         <artifactId>jboss-metadata-common</artifactId>
@@ -1381,19 +1368,16 @@
         <artifactId>jboss-metadata-war</artifactId>
         <version>${version.org.jboss.metadata.war}</version>
       </dependency>
- 
       <dependency>
         <groupId>org.jboss</groupId>
         <artifactId>jboss-reflect</artifactId>
         <version>${version.org.jboss.reflect}</version>
       </dependency>
-
       <dependency>
         <groupId>org.jboss.reloaded</groupId>
         <artifactId>jboss-reloaded-naming</artifactId>
         <version>${version.org.jboss.reloaded.naming}</version>
       </dependency>
-      
       <dependency>
         <groupId>org.jboss.reloaded</groupId>
         <artifactId>jboss-reloaded-naming-deployers</artifactId>
@@ -1405,7 +1389,6 @@
         <artifactId>jboss-mdr</artifactId>
         <version>${version.org.jboss.mdr}</version>
       </dependency>
-      
       <dependency>
         <groupId>org.jboss.test</groupId>
         <artifactId>jboss-test</artifactId>
@@ -1417,7 +1400,6 @@
           </exclusion>
         </exclusions>
       </dependency>
-      
       <dependency>
         <groupId>org.jboss.jbossas</groupId>
         <artifactId>jboss-server-manager</artifactId>
@@ -1484,14 +1466,12 @@
             <artifactId>jboss-deployers-core-spi</artifactId>
           </exclusion>
         </exclusions>
-      </dependency>    
-      
+      </dependency>
       <dependency>
         <groupId>org.jboss.integration</groupId>
         <artifactId>jboss-transaction-spi</artifactId>
         <version>${version.org.jboss.integration}</version>
       </dependency>
-      
       <dependency>
         <groupId>org.jboss</groupId>
         <artifactId>jboss-vfs</artifactId>
@@ -1503,7 +1483,6 @@
           </exclusion>
         </exclusions>
       </dependency>
-      
       <dependency>
         <groupId>org.jboss</groupId>
         <artifactId>jbossxb</artifactId>
@@ -1523,25 +1502,21 @@
           </exclusion>
         </exclusions>
       </dependency>
-      
       <dependency>
         <groupId>org.jboss.ws</groupId>
         <artifactId>jbossws-spi</artifactId>
         <version>${version.jboss.jbossws-spi}</version>
       </dependency>
-      
       <dependency>
         <groupId>org.jboss.naming</groupId>
         <artifactId>jnp-client</artifactId>
         <version>${version.org.jboss.naming}</version>       
       </dependency>
-      
       <dependency>
         <groupId>org.jboss.naming</groupId>
         <artifactId>jnpserver</artifactId>
         <version>${version.org.jboss.naming}</version>         
       </dependency>
-      
       <dependency>
         <groupId>org.jboss.cache</groupId>
         <artifactId>jbosscache-core</artifactId>
@@ -1553,7 +1528,6 @@
           </exclusion>
         </exclusions>
       </dependency>
-      
       <dependency>
         <groupId>org.jboss.cache</groupId>
         <artifactId>jbosscache-pojo</artifactId>
@@ -1569,7 +1543,6 @@
           </exclusion>
         </exclusions>
       </dependency>
-      
       <dependency>
         <groupId>org.jboss.cl</groupId>
         <artifactId>jboss-classloader</artifactId>
@@ -1581,19 +1554,16 @@
           </exclusion>
         </exclusions>
       </dependency>
-      
       <dependency>
         <groupId>org.jboss.cl</groupId>
         <artifactId>jboss-classloading</artifactId>
         <version>${version.org.jboss.cl}</version>
       </dependency>
-      
       <dependency>
         <groupId>org.jboss.cl</groupId>
         <artifactId>jboss-classloading-vfs</artifactId>
         <version>${version.org.jboss.cl}</version>
       </dependency>
-      
       <dependency>
        	<groupId>org.jboss.classpool</groupId>
 	<artifactId>jboss-classpool</artifactId>
@@ -1625,7 +1595,6 @@
           </exclusion>
         </exclusions>
       </dependency>
-      
       <dependency>
         <groupId>org.jboss.cluster</groupId>
         <artifactId>jboss-ha-server-api</artifactId>
@@ -1653,7 +1622,6 @@
           </exclusion>
         </exclusions>
       </dependency>
-      
       <dependency>
         <groupId>org.jboss.cluster</groupId>
         <artifactId>jboss-ha-server-cache-spi</artifactId>
@@ -1669,7 +1637,6 @@
           </exclusion>
         </exclusions>
       </dependency>
-      
       <dependency>
         <groupId>org.jboss.cluster</groupId>
         <artifactId>jboss-ha-server-cache-jbc</artifactId>
@@ -1705,74 +1672,62 @@
           </exclusion>
         </exclusions>
       </dependency>
-      
       <dependency>
         <groupId>org.jboss.deployers</groupId>
         <artifactId>jboss-deployers-client</artifactId>
         <version>${version.org.jboss.deployers}</version>
       </dependency>
-      
       <dependency>
         <groupId>org.jboss.deployers</groupId>
         <artifactId>jboss-deployers-client-spi</artifactId>
         <version>${version.org.jboss.deployers}</version>
       </dependency>
-      
       <dependency>
         <groupId>org.jboss.deployers</groupId>
         <artifactId>jboss-deployers-core</artifactId>
         <version>${version.org.jboss.deployers}</version>
       </dependency>
-      
       <dependency>
         <groupId>org.jboss.deployers</groupId>
         <artifactId>jboss-deployers-core-spi</artifactId>
         <version>${version.org.jboss.deployers}</version>
       </dependency>
-      
       <dependency>
         <groupId>org.jboss.deployers</groupId>
         <artifactId>jboss-deployers-impl</artifactId>
         <version>${version.org.jboss.deployers}</version>
       </dependency>
-      
       <dependency>
         <groupId>org.jboss.deployers</groupId>
         <artifactId>jboss-deployers-spi</artifactId>
         <version>${version.org.jboss.deployers}</version>
       </dependency>
-      
       <dependency>
         <groupId>org.jboss.deployers</groupId>
         <artifactId>jboss-deployers-structure-spi</artifactId>
         <version>${version.org.jboss.deployers}</version>
       </dependency>
-      
       <dependency>
         <groupId>org.jboss.deployers</groupId>
         <artifactId>jboss-deployers-vfs</artifactId>
         <version>${version.org.jboss.deployers}</version>
       </dependency>
-      
       <dependency>
         <groupId>org.jboss.deployers</groupId>
         <artifactId>jboss-deployers-vfs-spi</artifactId>
         <version>${version.org.jboss.deployers}</version>
       </dependency>
-
       <dependency>
 	<groupId>org.jboss.javaee</groupId>
 	<artifactId>jboss-ejb-api_3.1</artifactId>
 	<version>${version.org.jboss.ejb.api}</version>
       </dependency>
-
       <dependency>
         <groupId>org.jboss.ejb3</groupId>
         <artifactId>jboss-ejb3-common</artifactId>
         <version>${version.org.jboss.ejb3.common.client}</version>
         <classifier>client</classifier>
       </dependency>
-      
       <dependency>
         <groupId>org.jboss.ejb3</groupId>
         <artifactId>jboss-ejb3_1</artifactId>
@@ -1817,7 +1772,6 @@
           </exclusion>
         </exclusions>
       </dependency>
-      
       <dependency>
         <groupId>org.jboss.ejb3</groupId>
         <artifactId>jboss-ejb3-core</artifactId>
@@ -1858,7 +1812,6 @@
           </exclusion>          
         </exclusions>
       </dependency>
-      
       <dependency>
         <groupId>org.jboss.ejb3</groupId>
         <artifactId>jboss-ejb3-endpoint-deployer</artifactId>
@@ -1871,19 +1824,16 @@
           </exclusion>
         </exclusions>
       </dependency>
-      
       <dependency>
         <groupId>org.jboss.ejb3</groupId>
         <artifactId>jboss-ejb3-jpa-int</artifactId>
         <version>${version.org.jboss.ejb3.jpa.int}</version>
       </dependency>
-      
       <dependency>
 	<groupId>org.jboss.ejb3</groupId>
 	<artifactId>jboss-ejb3-mc-int</artifactId>
 	<version>${version.org.jboss.ejb3.mc.int}</version>
       </dependency>
-
       <dependency>
 	<groupId>org.jboss.ejb3</groupId>
 	<artifactId>jboss-ejb3-metrics-deployer</artifactId>
@@ -1897,7 +1847,6 @@
 	</exclusions>
 
       </dependency>
-
       <dependency>
         <groupId>org.jboss.ejb3</groupId>
         <artifactId>jboss-ejb3-proxy-impl</artifactId>
@@ -1911,14 +1860,12 @@
 		</exclusion>
         </exclusions>
       </dependency>
-
       <dependency>
         <groupId>org.jboss.ejb3</groupId>
         <artifactId>jboss-ejb3-proxy-spi</artifactId>
         <version>${version.org.jboss.ejb3.proxy.spi.client}</version>
         <classifier>client</classifier>
       </dependency>
-    
       <dependency>
         <groupId>org.jboss.ejb3</groupId>
         <artifactId>jboss-ejb3-proxy-clustered</artifactId>
@@ -1936,7 +1883,6 @@
 		</exclusion>
         </exclusions>	
       </dependency>
- 
       <dependency>
         <groupId>org.jboss.ejb3</groupId>
         <artifactId>jboss-ejb3-security</artifactId>
@@ -1959,169 +1905,141 @@
 
         </exclusions>
       </dependency>
-
       <dependency>
         <groupId>org.jboss.bootstrap</groupId>
         <artifactId>jboss-bootstrap-api</artifactId>
         <version>${version.org.jboss.bootstrap.api}</version>
       </dependency>
-
       <dependency>
         <groupId>org.jboss.bootstrap</groupId>
         <artifactId>jboss-bootstrap-api-as</artifactId>
         <version>${version.org.jboss.bootstrap.api.as}</version>
       </dependency>
-
       <dependency>
         <groupId>org.jboss.bootstrap</groupId>
         <artifactId>jboss-bootstrap-api-mc</artifactId>
         <version>${version.org.jboss.bootstrap.api.mc}</version>
       </dependency>
-
       <dependency>
         <groupId>org.jboss.bootstrap</groupId>
         <artifactId>jboss-bootstrap-impl-as</artifactId>
         <version>${version.org.jboss.bootstrap.impl.as}</version>
       </dependency>
-
       <dependency>
         <groupId>org.jboss.bootstrap</groupId>
         <artifactId>jboss-bootstrap-impl-base</artifactId>
         <version>${version.org.jboss.bootstrap.impl.base}</version>
       </dependency>
-
       <dependency>
         <groupId>org.jboss.bootstrap</groupId>
         <artifactId>jboss-bootstrap-impl-mc</artifactId>
         <version>${version.org.jboss.bootstrap.impl.mc}</version>
       </dependency>
-
       <dependency>
         <groupId>org.jboss.bootstrap</groupId>
         <artifactId>jboss-bootstrap-spi</artifactId>
         <version>${version.org.jboss.bootstrap.spi}</version>
       </dependency>
-
       <dependency>
         <groupId>org.jboss.bootstrap</groupId>
         <artifactId>jboss-bootstrap-spi-as</artifactId>
         <version>${version.org.jboss.bootstrap.spi.as}</version>
       </dependency>
-
       <dependency>
         <groupId>org.jboss.bootstrap</groupId>
         <artifactId>jboss-bootstrap-spi-mc</artifactId>
         <version>${version.org.jboss.bootstrap.spi.mc}</version>
       </dependency>
-      
       <dependency>
         <groupId>org.jboss.javaee</groupId>
         <artifactId>jboss-javaee</artifactId>
         <version>5.2.0.Beta1</version>
       </dependency>
-      
       <dependency>
         <groupId>org.jboss.javaee</groupId>
         <artifactId>jboss-ejb-api</artifactId>
         <version>3.0.0${version.suffix.org.jboss.javaee}_SP1</version>
       </dependency>
-      
       <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-jacc-api</artifactId>
         <version>1.1.0${version.suffix.org.jboss.javaee}_SP1</version>
       </dependency>
-      
       <dependency>
         <groupId>org.jboss.javaee</groupId>
         <artifactId>jboss-jad-api</artifactId>
         <version>1.2.0${version.suffix.org.jboss.javaee}</version>
       </dependency>
-      
       <dependency>
         <groupId>org.jboss.javaee</groupId>
         <artifactId>jboss-jaspi-api</artifactId>
         <version>1.0.0${version.suffix.org.jboss.javaee}</version>
       </dependency>
-      
       <dependency>
         <groupId>org.jboss.javaee</groupId>
         <artifactId>jboss-jca-api</artifactId>
         <version>1.5.0${version.suffix.org.jboss.javaee}</version>
       </dependency>
-      
       <dependency>
         <groupId>org.jboss.javaee</groupId>
         <artifactId>jboss-jms-api</artifactId>
         <version>1.1.0${version.suffix.org.jboss.javaee}</version>
       </dependency>
-
       <dependency>
         <groupId>org.jboss.javaee</groupId>
         <artifactId>jboss-transaction-api</artifactId>
         <version>1.0.1${version.suffix.org.jboss.javaee}</version>
       </dependency>
-      
       <dependency>
         <groupId>org.jboss.interceptor</groupId>
         <artifactId>jboss-interceptor-api</artifactId>
         <version>${version.interceptor.api}</version>
       </dependency>
-
       <dependency>
         <groupId>javax.enterprise</groupId>
         <artifactId>cdi-api</artifactId>
         <version>${version.weld.api}</version>
       </dependency>
-
       <dependency>
         <groupId>org.jboss.weld</groupId>
         <artifactId>weld-api</artifactId>
         <version>${version.weld.api}</version>
       </dependency>
-
       <dependency>
         <groupId>javax.inject</groupId>
         <artifactId>javax.inject</artifactId>
         <version>${version.inject.api}</version>
       </dependency>
-
       <dependency>
         <groupId>org.jboss.jpa</groupId>
         <artifactId>jboss-jpa-deployers</artifactId>
         <version>${version.org.jboss.jpa.deployers}</version>
       </dependency>
-
       <dependency>
         <groupId>org.jboss.jpa</groupId>
         <artifactId>jboss-jpa-impl</artifactId>
         <version>${version.org.jboss.jpa.impl}</version>
       </dependency>
-
       <dependency>
         <groupId>org.jboss.jpa</groupId>
         <artifactId>jboss-jpa-spi</artifactId>
         <version>${version.org.jboss.jpa.spi}</version>
       </dependency>
-
       <dependency>
         <groupId>org.jboss.man</groupId>
         <artifactId>jboss-managed</artifactId>
         <version>${version.org.jboss.man}</version>
       </dependency>
-      
       <dependency>
         <groupId>org.jboss.man</groupId>
         <artifactId>jboss-metatype</artifactId>
         <version>${version.org.jboss.man}</version>
       </dependency>
-      
       <dependency>
         <groupId>org.jboss.kernel</groupId>
         <artifactId>jboss-aop-mc-int</artifactId>
@@ -2137,19 +2055,16 @@
           </exclusion>
         </exclusions>
       </dependency>
-      
       <dependency>
         <groupId>org.jboss.kernel</groupId>
         <artifactId>jboss-dependency</artifactId>
         <version>${version.org.jboss.kernel}</version>
       </dependency>
-      
       <dependency>
         <groupId>org.jboss.kernel</groupId>
         <artifactId>jboss-kernel</artifactId>
         <version>${version.org.jboss.kernel}</version>
       </dependency>
-      
       <dependency>
        <groupId>org.jboss.mcann</groupId>
        <artifactId>mcann-core</artifactId>
@@ -2223,193 +2138,161 @@
          </exclusion>
        </exclusions>
       </dependency>
-    
       <dependency>
         <groupId>org.jboss.integration</groupId>
         <artifactId>jboss-profileservice-spi</artifactId>
         <version>${version.org.jboss.integration}</version>
       </dependency>
-
       <dependency>
         <groupId>org.jboss.security</groupId>
         <artifactId>jbosssx</artifactId>
         <version>${version.org.jboss.security}</version>
       </dependency>
-      
       <dependency>
         <groupId>org.jboss.security</groupId>
         <artifactId>jboss-negotiation</artifactId>
         <version>${version.org.jboss.security.negotiation}</version>
       </dependency>
-      
       <dependency>
         <groupId>org.jboss.service.binding</groupId>
         <artifactId>jboss-service-binding-core</artifactId>
         <version>${version.org.jboss.service.binding}</version>
       </dependency>
-      
       <dependency>
         <groupId>org.jboss.service.binding</groupId>
         <artifactId>jboss-service-binding-mgmt</artifactId>
         <version>${version.org.jboss.service.binding}</version>
       </dependency>
-
       <dependency>
         <groupId>org.jboss.threads</groupId>
         <artifactId>jboss-threads</artifactId>
         <version>${version.org.jboss.threads}</version>
       </dependency>
-
       <dependency>
         <groupId>org.jboss.threads</groupId>
         <artifactId>jboss-threads-metadata</artifactId>
         <version>${version.org.jboss.threads}</version>
       </dependency>
-
       <dependency>
         <groupId>org.jboss.xnio</groupId>
         <artifactId>xnio-api</artifactId>
         <version>${version.org.jboss.xnio}</version>
       </dependency>
-
       <dependency>
         <groupId>org.jboss.xnio</groupId>
         <artifactId>xnio-nio</artifactId>
         <version>${version.org.jboss.xnio}</version>
       </dependency>
-
       <dependency>
         <groupId>org.jboss.xnio</groupId>
         <artifactId>xnio-metadata</artifactId>
         <version>${version.org.jboss.xnio.metadata}</version>
       </dependency>
-
       <dependency>
         <groupId>org.jboss.stdio</groupId>
         <artifactId>jboss-stdio</artifactId>
         <version>${version.org.jboss.stdio}</version>
       </dependency>
-
       <dependency>
         <groupId>org.jboss.security</groupId>
         <artifactId>jbosssx-client</artifactId>
         <version>${version.org.jboss.security}</version>
       </dependency>
-      
       <dependency>
         <groupId>org.jboss.security</groupId>
         <artifactId>jboss-security-spi</artifactId>
         <version>${version.org.jboss.security}</version>
       </dependency>
-      
       <dependency>
         <groupId>org.osgi</groupId>
         <artifactId>osgi_R4_compendium</artifactId>
         <version>1.0</version>
       </dependency>
-      
       <dependency>
         <groupId>org.osgi</groupId>
         <artifactId>osgi_R4_core</artifactId>
         <version>1.0</version>
       </dependency>
-      
       <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-aop</artifactId>
         <version>${version.org.springframework}</version>
       </dependency>
-      
       <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-beans</artifactId>
         <version>${version.org.springframework}</version>
       </dependency>
-      
       <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-context</artifactId>
         <version>${version.org.springframework}</version>
       </dependency>
-      
       <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-core</artifactId>
         <version>${version.org.springframework}</version>
       </dependency>
-      
       <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-web</artifactId>
         <version>${version.org.springframework}</version>
       </dependency>
-      
       <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-webmvc</artifactId>
         <version>${version.org.springframework}</version>
       </dependency>
-      
       <dependency>
         <groupId>oswego-concurrent</groupId>
         <artifactId>concurrent</artifactId>
         <version>${version.oswego-concurrent.concurrent}</version>
       </dependency>
-      
       <dependency>
         <groupId>qdox</groupId>
         <artifactId>qdox</artifactId>
         <version>1.6.1</version>
       </dependency>
-      
       <dependency>
         <groupId>quartz</groupId>
         <artifactId>quartz</artifactId>
         <version>1.5.2</version>
       </dependency>
-      
       <dependency>
         <groupId>sleepycat</groupId>
         <artifactId>je</artifactId>
         <version>3.0.12</version>
       </dependency>
-      
       <dependency>
         <groupId>snmptrapappender</groupId>
         <artifactId>snmpTrapAppender</artifactId>
         <version>1.2.8</version>
       </dependency>
-      
       <dependency>
         <groupId>stax</groupId>
         <artifactId>stax-api</artifactId>
         <version>1.0</version>
       </dependency>
-      
       <dependency>
         <groupId>sun-fi</groupId>
         <artifactId>FastInfoset</artifactId>
         <version>${version.fastinfoset}</version>
       </dependency>
-      
       <dependency>
         <groupId>sun-fi</groupId>
         <artifactId>FastInfosetUtilities</artifactId>
         <version>${version.fastinfoset}</version>
       </dependency>
-      
       <dependency>
         <groupId>javax.activation</groupId>
         <artifactId>activation</artifactId>
         <version>1.1</version>
       </dependency>
-      
       <dependency>
         <groupId>javax.mail</groupId>
         <artifactId>mail</artifactId>
         <version>1.4.2</version>
       </dependency>
-      
       <dependency>
         <groupId>com.sun.xml.ws</groupId>
         <artifactId>jaxws-rt</artifactId>
@@ -2429,25 +2312,21 @@
           </exclusion>
         </exclusions>
       </dependency>
-
       <dependency>
         <groupId>com.sun.xml.ws</groupId>
         <artifactId>jaxws-tools</artifactId>
         <version>${version.sun-jaxws}</version>
       </dependency>
-
       <dependency>
         <groupId>sun-jaxws</groupId>
         <artifactId>stax-ex</artifactId>
         <version>${version.staxex}</version>
       </dependency>
-
       <dependency>
         <groupId>com.sun.xml.stream.buffer</groupId>
         <artifactId>streambuffer</artifactId>
         <version>${version.streambuffer}</version>
-      </dependency>    
-      
+      </dependency>
       <dependency>
         <groupId>org.jboss.security</groupId>
         <artifactId>jbossxacml</artifactId>
@@ -2459,96 +2338,84 @@
           </exclusion>
         </exclusions>
       </dependency>
-      
       <dependency>
         <groupId>trove</groupId>
         <artifactId>trove</artifactId>
         <version>1.0.2</version>
       </dependency>
-      
       <dependency>
         <groupId>wsdl4j</groupId>
         <artifactId>wsdl4j</artifactId>
         <version>1.6.1</version>
       </dependency>
-      
       <dependency>
         <groupId>wscommons-policy</groupId>
         <artifactId>policy</artifactId>
         <version>1.0</version>
       </dependency>
-      
       <dependency>
         <groupId>wutka-dtdparser</groupId>
         <artifactId>dtdparser</artifactId>
         <version>1.21-brew</version>
       </dependency>
-      
       <dependency>
         <groupId>xdoclet</groupId>
         <artifactId>xdoclet</artifactId>
         <version>${version.xdoclet}</version>
       </dependency>
-      
       <dependency>
         <groupId>xdoclet</groupId>
         <artifactId>xdoclet-ejb-module</artifactId>
         <version>${version.xdoclet}</version>
       </dependency>
-      
       <dependency>
         <groupId>xdoclet</groupId>
         <artifactId>xdoclet-hibernate-module</artifactId>
         <version>${version.xdoclet}</version>
       </dependency>
-      
       <dependency>
         <groupId>xdoclet</groupId>
         <artifactId>xdoclet-java-module</artifactId>
         <version>${version.xdoclet}</version>
       </dependency>
-      
       <dependency>
         <groupId>xdoclet</groupId>
         <artifactId>xdoclet-jboss-module</artifactId>
         <version>${version.xdoclet}</version>
       </dependency>
-      
       <dependency>
         <groupId>xdoclet</groupId>
         <artifactId>xdoclet-jmx-module</artifactId>
         <version>${version.xdoclet}</version>
       </dependency>
-      
       <dependency>
         <groupId>xdoclet</groupId>
         <artifactId>xdoclet-portlet-module</artifactId>
         <version>${version.xdoclet}</version>
       </dependency>
-      
       <dependency>
         <groupId>xdoclet</groupId>
         <artifactId>xdoclet-web-module</artifactId>
         <version>${version.xdoclet}</version>
       </dependency>
-      
       <dependency>
         <groupId>xdoclet</groupId>
         <artifactId>xdoclet-xdoclet-module</artifactId>
         <version>${version.xdoclet}</version>
       </dependency>
-      
       <dependency>
         <groupId>xdoclet</groupId>
         <artifactId>xjavadoc</artifactId>
         <version>${version.xdoclet}</version>
       </dependency>
-      
       <dependency>
         <groupId>xmlunit</groupId>
         <artifactId>xmlunit</artifactId>
         <version>1.0</version>
       </dependency>
+      
+      <!-- Combined integration jar.  Maybe this can be removed when we just use the 
+        -  individual compoennts -->
 
     </dependencies>
 

Modified: branches/Branch_Hornet_Temporary/management/.project
===================================================================
--- branches/Branch_Hornet_Temporary/management/.project	2010-01-13 04:03:39 UTC (rev 99324)
+++ branches/Branch_Hornet_Temporary/management/.project	2010-01-13 04:03:59 UTC (rev 99325)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>jboss-as-management</name>
+	<name>management</name>
 	<comment>JBoss Application Server (management module)</comment>
 	<projects>
 		<project>jboss-as-cluster</project>
@@ -13,6 +13,11 @@
 	</projects>
 	<buildSpec>
 		<buildCommand>
+			<name>org.eclipse.wst.common.project.facet.core.builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
 			<name>org.eclipse.jdt.core.javabuilder</name>
 			<arguments>
 			</arguments>
@@ -26,5 +31,6 @@
 	<natures>
 		<nature>org.maven.ide.eclipse.maven2Nature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
 	</natures>
 </projectDescription>

Modified: branches/Branch_Hornet_Temporary/messaging/pom.xml
===================================================================
--- branches/Branch_Hornet_Temporary/messaging/pom.xml	2010-01-13 04:03:39 UTC (rev 99324)
+++ branches/Branch_Hornet_Temporary/messaging/pom.xml	2010-01-13 04:03:59 UTC (rev 99325)
@@ -90,14 +90,8 @@
       <artifactId>jboss-metadata-war</artifactId>
     </dependency>
     <dependency>
-      <groupId>jboss.messaging</groupId>
-      <artifactId>jboss-messaging</artifactId>
-      <exclusions>
-        <exclusion>
-          <groupId>jgroups</groupId>
-          <artifactId>jgroups</artifactId>
-        </exclusion>
-      </exclusions>
+      <groupId>org.hornetq</groupId>
+      <artifactId>hornetq-resources</artifactId>
     </dependency>
     <dependency>
       <groupId>apache-xerces</groupId>

Deleted: branches/Branch_Hornet_Temporary/messaging/src/main/java/org/jboss/jms/server/ServerPeerMO.java
===================================================================
--- branches/Branch_Hornet_Temporary/messaging/src/main/java/org/jboss/jms/server/ServerPeerMO.java	2010-01-13 04:03:39 UTC (rev 99324)
+++ branches/Branch_Hornet_Temporary/messaging/src/main/java/org/jboss/jms/server/ServerPeerMO.java	2010-01-13 04:03:59 UTC (rev 99325)
@@ -1,456 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009, 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.
- */
-package org.jboss.jms.server;
-
-import java.util.List;
-
-import javax.management.ObjectName;
-
-import org.jboss.jms.server.destination.StringObjectNameMetaMapper;
-import org.jboss.managed.api.ManagedOperation.Impact;
-import org.jboss.managed.api.annotation.ActivationPolicy;
-import org.jboss.managed.api.annotation.ManagementComponent;
-import org.jboss.managed.api.annotation.ManagementObject;
-import org.jboss.managed.api.annotation.ManagementOperation;
-import org.jboss.managed.api.annotation.ManagementProperties;
-import org.jboss.managed.api.annotation.ManagementProperty;
-import org.jboss.managed.api.annotation.ViewUse;
-import org.jboss.messaging.util.Version;
-import org.jboss.metatype.api.annotations.MetaMapping;
-
-/**
- * Empty class to provide the management metadata for JBoss Messaging
- * org.jboss.jms.server.ServerPeer, when deployed in AS5.
- * 
- * @see {@linkplain org.jboss.jms.server.ServerPeer}
- * @author Scott.Stark at jboss.org
- * @version $Revision:$
- */
- at ManagementObject(
-      name="jboss.messaging:service=ServerPeer",
-      componentType = @ManagementComponent(type = "JMS", subtype = "ServerPeer"),
-      properties = ManagementProperties.ALL,
-      isRuntime = true)
-public class ServerPeerMO
-{
-   @ManagementProperty(use={ViewUse.CONFIGURATION},
-         description="The persistence manager name",
-         includeInTemplate=true, mandatory=true, readOnly=false)
-   @MetaMapping(StringObjectNameMetaMapper.class)
-   public ObjectName getPersistenceManager()
-   {
-      return null;
-   }
-   public void setPersistenceManager(ObjectName on)
-   {
-   }
-
-   @ManagementProperty(use={ViewUse.CONFIGURATION},
-         description="The post office name",
-         includeInTemplate=true, mandatory=true, readOnly=false)
-   @MetaMapping(StringObjectNameMetaMapper.class)
-   public ObjectName getPostOffice()
-   {
-      return null;
-   }
-   public void setPostOffice(ObjectName on)
-   {
-   }
-
-   @ManagementProperty(use={ViewUse.CONFIGURATION},
-         description="The user manager name",
-         includeInTemplate=true, mandatory=true, readOnly=false)
-   @MetaMapping(StringObjectNameMetaMapper.class)
-   public ObjectName getJmsUserManager()
-   {
-      return null;
-   }
-   public void setJMSUserManager(ObjectName on)
-   {
-   }
-
-   @ManagementProperty(use={ViewUse.CONFIGURATION},
-         description="The default DLQ on the server peer",
-         includeInTemplate=true,
-         activationPolicy=ActivationPolicy.DEPLOYMENT_RESTART)
-   @MetaMapping(StringObjectNameMetaMapper.class)
-   public ObjectName getDefaultDLQ()
-   {
-      return null;
-   }
-   public void setDefaultDLQ(ObjectName on)
-   {
-   }
-
-   @ManagementProperty(use={ViewUse.CONFIGURATION},
-         description="The default expiry queue on the server peer",
-         includeInTemplate=true, mandatory=true, readOnly=false)
-   @MetaMapping(StringObjectNameMetaMapper.class)
-   public ObjectName getDefaultExpiryQueue()
-   {
-      return null;
-   }
-   public void setDefaultExpiryQueue(ObjectName on)
-   {
-   }
-
-   //read only JMX attributes
-
-   @ManagementProperty(use={ViewUse.RUNTIME},
-         includeInTemplate=false, mandatory=false, readOnly=true)
-   public String getJMSVersion()
-   {
-      return null;
-   }
-
-   @ManagementProperty(use={ViewUse.RUNTIME},
-         includeInTemplate=false, mandatory=false, readOnly=true)
-   public int getJMSMajorVersion()
-   {
-      return 0;
-   }
-   @ManagementProperty(use={ViewUse.RUNTIME},
-         includeInTemplate=false, mandatory=false, readOnly=true)
-   public int getJMSMinorVersion()
-   {
-      return 0;
-   }
-   @ManagementProperty(use={ViewUse.RUNTIME},
-         includeInTemplate=false, mandatory=false, readOnly=true)
-   public String getJMSProviderName()
-   {
-      return null;
-   }
-   @ManagementProperty(use={ViewUse.RUNTIME},
-         includeInTemplate=false, mandatory=false, readOnly=true)
-   public String getProviderVersion()
-   {
-      return null;
-   }
-   @ManagementProperty(use={ViewUse.RUNTIME},
-         includeInTemplate=false, mandatory=false, readOnly=true)
-
-   public int getProviderMajorVersion()
-   {
-      return 0;
-   }
-   @ManagementProperty(use={ViewUse.RUNTIME},
-         includeInTemplate=false, mandatory=false, readOnly=true)
-
-   public int getProviderMinorVersion()
-   {
-      return 0;
-   }
-
-   //Read - write attributes
-
-   public void setSecurityDomain(String securityDomain) throws Exception
-   {
-   }
-   public String getSecurityDomain()
-   {
-      return null;
-   }
-
-   public long getFailoverStartTimeout()
-   {
-      return 0;
-   }
-
-   public void setFailoverStartTimeout(long timeout)
-   {
-   }
-
-   public long getFailoverCompleteTimeout()
-   {
-      return 0;
-   }
-
-   public void setFailoverCompleteTimeout(long timeout)
-   {
-   }
-
-   public int getDefaultMaxDeliveryAttempts()
-   {
-      return 0;
-   }
-
-   public void setDefaultMaxDeliveryAttempts(int attempts)
-   {
-   }
-
-   public long getMessageCounterSamplePeriod()
-   {
-      return 0;
-   }
-
-   public void setMessageCounterSamplePeriod(long newPeriod)
-   {
-
-   }
-
-   public long getDefaultRedeliveryDelay()
-   {
-      return 0;
-   }
-
-   public void setDefaultRedeliveryDelay(long delay)
-   {
-   }
-
-   public int getDefaultMessageCounterHistoryDayLimit()
-   {
-      return 0;
-   }
-
-   public void setDefaultMessageCounterHistoryDayLimit(int limit)
-   {
-   }
-
-   @ManagementProperty(use={ViewUse.CONFIGURATION},
-         includeInTemplate=false,
-         activationPolicy=ActivationPolicy.COMPONENT_RESTART)
-   public String getClusterPullConnectionFactoryName()
-   {
-      return null;
-   }
-   public void setClusterPullConnectionFactoryName(String name)
-   {
-   }
-
-   public boolean isUseXAForMessagePull()
-   {
-      return false;
-   }
-   @ManagementProperty(use={ViewUse.CONFIGURATION},
-         includeInTemplate=false,
-         activationPolicy=ActivationPolicy.COMPONENT_RESTART)
-   public void setUseXAForMessagePull(boolean useXA) throws Exception
-   {
-   }
-
-   public boolean isDefaultPreserveOrdering()
-   {
-      return false;
-   }
-   @ManagementProperty(use={ViewUse.CONFIGURATION},
-         includeInTemplate=false,
-         activationPolicy=ActivationPolicy.COMPONENT_RESTART)
-   public void setDefaultPreserveOrdering(boolean preserve) throws Exception
-   {
-   }
-
-   public long getRecoverDeliveriesTimeout()
-   {
-      return 0;
-   }
-   public void setRecoverDeliveriesTimeout(long timeout)
-   {
-   }
-
-   @ManagementProperty(use={ViewUse.CONFIGURATION},
-         includeInTemplate=false,
-         activationPolicy=ActivationPolicy.COMPONENT_RESTART)
-   public void setServerPeerID(int serverPeerID)
-   {
-   }
-   public int getServerPeerID()
-   {
-      return 0;
-   }
-
-   public String getDefaultQueueJNDIContext()
-   {
-      return null;
-   }
-   @ManagementProperty(use={ViewUse.CONFIGURATION},
-         includeInTemplate=false,
-         activationPolicy=ActivationPolicy.COMPONENT_RESTART)
-   public void setDefaultQueueJNDIContext(String defaultQueueJNDIContext)
-   {
-   }
-
-   public String getDefaultTopicJNDIContext()
-   {
-      return null;
-   }
-
-   public void setDefaultTopicJNDIContext(String defaultTopicJNDIContext)
-   {
-   }
-
-   public void setSuckerPassword(String password)
-   {
-
-   }
-
-   public void setStrictTck(boolean strictTck)
-   {
-   }
-
-   public boolean isStrictTck()
-   {
-      return false;
-   }
-   
-   
-   public void setEnableMessageCounters(boolean enable) 
-   {
-
-   }
-   
-   public boolean isEnableMessageCounters()
-   {
-      return false;
-   }      
-   
-   public void enableMessageCounters()
-   {
-      setEnableMessageCounters(true);
-   }
-
-   public void disableMessageCounters()
-   {
-      setEnableMessageCounters(false);
-   }
-
-   // JMX Operations -------------------------------------------------------------------------------
-
-   @ManagementOperation(impact = Impact.ReadWrite)
-   public String deployQueue(String name, String jndiName) throws Exception
-   {
-      return null;
-   }
-   @ManagementOperation(impact = Impact.ReadWrite)
-   public String deployQueue(String name, String jndiName, int fullSize, int pageSize, int downCacheSize) throws Exception
-   {
-      return null;
-   }
-   @ManagementOperation(impact = Impact.ReadWrite)
-   public boolean destroyQueue(String name) throws Exception
-   {
-      return false;
-   }
-   @ManagementOperation(impact = Impact.ReadWrite)
-   public boolean undeployQueue(String name) throws Exception
-   {
-      return false;
-   }
-   @ManagementOperation(impact = Impact.ReadWrite)
-   public String deployTopic(String name, String jndiName) throws Exception
-   {
-      return null;
-   }
-   @ManagementOperation(impact = Impact.ReadWrite)
-   public String deployTopic(String name, String jndiName, int fullSize, int pageSize, int downCacheSize) throws Exception
-   {
-      return null;
-   }
-   @ManagementOperation(impact = Impact.ReadWrite)
-   public boolean destroyTopic(String name) throws Exception
-   {
-      return false;
-   }
-   @ManagementOperation(impact = Impact.ReadWrite)
-   public boolean undeployTopic(String name) throws Exception
-   {
-      return false;
-   }
-   @ManagementOperation(impact = Impact.ReadOnly)
-   public List getMessageCounters() throws Exception
-   {
-      return null;
-   }
-   @ManagementOperation(impact = Impact.ReadOnly)
-   public List getMessageStatistics() throws Exception
-   {
-      return null;
-   }
-   @ManagementOperation(impact = Impact.ReadOnly)
-   public String listMessageCountersAsHTML() throws Exception
-   {
-      return null;
-   }
-   @ManagementOperation(impact = Impact.ReadWrite)
-   public void resetAllMessageCounters()
-   {
-   }
-   @ManagementOperation(impact = Impact.ReadWrite)
-   public void resetAllMessageCounterHistories()
-   {
-   }
-   @ManagementOperation(impact = Impact.ReadOnly)
-   public String showPreparedTransactionsAsHTML()
-   {
-      return null;
-   }
-   @ManagementOperation(impact = Impact.ReadOnly)
-   public String showActiveClientsAsHTML() throws Exception
-   {
-      return null;
-   }
-
-   // Public ---------------------------------------------------------------------------------------
-
-   @ManagementOperation(impact = Impact.ReadWrite)
-   public void resetAllSuckers()
-   {
-   }
-
-   public Version getVersion()
-   {
-      return null;
-   }
-
-   public boolean isSupportsFailover()
-   {
-      return false;
-   }
-   @ManagementProperty(use={ViewUse.CONFIGURATION},
-         includeInTemplate=false,
-         activationPolicy=ActivationPolicy.COMPONENT_RESTART)
-   public void setSupportsFailover(boolean supportsFailover) throws Exception
-   {
-   }
-
-   public String getServerAopConfig()
-   {
-      return null;
-   }
-    @ManagementProperty(use={ViewUse.CONFIGURATION},
-          includeInTemplate=false,
-          activationPolicy=ActivationPolicy.COMPONENT_RESTART)
-   public void setServerAopConfig(String serverAopConfig)
-   {
-   }
-
-   public String getClientAopConfig()
-   {
-      return null;
-   }
-   @ManagementProperty(use={ViewUse.CONFIGURATION},
-         includeInTemplate=false,
-         activationPolicy=ActivationPolicy.COMPONENT_RESTART)
-   public void setClientAopConfig(String clientAopConfig)
-   {
-   }
-}

Deleted: branches/Branch_Hornet_Temporary/messaging/src/main/java/org/jboss/jms/server/ServerPeerMODefinition.java
===================================================================
--- branches/Branch_Hornet_Temporary/messaging/src/main/java/org/jboss/jms/server/ServerPeerMODefinition.java	2010-01-13 04:03:39 UTC (rev 99324)
+++ branches/Branch_Hornet_Temporary/messaging/src/main/java/org/jboss/jms/server/ServerPeerMODefinition.java	2010-01-13 04:03:59 UTC (rev 99325)
@@ -1,82 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 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.
- */
-package org.jboss.jms.server;
-
-import org.jboss.logging.Logger;
-import org.jboss.managed.api.ManagedObject;
-import org.jboss.managed.api.factory.ManagedObjectFactory;
-import org.jboss.managed.api.factory.ManagedObjectDefinition;
-import org.jboss.managed.spi.factory.ManagedObjectBuilder;
-import org.jboss.metadata.spi.MetaData;
-
-/**
- * A ManagedObjectBuilder that maps the ServerPeer class to the ServerPeerMO
- * for its ManagedObject skeleton.
- *
- * @author Scott.Stark at jboss.org
- * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
- */
-public class ServerPeerMODefinition extends ManagedObjectDefinition
-{
-   private static Logger log = Logger.getLogger(ServerPeerMODefinition.class);
-
-   public ServerPeerMODefinition(ManagedObjectFactory factory)
-   {
-      super(ServerPeer.class, new ServerPeerMOBuilder(factory));
-   }
-
-   private static class ServerPeerMOBuilder implements ManagedObjectBuilder
-   {
-      private ManagedObjectFactory factory;
-
-      private ServerPeerMOBuilder(ManagedObjectFactory factory)
-      {
-         this.factory = factory;
-      }
-
-      /**
-       * Create a ManagedObject from QueueService to QueueServiceMO.
-       *
-       * @param clazz - the mbean class to create the ManagedObject for
-       * @param metaData - the MDR MetaData view
-       */
-      public ManagedObject buildManagedObject(Class<?> clazz, MetaData metaData)
-      {
-         ManagedObjectFactory mof = getMOFactory();
-         log.debug("Creating QueueServiceMO template for: " + clazz);
-         return mof.createManagedObject(ServerPeerMO.class, metaData);
-      }
-
-      /**
-       * Get MO factory.
-       *
-       * @return the MO factory
-       */
-      protected ManagedObjectFactory getMOFactory()
-      {
-         if (factory == null)
-            factory = ManagedObjectFactory.getInstance();
-
-         return factory;
-      }
-   }
-}




More information about the jboss-cvs-commits mailing list