Modified: activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/usecases/activemq.xml URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/usecases/activemq.xml?rev=916937&r1=916936&r2=916937&view=diff ============================================================================== --- activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/usecases/activemq.xml (original) +++ activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/usecases/activemq.xml Sat Feb 27 10:11:16 2010 @@ -15,7 +15,12 @@ See the License for the specific language governing permissions and limitations under the License. --> -<beans> +<beans + xmlns="http://www.springframework.org/schema/beans"; + xmlns:amq="http://activemq.apache.org/schema/core"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd + http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd";> <broker useJmx="true" xmlns="http://activemq.apache.org/schema/core";> @@ -42,19 +47,6 @@ </policyEntries></policyMap> </destinationPolicy> - - <persistenceAdapter> - <journaledJDBC journalLogFiles="5" dataDirectory="../data"/> - <!-- To use a different datasource, use th following syntax : --> - <!-- - <journaledJDBC journalLogFiles="5" dataDirectory="../data" dataSource="#postgres-ds"/> - --> - </persistenceAdapter> - - <transportConnectors> - <transportConnector uri="tcp://localhost:61616" discoveryUri="multicast://default"/> - </transportConnectors> - <networkConnectors> <!-- by default just auto discover the other brokers --> <networkConnector uri="multicast://default"/> @@ -62,7 +54,19 @@ <networkConnector uri="static://(tcp://host1:61616,tcp://host2:61616)"/> --> </networkConnectors> - + + <persistenceFactory> + <journalPersistenceAdapterFactory journalLogFiles="5" dataDirectory="../data"/> + <!-- To use a different datasource, use the following syntax : --> + <!-- + <journalPersistenceAdapterFactory journalLogFiles="5" dataDirectory="../data" dataSource="#postgres-ds"/> + --> + </persistenceFactory> + + <transportConnectors> + <transportConnector uri="tcp://localhost:61616" discoveryUri="multicast://default"/> + </transportConnectors> + </broker> <!-- This xbean configuration file supports all the standard spring xml configuration options -->
Modified: activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/usecases/multicast-broker-1.xml URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/usecases/multicast-broker-1.xml?rev=916937&r1=916936&r2=916937&view=diff ============================================================================== --- activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/usecases/multicast-broker-1.xml (original) +++ activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/usecases/multicast-broker-1.xml Sat Feb 27 10:11:16 2010 @@ -15,14 +15,17 @@ See the License for the specific language governing permissions and limitations under the License. --> -<beans> +<beans + xmlns="http://www.springframework.org/schema/beans"; + xmlns:amq="http://activemq.apache.org/schema/core"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd + http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd";> + <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/> <broker brokerName="BrokerA" persistent="false" useJmx="false" xmlns="http://activemq.apache.org/schema/core";> - <transportConnectors> - <transportConnector uri="tcp://localhost:61616" discoveryUri="multicast://default?group=${groupId}"/> - </transportConnectors> <networkConnectors> <networkConnector uri="multicast://default?group=${groupId}"/> @@ -31,6 +34,11 @@ <persistenceAdapter> <memoryPersistenceAdapter/> </persistenceAdapter> + + <transportConnectors> + <transportConnector uri="tcp://localhost:61616" discoveryUri="multicast://default?group=${groupId}"/> + </transportConnectors> + </broker> </beans> Modified: activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/usecases/multicast-broker-auto.xml URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/usecases/multicast-broker-auto.xml?rev=916937&r1=916936&r2=916937&view=diff ============================================================================== --- activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/usecases/multicast-broker-auto.xml (original) +++ activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/usecases/multicast-broker-auto.xml Sat Feb 27 10:11:16 2010 @@ -15,14 +15,17 @@ See the License for the specific language governing permissions and limitations under the License. --> -<beans> +<beans + xmlns="http://www.springframework.org/schema/beans"; + xmlns:amq="http://activemq.apache.org/schema/core"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd + http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd";> + <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/> <broker brokerName="BrokerB" persistent="false" useJmx="false" xmlns="http://activemq.apache.org/schema/core";> - <transportConnectors> - <transportConnector uri="tcp://localhost:0" discoveryUri="multicast://default?group=${groupId}"/> - </transportConnectors> <networkConnectors> <networkConnector uri="multicast://default?group=${groupId}"/> @@ -31,6 +34,11 @@ <persistenceAdapter> <memoryPersistenceAdapter/> </persistenceAdapter> + + <transportConnectors> + <transportConnector uri="tcp://localhost:0" discoveryUri="multicast://default?group=${groupId}"/> + </transportConnectors> + </broker> </beans> Modified: activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/usecases/receiver-discovery.xml URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/usecases/receiver-discovery.xml?rev=916937&r1=916936&r2=916937&view=diff ============================================================================== --- activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/usecases/receiver-discovery.xml (original) +++ activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/usecases/receiver-discovery.xml Sat Feb 27 10:11:16 2010 @@ -15,14 +15,16 @@ See the License for the specific language governing permissions and limitations under the License. --> -<beans> +<beans + xmlns="http://www.springframework.org/schema/beans"; + xmlns:amq="http://activemq.apache.org/schema/core"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd + http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd";> <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/> <broker brokerName="receiver" persistent="false" useJmx="false" xmlns="http://activemq.apache.org/schema/core";> - <transportConnectors> - <transportConnector uri="tcp://localhost:0" discoveryUri="multicast://default?group=${groupId}"/> - </transportConnectors> <networkConnectors> <networkConnector uri="multicast://default?group=${groupId}"/> @@ -31,6 +33,11 @@ <persistenceAdapter> <memoryPersistenceAdapter/> </persistenceAdapter> + + <transportConnectors> + <transportConnector uri="tcp://localhost:0" discoveryUri="multicast://default?group=${groupId}"/> + </transportConnectors> + </broker> </beans> Modified: activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/usecases/receiver-duplex.xml URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/usecases/receiver-duplex.xml?rev=916937&r1=916936&r2=916937&view=diff ============================================================================== --- activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/usecases/receiver-duplex.xml (original) +++ activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/usecases/receiver-duplex.xml Sat Feb 27 10:11:16 2010 @@ -14,30 +14,28 @@ See the License for the specific language governing permissions and limitations under the License. --> -<beans - xmlns="http://www.springframework.org/schema/beans"; - xmlns:amq="http://activemq.org/config/1.0"; +<beans + xmlns="http://www.springframework.org/schema/beans"; + xmlns:amq="http://activemq.apache.org/schema/core"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd - http://activemq.org/config/1.0 http://activemq.apache.org/schema/activemq-core.xsd - http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd";> + http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd";> <!-- Allows us to use system properties as variables in this configuration file --> <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/> - - <broker brokerName="receiver" persistent="false" useJmx="true" xmlns="http://activemq.org/config/1.0"; > + <broker brokerName="receiver" persistent="false" useJmx="true" xmlns="http://activemq.apache.org/schema/core"; > + <!-- The store and forward broker networks ActiveMQ will listen to --> + <networkConnectors> + </networkConnectors> + <!-- The transport connectors ActiveMQ will listen to --> <transportConnectors> <transportConnector uri="tcp://localhost:62002"/> </transportConnectors> - <!-- The store and forward broker networks ActiveMQ will listen to --> - <networkConnectors> - </networkConnectors> - </broker> Modified: activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/usecases/receiver-http.xml URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/usecases/receiver-http.xml?rev=916937&r1=916936&r2=916937&view=diff ============================================================================== --- activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/usecases/receiver-http.xml (original) +++ activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/usecases/receiver-http.xml Sat Feb 27 10:11:16 2010 @@ -15,13 +15,15 @@ See the License for the specific language governing permissions and limitations under the License. --> -<beans> +<beans + xmlns="http://www.springframework.org/schema/beans"; + xmlns:amq="http://activemq.apache.org/schema/core"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd + http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd";> - <broker brokerName="receiver" persistent="false" xmlns="http://activemq.apache.org/schema/core";> - <transportConnectors> - <transportConnector uri="http://localhost:62302"/> - </transportConnectors> + <broker brokerName="receiver" persistent="false" xmlns="http://activemq.apache.org/schema/core";> <networkConnectors> <networkConnector uri="static:(http://localhost:62301)"/> </networkConnectors> @@ -29,6 +31,11 @@ <persistenceAdapter> <memoryPersistenceAdapter/> </persistenceAdapter> + + <transportConnectors> + <transportConnector uri="http://localhost:62302"/> + </transportConnectors> + </broker> </beans> Modified: activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/usecases/receiver-zeroconf.xml URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/usecases/receiver-zeroconf.xml?rev=916937&r1=916936&r2=916937&view=diff ============================================================================== --- activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/usecases/receiver-zeroconf.xml (original) +++ activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/usecases/receiver-zeroconf.xml Sat Feb 27 10:11:16 2010 @@ -16,7 +16,12 @@ See the License for the specific language governing permissions and limitations under the License. --> -<beans> +<beans + xmlns="http://www.springframework.org/schema/beans"; + xmlns:amq="http://activemq.apache.org/schema/core"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd + http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd";> <broker name="receiver"> <connector> Modified: activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/usecases/receiver.xml URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/usecases/receiver.xml?rev=916937&r1=916936&r2=916937&view=diff ============================================================================== --- activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/usecases/receiver.xml (original) +++ activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/usecases/receiver.xml Sat Feb 27 10:11:16 2010 @@ -15,12 +15,14 @@ See the License for the specific language governing permissions and limitations under the License. --> -<beans> +<beans + xmlns="http://www.springframework.org/schema/beans"; + xmlns:amq="http://activemq.apache.org/schema/core"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd + http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd";> <broker brokerName="receiver" persistent="false" useJmx="false" xmlns="http://activemq.apache.org/schema/core";> - <transportConnectors> - <transportConnector uri="tcp://localhost:62002"/> - </transportConnectors> <networkConnectors> <networkConnector uri="static:(tcp://localhost:62001)"/> @@ -29,6 +31,11 @@ <persistenceAdapter> <memoryPersistenceAdapter/> </persistenceAdapter> + + <transportConnectors> + <transportConnector uri="tcp://localhost:62002"/> + </transportConnectors> + </broker> </beans> Modified: activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/usecases/sender-activecluster.xml URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/usecases/sender-activecluster.xml?rev=916937&r1=916936&r2=916937&view=diff ============================================================================== --- activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/usecases/sender-activecluster.xml (original) +++ activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/usecases/sender-activecluster.xml Sat Feb 27 10:11:16 2010 @@ -16,7 +16,12 @@ See the License for the specific language governing permissions and limitations under the License. --> -<beans> +<beans + xmlns="http://www.springframework.org/schema/beans"; + xmlns:amq="http://activemq.apache.org/schema/core"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd + http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd";> <broker name="sender"> <connector> Modified: activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/usecases/sender-discovery.xml URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/usecases/sender-discovery.xml?rev=916937&r1=916936&r2=916937&view=diff ============================================================================== --- activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/usecases/sender-discovery.xml (original) +++ activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/usecases/sender-discovery.xml Sat Feb 27 10:11:16 2010 @@ -15,14 +15,16 @@ See the License for the specific language governing permissions and limitations under the License. --> -<beans> +<beans + xmlns="http://www.springframework.org/schema/beans"; + xmlns:amq="http://activemq.apache.org/schema/core"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd + http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd";> <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/> <broker brokerName="sender" persistent="false" useJmx="false" xmlns="http://activemq.apache.org/schema/core";> - <transportConnectors> - <transportConnector uri="tcp://localhost:0" discoveryUri="multicast://default?group=${groupId}"/> - </transportConnectors> <networkConnectors> <networkConnector uri="multicast://default?group=${groupId}"/> @@ -31,6 +33,11 @@ <persistenceAdapter> <memoryPersistenceAdapter/> </persistenceAdapter> + + <transportConnectors> + <transportConnector uri="tcp://localhost:0" discoveryUri="multicast://default?group=${groupId}"/> + </transportConnectors> + </broker> </beans> Modified: activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/usecases/sender-duplex.xml URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/usecases/sender-duplex.xml?rev=916937&r1=916936&r2=916937&view=diff ============================================================================== --- activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/usecases/sender-duplex.xml (original) +++ activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/usecases/sender-duplex.xml Sat Feb 27 10:11:16 2010 @@ -14,49 +14,45 @@ See the License for the specific language governing permissions and limitations under the License. --> -<beans - xmlns="http://www.springframework.org/schema/beans"; - xmlns:amq="http://activemq.org/config/1.0"; +<beans + xmlns="http://www.springframework.org/schema/beans"; + xmlns:amq="http://activemq.apache.org/schema/core"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd - http://activemq.org/config/1.0 http://activemq.apache.org/schema/activemq-core.xsd - http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd";> + http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd";> <!-- Allows us to use system properties as variables in this configuration file --> <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/> - <broker brokerName="sender" persistent="false" useJmx="true" xmlns="http://activemq.org/config/1.0"; > <!-- dataDirectory="${activemq.base}/data"> --> + <broker brokerName="sender" persistent="false" useJmx="true" xmlns="http://activemq.apache.org/schema/core"; > <!-- dataDirectory="${activemq.base}/data"> --> - - - <!-- The transport connectors ActiveMQ will listen to --> - <transportConnectors> - <transportConnector uri="tcp://localhost:62001"/> - </transportConnectors> - <!-- The store and forward broker networks ActiveMQ will listen to --> <networkConnectors> <!-- by default just auto discover the other brokers --> <networkConnector name="monitoring" uri="static:(tcp://localhost:62002)" duplex="true" > - <excludedDestinations> - <queue physicalName="exclude.test.foo"/> - <topic physicalName="exclude.test.bar"/> - </excludedDestinations> <dynamicallyIncludedDestinations> <queue physicalName="include.test.foo"/> <topic physicalName="include.test.bar"/> </dynamicallyIncludedDestinations> + <excludedDestinations> + <queue physicalName="exclude.test.foo"/> + <topic physicalName="exclude.test.bar"/> + </excludedDestinations> <staticallyIncludedDestinations> <queue physicalName="always.include.queue"/> <topic physicalName="always.include.topic"/> </staticallyIncludedDestinations> - - </networkConnector> </networkConnectors> + + + <!-- The transport connectors ActiveMQ will listen to --> + <transportConnectors> + <transportConnector uri="tcp://localhost:62001"/> + </transportConnectors> </broker> Modified: activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/usecases/sender-http.xml URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/usecases/sender-http.xml?rev=916937&r1=916936&r2=916937&view=diff ============================================================================== --- activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/usecases/sender-http.xml (original) +++ activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/usecases/sender-http.xml Sat Feb 27 10:11:16 2010 @@ -15,7 +15,12 @@ See the License for the specific language governing permissions and limitations under the License. --> -<beans> +<beans + xmlns="http://www.springframework.org/schema/beans"; + xmlns:amq="http://activemq.apache.org/schema/core"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd + http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd";> <broker brokerName="sender" persistent="false" xmlns="http://activemq.apache.org/schema/core";> <transportConnectors> Modified: activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/usecases/sender-zeroconf.xml URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/usecases/sender-zeroconf.xml?rev=916937&r1=916936&r2=916937&view=diff ============================================================================== --- activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/usecases/sender-zeroconf.xml (original) +++ activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/usecases/sender-zeroconf.xml Sat Feb 27 10:11:16 2010 @@ -16,7 +16,12 @@ See the License for the specific language governing permissions and limitations under the License. --> -<beans> +<beans + xmlns="http://www.springframework.org/schema/beans"; + xmlns:amq="http://activemq.apache.org/schema/core"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd + http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd";> <broker name="sender"> <connector> Modified: activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/usecases/sender.xml URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/usecases/sender.xml?rev=916937&r1=916936&r2=916937&view=diff ============================================================================== --- activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/usecases/sender.xml (original) +++ activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/usecases/sender.xml Sat Feb 27 10:11:16 2010 @@ -15,12 +15,14 @@ See the License for the specific language governing permissions and limitations under the License. --> -<beans> +<beans + xmlns="http://www.springframework.org/schema/beans"; + xmlns:amq="http://activemq.apache.org/schema/core"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd + http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd";> <broker brokerName="sender" persistent="false" useJmx="false" xmlns="http://activemq.apache.org/schema/core";> - <transportConnectors> - <transportConnector uri="tcp://localhost:62001"/> - </transportConnectors> <networkConnectors> <networkConnector uri="static:(tcp://localhost:62002)"> @@ -33,6 +35,11 @@ <persistenceAdapter> <memoryPersistenceAdapter/> </persistenceAdapter> + + <transportConnectors> + <transportConnector uri="tcp://localhost:62001"/> + </transportConnectors> + </broker> </beans> Modified: activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/util/plugin-broker.xml URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/util/plugin-broker.xml?rev=916937&r1=916936&r2=916937&view=diff ============================================================================== --- activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/util/plugin-broker.xml (original) +++ activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/util/plugin-broker.xml Sat Feb 27 10:11:16 2010 @@ -18,7 +18,13 @@ <!-- this file can only be parsed using the xbean-spring library --> <!-- START SNIPPET: xbean --> -<beans> +<beans + xmlns="http://www.springframework.org/schema/beans"; + xmlns:amq="http://activemq.apache.org/schema/core"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd + http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd";> + <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/> <broker useJmx="false" persistent="false" xmlns="http://activemq.apache.org/schema/core";> Modified: activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/xbean/activemq-policy.xml URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/xbean/activemq-policy.xml?rev=916937&r1=916936&r2=916937&view=diff ============================================================================== --- activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/xbean/activemq-policy.xml (original) +++ activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/xbean/activemq-policy.xml Sat Feb 27 10:11:16 2010 @@ -18,7 +18,12 @@ <!-- this file can only be parsed using the xbean-spring library --> <!-- START SNIPPET: xbean --> -<beans> +<beans + xmlns="http://www.springframework.org/schema/beans"; + xmlns:amq="http://activemq.apache.org/schema/core"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd + http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd";> <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/> @@ -48,15 +53,17 @@ </policyEntry> <policyEntry topic="PRICES.>"> + + <!-- lets force old messages to be discarded for slow consumers --> + <pendingMessageLimitStrategy> + <constantPendingMessageLimitStrategy limit="10"/> + </pendingMessageLimitStrategy> + <!-- 10 seconds worth --> <subscriptionRecoveryPolicy> <timedSubscriptionRecoveryPolicy recoverDuration="10000" /> </subscriptionRecoveryPolicy> - <!-- lets force old messages to be discarded for slow consumers --> - <pendingMessageLimitStrategy> - <constantPendingMessageLimitStrategy limit="10"/> - </pendingMessageLimitStrategy> </policyEntry> </policyEntries> </policyMap> Modified: activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/xbean/activemq.xml URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/xbean/activemq.xml?rev=916937&r1=916936&r2=916937&view=diff ============================================================================== --- activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/xbean/activemq.xml (original) +++ activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/xbean/activemq.xml Sat Feb 27 10:11:16 2010 @@ -18,31 +18,37 @@ <!-- this file can only be parsed using the xbean-spring library --> <!-- START SNIPPET: example --> -<beans> +<beans + xmlns="http://www.springframework.org/schema/beans"; + xmlns:amq="http://activemq.apache.org/schema/core"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd + http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd";> <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/> <broker useJmx="true" xmlns="http://activemq.apache.org/schema/core";> - <persistenceAdapter> - <journaledJDBC journalLogFiles="5" dataDirectory="${basedir}/target/foo" /> + <networkConnectors> + <!-- + <networkConnector uri="multicast://default?initialReconnectDelay=100" /> + <networkConnector uri="static://(tcp://localhost:61616)" /> + --> + </networkConnectors> + + <persistenceFactory> + <journalPersistenceAdapterFactory journalLogFiles="5" dataDirectory="${basedir}/target/foo" /> <!-- To use a different dataSource, use the following syntax : --> <!-- - <journaledJDBC journalLogFiles="5" dataDirectory="${basedir}/activemq-data" dataSource="#mysql-ds"/> + <journalPersistenceAdapterFactory journalLogFiles="5" dataDirectory="${basedir}/activemq-data" dataSource="#mysql-ds"/> --> - </persistenceAdapter> + </persistenceFactory> <transportConnectors> <transportConnector uri="tcp://localhost:61636" /> </transportConnectors> - <networkConnectors> - <!-- - <networkConnector uri="multicast://default?initialReconnectDelay=100" /> - <networkConnector uri="static://(tcp://localhost:61616)" /> - --> - </networkConnectors> </broker> <!-- MySql DataSource Sample Setup --> Modified: activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/xbean/activemq2.xml URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/xbean/activemq2.xml?rev=916937&r1=916936&r2=916937&view=diff ============================================================================== --- activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/xbean/activemq2.xml (original) +++ activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/xbean/activemq2.xml Sat Feb 27 10:11:16 2010 @@ -16,7 +16,12 @@ limitations under the License. --> -<beans> +<beans + xmlns="http://www.springframework.org/schema/beans"; + xmlns:amq="http://activemq.apache.org/schema/core"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd + http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd";> <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/> @@ -39,19 +44,13 @@ </destinationPolicy> - <persistenceAdapter> - <journaledJDBC journalLogFiles="5" dataDirectory="${basedir}/target/data" /> - </persistenceAdapter> + <persistenceFactory> + <journalPersistenceAdapterFactory journalLogFiles="5" dataDirectory="${basedir}/target/data" /> + </persistenceFactory> <transportConnectors> <transportConnector uri="tcp://localhost:61616" /> </transportConnectors> -<!-- - <networkConnectors> - <networkConnector - uri="multicast://default?initialReconnectDelay=100" /> - </networkConnectors> - --> </broker> </beans> \ No newline at end of file Modified: activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/xbean/connector-test.xml URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/xbean/connector-test.xml?rev=916937&r1=916936&r2=916937&view=diff ============================================================================== --- activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/xbean/connector-test.xml (original) +++ activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/xbean/connector-test.xml Sat Feb 27 10:11:16 2010 @@ -18,30 +18,35 @@ <!-- this file can only be parsed using the xbean-spring library --> <!-- START SNIPPET: xbean --> -<beans> +<beans + xmlns="http://www.springframework.org/schema/beans"; + xmlns:amq="http://activemq.apache.org/schema/core"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd + http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd";> <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/> <broker useJmx="true" xmlns="http://activemq.apache.org/schema/core";> - <transportConnectors> - <transportConnector uri="tcp://localhost:61636" /> - </transportConnectors> <networkConnectors> <networkConnector uri="static://(tcp://localhost:61616)"> - <excludedDestinations> - <queue physicalName="exclude.test.foo"/> - <topic physicalName="exclude.test.bar"/> - </excludedDestinations> <dynamicallyIncludedDestinations> <queue physicalName="include.test.foo"/> <topic physicalName="include.test.bar"/> </dynamicallyIncludedDestinations> + <excludedDestinations> + <queue physicalName="exclude.test.foo"/> + <topic physicalName="exclude.test.bar"/> + </excludedDestinations> </networkConnector> </networkConnectors> - + <transportConnectors> + <transportConnector uri="tcp://localhost:61636" /> + </transportConnectors> + </broker> </beans> Modified: activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/xbean/jdbc-persistence-test.xml URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/xbean/jdbc-persistence-test.xml?rev=916937&r1=916936&r2=916937&view=diff ============================================================================== --- activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/xbean/jdbc-persistence-test.xml (original) +++ activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/xbean/jdbc-persistence-test.xml Sat Feb 27 10:11:16 2010 @@ -18,18 +18,23 @@ <!-- this file can only be parsed using the xbean-spring library --> <!-- START SNIPPET: xbean --> -<beans> +<beans + xmlns="http://www.springframework.org/schema/beans"; + xmlns:amq="http://activemq.apache.org/schema/core"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd + http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd";> <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/> <broker useJmx="false" xmlns="http://activemq.apache.org/schema/core";> - <persistenceAdapter> - <journaledJDBC useJournal="false"> + <persistenceFactory> + <journalPersistenceAdapterFactory useJournal="false"> <statements> <statements tablePrefix="BROKER1."/> </statements> - </journaledJDBC> - </persistenceAdapter> + </journalPersistenceAdapterFactory> + </persistenceFactory> </broker> Modified: activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/xbean/management-context-test.xml URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/xbean/management-context-test.xml?rev=916937&r1=916936&r2=916937&view=diff ============================================================================== --- activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/xbean/management-context-test.xml (original) +++ activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/xbean/management-context-test.xml Sat Feb 27 10:11:16 2010 @@ -18,7 +18,12 @@ <!-- this file can only be parsed using the xbean-spring library --> <!-- START SNIPPET: xbean --> -<beans> +<beans + xmlns="http://www.springframework.org/schema/beans"; + xmlns:amq="http://activemq.apache.org/schema/core"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd + http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd";> <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer" /> Modified: activemq/trunk/activemq-core/src/test/resources/spring-embedded-xbean-bean-ref.xml URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/resources/spring-embedded-xbean-bean-ref.xml?rev=916937&r1=916936&r2=916937&view=diff ============================================================================== --- activemq/trunk/activemq-core/src/test/resources/spring-embedded-xbean-bean-ref.xml (original) +++ activemq/trunk/activemq-core/src/test/resources/spring-embedded-xbean-bean-ref.xml Sat Feb 27 10:11:16 2010 @@ -35,7 +35,7 @@ </bean> - <amq:broker poor="false" + <amq:broker persistent="true" advisorySupport="false" dataDirectory="target/amqdata"
