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

6 files changed, 2 insertions, 214 deletions

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 @@
-<?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.
- -
- --><!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="null" threshold="null">
-    <appender class="org.apache.log4j.QpidCompositeRollingAppender" name="ArchivingFileAppender">
-        <!-- Ensure that logs allways have the dateFormat set-->
-        <param name="StaticLogFileName" value="false"/>
-        <param name="File" value="${QPID_WORK}/log/${logprefix}qpid${logsuffix}.log"/>
-        <param name="Append" value="false"/>
-        <!-- Change the direction so newer files have bigger numbers -->
-        <!-- So log.1 is written then log.2 etc This prevents a lot of file renames at log rollover -->
-        <param name="CountDirection" value="1"/>
-        <!-- Use default 10MB -->
-        <!--param name="MaxFileSize" value="100000"/-->
-        <param name="DatePattern" value="'.'yyyy-MM-dd-HH-mm"/>
-        <!-- Unlimited number of backups -->
-        <param name="MaxSizeRollBackups" value="-1"/>
-        <!-- Compress(gzip) the backup files-->
-        <param name="CompressBackupFiles" value="true"/>
-        <!-- Compress the backup files using a second thread -->
-        <param name="CompressAsync" value="true"/>
-        <!-- Start at zero numbered files-->
-        <param name="ZeroBased" value="true"/>
-        <!-- Backup Location -->
-        <param name="backupFilesToPath" value="${QPID_WORK}/backup/log"/>
-
-        <layout class="org.apache.log4j.PatternLayout">
-            <param name="ConversionPattern" value="%d %-5p [%t] %C{2} (%F:%L) - %m%n"/>
-        </layout>
-    </appender>
-
-    <appender class="org.apache.log4j.FileAppender" name="FileAppender">
-        <param name="File" value="${QPID_WORK}/log/${logprefix}qpid${logsuffix}.log"/>
-        <param name="Append" value="false"/>
-
-        <layout class="org.apache.log4j.PatternLayout">
-            <param name="ConversionPattern" value="%d %-5p [%t] %C{2} (%F:%L) - %m%n"/>
-        </layout>
-    </appender>
-
-    <appender class="org.apache.log4j.FileAppender" name="AlertFile">
-        <param name="File" value="${QPID_WORK}/log/alert.log"/>
-        <param name="Append" value="false"/>
-
-        <layout class="org.apache.log4j.PatternLayout">
-            <param name="ConversionPattern" value="%d %-5p [%t] %C{2} (%F:%L) - %m%n"/>
-        </layout>
-    </appender>
-
-    <appender class="org.apache.log4j.ConsoleAppender" name="STDOUT">
-
-        <layout class="org.apache.log4j.PatternLayout">
-            <param name="ConversionPattern" value="%d %-5p [%t] %C{2} (%F:%L) - %m%n"/>
-        </layout>
-    </appender>
-
-    <category additivity="true" name="Qpid.Broker">
-        <priority value="debug"/>
-        <appender-ref ref="AlertFile"/>
-        <!--appender-ref ref="STDOUT"/-->        
-    </category>
-
-
-    <category additivity="true" name="org.apache.qpid.server.queue.AMQQueueMBean">
-        <priority value="info"/>
-        <appender-ref ref="AlertFile"/>
-    </category>
-
-
-    <!-- Provide warnings to standard output -->
-    <!--category additivity="true" name="org.apache.qpid">
-        <priority value="warn"/>
-        <appender-ref ref="STDOUT"/>
-    </category-->
-
-
-    <!-- Additional level settings for debugging -->
-    <!-- Each class in the Broker is a category that can have its logging level adjusted. -->
-    <!-- This will provide more details if available about that classes processing. -->
-    <!--category additivity="true" name="org.apache.qpid.server.txn">
-        <priority value="debug"/>
-    </category>-->
-
-    <!--<category additivity="true" name="org.apache.qpid.server.store">
-        <priority value="debug"/>
-    </category-->
-
-    <!-- Log all info events to file -->
-    <root>
-        <priority value="debug"/>
-        <appender-ref ref="STDOUT"/>
-        <!--appender-ref ref="FileAppender"/-->
-    </root>
-
-</log4j:configuration>
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 += ":";