This is related to QPID-1619

Added the man page back.
Renamed qman-jmx-start to qman-jmx and there is no corresponding stop script.
Added a simple qman.log4j
Ran dos2unix on qman-config.xml


git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@738568 13f79535-47bb-0310-9956-ffa450edef68

5 files changed, 86 insertions, 29 deletions

diff --git a/qpid/java/management/client/bin/qman-jmx-start.cmd b/qpid/java/management/client/bin/qman-jmx.cmd
index c04241494d..c04241494d 100644
--- a/qpid/java/management/client/bin/qman-jmx-start.cmd
+++ b/qpid/java/management/client/bin/qman-jmx.cmd
diff --git a/qpid/java/management/client/bin/qman-jmx-start.sh b/qpid/java/management/client/bin/qman-jmx.sh
index 14bf663516..9058999bef 100644
--- a/qpid/java/management/client/bin/qman-jmx-start.sh
+++ b/qpid/java/management/client/bin/qman-jmx.sh
@@ -42,17 +42,28 @@ if [ "$JAVA_HOME" = "" ] ; then
 fi
 
 if [ "$QMAN_HOME" = "" ] ; then
-	QMAN_HOME=..
-fi
 
-if [ "$QMAN_CONFIG_FILE" = "" ] ; then
-	QMAN_CONFIG_FILE=$QMAN_HOME/etc/qman-config.xml
-fi
+    if [ "$QPID_LIB_PATH" = "" ] ; then
+        QPID_LIB_PATH=/usr/share/java
+    fi
 
-QMAN_LIBS=$QMAN_HOME/lib
+    if [ "$QMAN_CONFIG_FILE" = "" ] ; then
+	QMAN_CONFIG_FILE=/etc/qman-config.xml
+        QMAN_LOG4J=/etc/qman.log4j
+    fi
+else
+    if [ "$QPID_LIB_PATH" = "" ] ; then
+        QPID_LIB_PATH=$QMAN_HOME/lib
+    fi
+
+    if [ "$QMAN_CONFIG_FILE" = "" ] ; then
+        QMAN_CONFIG_FILE=$QMAN_HOME/etc/qman-config.xml
+        QMAN_LOG4J=$QMAN_HOME/etc/qman.log4j
+    fi
+fi
 
 QMAN_CLASSPATH=`find $QMAN_LIBS | tr '\n' ":"`
-QMAN_CLASSPATH=$QMAN_CLASSPATH:$QMAN_HOME/etc
+QMAN_CLASSPATH=$QMAN_LOG4J:$QMAN_CLASSPATH
 
 echo "==============================================================================="
 echo ""
@@ -67,9 +78,9 @@ echo	 "Java Opts : $JAVA_OPTS"
 echo ""
 echo	 "Configuration file : $QMAN_CONFIG_FILE"
 echo ""
-echo	 "Bootstrap classpath : $QMAN_CLASSPATH"
+echo     "Log4J file :  $QMAN_LOG4J"
 echo ""
 echo "==============================================================================="
 echo ""
 
