Cleans JMS bridge sample targets.

Adds STOMP bridge server target.

joram/samples/src/joram/build.xml

@@ -97,7 +97,7 @@
     </antcall>
   </target>
 
-  <!-- Start a single server in NullTransaction mode with all extension bundles-->
+  <!-- Start a single server in NullTransaction mode with all extension bundles -->
   <target name="extended_server" depends="init"
           description="--> Starts a single server in non-persistent mode">
     <antcall target="server">
@@ -107,6 +107,16 @@
     </antcall>
   </target>
 
+  <!-- Start a single server in NullTransaction mode with extension bundles needed for JASP-->
+  <target name="stomp_server" depends="init"
+          description="--> Starts a single server in non-persistent mode">
+    <antcall target="server">
+      <param name="sid" value="0"/>
+      <param name="a3.conf" value="${conf.dir}/centralized_a3servers.xml"/>
+      <param name="osgi.conf" value="${conf.dir}/config_stomp.properties"/>    	
+    </antcall>
+  </target>
+
   <!-- Setup a distributed architecture with 3 servers -->
   <target name="server0" depends="init"
           description="--> Starts a server for a distributed architecture (w/ id 0)">
@@ -745,25 +755,19 @@
     <mkdir dir="${run.dir}"/>
     <copy file="${conf.dir}/a3config.dtd" todir="${run.dir}"/>
     <copy file="${conf.dir}/a3debug.cfg" todir="${run.dir}"/>
-    <copy file="${conf.dir}/jndi.properties"
-          tofile="${run.dir}/jndi.properties"
-          overwrite="true"/>
     <copy file="${conf.dir}/bridge_a3servers.xml"
           tofile="${run.dir}/a3servers.xml"
           overwrite="true"/>
   </target>
 
-  <target name="bridge_server0" depends="bridge_init"
-          description="--> Starts a server 0 for bridge">
-    <antcall target="server">
-      <param name="sid" value="0"/>
-    </antcall>
-  </target>
-	
-  <target name="bridge_server1" depends="bridge_init"
-          description="--> Starts a server 1 for bridge">
+  <!-- Start the bridge server -->
+  <target name="bridge_server" depends="init"
+          description="--> Starts the bridge server">
+    <copy file="${conf.dir}/jndi.properties" todir="${run.dir}"/>
     <antcall target="server">
       <param name="sid" value="1"/>
+      <param name="a3.conf" value="${conf.dir}/bridge_a3servers.xml"/>
+      <param name="osgi.conf" value="${conf.dir}/config_bridge.properties"/>    	
     </antcall>
   </target>
 	
@@ -776,7 +780,7 @@
     </java>
   </target>
 
-  <!-- Runs the bridge sender -->
+  <!-- Runs the bridge producer -->
   <target name="bridge_producer" depends="init"
     description="--> Runs the BRIDGE sample producer">
     <java classname="bridge.BridgeProducer" failonerror="no" fork="yes"
@@ -793,121 +797,6 @@
       <classpath path="${project.class.path}"/>
     </java>
   </target>
-
-
- <!-- Runs the bridge sender -->
-  <target name="bridge_publisher" depends="init"
-    description="--> Runs the BRIDGE sample producer">
-    <java classname="bridge.BridgePublisher" failonerror="no" fork="yes"
-          dir="${run.dir}">
-      <classpath path="${project.class.path}"/>
-    </java>
-  </target>
-
-  <!-- Runs the bridge consumer -->
-  <target name="bridge_subscriber" depends="init"
-    description="--> Runs the BRIDGE sample consumer">
-    <java classname="bridge.BridgeSubscriber" failonerror="no" fork="yes"
-          dir="${run.dir}">
-      <classpath path="${project.class.path}"/>
-    </java>
-  </target>
-
-  <!-- Runs the foreign sender -->
-  <target name="foreign_producer" depends="init"
-    description="--> Runs the foreign sample producer">
-    <java classname="bridge.ForeignProducer" failonerror="no" fork="yes"
-          dir="${run.dir}">
-      <classpath path="${project.class.path}"/>
-    </java>
-  </target>
-
-  <!-- Runs the foreign consumer -->
-  <target name="foreign_consumer" depends="init"
-    description="--> Runs the foreign sample consumer">
-    <java classname="bridge.ForeignConsumer" failonerror="no" fork="yes"
-          dir="${run.dir}">
-      <classpath path="${project.class.path}"/>
-    </java>
-  </target>
-
- <!-- Runs the foreign publisher -->
-  <target name="foreign_publisher" depends="init"
-    description="--> Runs the foreign sample producer">
-    <java classname="bridge.ForeignPublisher" failonerror="no" fork="yes"
-          dir="${run.dir}">
-      <classpath path="${project.class.path}"/>
-    </java>
-  </target>
-
-  <!-- Runs the foreign consumer -->
-  <target name="foreign_subscriber" depends="init"
-    description="--> Runs the foreign sample consumer">
-    <java classname="bridge.ForeignSubscriber" failonerror="no" fork="yes"
-          dir="${run.dir}">
-      <classpath path="${project.class.path}"/>
-    </java>
-  </target>
-
-
-	<!-- BRIDGE TESTS -->
-  <target name="XAbridge_server0" depends="bridge_init"
-          description="--> Starts a server 0 for bridge">
-    <antcall target="server">
-      <param name="sid" value="0"/>
-    </antcall>
-  </target>
-  <target name="XAbridge_server1" depends="bridge_init"
-          description="--> Starts a server 1 for bridge">
-    <antcall target="server">
-      <param name="sid" value="1"/>
-    </antcall>
-  </target>
-	
-  <!-- Runs the bridge administration -->
-  <target name="XAbridge_admin" depends="init"
-    description="--> Runs the BRIDGE sample administration">
-    <java classname="bridge.XABridgeAdmin" failonerror="no" fork="yes"
-          dir="${run.dir}">
-      <classpath path="${project.class.path}"/>
-    </java>
-  </target>
-
-  <!-- Runs the bridge sender -->
-  <target name="XAforeign_publisher" depends="init"
-    description="--> Runs the BRIDGE sample producer">
-    <java classname="bridge.XAForeignPublisher" failonerror="no" fork="yes"
-          dir="${run.dir}">
-      <classpath path="${project.class.path}"/>
-    </java>
-  </target>
-
-  <!-- Runs the bridge consumer -->
-  <target name="XAforeign_subscriber" depends="init"
-    description="--> Runs the BRIDGE sample consumer">
-    <java classname="bridge.XAForeignSubscriber" failonerror="no" fork="yes"
-          dir="${run.dir}">
-      <classpath path="${project.class.path}"/>
-    </java>
-  </target>
-	
-  <!-- Runs the foreign sender -->
-  <target name="XAforeign_producer" depends="init"
-    description="--> Runs the foreign sample producer">
-    <java classname="bridge.XAForeignProducer" failonerror="no" fork="yes"
-          dir="${run.dir}">
-      <classpath path="${project.class.path}"/>
-    </java>
-  </target>
-
-  <!-- Runs the foreign consumer -->
-  <target name="XAforeign_consumer" depends="init"
-    description="--> Runs the foreign sample consumer">
-    <java classname="bridge.XAForeignConsumer" failonerror="no" fork="yes"
-          dir="${run.dir}">
-      <classpath path="${project.class.path}"/>
-    </java>
-  </target>
   
   <!-- **************************************************
        * JCA sample