[jboss-cvs] JBoss Messaging SVN: r6386 - in trunk: tests/joram-tests/src/org/jboss/test/jms and 1 other directory.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Thu Apr 9 14:57:25 EDT 2009


Author: timfox
Date: 2009-04-09 14:57:25 -0400 (Thu, 09 Apr 2009)
New Revision: 6386

Modified:
   trunk/build-messaging.xml
   trunk/build.xml
   trunk/tests/joram-tests/src/org/jboss/test/jms/SpawnedJMSServer.java
Log:
fixed joram tests

Modified: trunk/build-messaging.xml
===================================================================
--- trunk/build-messaging.xml	2009-04-09 18:19:44 UTC (rev 6385)
+++ trunk/build-messaging.xml	2009-04-09 18:57:25 UTC (rev 6386)
@@ -1515,84 +1515,5 @@
       </findbugs>
 
    </target>
-   <!-- Examples -->
-
-   <target name="queueExample" depends="jar-client, jar-transports, jar-jms">
-      <ant dir="${examples.dir}/jms" antfile="build.xml" target="queueExample"/>
-   </target>
-
-   <target name="topicExample" depends="jar-client, jar-transports, jar-jms">
-      <ant dir="${examples.dir}/jms" antfile="build.xml" target="topicExample"/>
-   </target>
-
-   <target name="durSubExample" depends="jar-client, jar-transports, jar-jms">
-      <ant dir="${examples.dir}/jms" antfile="build.xml" target="durSubExample"/>
-   </target>
-
-   <target name="wildcardExample" depends="jar-client, jar-transports, jar-jms">
-      <ant dir="${examples.dir}/jms" antfile="build.xml" target="wildcardExample"/>
-   </target>
-
-   <target name="messageGroupingExample" depends="jar-client, jar-transports, jar-jms">
-      <ant dir="${examples.dir}/jms" antfile="build.xml" target="messageGroupingExample"/>
-   </target>
-
-   <target name="scheduledExample" depends="jar-client, jar-transports, jar-jms">
-      <ant dir="${examples.dir}/jms" antfile="build.xml" target="scheduledExample"/>
-   </target>
-
-   <target name="simpleClient" depends="jar-client, jar-transports, jar-jms">
-      <ant dir="${examples.dir}/messaging" antfile="build.xml" target="simpleClient"/>
-   </target>
-
-   <target name="ssslClient" depends="jar-client, jar-transports, jar-jms">
-      <ant dir="${examples.dir}/messaging" antfile="build.xml" target="sslClient"/>
-   </target>
-
-   <target name="simpleExample" depends="jar">
-      <ant dir="${examples.dir}/messaging" antfile="build.xml" target="simpleExample"/>
-   </target>
-
-   <target name="managementClient" depends="jar-client, jar-transports, jar-jms">
-      <ant dir="${examples.dir}/messaging" antfile="build.xml" target="managementClient"/>
-   </target>
-
-   <target name="wildCardClient" depends="jar-client, jar-transports, jar-jms">
-      <ant dir="${examples.dir}/messaging" antfile="build.xml" target="wildCardClient"/>
-   </target>
-
-   <target name="scheduledMessageExample" depends="jar-client, jar-transports, jar-jms">
-      <ant dir="${examples.dir}/messaging" antfile="build.xml" target="scheduledMessageExample"/>
-   </target>
-   <!-- Performance examples -->
-
-   <target name="perfListener" depends="jar-client, jar-transports, jar-jms">
-      <ant dir="${examples.dir}/jms" antfile="build.xml" target="perfListener"/>
-   </target>
-
-   <target name="perfAutoAckListener" depends="jar-client, jar-transports, jar-jms">
-      <ant dir="${examples.dir}/jms" antfile="build.xml" target="perfAutoAckListener"/>
-   </target>
-
-   <target name="perfDupsOKListener" depends="jar-client, jar-transports, jar-jms">
-      <ant dir="${examples.dir}/jms" antfile="build.xml" target="perfDupsOKListener"/>
-   </target>
-
-   <target name="perfTransactionalListener" depends="jar-client, jar-transports, jar-jms">
-      <ant dir="${examples.dir}/jms" antfile="build.xml" target="perfTransactionalListener"/>
-   </target>
-
-   <target name="perfSender" depends="jar-client, jar-transports, jar-jms">
-      <ant dir="${examples.dir}/jms" antfile="build.xml" target="perfSender"/>
-   </target>
-
-   <target name="perfNonTransactionalSender" depends="jar-client, jar-transports, jar-jms">
-      <ant dir="${examples.dir}/jms" antfile="build.xml" target="perfNonTransactionalSender"/>
-   </target>
-
-   <target name="perfTransactionalSender" depends="jar-client, jar-transports, jar-jms">
-      <ant dir="${examples.dir}/jms" antfile="build.xml" target="perfTransactionalSender"/>
-   </target>
-
-
+     
 </project>

