You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ar...@apache.org on 2008/10/28 14:07:54 UTC
svn commit: r708563 - in /incubator/qpid/trunk/qpid/java: ./ lib/
management/client/
management/client/src/main/java/org/apache/qpid/management/domain/services/
management/client/src/main/java/org/apache/qpid/management/servlet/
Author: arnaudsimon
Date: Tue Oct 28 06:07:53 2008
New Revision: 708563
URL: http://svn.apache.org/viewvc?rev=708563&view=rev
Log:
QPID-1401: added qman servlet + updated build script for building the servlet.
Added:
incubator/qpid/trunk/qpid/java/lib/javax.servlet.jar (with props)
incubator/qpid/trunk/qpid/java/management/client/src/main/java/org/apache/qpid/management/servlet/
Modified:
incubator/qpid/trunk/qpid/java/build.deps
incubator/qpid/trunk/qpid/java/management/client/build.xml
incubator/qpid/trunk/qpid/java/management/client/src/main/java/org/apache/qpid/management/domain/services/QMan.java
incubator/qpid/trunk/qpid/java/module.xml
Modified: incubator/qpid/trunk/qpid/java/build.deps
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/build.deps?rev=708563&r1=708562&r2=708563&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/build.deps (original)
+++ incubator/qpid/trunk/qpid/java/build.deps Tue Oct 28 06:07:53 2008
@@ -28,7 +28,7 @@
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 @@
${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}
Added: incubator/qpid/trunk/qpid/java/lib/javax.servlet.jar
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/lib/javax.servlet.jar?rev=708563&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/qpid/trunk/qpid/java/lib/javax.servlet.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: incubator/qpid/trunk/qpid/java/management/client/build.xml
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/management/client/build.xml?rev=708563&r1=708562&r2=708563&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/management/client/build.xml (original)
+++ incubator/qpid/trunk/qpid/java/management/client/build.xml Tue Oct 28 06:07:53 2008
@@ -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>
Modified: incubator/qpid/trunk/qpid/java/management/client/src/main/java/org/apache/qpid/management/domain/services/QMan.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/management/client/src/main/java/org/apache/qpid/management/domain/services/QMan.java?rev=708563&r1=708562&r2=708563&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/management/client/src/main/java/org/apache/qpid/management/domain/services/QMan.java (original)
+++ incubator/qpid/trunk/qpid/java/management/client/src/main/java/org/apache/qpid/management/domain/services/QMan.java Tue Oct 28 06:07:53 2008
@@ -50,7 +50,7 @@
* 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);
Modified: incubator/qpid/trunk/qpid/java/module.xml
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/module.xml?rev=708563&r1=708562&r2=708563&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/module.xml (original)
+++ incubator/qpid/trunk/qpid/java/module.xml Tue Oct 28 06:07:53 2008
@@ -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>