From 5a22b9a7565cdc8a0f32f1f32fa709801a2ad9d3 Mon Sep 17 00:00:00 2001 From: Robert Gemmell Date: Wed, 30 Nov 2011 16:06:13 +0000 Subject: NO-JIRA: remove unused 'qpid.passwd' file, update 'md5passwd' file to align users with the 'passwd' file. Remove unused out of date debug log4j config file. Remove old unused conf files. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1208478 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/java/broker/etc/debug.log4j.xml | 114 --------------------- qpid/java/broker/etc/md5passwd | 3 +- qpid/java/broker/etc/qpid-server.conf | 25 ----- qpid/java/broker/etc/qpid-server.conf.jpp | 48 --------- qpid/java/broker/etc/qpid.passwd | 23 ----- .../org/apache/qpid/tools/security/Passwd.java | 3 - 6 files changed, 2 insertions(+), 214 deletions(-) delete mode 100644 qpid/java/broker/etc/debug.log4j.xml delete mode 100644 qpid/java/broker/etc/qpid-server.conf delete mode 100644 qpid/java/broker/etc/qpid-server.conf.jpp delete mode 100644 qpid/java/broker/etc/qpid.passwd (limited to 'qpid/java') diff --git a/qpid/java/broker/etc/debug.log4j.xml b/qpid/java/broker/etc/debug.log4j.xml deleted file mode 100644 index fc0bd9f34f..0000000000 --- a/qpid/java/broker/etc/debug.log4j.xml +++ /dev/null @@ -1,114 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/qpid/java/broker/etc/md5passwd b/qpid/java/broker/etc/md5passwd index 6a149919de..59354a21f5 100644 --- a/qpid/java/broker/etc/md5passwd +++ b/qpid/java/broker/etc/md5passwd @@ -17,5 +17,6 @@ # under the License. # guest:CE4DQ6BIb/BVMN9scFyLtA== +client:CE4DQ6BIb/BVMN9scFyLtA== +server:CE4DQ6BIb/BVMN9scFyLtA== admin:ISMvKXpXpadDiUoOSoAfww== -user:aBzonUodYLhwSa8s9A10sA== diff --git a/qpid/java/broker/etc/qpid-server.conf b/qpid/java/broker/etc/qpid-server.conf deleted file mode 100644 index 8a16849b04..0000000000 --- a/qpid/java/broker/etc/qpid-server.conf +++ /dev/null @@ -1,25 +0,0 @@ -# -# 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/qpid/java/broker/etc/qpid-server.conf.jpp b/qpid/java/broker/etc/qpid-server.conf.jpp deleted file mode 100644 index 0378c82fd9..0000000000 --- a/qpid/java/broker/etc/qpid-server.conf.jpp +++ /dev/null @@ -1,48 +0,0 @@ -# -# 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 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/qpid/java/broker/etc/qpid.passwd b/qpid/java/broker/etc/qpid.passwd deleted file mode 100644 index dbfb9d1923..0000000000 --- a/qpid/java/broker/etc/qpid.passwd +++ /dev/null @@ -1,23 +0,0 @@ -# -# 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/qpid/java/broker/src/main/java/org/apache/qpid/tools/security/Passwd.java b/qpid/java/broker/src/main/java/org/apache/qpid/tools/security/Passwd.java index c27c52eb8e..bfcdbe7460 100644 --- a/qpid/java/broker/src/main/java/org/apache/qpid/tools/security/Passwd.java +++ b/qpid/java/broker/src/main/java/org/apache/qpid/tools/security/Passwd.java @@ -60,9 +60,6 @@ public class Passwd private static void output(String user, byte[] encoded) throws IOException { - -// File passwdFile = new File("qpid.passwd"); - PrintStream ps = new PrintStream(System.out); user += ":"; -- cgit v1.2.1