From 80ba5c5efdc23e3922b8f8f5152ceeaefa6951b6 Mon Sep 17 00:00:00 2001
From: Andrew Donald Kennedy <grkvlt@apache.org>
Date: Mon, 6 Dec 2010 16:05:46 +0000
Subject: Attempt one at merge from r1021441:HEAD

git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/grkvlt-network-20101013@1042697 13f79535-47bb-0310-9956-ffa450edef68
---
 qpid/java/management/client/README.txt              |  2 +-
 qpid/java/management/client/bin/qman-wsdm-start.cmd |  6 +++---
 qpid/java/management/client/bin/qman-wsdm-start.sh  |  4 ++--
 qpid/java/management/client/build.xml               | 10 +++++-----
 4 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'qpid/java/management/client')

diff --git a/qpid/java/management/client/README.txt b/qpid/java/management/client/README.txt
index 34a48f1f50..ecd61da75e 100644
--- a/qpid/java/management/client/README.txt
+++ b/qpid/java/management/client/README.txt
@@ -39,4 +39,4 @@ Administration
 
 After QMan has been started successfully you can browse its administration console pointing your browser to :
 
-http://<host>:<port>/qman/admin.jsp
\ No newline at end of file
+http://<host>:<port>/qman/console
diff --git a/qpid/java/management/client/bin/qman-wsdm-start.cmd b/qpid/java/management/client/bin/qman-wsdm-start.cmd
index df30ce8617..ec8321c6b8 100644
--- a/qpid/java/management/client/bin/qman-wsdm-start.cmd
+++ b/qpid/java/management/client/bin/qman-wsdm-start.cmd
@@ -59,8 +59,8 @@ SET CLASSPATH=%CLASSPATH%;%QMAN_LIBS%\start.jar
 SET CLASSPATH=%CLASSPATH%;%QMAN_LIBS%\jetty-6.1.14.jar
 SET CLASSPATH=%CLASSPATH%;%QMAN_LIBS%\jetty-util-6.1.14.jar
 SET CLASSPATH=%CLASSPATH%;%QMAN_LIBS%\geronimo-servlet_2.5_spec-1.2.jar
-SET CLASSPATH=%CLASSPATH%;%QMAN_LIBS%\slf4j-api-1.4.0.jar
-SET CLASSPATH=%CLASSPATH%;%QMAN_LIBS%\slf4j-log4j12-1.4.0.jar
+SET CLASSPATH=%CLASSPATH%;%QMAN_LIBS%\slf4j-api-1.6.1.jar
+SET CLASSPATH=%CLASSPATH%;%QMAN_LIBS%\slf4j-log4j12-1.6.1.jar
 SET CLASSPATH=%CLASSPATH%;%QMAN_LIBS%\log4j-1.2.12.jar
 
 echo ===============================================================================
@@ -85,4 +85,4 @@ echo.
 echo ===============================================================================
 echo.
 
-%JAVA% -cp %CLASSPATH% -DQMAN_HOME=%QMAN_HOME% -Djetty.home=%QMAN_HOME% -Dqman.host=%QMAN_WSDM_ADAPTER_HOST%  -Dqman.port=%QMAN_WSDM_ADAPTER_PORT% -DSTOP.PORT=%ADMIN_PORT% -DSTOP.KEY=%ADMIN_KEY% -Dqman-config=%QMAN_CONFIG_FILE%  org.mortbay.start.Main %JETTY_CONFIG_FILE%
\ No newline at end of file
+%JAVA% -cp %CLASSPATH% -DQMAN_HOME=%QMAN_HOME% -Djetty.home=%QMAN_HOME% -Dqman.host=%QMAN_WSDM_ADAPTER_HOST%  -Dqman.port=%QMAN_WSDM_ADAPTER_PORT% -DSTOP.PORT=%ADMIN_PORT% -DSTOP.KEY=%ADMIN_KEY% -Dqman-config=%QMAN_CONFIG_FILE%  org.mortbay.start.Main %JETTY_CONFIG_FILE%
diff --git a/qpid/java/management/client/bin/qman-wsdm-start.sh b/qpid/java/management/client/bin/qman-wsdm-start.sh
index 39a4cba66e..0024890527 100644
--- a/qpid/java/management/client/bin/qman-wsdm-start.sh
+++ b/qpid/java/management/client/bin/qman-wsdm-start.sh
@@ -58,7 +58,7 @@ ADMIN_KEY=gazzax
 QMAN_LIBS=$QMAN_HOME/lib
 JETTY_CONFIG_FILE=$QMAN_HOME/etc/jetty.xml
  
