fixed namespaces in XML files to only apply the ActiveMQ namespace to the <broker> element and its decendants to avoid confusing spring/xbean-spring when using other tags like <bean>. Bad James - they should have been like this to start with :)

git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@421897 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
James Strachan 2006-07-14 13:10:19 +00:00
parent 9b6942f4c1
commit 1fd01f0888
32 changed files with 83 additions and 82 deletions

View File

@ -14,10 +14,10 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
<beans xmlns="http://activemq.org/config/1.0">
<beans>
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
<broker brokerName="master" persistent="false" useJmx="false" deleteAllMessagesOnStartup="true">
<broker brokerName="master" persistent="false" useJmx="false" deleteAllMessagesOnStartup="true" xmlns="http://activemq.org/config/1.0">
<transportConnectors>
<transportConnector uri="tcp://localhost:62001"/>
</transportConnectors>

View File

@ -14,10 +14,10 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
<beans xmlns="http://activemq.org/config/1.0">
<beans">
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
<broker brokerName="slave" persistent="false" useJmx="false" masterConnectorURI="tcp://localhost:62001" deleteAllMessagesOnStartup="true">
<broker brokerName="slave" persistent="false" useJmx="false" masterConnectorURI="tcp://localhost:62001" deleteAllMessagesOnStartup="true" xmlns="http://activemq.org/config/1.0>
<transportConnectors>
<transportConnector uri="tcp://localhost:62002"/>
</transportConnectors>

View File

@ -17,10 +17,10 @@
<!-- this file can only be parsed using the xbean-spring library -->
<!-- START SNIPPET: xbean -->
<beans xmlns="http://activemq.org/config/1.0">
<beans>
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
<broker persistent="false">
<broker persistent="false" xmlns="http://activemq.org/config/1.0">
<!-- lets define the dispatch policy -->
<destinationPolicy>

View File

@ -14,10 +14,10 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
<beans xmlns="http://activemq.org/config/1.0">
<beans>
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
<broker brokerName="broker" persistent="false" useJmx="false">
<broker brokerName="broker" persistent="false" useJmx="false" xmlns="http://activemq.org/config/1.0">
<transportConnectors>
<transportConnector uri="tcp://localhost:0"/>
</transportConnectors>

View File

@ -14,12 +14,12 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
<beans xmlns="http://activemq.org/config/1.0">
<beans>
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
<usageManager id="memory-manager" limit="1048576"/> <!-- 1 meg limit -->
<broker useJmx="true" deleteAllMessagesOnStartup="true" memoryManager="#memory-manager">
<broker useJmx="true" deleteAllMessagesOnStartup="true" memoryManager="#memory-manager" xmlns="http://activemq.org/config/1.0">
<persistenceAdapter>
<journaledJDBC

View File

@ -14,9 +14,9 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
<beans xmlns="http://activemq.org/config/1.0">
<beans>
<broker brokerName="brokerXmlConfigHelper" persistent="false" useShutdownHook="false" deleteAllMessagesOnStartup="true">
<broker brokerName="brokerXmlConfigHelper" persistent="false" useShutdownHook="false" deleteAllMessagesOnStartup="true" xmlns="http://activemq.org/config/1.0">
<transportConnectors>
<transportConnector uri="tcp://localhost:61638"/>
</transportConnectors>

View File

@ -14,10 +14,10 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
<beans xmlns="http://activemq.org/config/1.0">
<beans>
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
<broker brokerName="localBroker" persistent="true" useShutdownHook="false">
<broker brokerName="localBroker" persistent="true" useShutdownHook="false" xmlns="http://activemq.org/config/1.0">
<transportConnectors>
<transportConnector uri="tcp://localhost:61616"/>
</transportConnectors>

View File

@ -14,9 +14,9 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
<beans xmlns="http://activemq.org/config/1.0">
<beans>
<broker brokerName="localBroker" persistent="false" useShutdownHook="false">
<broker brokerName="localBroker" persistent="false" useShutdownHook="false" xmlns="http://activemq.org/config/1.0">
<transportConnectors><transportConnector uri="tcp://localhost:61616" /></transportConnectors>

View File

@ -14,9 +14,9 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
<beans xmlns="http://activemq.org/config/1.0">
<beans>
<broker brokerName="remoteBroker" persistent="false" useShutdownHook="false">
<broker brokerName="remoteBroker" persistent="false" useShutdownHook="false" xmlns="http://activemq.org/config/1.0">
<transportConnectors><transportConnector uri="tcp://localhost:61617" /></transportConnectors>

View File

@ -14,10 +14,10 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
<beans xmlns="http://activemq.org/config/1.0">
<beans>
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
<broker brokerName="remoteBroker" persistent="true" useShutdownHook="false">
<broker brokerName="remoteBroker" persistent="true" useShutdownHook="false" xmlns="http://activemq.org/config/1.0">
<transportConnectors>
<transportConnector uri="tcp://localhost:61617"/>
</transportConnectors>

