Permalink
Browse files

Updated the xml schema reference for the different broker configurati…

…on files

to use the 5.3.1 xml schema.
  • Loading branch information...
1 parent eaa1155 commit 393576e8e856072bdbf34e2177e485e698eab989 Claudio Corsi committed Sep 19, 2011
@@ -1,46 +1,47 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You 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.
- -->
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You 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.
+ -->
<beans xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="http://www.springframework.org/schema/beans"
- xmlns:amq="http://activemq.apache.org/schema/core"
- xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core-5.4.2.xsd ">
+ xmlns="http://www.springframework.org/schema/beans"
+ xmlns:amq="http://activemq.apache.org/schema/core"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+ http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core-5.3.1.xsd ">
- <!-- Allows us to use system properties as variables in this configuration file -->
- <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
- <property name="location">
- <value>@@PROPERTIESFILE@@</value>
- </property>
- </bean>
+ <!-- Allows us to use system properties as variables in this configuration file -->
+ <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
+ <property name="location">
+ <value>@@PROPERTIESFILE@@</value>
+ </property>
+ </bean>
- <broker xmlns="http://activemq.apache.org/schema/core"
- brokerName="activemq-${activemq.suffix.name}">
+ <broker xmlns="http://activemq.apache.org/schema/core"
+ brokerName="activemq-${activemq.suffix.name}">
- <managementContext>
- <managementContext connectorPath="/activemq-${activemq.suffix.name}" />
- </managementContext>
+ <managementContext>
+ <managementContext connectorPath="/activemq-${activemq.suffix.name}" />
+ </managementContext>
- <persistenceAdapter>
- <kahaDB directory="${kahadb.dir}/${kahadb.prefix}/kahadb"/>
- </persistenceAdapter>
-
- <transportConnectors>
- <transportConnector name="openwire" uri="tcp://${hostname}:${port.number}"/>
- </transportConnectors>
- </broker>
+ <persistenceAdapter>
+ <kahaDB directory="${kahadb.dir}/${kahadb.prefix}/kahadb"/>
+ </persistenceAdapter>
+
+ <transportConnectors>
+ <transportConnector name="openwire" uri="tcp://${hostname}:${port.number}"/>
+ </transportConnectors>
+ </broker>
</beans>
@@ -1,78 +1,78 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor
- license agreements. See the NOTICE file distributed with this work for additional
- information regarding copyright ownership. The ASF licenses this file to
- You 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. -->
+ license agreements. See the NOTICE file distributed with this work for additional
+ information regarding copyright ownership. The ASF licenses this file to
+ You 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. -->
<beans xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="http://www.springframework.org/schema/beans" xmlns:amq="http://activemq.apache.org/schema/core"
- xsi:schemaLocation="
- http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
- http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core-5.4.2.xsd ">
+ xmlns="http://www.springframework.org/schema/beans" xmlns:amq="http://activemq.apache.org/schema/core"
+ xsi:schemaLocation="
+ http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+ http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core-5.3.1.xsd ">
- <!-- Allows us to use system properties as variables in this configuration
- file -->
- <bean
- class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
- <property name="location">
- <value>@@PROPERTIESFILE@@</value>
- </property>
- </bean>
+ <!-- Allows us to use system properties as variables in this configuration
+ file -->
+ <bean
+ class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
+ <property name="location">
+ <value>@@PROPERTIESFILE@@</value>
+ </property>
+ </bean>
- <broker xmlns="http://activemq.apache.org/schema/core"
- brokerName="hub-${hub.suffix.name}">
+ <broker xmlns="http://activemq.apache.org/schema/core"
+ brokerName="hub-${hub.suffix.name}">
- <destinationPolicy>
- <policyMap>
- <policyEntries>
- <policyEntry topic=">" producerFlowControl="true"
- memoryLimit="1mb">
- <pendingSubscriberPolicy>
- <vmCursor />
- </pendingSubscriberPolicy>
- </policyEntry>
- <policyEntry queue=">" producerFlowControl="true"
- memoryLimit="1mb">
- <!-- <pendingQueuePolicy>
- <vmQueueCursor/>
- </pendingQueuePolicy>
- -->
- </policyEntry>
- </policyEntries>
- </policyMap>
- </destinationPolicy>
+ <destinationPolicy>
+ <policyMap>
+ <policyEntries>
+ <policyEntry topic=">" producerFlowControl="true"
+ memoryLimit="1mb">
+ <pendingSubscriberPolicy>
+ <vmCursor />
+ </pendingSubscriberPolicy>
+ </policyEntry>
+ <policyEntry queue=">" producerFlowControl="true"
+ memoryLimit="1mb">
+ <!-- <pendingQueuePolicy>
+ <vmQueueCursor/>
+ </pendingQueuePolicy>
+ -->
+ </policyEntry>
+ </policyEntries>
+ </policyMap>
+ </destinationPolicy>
- <managementContext>
- <managementContext connectorPath="/hub-${hub.suffix.name}" />
- </managementContext>
+ <managementContext>
+ <managementContext connectorPath="/hub-${hub.suffix.name}" />
+ </managementContext>
- <persistenceAdapter>
- <kahaDB directory="${kahadb.dir}/${kahadb.prefix}/kahadb" />
- </persistenceAdapter>
+ <persistenceAdapter>
+ <kahaDB directory="${kahadb.dir}/${kahadb.prefix}/kahadb" />
+ </persistenceAdapter>
- <systemUsage>
- <systemUsage>
- <memoryUsage>
- <memoryUsage limit="20 mb"/>
- </memoryUsage>
- <storeUsage>
- <storeUsage limit="1 gb"/>
- </storeUsage>
- <tempUsage>
- <tempUsage limit="100 mb"/>
- </tempUsage>
- </systemUsage>
- </systemUsage>
+ <systemUsage>
+ <systemUsage>
+ <memoryUsage>
+ <memoryUsage limit="20 mb"/>
+ </memoryUsage>
+ <storeUsage>
+ <storeUsage limit="1 gb"/>
+ </storeUsage>
+ <tempUsage>
+ <tempUsage limit="100 mb"/>
+ </tempUsage>
+ </systemUsage>
+ </systemUsage>
- <transportConnectors>
- <transportConnector name="openwire"
- uri="tcp://${hub.hostname}:${hub.port.number}" />
- </transportConnectors>
- </broker>
+ <transportConnectors>
+ <transportConnector name="openwire"
+ uri="tcp://${hub.hostname}:${hub.port.number}" />
+ </transportConnectors>
+ </broker>
</beans>
@@ -1,46 +1,46 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You 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.
- -->
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You 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.
+ -->
<beans xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="http://www.springframework.org/schema/beans"
- xmlns:amq="http://activemq.apache.org/schema/core"
- xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core-5.4.2.xsd ">
+ xmlns="http://www.springframework.org/schema/beans"
+ xmlns:amq="http://activemq.apache.org/schema/core"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+ http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core-5.3.1.xsd ">
- <!-- Allows us to use system properties as variables in this configuration file -->
- <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
- <property name="location">
- <value>@@PROPERTIESFILE@@</value>
- </property>
- </bean>
+ <!-- Allows us to use system properties as variables in this configuration file -->
+ <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
+ <property name="location">
+ <value>@@PROPERTIESFILE@@</value>
+ </property>
+ </bean>
- <broker xmlns="http://activemq.apache.org/schema/core"
- brokerName="main-${main.suffix.name}">
+ <broker xmlns="http://activemq.apache.org/schema/core"
+ brokerName="main-${main.suffix.name}">
- <managementContext>
- <managementContext connectorPath="/main-${main.suffix.name}" />
- </managementContext>
+ <managementContext>
+ <managementContext connectorPath="/main-${main.suffix.name}" />
+ </managementContext>
- <persistenceAdapter>
- <kahaDB directory="${kahadb.dir}/${kahadb.prefix}/kahadb"/>
- </persistenceAdapter>
-
- <transportConnectors>
- <transportConnector name="openwire" uri="tcp://${hostname}:${port.number}"/>
- </transportConnectors>
- </broker>
+ <persistenceAdapter>
+ <kahaDB directory="${kahadb.dir}/${kahadb.prefix}/kahadb"/>
+ </persistenceAdapter>
+
+ <transportConnectors>
+ <transportConnector name="openwire" uri="tcp://${hostname}:${port.number}"/>
+ </transportConnectors>
+ </broker>
</beans>
-
@@ -1,46 +1,46 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You 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.
- -->
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You 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.
+ -->
<beans xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="http://www.springframework.org/schema/beans"
- xmlns:amq="http://activemq.apache.org/schema/core"
- xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core-5.4.2.xsd ">
+ xmlns="http://www.springframework.org/schema/beans"
+ xmlns:amq="http://activemq.apache.org/schema/core"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+ http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core-5.3.1.xsd ">
- <!-- Allows us to use system properties as variables in this configuration file -->
- <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
- <property name="location">
- <value>@@PROPERTIESFILE@@</value>
- </property>
- </bean>
+ <!-- Allows us to use system properties as variables in this configuration file -->
+ <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
+ <property name="location">
+ <value>@@PROPERTIESFILE@@</value>
+ </property>
+ </bean>
- <broker xmlns="http://activemq.apache.org/schema/core"
- brokerName="master-${master.suffix.name}"
- shutdownOnSlaveFailure="true" waitForSlave="true">
+ <broker xmlns="http://activemq.apache.org/schema/core"
+ brokerName="master-${master.suffix.name}"
+ shutdownOnSlaveFailure="true" waitForSlave="true">
- <managementContext>
- <managementContext connectorPath="/master-${master.suffix.name}" />
- </managementContext>
+ <managementContext>
+ <managementContext connectorPath="/master-${master.suffix.name}" />
+ </managementContext>
- <persistenceAdapter>
- <kahaDB directory="${kahadb.dir}/${kahadb.prefix}/kahadb"/>
- </persistenceAdapter>
- <transportConnectors>
- <transportConnector name="openwire" uri="tcp://${master.hostname}:${master.port.number}"/>
- </transportConnectors>
- </broker>
+ <persistenceAdapter>
+ <kahaDB directory="${kahadb.dir}/${kahadb.prefix}/kahadb"/>
+ </persistenceAdapter>
+ <transportConnectors>
+ <transportConnector name="openwire" uri="tcp://${master.hostname}:${master.port.number}"/>
+ </transportConnectors>
+ </broker>
</beans>
-
Oops, something went wrong.

0 comments on commit 393576e

Please sign in to comment.