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

5 files changed, 48 insertions, 6 deletions

diff --git a/qpid/java/build.deps b/qpid/java/build.deps
index 723fa6d80a..bd68e6fda5 100644
--- a/qpid/java/build.deps
+++ b/qpid/java/build.deps
@@ -28,7 +28,7 @@ xalan=lib/xalan-2.7.0.jar
 osgi-core=lib/org.osgi.core-1.0.0.jar
 felix-framework=lib/org.apache.felix.framework-1.0.0.jar
 
-
+servlet=lib/javax.servlet.jar
 felix.libs=${osgi-core} ${felix-framework}
 
 common.libs=${slf4j-api} ${backport-util-concurrent} ${mina-core} \
@@ -40,7 +40,7 @@ broker.libs=${common.libs} ${commons-cli} ${commons-logging} ${log4j} \
     ${slf4j-log4j} ${xalan} ${felix.libs} ${build.lib}/${project.name}-common-${project.version}.jar
 
 broker-plugins.libs=${common.libs} ${felix.libs} 
-management-client.libs=${client.libs} ${commons-pool} ${log4j}
+management-client.libs=${client.libs} ${commons-pool} ${log4j} ${slf4j-log4j} ${servlet}
 
 junit-toolkit.libs=${log4j} ${junit} ${slf4j-api}
 test.libs=${slf4j-log4j} ${junit-toolkit.libs}
diff --git a/qpid/java/lib/javax.servlet.jar b/qpid/java/lib/javax.servlet.jar
new file mode 100644
index 0000000000..3bc9f07c77
--- /dev/null
+++ b/qpid/java/lib/javax.servlet.jar
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);
diff --git a/qpid/java/module.xml b/qpid/java/module.xml
index 2ed8e014ff..c487ffb134 100644
--- a/qpid/java/module.xml
+++ b/qpid/java/module.xml
@@ -302,7 +302,9 @@
     </copy>
   </target>
 
-  <target name="build" depends="jar,jar-tests,libs,copy-bin,copy-etc" description="compile and copy resources into build tree"/>
+  <target name="postbuild" description="run after a build"/>
+
+  <target name="build" depends="jar,jar-tests,libs,copy-bin,copy-etc,postbuild" description="compile and copy resources into build tree"/>
   <target name="jar.manifest" depends="compile" if="module.manifest">
     <jar destfile="${module.jar}" basedir="${module.classes}" manifest="${module.manifest}"/>
   </target>