From f6199fe13620e110d16cab220a428d758bae0645 Mon Sep 17 00:00:00 2001 From: Bosanac Dejan Date: Tue, 8 Sep 2009 12:35:40 +0000 Subject: [PATCH] https://issues.apache.org/activemq/browse/AMQ-1894 - tidying up configurations and inserting comments git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@812481 13f79535-47bb-0310-9956-ffa450edef68 --- assembly/src/release/conf/activemq-camel.xml | 19 +++--- assembly/src/release/conf/activemq-jetty.xml | 9 ++- assembly/src/release/conf/activemq.xml | 41 +++++++++---- assembly/src/sample-conf/activemq-command.xml | 12 ++++ assembly/src/sample-conf/activemq-demo.xml | 7 +++ .../activemq-dynamic-network-broker1.xml | 60 ++++++++++++++----- .../activemq-dynamic-network-broker2.xml | 60 ++++++++++++++----- assembly/src/sample-conf/activemq-jdbc.xml | 14 ++++- .../src/sample-conf/activemq-security.xml | 19 +++++- .../activemq-static-network-broker1.xml | 47 +++++++++++---- .../activemq-static-network-broker2.xml | 48 +++++++++++---- 11 files changed, 253 insertions(+), 83 deletions(-) diff --git a/assembly/src/release/conf/activemq-camel.xml b/assembly/src/release/conf/activemq-camel.xml index ec38771479..39211bf364 100644 --- a/assembly/src/release/conf/activemq-camel.xml +++ b/assembly/src/release/conf/activemq-camel.xml @@ -14,15 +14,20 @@ See the License for the specific language governing permissions and limitations under the License. --> + - @@ -38,7 +43,7 @@ diff --git a/assembly/src/release/conf/activemq-jetty.xml b/assembly/src/release/conf/activemq-jetty.xml index 5cbb646513..c4251aebdd 100644 --- a/assembly/src/release/conf/activemq-jetty.xml +++ b/assembly/src/release/conf/activemq-jetty.xml @@ -14,10 +14,13 @@ See the License for the specific language governing permissions and limitations under the License. --> + - diff --git a/assembly/src/release/conf/activemq.xml b/assembly/src/release/conf/activemq.xml index 05c9a708c2..0694d0506f 100755 --- a/assembly/src/release/conf/activemq.xml +++ b/assembly/src/release/conf/activemq.xml @@ -22,16 +22,17 @@ http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd"> - + + + file:${activemq.base}/conf/credentials.properties + + - + - + - + http://activemq.apache.org/producer-flow-control.html + + + + + + + + + + + @@ -73,7 +87,7 @@ - + --> + + diff --git a/assembly/src/sample-conf/activemq-command.xml b/assembly/src/sample-conf/activemq-command.xml index 773d955cc9..8916b3e155 100644 --- a/assembly/src/sample-conf/activemq-command.xml +++ b/assembly/src/sample-conf/activemq-command.xml @@ -14,6 +14,17 @@ See the License for the specific language governing permissions and limitations under the License. --> + @@ -25,6 +36,7 @@ + \ No newline at end of file diff --git a/assembly/src/sample-conf/activemq-demo.xml b/assembly/src/sample-conf/activemq-demo.xml index f9e320aa34..dc2e7021c1 100644 --- a/assembly/src/sample-conf/activemq-demo.xml +++ b/assembly/src/sample-conf/activemq-demo.xml @@ -14,6 +14,13 @@ See the License for the specific language governing permissions and limitations under the License. --> + + + + + + + + + + + + + + + + @@ -45,19 +87,11 @@ - - - - - + - + @@ -72,12 +106,6 @@ - - - - - - diff --git a/assembly/src/sample-conf/activemq-dynamic-network-broker2.xml b/assembly/src/sample-conf/activemq-dynamic-network-broker2.xml index b0e5c1a74f..f7a4370b07 100644 --- a/assembly/src/sample-conf/activemq-dynamic-network-broker2.xml +++ b/assembly/src/sample-conf/activemq-dynamic-network-broker2.xml @@ -14,6 +14,22 @@ See the License for the specific language governing permissions and limitations under the License. --> + + + + + + + + + + + + + + + @@ -45,20 +87,12 @@ - - - - - + - + @@ -72,12 +106,6 @@ - - - - - - diff --git a/assembly/src/sample-conf/activemq-jdbc.xml b/assembly/src/sample-conf/activemq-jdbc.xml index 55c34ae059..e89ca7d274 100644 --- a/assembly/src/sample-conf/activemq-jdbc.xml +++ b/assembly/src/sample-conf/activemq-jdbc.xml @@ -14,13 +14,23 @@ See the License for the specific language governing permissions and limitations under the License. --> + - + - + diff --git a/assembly/src/sample-conf/activemq-security.xml b/assembly/src/sample-conf/activemq-security.xml index 2dce054af8..3384bc567a 100644 --- a/assembly/src/sample-conf/activemq-security.xml +++ b/assembly/src/sample-conf/activemq-security.xml @@ -15,6 +15,16 @@ See the License for the specific language governing permissions and limitations under the License. --> + + - + @@ -70,8 +81,14 @@ + + + \ No newline at end of file diff --git a/assembly/src/sample-conf/activemq-static-network-broker1.xml b/assembly/src/sample-conf/activemq-static-network-broker1.xml index 148e9dcdc3..5a880b3815 100644 --- a/assembly/src/sample-conf/activemq-static-network-broker1.xml +++ b/assembly/src/sample-conf/activemq-static-network-broker1.xml @@ -14,6 +14,22 @@ See the License for the specific language governing permissions and limitations under the License. --> + + + + + + + + + + + + + + @@ -47,15 +80,11 @@ - - - - - + - + @@ -70,12 +99,6 @@ - - - - - - diff --git a/assembly/src/sample-conf/activemq-static-network-broker2.xml b/assembly/src/sample-conf/activemq-static-network-broker2.xml index e15bb6712f..1e3796902f 100644 --- a/assembly/src/sample-conf/activemq-static-network-broker2.xml +++ b/assembly/src/sample-conf/activemq-static-network-broker2.xml @@ -14,6 +14,22 @@ See the License for the specific language governing permissions and limitations under the License. --> + + + + + + + + + + + + + + + @@ -47,16 +80,11 @@ - - - - - - + - + @@ -71,12 +99,6 @@ - - - - - -