Author: gaohoward Date: 2010-10-10 20:56:51 -0400 (Sun, 10 Oct 2010) New Revision: 9763 Modified: trunk/examples/javaee/xarecovery/server/hornetq-jms.xml trunk/examples/jms/client-kickoff/server0/hornetq-jms.xml trunk/examples/jms/jms-bridge/server0/hornetq-jms.xml trunk/examples/jms/jms-bridge/server1/hornetq-jms.xml trunk/examples/jms/jms-bridge/src/org/hornetq/jms/example/JMSBridgeExample.java trunk/examples/jms/jmx/server0/hornetq-jms.xml trunk/examples/jms/management/server0/hornetq-jms.xml trunk/examples/jms/message-counters/server0/hornetq-jms.xml trunk/examples/jms/queue-requestor/server0/hornetq-jms.xml trunk/examples/jms/symmetric-cluster/src/org/hornetq/jms/example/SymmetricClusterExample.java trunk/examples/jms/xa-heuristic/server0/hornetq-jms.xml trunk/examples/jms/xa-receive/server0/hornetq-jms.xml trunk/examples/jms/xa-send/server0/hornetq-jms.xml trunk/examples/jms/xa-with-jta/server0/hornetq-jms.xml trunk/examples/soak/tx-restarts/server0/hornetq-jms.xml Log: HORNETQ-515 -- example configuration changes Modified: trunk/examples/javaee/xarecovery/server/hornetq-jms.xml =================================================================== --- trunk/examples/javaee/xarecovery/server/hornetq-jms.xml 2010-10-10 12:15:41 UTC (rev 9762) +++ trunk/examples/javaee/xarecovery/server/hornetq-jms.xml 2010-10-11 00:56:51 UTC (rev 9763) @@ -3,6 +3,7 @@ xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd"> <connection-factory name="ConnectionFactory"> + <xa>true</xa> <connectors> <connector-ref connector-name="netty"/> </connectors> @@ -16,4 +17,4 @@ <queue name="testQueue"> <entry name="/queue/testQueue"/> </queue> -</configuration> \ No newline at end of file +</configuration> Modified: trunk/examples/jms/client-kickoff/server0/hornetq-jms.xml =================================================================== --- trunk/examples/jms/client-kickoff/server0/hornetq-jms.xml 2010-10-10 12:15:41 UTC (rev 9762) +++ trunk/examples/jms/client-kickoff/server0/hornetq-jms.xml 2010-10-11 00:56:51 UTC (rev 9763) @@ -2,7 +2,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd"> <!--the connection factory used by the example--> - <connection-factory name="ConnectionFactory"> + <connection-factory name="ConnectionFactory" signature="queue"> <connectors> <connector-ref connector-name="netty"/> </connectors> @@ -11,4 +11,4 @@ </entries> </connection-factory> -</configuration> \ No newline at end of file +</configuration> Modified: trunk/examples/jms/jms-bridge/server0/hornetq-jms.xml =================================================================== --- trunk/examples/jms/jms-bridge/server0/hornetq-jms.xml 2010-10-10 12:15:41 UTC (rev 9762) +++ trunk/examples/jms/jms-bridge/server0/hornetq-jms.xml 2010-10-11 00:56:51 UTC (rev 9763) @@ -3,6 +3,7 @@ xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd"> <connection-factory name="ConnectionFactory"> + <xa>true</xa> <connectors> <connector-ref connector-name="netty"/> </connectors> @@ -11,6 +12,15 @@ </entries> </connection-factory> + <connection-factory name="ClientConnectionFactory"> + <connectors> + <connector-ref connector-name="netty"/> + </connectors> + <entries> + <entry name="/client/ConnectionFactory"/> + </entries> + </connection-factory> + <topic name="topic"> <entry name="/source/topic"/> </topic> Modified: trunk/examples/jms/jms-bridge/server1/hornetq-jms.xml =================================================================== --- trunk/examples/jms/jms-bridge/server1/hornetq-jms.xml 2010-10-10 12:15:41 UTC (rev 9762) +++ trunk/examples/jms/jms-bridge/server1/hornetq-jms.xml 2010-10-11 00:56:51 UTC (rev 9763) @@ -3,6 +3,7 @@ xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd"> <connection-factory name="ConnectionFactory"> + <xa>true</xa> <connectors> <connector-ref connector-name="netty"/> </connectors> @@ -11,6 +12,15 @@ </entries> </connection-factory> + <connection-factory name="ClientConnectionFactory"> + <connectors> + <connector-ref connector-name="netty"/> + </connectors> + <entries> + <entry name="/client/ConnectionFactory"/> + </entries> + </connection-factory> + <queue name="target"> <entry name="/target/queue"/> </queue> Modified: trunk/examples/jms/jms-bridge/src/org/hornetq/jms/example/JMSBridgeExample.java =================================================================== --- trunk/examples/jms/jms-bridge/src/org/hornetq/jms/example/JMSBridgeExample.java 2010-10-10 12:15:41 UTC (rev 9762) +++ trunk/examples/jms/jms-bridge/src/org/hornetq/jms/example/JMSBridgeExample.java 2010-10-11 00:56:51 UTC (rev 9763) @@ -55,7 +55,7 @@ try { // Step 2. Lookup the *source* JMS resources - ConnectionFactory sourceConnectionFactory = (ConnectionFactory)sourceContext.lookup("/source/ConnectionFactory"); + ConnectionFactory sourceConnectionFactory = (ConnectionFactory)sourceContext.lookup("/client/ConnectionFactory"); Topic sourceTopic = (Topic)sourceContext.lookup("/source/topic"); // Step 3. Create a connection, a session and a message producer for the *source* topic @@ -75,7 +75,7 @@ sourceConnection.close(); // Step 6. Lookup the *target* JMS resources - ConnectionFactory targetConnectionFactory = (ConnectionFactory)targetContext.lookup("/target/ConnectionFactory"); + ConnectionFactory targetConnectionFactory = (ConnectionFactory)targetContext.lookup("/client/ConnectionFactory"); Queue targetQueue = (Queue)targetContext.lookup("/target/queue"); // Step 7. Create a connection, a session and a message consumer for the *target* queue Modified: trunk/examples/jms/jmx/server0/hornetq-jms.xml =================================================================== --- trunk/examples/jms/jmx/server0/hornetq-jms.xml 2010-10-10 12:15:41 UTC (rev 9762) +++ trunk/examples/jms/jmx/server0/hornetq-jms.xml 2010-10-11 00:56:51 UTC (rev 9763) @@ -2,7 +2,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd"> <!--the connection factory used by the example--> - <connection-factory name="ConnectionFactory"> + <connection-factory name="ConnectionFactory" signature="queue"> <connectors> <connector-ref connector-name="netty"/> </connectors> @@ -16,4 +16,4 @@ <entry name="/queue/exampleQueue"/> </queue> -</configuration> \ No newline at end of file +</configuration> Modified: trunk/examples/jms/management/server0/hornetq-jms.xml =================================================================== --- trunk/examples/jms/management/server0/hornetq-jms.xml 2010-10-10 12:15:41 UTC (rev 9762) +++ trunk/examples/jms/management/server0/hornetq-jms.xml 2010-10-11 00:56:51 UTC (rev 9763) @@ -2,7 +2,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd"> <!--the connection factory used by the example--> - <connection-factory name="ConnectionFactory"> + <connection-factory name="ConnectionFactory" signature="queue"> <connectors> <connector-ref connector-name="netty"/> </connectors> @@ -15,4 +15,4 @@ <queue name="exampleQueue"> <entry name="/queue/exampleQueue"/> </queue> -</configuration> \ No newline at end of file +</configuration> Modified: trunk/examples/jms/message-counters/server0/hornetq-jms.xml =================================================================== --- trunk/examples/jms/message-counters/server0/hornetq-jms.xml 2010-10-10 12:15:41 UTC (rev 9762) +++ trunk/examples/jms/message-counters/server0/hornetq-jms.xml 2010-10-11 00:56:51 UTC (rev 9763) @@ -2,7 +2,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd"> <!--the connection factory used by the example--> - <connection-factory name="ConnectionFactory"> + <connection-factory name="ConnectionFactory" signature="queue"> <connectors> <connector-ref connector-name="netty-connector"/> </connectors> @@ -21,4 +21,4 @@ <entry name="/queue/expiryQueue"/> </queue> -</configuration> \ No newline at end of file +</configuration> Modified: trunk/examples/jms/queue-requestor/server0/hornetq-jms.xml =================================================================== --- trunk/examples/jms/queue-requestor/server0/hornetq-jms.xml 2010-10-10 12:15:41 UTC (rev 9762) +++ trunk/examples/jms/queue-requestor/server0/hornetq-jms.xml 2010-10-11 00:56:51 UTC (rev 9763) @@ -2,7 +2,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd"> <!--the connection factory used by the example--> - <connection-factory name="ConnectionFactory"> + <connection-factory name="ConnectionFactory" signature="queue"> <connectors> <connector-ref connector-name="netty-connector"/> </connectors> @@ -16,4 +16,4 @@ <entry name="/queue/exampleQueue"/> </queue> -</configuration> \ No newline at end of file +</configuration> Modified: trunk/examples/jms/symmetric-cluster/src/org/hornetq/jms/example/SymmetricClusterExample.java =================================================================== --- trunk/examples/jms/symmetric-cluster/src/org/hornetq/jms/example/SymmetricClusterExample.java 2010-10-10 12:15:41 UTC (rev 9762) +++ trunk/examples/jms/symmetric-cluster/src/org/hornetq/jms/example/SymmetricClusterExample.java 2010-10-11 00:56:51 UTC (rev 9763) @@ -23,6 +23,7 @@ import org.hornetq.api.jms.HornetQJMSClient; import org.hornetq.common.example.HornetQExample; +import org.hornetq.jms.server.impl.JMSFactoryType; /** * This example demonstrates a cluster of three nodes set up in a symmetric topology - i.e. each node @@ -79,7 +80,7 @@ // connection factory directly we avoid having to worry about a JNDI look-up. // In an app server environment you could use HA-JNDI to lookup from the clustered JNDI servers without // having to know about a specific one. - ConnectionFactory cf = HornetQJMSClient.createConnectionFactory("231.7.7.7", 9876); + ConnectionFactory cf = (ConnectionFactory)HornetQJMSClient.createConnectionFactory("231.7.7.7", 9876, JMSFactoryType.CF); // We give a little while for each server to broadcast its whereabouts to the client Thread.sleep(2000); Modified: trunk/examples/jms/xa-heuristic/server0/hornetq-jms.xml =================================================================== --- trunk/examples/jms/xa-heuristic/server0/hornetq-jms.xml 2010-10-10 12:15:41 UTC (rev 9762) +++ trunk/examples/jms/xa-heuristic/server0/hornetq-jms.xml 2010-10-11 00:56:51 UTC (rev 9763) @@ -3,6 +3,7 @@ xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd"> <!--the connection factory used by the example--> <connection-factory name="ConnectionFactory"> + <xa>true</xa> <connectors> <connector-ref connector-name="netty-connector"/> </connectors> @@ -16,4 +17,4 @@ <entry name="/queue/exampleQueue"/> </queue> -</configuration> \ No newline at end of file +</configuration> Modified: trunk/examples/jms/xa-receive/server0/hornetq-jms.xml =================================================================== --- trunk/examples/jms/xa-receive/server0/hornetq-jms.xml 2010-10-10 12:15:41 UTC (rev 9762) +++ trunk/examples/jms/xa-receive/server0/hornetq-jms.xml 2010-10-11 00:56:51 UTC (rev 9763) @@ -3,6 +3,7 @@ xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd"> <!--the connection factory used by the example--> <connection-factory name="ConnectionFactory"> + <xa>true</xa> <connectors> <connector-ref connector-name="netty-connector"/> </connectors> @@ -16,4 +17,4 @@ <entry name="/queue/exampleQueue"/> </queue> -</configuration> \ No newline at end of file +</configuration> Modified: trunk/examples/jms/xa-send/server0/hornetq-jms.xml =================================================================== --- trunk/examples/jms/xa-send/server0/hornetq-jms.xml 2010-10-10 12:15:41 UTC (rev 9762) +++ trunk/examples/jms/xa-send/server0/hornetq-jms.xml 2010-10-11 00:56:51 UTC (rev 9763) @@ -3,6 +3,7 @@ xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd"> <!--the connection factory used by the example--> <connection-factory name="ConnectionFactory"> + <xa>true</xa> <connectors> <connector-ref connector-name="netty-connector"/> </connectors> @@ -16,4 +17,4 @@ <entry name="/queue/exampleQueue"/> </queue> -</configuration> \ No newline at end of file +</configuration> Modified: trunk/examples/jms/xa-with-jta/server0/hornetq-jms.xml =================================================================== --- trunk/examples/jms/xa-with-jta/server0/hornetq-jms.xml 2010-10-10 12:15:41 UTC (rev 9762) +++ trunk/examples/jms/xa-with-jta/server0/hornetq-jms.xml 2010-10-11 00:56:51 UTC (rev 9763) @@ -3,6 +3,7 @@ xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd"> <!--the connection factory used by the example--> <connection-factory name="ConnectionFactory"> + <xa>true</xa> <connectors> <connector-ref connector-name="netty-connector"/> </connectors> @@ -16,4 +17,4 @@ <entry name="/queue/exampleQueue"/> </queue> -</configuration> \ No newline at end of file +</configuration> Modified: trunk/examples/soak/tx-restarts/server0/hornetq-jms.xml =================================================================== --- trunk/examples/soak/tx-restarts/server0/hornetq-jms.xml 2010-10-10 12:15:41 UTC (rev 9762) +++ trunk/examples/soak/tx-restarts/server0/hornetq-jms.xml 2010-10-11 00:56:51 UTC (rev 9763) @@ -3,6 +3,7 @@ xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd"> <!--the connection factory used by the example--> <connection-factory name="ConnectionFactory"> + <xa>true</xa> <connectors> <connector-ref connector-name="netty-connector"/> </connectors>