Modified: trunk/build.xml
===================================================================
--- trunk/build.xml	2009-04-09 18:19:44 UTC (rev 6385)
+++ trunk/build.xml	2009-04-09 18:57:25 UTC (rev 6386)
@@ -272,80 +272,5 @@
     <target name="findbugs" depends="createthirdparty">
        <ant antfile="build-messaging.xml" target="findbugs"/>
     </target>
-   <!--example targets-->
-   <target name="queueExample" depends="createthirdparty">
-      <ant antfile="build-messaging.xml" target="queueExample"/>
-   </target>
-
-   <target name="topicExample" depends="createthirdparty">
-      <ant antfile="build-messaging.xml" target="topicExample"/>
-   </target>
-
-   <target name="durSubExample" depends="createthirdparty">
-      <ant antfile="build-messaging.xml" target="durSubExample"/>
-   </target>
-
-   <target name="wildcardExample" depends="createthirdparty">
-      <ant antfile="build-messaging.xml" target="wildcardExample"/>
-   </target>
-
-   <target name="scheduledMessageExample" depends="createthirdparty">
-      <ant antfile="build-messaging.xml" target="scheduledMessageExample"/>
-   </target>
-
-   <target name="messageGroupingExample" depends="createthirdparty">
-      <ant antfile="build-messaging.xml" target="messageGroupingExample"/>
-   </target>
-
-   <target name="scheduledExample" depends="createthirdparty">
-      <ant antfile="build-messaging.xml" target="scheduledExample"/>
-   </target>
-
-   <target name="perfListener" depends="createthirdparty">
-      <ant antfile="build-messaging.xml" target="perfListener"/>
-   </target>
-
-   <target name="perfAutoAckListener" depends="createthirdparty">
-      <ant antfile="build-messaging.xml" target="perfAutoAckListener"/>
-   </target>
-
-   <target name="perfDupsOKListener" depends="createthirdparty">
-      <ant antfile="build-messaging.xml" target="perfDupsOKListener"/>
-   </target>
-
-   <target name="perfTransactionalListener" depends="createthirdparty">
-      <ant antfile="build-messaging.xml" target="perfTransactionalListener"/>
-   </target>
-
-   <target name="perfSender" depends="createthirdparty">
-      <ant antfile="build-messaging.xml" target="perfSender"/>
-   </target>
-
-   <target name="perfNonTransactionalSender" depends="createthirdparty">
-      <ant antfile="build-messaging.xml" target="perfNonTransactionalSender"/>
-   </target>
-
-   <target name="perfTransactionalSender" depends="createthirdparty">
-      <ant antfile="build-messaging.xml" target="perfTransactionalSender"/>
-   </target>
-
-   <target name="simpleClient" depends="createthirdparty">
-      <ant antfile="build-messaging.xml" target="simpleClient"/>
-   </target>
-
-   <target name="sslClient" depends="createthirdparty">
-      <ant antfile="build-messaging.xml" target="sslClient"/>
-   </target>
-
-   <target name="simpleExample" depends="createthirdparty">
-      <ant antfile="build-messaging.xml" target="simpleExample"/>
-   </target>
-
-    <target name="managementClient" depends="createthirdparty">
-       <ant antfile="build-messaging.xml" target="managementClient"/>
-    </target>
-
-   <target name="wildCardClient" depends="createthirdparty">
-      <ant antfile="build-messaging.xml" target="wildCardClient"/>
-   </target>
+  
 </project>

Modified: trunk/tests/joram-tests/src/org/jboss/test/jms/SpawnedJMSServer.java
===================================================================
--- trunk/tests/joram-tests/src/org/jboss/test/jms/SpawnedJMSServer.java	2009-04-09 18:19:44 UTC (rev 6385)
+++ trunk/tests/joram-tests/src/org/jboss/test/jms/SpawnedJMSServer.java	2009-04-09 18:57:25 UTC (rev 6386)
@@ -61,7 +61,7 @@
          System.setProperty("java.rmi.server.hostname", "localhost");
          System.setProperty("java.naming.factory.initial", "org.jnp.interfaces.NamingContextFactory");
          System.setProperty("java.naming.factory.url.pkgs", "org.jboss.naming:org.jnp.interfaces");
-
+  
          final NamingBeanImpl namingInfo = new NamingBeanImpl();
          namingInfo.start();
          final Main jndiServer = new Main();
@@ -71,10 +71,11 @@
          jndiServer.setRmiPort(1098);
          jndiServer.setRmiBindAddress("localhost");
          jndiServer.start();
-
+         
          Configuration conf = new ConfigurationImpl();
          conf.getAcceptorConfigurations().add(new TransportConfiguration(NettyAcceptorFactory.class.getName()));
          conf.setSecurityEnabled(false);
+         conf.setEnableFileDeployment(true);
          final MessagingServer server = Messaging.newMessagingServer(conf);
          server.start();
 




More information about the jboss-cvs-commits mailing list