-"$JAVA" $JAVA_OPTS -cp $QMAN_CLASSPATH -Dcom.sun.management.jmxremote -Dqman-config=$QMAN_CONFIG_FILE org.apache.qpid.management.domain.services.QMan
\ No newline at end of file
+"$JAVA" $JAVA_OPTS -cp $QMAN_CLASSPATH -Dcom.sun.management.jmxremote -Dlog4j.configuration=qman.log4j -Dqman-config=$QMAN_CONFIG_FILE org.apache.qpid.management.domain.services.QMan
diff --git a/qpid/java/management/client/doc/man/qman-jmx b/qpid/java/management/client/doc/man/qman-jmx
new file mode 100644
index 0000000000..064c00eae5
--- /dev/null
+++ b/qpid/java/management/client/doc/man/qman-jmx
@@ -0,0 +1,17 @@
+.TH qman-jmx
+.SH NAME
+qman-jmx is a Management bridge that exposes one (or several) Qpid broker domain model as MBeans that are accessible through the Java Management Extensions (JMX). Once you run qman you need to start a JMX Console such as JConsole to browse the MBeans exposed by Q-Man.
+.SH SYNOPSIS
+qman
+.SH DESCRIPTION
+For more information on customizing qman-jmx for your own environment please read http://cwiki.apache.org/confluence/display/qpid/Qman+Tool
+.SH Configuration
+.SS Classpath
+By default qman jars will be loaded from /usr/share/java. If you want to load from an alternative location you could specify it using QPID_LIB_PATH var.
+.SS Config file
+qman can be configured to connect to one or more brokers at startup by adding brokers in 
+.I /etc/qman-config.xml
+If you want to load qman with qman-config.xml from a different location, you can specify it using QPID_CONFIG_FILE var.
+.SS log4j configuration
+qman expects qman.log4j file to be in the classpath. By default it will be put in 
+.I /usr/share/java
diff --git a/qpid/java/management/client/etc/qman-config.xml b/qpid/java/management/client/etc/qman-config.xml
index beb33acfc9..c1a5da9184 100644
--- a/qpid/java/management/client/etc/qman-config.xml
+++ b/qpid/java/management/client/etc/qman-config.xml
@@ -18,17 +18,17 @@
  - under the License.
  -
  -->
-<!-- 

-Default configuration for QMan is empty; 

-that is, there's no broker configured at startup.

-If  you want to connect with a running broker when QMan starts up, 

-you can do that uncommenting and editing the template reported below.

+<!-- 
+Default configuration for QMan is empty; 
+that is, there's no broker configured at startup.
+If  you want to connect with a running broker when QMan starts up, 
+you can do that uncommenting and editing the template reported below.
 -->
-<configuration>

+<configuration>
 <!-- 	<brokers>
 		<broker>
-			<host>localhost</host>

-			<port>5672</port>

+			<host>localhost</host>
+			<port>5672</port>
 			<virtual-host>test</virtual-host>
 	  		<user>guest</user>
 	  		<password>guest</password>
@@ -36,16 +36,16 @@ you can do that uncommenting and editing the template reported below.
 	  		<initial-pool-capacity>0</initial-pool-capacity>
 	  		<max-wait-timeout>-1</max-wait-timeout>
 		</broker>
-		<broker>

-			<host>localhost</host>

-			<port>5672</port>

-			<virtual-host>test</virtual-host>

-	  		<user>guest</user>

-	  		<password>guest</password>

-	  		<max-pool-capacity>4</max-pool-capacity>

-	  		<initial-pool-capacity>0</initial-pool-capacity>

-	  		<max-wait-timeout>-1</max-wait-timeout>

-		</broker>

-  </brokers>

-  --> 

+		<broker>
+			<host>localhost</host>
+			<port>5672</port>
+			<virtual-host>test</virtual-host>
+	  		<user>guest</user>
+	  		<password>guest</password>
+	  		<max-pool-capacity>4</max-pool-capacity>
+	  		<initial-pool-capacity>0</initial-pool-capacity>
+	  		<max-wait-timeout>-1</max-wait-timeout>
+		</broker>
+  </brokers>
+  --> 
 </configuration>
diff --git a/qpid/java/management/client/etc/qman.log4j b/qpid/java/management/client/etc/qman.log4j
new file mode 100644
index 0000000000..bf6f940a6c
--- /dev/null
+++ b/qpid/java/management/client/etc/qman.log4j
@@ -0,0 +1,29 @@
+#
+# 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.
+#
+log4j.rootLogger=${root.logging.level}
+
+log4j.logger.org.apache.qpid=ERROR, console
+log4j.additivity.org.apache.qpid=false
+
+log4j.logger.org.apache.qpid.management.client=DEBUG, console
+
+log4j.appender.console=org.apache.log4j.ConsoleAppender
+log4j.appender.console.Threshold=error
+log4j.appender.console.layout=org.apache.log4j.PatternLayout
+log4j.appender.console.layout.ConversionPattern=%t %d %p [%c{4}] %m%n