[hornetq-commits] JBoss hornetq SVN: r9080 - in trunk: src/config and 2 other directories.

[do-not-reply at jboss.org]

Author: clebert.suconic at jboss.com
Date: 2010-04-08 15:39:55 -0400 (Thu, 08 Apr 2010)
New Revision: 9080

Removed:
   trunk/src/config/jboss-as-6/
Modified:
   trunk/build-hornetq.xml
   trunk/tests/src/org/hornetq/tests/integration/management/AddressControlTest.java
   trunk/tests/src/org/hornetq/tests/integration/management/ManagementTestBase.java
   trunk/tests/src/org/hornetq/tests/unit/core/journal/impl/TimedBufferTest.java
Log:
Removing as6 configuration and moving it to hornetq-int on as6 source code

Modified: trunk/build-hornetq.xml
===================================================================
--- trunk/build-hornetq.xml	2010-04-08 15:19:33 UTC (rev 9079)
+++ trunk/build-hornetq.xml	2010-04-08 19:39:55 UTC (rev 9080)
@@ -92,8 +92,6 @@
    <property name="src.config.trunk.clustered.dir" value="${src.dir}/config/trunk/clustered"/>
    <property name="src.config.jbossas.non-clustered.dir" value="${src.dir}/config/jboss-as/non-clustered"/>    
    <property name="src.config.jbossas.clustered.dir" value="${src.dir}/config/jboss-as/clustered"/>
-   <property name="src.config.jbossas6.non-clustered.dir" value="${src.dir}/config/jboss-as-6/non-clustered"/>    
-   <property name="src.config.jbossas6.clustered.dir" value="${src.dir}/config/jboss-as-6/clustered"/>
    <property name="src.config.service.dir" value="${src.dir}/config/service"/>
    <property name="src.schema.dir" value="${src.config.dir}/common/schema"/>
    <property name="src.bin.dir" value="${src.dir}/bin"/>
@@ -620,14 +618,6 @@
       <antcall target="-validate-configuration">
          <param name="conf.dir" value="${src.config.jbossas.clustered.dir}"/>
       </antcall>
-
-      <!-- AS 6 configuration validation -->
-      <antcall target="-validate-configuration">
-         <param name="conf.dir" value="${src.config.jbossas6.non-clustered.dir}"/>
-      </antcall>
-      <antcall target="-validate-configuration">
-         <param name="conf.dir" value="${src.config.jbossas6.clustered.dir}"/>
-      </antcall>
    </target>
     
    <target name="-validate-configuration">
@@ -814,9 +804,6 @@
            <include name="ra.xml"/>
            <exclude  name="**/build.xml"/>
          </fileset>
-         <fileset dir="${src.config.dir}">
-           <include  name="jboss-as-6/**"/>
-         </fileset>
          <fileset dir="${native.bin.dir}">
            <include  name="**/*.so"/>
          </fileset>

Modified: trunk/tests/src/org/hornetq/tests/integration/management/AddressControlTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/management/AddressControlTest.java	2010-04-08 15:19:33 UTC (rev 9079)
+++ trunk/tests/src/org/hornetq/tests/integration/management/AddressControlTest.java	2010-04-08 19:39:55 UTC (rev 9080)
@@ -67,6 +67,9 @@
       AddressControl addressControl = createManagementControl(address);
 
       Assert.assertEquals(address.toString(), addressControl.getAddress());
+      
+      
+      Thread.sleep(120 * 1000);
 
       session.deleteQueue(queue);
    }

Modified: trunk/tests/src/org/hornetq/tests/integration/management/ManagementTestBase.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/management/ManagementTestBase.java	2010-04-08 15:19:33 UTC (rev 9079)
+++ trunk/tests/src/org/hornetq/tests/integration/management/ManagementTestBase.java	2010-04-08 19:39:55 UTC (rev 9080)
@@ -82,7 +82,7 @@
    {
       super.setUp();
 
-      mbeanServer = MBeanServerFactory.createMBeanServer();
+      mbeanServer = java.lang.management.ManagementFactory.getPlatformMBeanServer();
    }
 
    @Override

Modified: trunk/tests/src/org/hornetq/tests/unit/core/journal/impl/TimedBufferTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/unit/core/journal/impl/TimedBufferTest.java	2010-04-08 15:19:33 UTC (rev 9079)
+++ trunk/tests/src/org/hornetq/tests/unit/core/journal/impl/TimedBufferTest.java	2010-04-08 19:39:55 UTC (rev 9080)
@@ -60,6 +60,7 @@
       {
       }
    };
+   
 
    public void testFillBuffer()
    {