[jboss-cvs] JBossAS SVN: r99923 - in branches/Branch_Hornet_Temporary_2: hornetq-int/src/main/java/org/jboss/jms/testintegration and 2 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Mon Jan 25 17:25:45 EST 2010


Author: clebert.suconic at jboss.com
Date: 2010-01-25 17:25:45 -0500 (Mon, 25 Jan 2010)
New Revision: 99923

Removed:
   branches/Branch_Hornet_Temporary_2/hornetq-int/src/main/java/org/jboss/jms/server/destination/DestinationManager.java
Modified:
   branches/Branch_Hornet_Temporary_2/hornetq-int/src/main/java/org/jboss/jms/testintegration/HornetQTestAdmin.java
   branches/Branch_Hornet_Temporary_2/testsuite/build.xml
   branches/Branch_Hornet_Temporary_2/testsuite/pom.xml
   branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging/test/Jms11UnitTest.java
Log:
changes

Deleted: branches/Branch_Hornet_Temporary_2/hornetq-int/src/main/java/org/jboss/jms/server/destination/DestinationManager.java
===================================================================
--- branches/Branch_Hornet_Temporary_2/hornetq-int/src/main/java/org/jboss/jms/server/destination/DestinationManager.java	2010-01-25 21:26:06 UTC (rev 99922)
+++ branches/Branch_Hornet_Temporary_2/hornetq-int/src/main/java/org/jboss/jms/server/destination/DestinationManager.java	2010-01-25 22:25:45 UTC (rev 99923)
@@ -1,28 +0,0 @@
-package org.jboss.jms.server.destination;
-
-public interface DestinationManager {
-
-	/**
-	 * Creates a JMS Queue with the specified name and JNDI binding.
-	 * 
-	 * @return {@code true} if the queue was created, {@code false} else
-	 */
-	boolean createQueue(String name, String jndiBinding) throws Exception;
-
-	/**
-	 * Destroys a JMS Queue with the specified name.
-	 * 
-	 * @return {@code true} if the queue was destroyed, {@code false} else
-	 */
-	boolean destroyQueue(String name) throws Exception;
-
-	/**
-	 * Creates a JMS Topic with the specified name and JNDI binding.
-	 * 
-	 * @return {@code true} if the topic was created, {@code false} else
-	 */
-	boolean createTopic(String name, String jndiBinding) throws Exception;
-
-	boolean destroyTopic(String name) throws Exception;
-
-}