View File

@ -14,10 +14,10 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
<beans xmlns="http://activemq.org/config/1.0">
<beans >
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
<broker brokerName="broker" persistent="true" useShutdownHook="false" deleteAllMessagesOnStartup="true">
<broker brokerName="broker" persistent="true" useShutdownHook="false" deleteAllMessagesOnStartup="true" xmlns="http://activemq.org/config/1.0">
<transportConnectors>
<transportConnector uri="tcp://localhost:61616"/>
</transportConnectors>

View File

@ -14,10 +14,10 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
<beans xmlns="http://activemq.org/config/1.0">
<beans>
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
<broker brokerName="slowConsumerBroker" persistent="true" useShutdownHook="false">
<broker brokerName="slowConsumerBroker" persistent="true" useShutdownHook="false" xmlns="http://activemq.org/config/1.0">
<transportConnectors>
<transportConnector uri="tcp://localhost:61616"/>
</transportConnectors>

View File

@ -17,10 +17,10 @@
<!-- this file can only be parsed using the xbean-spring library -->
<!-- START SNIPPET: example -->
<beans xmlns="http://activemq.org/config/1.0">
<beans>
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
<broker useJmx="false" persistent="false">
<broker useJmx="false" persistent="false" xmlns="http://activemq.org/config/1.0">
<plugins>
<!-- use JAAS to authenticate using the login.config file on the classpath to configure JAAS -->

View File

@ -17,10 +17,10 @@
<!-- this file can only be parsed using the xbean-spring library -->
<!-- START SNIPPET: xbean -->
<beans xmlns="http://activemq.org/config/1.0">
<beans>
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
<broker persistent="false">
<broker persistent="false" xmlns="http://activemq.org/config/1.0">
<destinationPolicy>
<policyMap>

View File

@ -17,10 +17,10 @@
<!-- this file can only be parsed using the xbean-spring library -->
<!-- START SNIPPET: xbean -->
<beans xmlns="http://activemq.org/config/1.0">
<beans>
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
<broker persistent="false">
<broker persistent="false" xmlns="http://activemq.org/config/1.0">
<destinationPolicy>
<policyMap>

View File

@ -17,11 +17,11 @@
<!-- this file can only be parsed using the xbean-spring library -->
<!-- START SNIPPET: xbean -->
<beans xmlns="http://activemq.org/config/1.0"
xmlns:s="http://xbean.org/spring/">
<beans xmlns:s="http://xbean.org/spring/">
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
<broker persistent="false">
<broker persistent="false" xmlns="http://activemq.org/config/1.0">
<destinationPolicy>
<policyMap>

View File

@ -17,10 +17,11 @@
<!-- this file can only be parsed using the xbean-spring library -->
<!-- START SNIPPET: xbean -->
<beans xmlns="http://activemq.org/config/1.0">
<beans>
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
<broker persistent="false">
<broker persistent="false" xmlns="http://activemq.org/config/1.0">
<destinationPolicy>
<policyMap>

View File

@ -14,9 +14,9 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
<beans xmlns="http://activemq.org/config/1.0">
<beans>
<broker useJmx="true">
<broker useJmx="true" xmlns="http://activemq.org/config/1.0">
<!-- In ActiveMQ 4, you can setup destination policies -->
<destinationPolicy>

View File

@ -14,9 +14,9 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
<beans xmlns="http://activemq.org/config/1.0">
<beans>
<broker brokerName="BrokerA" persistent="false" useJmx="false">
<broker brokerName="BrokerA" persistent="false" useJmx="false" xmlns="http://activemq.org/config/1.0">
<transportConnectors>
<transportConnector uri="tcp://localhost:61616" discoveryUri="multicast://default"/>
</transportConnectors>

View File

@ -14,9 +14,9 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
<beans xmlns="http://activemq.org/config/1.0">
<beans>
<broker brokerName="BrokerB" persistent="false" useJmx="false">
<broker brokerName="BrokerB" persistent="false" useJmx="false" xmlns="http://activemq.org/config/1.0">
<transportConnectors>
<transportConnector uri="tcp://localhost:61617" discoveryUri="multicast://default"/>
</transportConnectors>

View File

@ -14,9 +14,9 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
<beans xmlns="http://activemq.org/config/1.0">
<beans>
<broker brokerName="BrokerB" persistent="false" useJmx="false">
<broker brokerName="BrokerB" persistent="false" useJmx="false" xmlns="http://activemq.org/config/1.0">
<transportConnectors>
<transportConnector uri="tcp://localhost:0" discoveryUri="multicast://default"/>
</transportConnectors>

