From 1e568c49bae7bfc03fa89e34dac8ac97ff2a54bb Mon Sep 17 00:00:00 2001 From: Martin Ritchie Date: Tue, 14 Apr 2009 15:54:16 +0000 Subject: QPID-1807 : Add 0.5-fix broker and update SlowMessageStore to use MessageStores rather than TransactionLogs git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@764850 13f79535-47bb-0310-9956-ffa450edef68 --- java/broker/etc/access | 19 +++ java/broker/etc/acl.config.xml | 230 ++++++++++++++++++++++++++++++++++ java/broker/etc/config.xml | 138 ++++++++++++++++++++ java/broker/etc/debug.log4j.xml | 114 +++++++++++++++++ java/broker/etc/jmxremote.access | 23 ++++ java/broker/etc/log4j.xml | 98 +++++++++++++++ java/broker/etc/md5passwd | 21 ++++ java/broker/etc/mstool-log4j.xml | 54 ++++++++ java/broker/etc/passwd | 22 ++++ java/broker/etc/passwdVhost | 19 +++ java/broker/etc/persistent_config.xml | 121 ++++++++++++++++++ java/broker/etc/qpid-server.conf | 25 ++++ java/broker/etc/qpid-server.conf.jpp | 49 ++++++++ java/broker/etc/qpid.passwd | 23 ++++ java/broker/etc/transient_config.xml | 118 +++++++++++++++++ java/broker/etc/virtualhosts.xml | 123 ++++++++++++++++++ 16 files changed, 1197 insertions(+) create mode 100644 java/broker/etc/access create mode 100644 java/broker/etc/acl.config.xml create mode 100644 java/broker/etc/config.xml create mode 100644 java/broker/etc/debug.log4j.xml create mode 100644 java/broker/etc/jmxremote.access create mode 100644 java/broker/etc/log4j.xml create mode 100644 java/broker/etc/md5passwd create mode 100644 java/broker/etc/mstool-log4j.xml create mode 100644 java/broker/etc/passwd create mode 100644 java/broker/etc/passwdVhost create mode 100644 java/broker/etc/persistent_config.xml create mode 100644 java/broker/etc/qpid-server.conf create mode 100644 java/broker/etc/qpid-server.conf.jpp create mode 100644 java/broker/etc/qpid.passwd create mode 100644 java/broker/etc/transient_config.xml create mode 100644 java/broker/etc/virtualhosts.xml (limited to 'java/broker/etc') diff --git a/java/broker/etc/access b/java/broker/etc/access new file mode 100644 index 0000000000..58b7443fa9 --- /dev/null +++ b/java/broker/etc/access @@ -0,0 +1,19 @@ +# +# 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. + +guest:localhost(rw),test(rw) \ No newline at end of file diff --git a/java/broker/etc/acl.config.xml b/java/broker/etc/acl.config.xml new file mode 100644 index 0000000000..a2b723fc63 --- /dev/null +++ b/java/broker/etc/acl.config.xml @@ -0,0 +1,230 @@ + + + + ${QPID_HOME} + ${QPID_WORK} + ${prefix}/etc + + + false + + false + nio + 5672 + 8672 + 32768 + 32768 + + + false + 8999 + false + + + + false + false + 65535 + false + false + + + + + + + passwordfile + org.apache.qpid.server.security.auth.database.PlainPasswordFilePrincipalDatabase + + + passwordFile + ${conf}/passwd + + + + + + + org.apache.qpid.server.security.access.plugins.DenyAll + + + + ${conf}/jmxremote.access + passwordfile + + + + + ${conf}/virtualhosts + + + test + + + org.apache.qpid.server.store.MemoryMessageStore + + + + amq.direct + + 4235264 + + 2117632 + + 600000 + + + + + + org.apache.qpid.server.security.access.plugins.SimpleXML + + + + + + + amq.direct + + + + + example.RequestQueue + + client + + + + + + tmp_* + + server + + + + TempQueue* + + server + + + + + + + + + + + + + + + + + client + + + + + + + example.RequestQueue + + server + + + + + + + + + + + + + + + + amq.direct + + client + + + + + + + example.RequestQueue + + server + + + + + + + + + + + + + + + + development + + + org.apache.qpid.server.store.MemoryMessageStore + + + + + + localhost + + + org.apache.qpid.server.store.MemoryMessageStore + + + + + + + + 0 + 2.0 + + + ${conf}/virtualhosts.xml + + + diff --git a/java/broker/etc/config.xml b/java/broker/etc/config.xml new file mode 100644 index 0000000000..e0045c1e74 --- /dev/null +++ b/java/broker/etc/config.xml @@ -0,0 +1,138 @@ + + + + ${QPID_HOME} + ${QPID_WORK} + ${prefix}/etc + + + false + + false + + nio + 5672 + 8672 + 32768 + 32768 + + + true + 8999 + + true + + ${prefix}/../test_resources/ssl/keystore.jks + password + + + + + false + false + 65535 + false + false + + + + + + + passwordfile + org.apache.qpid.server.security.auth.database.PlainPasswordFilePrincipalDatabase + + + passwordFile + ${conf}/passwd + + + + + + + org.apache.qpid.server.security.access.plugins.AllowAll + + + false + + + ${conf}/jmxremote.access + passwordfile + + + + + ${conf}/virtualhosts + + + localhost + + + org.apache.qpid.server.store.MemoryMessageStore + + + + 20000 + + + + + + + development + + + org.apache.qpid.server.store.MemoryMessageStore + + + + + + test + + + org.apache.qpid.server.store.MemoryMessageStore + + + + + + + 0 + 2.0 + + + true + + + ${conf}/virtualhosts.xml + + + diff --git a/java/broker/etc/debug.log4j.xml b/java/broker/etc/debug.log4j.xml new file mode 100644 index 0000000000..fc0bd9f34f --- /dev/null +++ b/java/broker/etc/debug.log4j.xml @@ -0,0 +1,114 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/java/broker/etc/jmxremote.access b/java/broker/etc/jmxremote.access new file mode 100644 index 0000000000..1a51a6991b --- /dev/null +++ b/java/broker/etc/jmxremote.access @@ -0,0 +1,23 @@ +# +# 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. + +#Generated by JMX Console : Last edited by user:admin +#Tue Jun 12 16:46:39 BST 2007 +admin=admin +guest=readonly +user=readwrite diff --git a/java/broker/etc/log4j.xml b/java/broker/etc/log4j.xml new file mode 100644 index 0000000000..a395d0fd56 --- /dev/null +++ b/java/broker/etc/log4j.xml @@ -0,0 +1,98 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/java/broker/etc/md5passwd b/java/broker/etc/md5passwd new file mode 100644 index 0000000000..6a149919de --- /dev/null +++ b/java/broker/etc/md5passwd @@ -0,0 +1,21 @@ +# +# 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. +# +guest:CE4DQ6BIb/BVMN9scFyLtA== +admin:ISMvKXpXpadDiUoOSoAfww== +user:aBzonUodYLhwSa8s9A10sA== diff --git a/java/broker/etc/mstool-log4j.xml b/java/broker/etc/mstool-log4j.xml new file mode 100644 index 0000000000..8c46010e2d --- /dev/null +++ b/java/broker/etc/mstool-log4j.xml @@ -0,0 +1,54 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/java/broker/etc/passwd b/java/broker/etc/passwd new file mode 100644 index 0000000000..7aca438551 --- /dev/null +++ b/java/broker/etc/passwd @@ -0,0 +1,22 @@ +# +# 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. +# +guest:guest +client:guest +server:guest + diff --git a/java/broker/etc/passwdVhost b/java/broker/etc/passwdVhost new file mode 100644 index 0000000000..48ce8299b6 --- /dev/null +++ b/java/broker/etc/passwdVhost @@ -0,0 +1,19 @@ +# +# 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. +# +guest:guest:localhost,test diff --git a/java/broker/etc/persistent_config.xml b/java/broker/etc/persistent_config.xml new file mode 100644 index 0000000000..67ef28117d --- /dev/null +++ b/java/broker/etc/persistent_config.xml @@ -0,0 +1,121 @@ + + + + + ${QPID_HOME} + ${QPID_WORK} + ${prefix}/etc + + nio + 5672 + 8672 + 32768 + 32768 + + + true + 8999 + + true + + ${prefix}/../test_resources/ssl/keystore.jks + password + + + + + false + false + 65535 + false + + + + + + passwordfile + org.apache.qpid.server.security.auth.database.PlainPasswordFilePrincipalDatabase + + + passwordFile + ${conf}/passwd + + + + + + + org.apache.qpid.server.security.access.plugins.AllowAll + + + ${conf}/jmxremote.access + passwordfile + + + + + + localhost + + + org.apache.qpid.server.store.berkeleydb.BDBMessageStore + ${work}/bdbstore/localhost-store + + + + + + development + + + org.apache.qpid.server.store.berkeleydb.BDBMessageStore + ${work}/bdbstore/development-store + + + + + + test + + + org.apache.qpid.server.store.berkeleydb.BDBMessageStore + ${work}/bdbstore/test-store + + + + + + + 0 + 2.0 + + + true + + + ${conf}/virtualhosts.xml + + + diff --git a/java/broker/etc/qpid-server.conf b/java/broker/etc/qpid-server.conf new file mode 100644 index 0000000000..8a16849b04 --- /dev/null +++ b/java/broker/etc/qpid-server.conf @@ -0,0 +1,25 @@ +# +# 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. +# + +QPID_LIBS=$QPID_HOME/lib/qpid-all.jar:$QPID_HOME/lib/bdbstore-launch.jar + +export JAVA=java \ + JAVA_VM=-server \ + JAVA_MEM=-Xmx1024m \ + CLASSPATH=$QPID_LIBS diff --git a/java/broker/etc/qpid-server.conf.jpp b/java/broker/etc/qpid-server.conf.jpp new file mode 100644 index 0000000000..3ed2431ef3 --- /dev/null +++ b/java/broker/etc/qpid-server.conf.jpp @@ -0,0 +1,49 @@ +# +# 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. +# + +QPID_LIBS=$(build-classpath backport-util-concurrent \ + commons-beanutils \ + commons-beanutils-core \ + commons-cli \ + commons-codec \ + commons-collections \ + commons-configuration \ + commons-digester \ + commons-lang \ + commons-logging \ + commons-logging-api \ + dom4j \ + geronimo-jms-1.1-api \ + isorelax \ + jaxen \ + log4j \ + mina/core \ + mina/filter-ssl \ + mina/java5 \ + msv-msv \ + qpid-broker \ + qpid-client \ + qpid-common \ + relaxngDatatype \ + slf4j) + +export JAVA=java \ + JAVA_VM=-server \ + JAVA_MEM=-Xmx1024m \ + CLASSPATH=$QPID_LIBS diff --git a/java/broker/etc/qpid.passwd b/java/broker/etc/qpid.passwd new file mode 100644 index 0000000000..dbfb9d1923 --- /dev/null +++ b/java/broker/etc/qpid.passwd @@ -0,0 +1,23 @@ +# +# 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. +# +guest:CE4DQ6BIb/BVMN9scFyLtA== +admin:ISMvKXpXpadDiUoOSoAfww== +user:CE4DQ6BIb/BVMN9scFyLtA== +server:CE4DQ6BIb/BVMN9scFyLtA== +client:CE4DQ6BIb/BVMN9scFyLtA== diff --git a/java/broker/etc/transient_config.xml b/java/broker/etc/transient_config.xml new file mode 100644 index 0000000000..a21afe7d21 --- /dev/null +++ b/java/broker/etc/transient_config.xml @@ -0,0 +1,118 @@ + + + + ${QPID_HOME} + ${QPID_WORK} + ${prefix}/etc + + nio + 5672 + 8672 + 32768 + 32768 + + + true + 8999 + + true + + ${prefix}/../test_resources/ssl/keystore.jks + password + + + + + false + false + 65535 + false + + + + + + passwordfile + org.apache.qpid.server.security.auth.database.PlainPasswordFilePrincipalDatabase + + + passwordFile + ${conf}/passwd + + + + + + + org.apache.qpid.server.security.access.plugins.AllowAll + + + ${conf}/jmxremote.access + passwordfile + + + + + + localhost + + + org.apache.qpid.server.store.MemoryMessageStore + + + + + + development + + + org.apache.qpid.server.store.MemoryMessageStore + + + + + + test + + + org.apache.qpid.server.store.MemoryMessageStore + + + + + + + 0 + 2.0 + + + true + + + ${conf}/virtualhosts.xml + + + diff --git a/java/broker/etc/virtualhosts.xml b/java/broker/etc/virtualhosts.xml new file mode 100644 index 0000000000..f62ec3f5d7 --- /dev/null +++ b/java/broker/etc/virtualhosts.xml @@ -0,0 +1,123 @@ + + + + test + + localhost + + + + direct + test.direct + true + + + topic + test.topic + + + + amq.direct + 4235264 + 2117632 + 600000 + + + queue + + + ping + + + test-queue + + test.direct + true + + + + test-ping + + test.direct + + + + + + + + + + development + + + 30000 + 5000 + + queue + + amq.direct + 4235264 + 2117632 + 600000 + + + + ping + + amq.direct + 4235264 + 2117632 + 600000 + + + + + + + test + + + 30000 + 5000 + + queue + + amq.direct + 4235264 + 2117632 + 600000 + + + + ping + + amq.direct + 4235264 + 2117632 + 600000 + + + + + + -- cgit v1.2.1