Modified: branches/Branch_Hornet_Temporary_2/hornetq-int/src/main/java/org/jboss/jms/testintegration/HornetQTestAdmin.java
===================================================================
--- branches/Branch_Hornet_Temporary_2/hornetq-int/src/main/java/org/jboss/jms/testintegration/HornetQTestAdmin.java	2010-01-25 21:26:06 UTC (rev 99922)
+++ branches/Branch_Hornet_Temporary_2/hornetq-int/src/main/java/org/jboss/jms/testintegration/HornetQTestAdmin.java	2010-01-25 22:25:45 UTC (rev 99923)
@@ -15,7 +15,7 @@
 	{
 		try
 		{
-			hornetQJMSServerName = new ObjectName("module=JMS,type=Server");
+			hornetQJMSServerName = new ObjectName("org.hornetq:module=JMS,type=Server");
 		} catch (Exception e)
 		{
 			throw new NestedRuntimeException(e);
@@ -29,12 +29,14 @@
 
 	public Object createQueue(String name, TestRole[] securityConfig) throws Exception
 	{
+		System.out.println("Creating queue " + name);
 		jmx.invoke(hornetQJMSServerName, "createQueue", new Object[]{name, "/queue/" + name}, new String[] {"java.lang.String", "java.lang.String"});
 		return name;
 	}
 
 	public Object createTopic(String name, TestRole[] securityConfig) throws Exception
 	{
+		System.out.println("Creating topic " + name);
 		jmx.invoke(hornetQJMSServerName, "createTopic", new Object[]{name, "/queue/" + name}, new String[] {"java.lang.String", "java.lang.String"});
 		return name;
 	}

Modified: branches/Branch_Hornet_Temporary_2/testsuite/build.xml
===================================================================
--- branches/Branch_Hornet_Temporary_2/testsuite/build.xml	2010-01-25 21:26:06 UTC (rev 99922)
+++ branches/Branch_Hornet_Temporary_2/testsuite/build.xml	2010-01-25 22:25:45 UTC (rev 99923)
@@ -267,8 +267,8 @@
       <fileset refid="org.jboss.jaxr:juddi-service:sar"/>
       <fileset refid="org.jboss.remoting:jboss-remoting:jar"/>
       <fileset refid="jboss:jboss-serialization:jar"/>
-      <fileset refid="org.jboss.ejb3:jboss-ejb3-core:jar"/>
-      <fileset refid="org.jboss.ejb3:jboss-ejb3-core:jar:client"/>
+      <!-- <fileset refid="org.jboss.ejb3:jboss-ejb3-core:jar"/> 
+      <fileset refid="org.jboss.ejb3:jboss-ejb3-core:jar:client"/> -->
       <fileset refid="org.jboss.ejb3:jboss-ejb3-ext-api:jar"/>
       <fileset refid="org.jboss.ejb3:jboss-ejb3-proxy-impl:jar"/>
       <fileset refid="org.jboss.ejb3:jboss-ejb3-proxy-impl:jar:client"/>
@@ -306,9 +306,17 @@
       <fileset refid="org.jboss.service.binding:jboss-service-binding-core:jar"/>
       <fileset refid="org.jboss.service.binding:jboss-service-binding-mgmt:jar"/>
       <fileset refid="stax:stax-api:jar"/>
+    	
+      <fileset refid="org.jboss.jbossas:jboss-as-hornetq-int:jar"/>
+
+        <fileset refid="org.hornetq:hornetq-core-client:jar"/>
+        <fileset refid="org.hornetq:hornetq-jms-client:jar"/>
+        <fileset refid="org.hornetq:hornetq-transports:jar"/>
+    	<fileset refid="org.jboss.netty:netty:jar"/>
+    	
       <!-- needed for messaging JMS provider tests -->
-      <fileset refid="jboss.messaging:jboss-messaging:jar"/>
-      <fileset refid="jboss.messaging:jboss-messaging-client:jar"/>
+      <!-- <fileset refid="jboss.messaging:jboss-messaging:jar"/>
+      <fileset refid="jboss.messaging:jboss-messaging-client:jar"/> -->
       <!-- needed for proxy tests -->
       <fileset refid="bcel:bcel:jar"/>
       <!-- needed for security login module tests -->
@@ -950,10 +958,11 @@
    </patternset>
    <!-- jbossmessaging includes -->
    <patternset id="jbossmessaging.includes">
-     <include name="org/jboss/test/jbossmessaging/test/*UnitTestCase.class"/>
+    <include name="org/jboss/test/jbossmessaging/**/Jms11UnitTest.class"/>
+<!--      <include name="org/jboss/test/jbossmessaging/test/*UnitTestCase.class"/>
      <include name="org/jboss/test/jbossmessaging/perf/*StressTestCase.class"/>
      <include name="org/jboss/test/jbossmessaging/ra/*UnitTestCase.class"/>
-     <include name="org/jboss/test/jms/integration/**/*Test.class"/>
+     <include name="org/jboss/test/jms/integration/**/*Test.class"/> -->
    </patternset>
    <patternset id="jbossmessaging-clustering.includes">
      <include name="org/jboss/test/jbossmessaging/clustertest/*TestCase.class"/>

Modified: branches/Branch_Hornet_Temporary_2/testsuite/pom.xml
===================================================================
--- branches/Branch_Hornet_Temporary_2/testsuite/pom.xml	2010-01-25 21:26:06 UTC (rev 99922)
+++ branches/Branch_Hornet_Temporary_2/testsuite/pom.xml	2010-01-25 22:25:45 UTC (rev 99923)
@@ -138,6 +138,20 @@
       <artifactId>hibernate-testing</artifactId>
     </dependency>
 
+    <dependency>
+      <groupId>org.jboss.jbossas</groupId>
+      <artifactId>jboss-as-hornetq-int</artifactId>
+    </dependency>
+
+
+    <dependency>
+      <groupId>org.jboss.netty</groupId>
+      <artifactId>netty</artifactId>
+    </dependency>
+
+
+
+
   </dependencies>
   
   <profiles>

Modified: branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging/test/Jms11UnitTest.java
===================================================================
--- branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging/test/Jms11UnitTest.java	2010-01-25 21:26:06 UTC (rev 99922)
+++ branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging/test/Jms11UnitTest.java	2010-01-25 22:25:45 UTC (rev 99923)
@@ -47,6 +47,9 @@
 import javax.naming.InitialContext;
 
 import EDU.oswego.cs.dl.util.concurrent.CountDown;
+
+import org.jboss.jms.testintegration.JMSTestAdmin;
+import org.jboss.jms.testintegration.JMSTestAdminFactory;
 import org.jboss.logging.Logger;
 import org.jboss.test.jbossmessaging.JMSTestCase;
 import org.jboss.test.jbossmessaging.perf.JMSPerfStressTestCase;
@@ -73,13 +76,20 @@
    static Connection queueConnection;
    static Connection topicConnection;
 
-   public static junit.framework.Test suite() throws Exception
+   public void setUp() throws Exception
    {
-       ClassLoader loader = Thread.currentThread().getContextClassLoader();
-       String resourceName = getJMSResourceRelativePathname("test-destinations-full-service.xml") ;
-
-       return getDeploySetup(Jms11UnitTest.class,
-               loader.getResource(resourceName).toString());
+       JMSTestAdmin admin = JMSTestAdminFactory.getFactory().newAdmin();
+       admin.createTopic("testTopic", null);
+       admin.createTopic("securedTopic", null);
+       admin.createTopic("testDurableTopic", null);
+       admin.createTopic("testDurableTopic", null);
+       
+       admin.createQueue("testQueue", null);
+       admin.createQueue("A", null);
+       admin.createQueue("B", null);
+       admin.createQueue("C", null);
+       admin.createQueue("D", null);
+       admin.createQueue("ex", null);
    }
 
    public Jms11UnitTest(String name) throws Exception




More information about the jboss-cvs-commits mailing list