-QMAN_CLASSPATH=$QMAN_HOME/etc:$QMAN_LIBS/start.jar:$QMAN_LIBS/jetty-6.1.14.jar:$QMAN_LIBS/jetty-util-6.1.14.jar:$QMAN_LIBS/geronimo-servlet_2.5_spec-1.2.jar:$QMAN_LIBS/slf4j-api-1.4.0.jar:$QMAN_LIBS/slf4j-log4j12-1.4.0.jar:$QMAN_LIBS/log4j-1.2.12.jar
+QMAN_CLASSPATH=$QMAN_HOME/etc:$QMAN_LIBS/start.jar:$QMAN_LIBS/jetty-6.1.14.jar:$QMAN_LIBS/jetty-util-6.1.14.jar:$QMAN_LIBS/geronimo-servlet_2.5_spec-1.2.jar:$QMAN_LIBS/slf4j-api-1.6.1.jar:$QMAN_LIBS/slf4j-log4j12-1.6.1.jar:$QMAN_LIBS/log4j-1.2.12.jar
 
 echo "==============================================================================="
 echo""
@@ -86,4 +86,4 @@ echo""
 echo "==============================================================================="
 echo""
 
-"$JAVA" $JAVA_OPTS -cp $QMAN_CLASSPATH -DQMAN_HOME=$QMAN_HOME -Djetty.home=$QMAN_HOME -Dqman.host=$QMAN_WSDM_ADAPTER_HOST -Dqman.port=$QMAN_WSDM_ADAPTER_PORT -DSTOP.PORT=$ADMIN_PORT -DSTOP.KEY=$ADMIN_KEY -Dqman-config=$QMAN_CONFIG_FILE org.mortbay.start.Main $JETTY_CONFIG_FILE
\ No newline at end of file
+"$JAVA" $JAVA_OPTS -cp $QMAN_CLASSPATH -DQMAN_HOME=$QMAN_HOME -Djetty.home=$QMAN_HOME -Dqman.host=$QMAN_WSDM_ADAPTER_HOST -Dqman.port=$QMAN_WSDM_ADAPTER_PORT -DSTOP.PORT=$ADMIN_PORT -DSTOP.KEY=$ADMIN_KEY -Dqman-config=$QMAN_CONFIG_FILE org.mortbay.start.Main $JETTY_CONFIG_FILE
diff --git a/qpid/java/management/client/build.xml b/qpid/java/management/client/build.xml
index f623449c4b..a67f69c43d 100644
--- a/qpid/java/management/client/build.xml
+++ b/qpid/java/management/client/build.xml
@@ -44,9 +44,9 @@
 		<copy todir="${module.release}" failonerror="false" flatten="true">
 			<fileset dir="${resources}" excludes="META-INF">
 				<exclude name="META-INF"/>
-				<exclude name="README"/>
+				<exclude name="README.txt"/>
 			</fileset>
-			<fileset file="${module.build}${file.separator}README"/>
+			<fileset file="${module.build}${file.separator}README.txt"/>
 	    </copy>
 	</target>
 
@@ -153,7 +153,7 @@
 	<target name="copy-README-to-build">
 		<copy todir="${module.build}">
 			<fileset dir="${module.src}${file.separator}..${file.separator}..${file.separator}..">
-				<include name="README"/>				
+				<include name="README.txt"/>				
 			</fileset>
 		</copy>			
 	</target>
@@ -163,7 +163,7 @@
 		<mkdir dir="${examples.folder}${file.separator}sample_messages"/>
 		<copy todir="${examples.folder}">
 			<fileset dir="${module.src}${file.separator}..${file.separator}..${file.separator}example">
-				<include name="README"/>				
+				<include name="README.txt"/>				
 			</fileset>
 		</copy>		
 		<copy todir="${examples.folder}${file.separator}src">
@@ -175,7 +175,7 @@
 		<copy todir="${examples.folder}${file.separator}sample_messages">
 			<fileset dir="${module.src}${file.separator}..${file.separator}..${file.separator}example" >
 				<exclude name="**/*.java"/>
-				<exclude name="**/README"/>				
+				<exclude name="**/README.txt"/>				
 				<include name="**/*.out.*"/>
 			</fileset>
 		</copy>
-- 
cgit v1.2.1