QPID-1401: added qman servlet + updated build script for building the servlet.

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

2 files changed, 43 insertions, 3 deletions

diff --git a/qpid/java/management/client/build.xml b/qpid/java/management/client/build.xml
index b0cd3d1b37..608e491f80 100644
--- a/qpid/java/management/client/build.xml
+++ b/qpid/java/management/client/build.xml
@@ -20,8 +20,48 @@
  -->
 <project name="Qpid Management Client" default="build">
 
-  <property name="module.depends" value="client common"/>
+    <property name="module.depends" value="client common"/>
 
-  <import file="../../module.xml"/>
+    <import file="../../module.xml"/>
+
+
+    <property name="servlet.war" value="qmanServlet.war"/>
+    <property name="servlet.root" value="${module.build}/servlet"/>
+    <property name="servlet.web-inf" value="${servlet.root}/WEB-INF"/>
+    <property name="servlet.classes" value="${servlet.web-inf}/classes"/>
+   
+
+    <target name="servlet-prepare">        
+        <mkdir dir="${servlet.root}"/>
+        <mkdir dir="${servlet.web-inf}"/>
+        <mkdir dir="${servlet.classes}"/>
+        <mkdir dir="${servlet.lib}"/>
+        <copy file="./web.xml" todir="${servlet.web-inf}" verbose="false"/>
+        <copy todir="${servlet.classes}" verbose="false">
+            <fileset dir="${module.classes}">
+                <include name="org/apache/qpid/management/servlet/*"/>
+            </fileset>
+        </copy>
+        <copy todir="${servlet.web-inf}">
+            <fileset dir="${build}" includes="${module.libs}"/>
+        </copy>
+        <copy todir="${servlet.web-inf}/lib">
+            <fileset dir="${build}/lib">
+                <include name="qpid-client-incubating*.jar"/>
+                <include name="qpid-common-incubating*.jar"/>
+                <include name="qpid-management-client-incubating*.jar"/>
+            </fileset>
+        </copy>
+    </target>
+
+    <target name="servlet-clean">
+      <delete dir="${servlet.root}"/>
+    </target>
+
+    <target name="servlet">
+        <jar destfile="${servlet.root}/${servlet.war}" basedir="${servlet.root}"/>
+    </target>
+
+    <target name="postbuild" depends="servlet-clean,servlet-prepare,servlet" description="run after a build"/>
 
 </project>
diff --git a/qpid/java/management/client/src/main/java/org/apache/qpid/management/domain/services/QMan.java b/qpid/java/management/client/src/main/java/org/apache/qpid/management/domain/services/QMan.java
index f2a4ea54a0..b6264a73de 100644
--- a/qpid/java/management/client/src/main/java/org/apache/qpid/management/domain/services/QMan.java
+++ b/qpid/java/management/client/src/main/java/org/apache/qpid/management/domain/services/QMan.java
@@ -50,7 +50,7 @@ public class QMan
      * Starts QMan.
      * @throws StartupFailureException when it's not possible to proceed with startup.
      */
-    void start() throws StartupFailureException
+    public void start() throws StartupFailureException
     {
         LOGGER.info(Messages.QMAN_000001_STARTING_QMAN);
         LOGGER.info(Messages.QMAN_000002_READING_CONFIGURATION);