View File

@ -14,10 +14,10 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
<beans xmlns="http://activemq.org/config/1.0">
<beans>
<broker brokerName="receiver" persistent="false" useJmx="false">
<broker brokerName="receiver" persistent="false" useJmx="false" xmlns="http://activemq.org/config/1.0">
<transportConnectors>
<transportConnector uri="tcp://localhost:0" discoveryUri="multicast://default"/>
</transportConnectors>

View File

@ -14,9 +14,9 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
<beans xmlns="http://activemq.org/config/1.0">
<beans>
<broker brokerName="receiver" persistent="false">
<broker brokerName="receiver" persistent="false" xmlns="http://activemq.org/config/1.0">
<transportConnectors>
<transportConnector uri="http://localhost:62302"/>
</transportConnectors>

View File

@ -14,9 +14,9 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
<beans xmlns="http://activemq.org/config/1.0">
<beans>
<broker brokerName="receiver" persistent="false" useJmx="false">
<broker brokerName="receiver" persistent="false" useJmx="false" xmlns="http://activemq.org/config/1.0">
<transportConnectors>
<transportConnector uri="tcp://localhost:62002"/>
</transportConnectors>

View File

@ -14,9 +14,9 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
<beans xmlns="http://activemq.org/config/1.0">
<beans>
<broker brokerName="sender" persistent="false" useJmx="false">
<broker brokerName="sender" persistent="false" useJmx="false" xmlns="http://activemq.org/config/1.0">
<transportConnectors>
<transportConnector uri="tcp://localhost:0" discoveryUri="multicast://default"/>
</transportConnectors>

View File

@ -14,9 +14,9 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
<beans xmlns="http://activemq.org/config/1.0">
<beans>
<broker brokerName="sender" persistent="false">
<broker brokerName="sender" persistent="false" xmlns="http://activemq.org/config/1.0">
<transportConnectors>
<transportConnector uri="http://localhost:62301"/>
</transportConnectors>

View File

@ -14,9 +14,9 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
<beans xmlns="http://activemq.org/config/1.0">
<beans>
<broker brokerName="sender" persistent="false" useJmx="false">
<broker brokerName="sender" persistent="false" useJmx="false" xmlns="http://activemq.org/config/1.0">
<transportConnectors>
<transportConnector uri="tcp://localhost:62001"/>
</transportConnectors>

View File

@ -17,11 +17,11 @@
<!-- this file can only be parsed using the xbean-spring library -->
<!-- START SNIPPET: xbean -->
<beans xmlns="http://activemq.org/config/1.0">
<beans>
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
<broker persistent="false" brokerName="${brokername}">
<broker persistent="false" brokerName="${brokername}" xmlns="http://activemq.org/config/1.0">
<!-- lets define the dispatch policy -->
<destinationPolicy>

View File

@ -15,12 +15,12 @@
limitations under the License.
-->
<beans xmlns="http://activemq.org/config/1.0">
<beans>
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
<!-- for easier integration with the JUnit tests, lets not start the broker when the ApplicationContext starts -->
<broker useJmx="true" start="false">
<broker useJmx="true" start="false" xmlns="http://activemq.org/config/1.0">
<destinationPolicy>
<policyMap>
<policyEntries>

View File

@ -17,11 +17,11 @@
<!-- this file can only be parsed using the xbean-spring library -->
<!-- START SNIPPET: xbean -->
<beans xmlns="http://activemq.org/config/1.0">
<beans>
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
<broker useJmx="true">
<broker useJmx="true" xmlns="http://activemq.org/config/1.0">
<transportConnectors>
<transportConnector uri="tcp://localhost:61636" />

View File

@ -17,10 +17,10 @@
<!-- this file can only be parsed using the xbean-spring library -->
<!-- START SNIPPET: xbean -->
<beans xmlns="http://activemq.org/config/1.0">
<beans>
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
<broker useJmx="false">
<broker useJmx="false" xmlns="http://activemq.org/config/1.0">
<persistenceAdapter>
<journaledJDBC useJournal="false">

View File

@ -1,30 +1,30 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright 2005-2006 The Apache Software Foundation
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
Copyright 2005-2006 The Apache Software Foundation
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<!-- this file can only be parsed using the xbean-spring library -->
<!-- START SNIPPET: xbean -->
<beans xmlns="http://activemq.org/config/1.0">
<beans>
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer" />
<broker useJmx="true">
<managementContext>
<managementContext connectorPort="2011" jmxDomainName="test.domain"/>
</managementContext>
<broker useJmx="true" xmlns="http://activemq.org/config/1.0">
<managementContext>
<managementContext connectorPort="2011" jmxDomainName="test.domain" />
</managementContext>
</broker>
</beans>