[jboss-svn-commits] JBL Code SVN: r15029 - in labs/jbossesb/trunk/product/tools/console: management-esb and 1 other directory.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Tue Sep 11 17:43:07 EDT 2007
Author: tcunning
Date: 2007-09-11 17:43:07 -0400 (Tue, 11 Sep 2007)
New Revision: 15029
Modified:
labs/jbossesb/trunk/product/tools/console/build.xml
labs/jbossesb/trunk/product/tools/console/management-esb/build.xml
Log:
bug:JBESB-973
Build monitoring console into the ESB.
Modified: labs/jbossesb/trunk/product/tools/console/build.xml
===================================================================
--- labs/jbossesb/trunk/product/tools/console/build.xml 2007-09-11 21:41:45 UTC (rev 15028)
+++ labs/jbossesb/trunk/product/tools/console/build.xml 2007-09-11 21:43:07 UTC (rev 15029)
@@ -2,137 +2,137 @@
<project name="jboss-esb-console" default="deploy" basedir=".">
- <!-- Give user a chance to override without editing this file or typing -D -->
- <property file="${basedir}/build.properties" />
+<!-- Give user a chance to override without editing this file or typing -D -->
+<property file="${basedir}/build.properties" />
- <!-- set global properties for this build -->
- <property name="project.name" value="jboss-esb-console"/>
- <property name="dist.dir" value="${basedir}/build" />
- <property name="src.java.dir" value="src" />
- <property name="src.test.dir" value="test" />
- <property name="lib.dir" value="lib" />
- <property name="exploded.archives.dir" value="${basedir}/exploded-archives" />
- <property name="ear.dir" value="${exploded.archives.dir}/${project.name}.ear" />
- <property name="jar.dir" value="${exploded.archives.dir}/${project.name}.jar" />
- <property name="war.dir" value="${exploded.archives.dir}/${project.name}.war" />
- <property name="test.dir" value="test-build" />
- <property name="embedded-ejb3.dir" value="${basedir}/embedded-ejb/conf" />
- <property name="deploy.dir" value="${jboss.home}/server/default/deploy" />
- <property name="ear.deploy.dir" value="${deploy.dir}/${project.name}.ear" />
- <property name="jar.deploy.dir" value="${ear.deploy.dir}/${project.name}.jar" />
- <property name="war.deploy.dir" value="${ear.deploy.dir}/${project.name}.war" />
- <property name="testng.jar" value="${basedir}/lib/testng-4.5.1-jdk15.jar" />
- <property name="javac.debug" value="true" />
- <property name="javac.deprecation" value="false" />
- <property name="product.lib.ext.dir" location="../../lib/ext" />
- <property name="product.services.smooks.lib.ext.dir" location="../../services/smooks/lib/ext" />
+<!-- set global properties for this build -->
+<property name="project.name" value="jboss-esb-console"/>
+<property name="dist.dir" value="${basedir}/build" />
+<property name="src.java.dir" value="src" />
+<property name="src.test.dir" value="test" />
+<property name="lib.dir" value="lib" />
+<property name="exploded.archives.dir" value="${basedir}/exploded-archives" />
+<property name="ear.dir" value="${exploded.archives.dir}/${project.name}.ear" />
+<property name="jar.dir" value="${exploded.archives.dir}/${project.name}.jar" />
+<property name="war.dir" value="${exploded.archives.dir}/${project.name}.war" />
+<property name="test.dir" value="test-build" />
+<property name="embedded-ejb3.dir" value="${basedir}/embedded-ejb/conf" />
+<property name="deploy.dir" value="${jboss.home}/server/default/deploy" />
+<property name="ear.deploy.dir" value="${deploy.dir}/${project.name}.ear" />
+<property name="jar.deploy.dir" value="${ear.deploy.dir}/${project.name}.jar" />
+<property name="war.deploy.dir" value="${ear.deploy.dir}/${project.name}.war" />
+<property name="testng.jar" value="${basedir}/lib/testng-4.5.1-jdk15.jar" />
+<property name="javac.debug" value="true" />
+<property name="javac.deprecation" value="false" />
+<property name="product.lib.ext.dir" location="../../lib/ext" />
+<property name="product.services.smooks.lib.ext.dir" location="../../services/smooks/lib/ext" />
- <fileset id="lib" dir="${lib.dir}">
- <include name="*.jar" />
- </fileset>
+<fileset id="lib" dir="${lib.dir}">
+ <include name="*.jar" />
+</fileset>
- <fileset id="milyn" dir="${product.services.smooks.lib.ext.dir}"
- includes="milyn*.jar" />
-
- <fileset id="milyn-dependencies" dir="${product.lib.ext.dir}"
- includes="opencsv*.jar,ognl-*.jar,xbean.jar,xmlpublic.jar,groovy*.jar" />
-
- <path id="build.classpath">
- <fileset refid="lib" />
- <fileset refid="milyn" />
- <fileset refid="milyn-dependencies" />
- </path>
+<fileset id="milyn" dir="${product.services.smooks.lib.ext.dir}"
+ includes="milyn*.jar" />
- <target name="init" description="Initialize the build">
- <mkdir dir="${dist.dir}" />
- <mkdir dir="${jar.dir}" />
- <mkdir dir="${ear.dir}" />
- <mkdir dir="${war.dir}" />
- </target>
+<fileset id="milyn-dependencies" dir="${product.lib.ext.dir}"
+ includes="opencsv*.jar,ognl-*.jar,xbean.jar,xmlpublic.jar,groovy*.jar" />
- <target name="compile" depends="init"
- description="Compile the Java source code"
- unless="eclipse.running">
-
- <javac classpathref="build.classpath"
- destdir="${jar.dir}"
- debug="${javac.debug}"
- deprecation="${javac.deprecation}"
- nowarn="on">
- <src path="${src.java.dir}" />
- </javac>
- </target>
+<path id="build.classpath">
+ <fileset refid="lib" />
+ <fileset refid="milyn" />
+ <fileset refid="milyn-dependencies" />
+</path>
- <target name="copyclasses" depends="init"
- description="Copy the classes that were compiled by eclipse"
- if="eclipse.running">
- <copy todir="${jar.dir}">
- <fileset dir="${test.dir}">
- <include name="**/*.class"/>
- </fileset>
- </copy>
- </target>
+<target name="init" description="Initialize the build">
+ <mkdir dir="${dist.dir}" />
+ <mkdir dir="${jar.dir}" />
+ <mkdir dir="${ear.dir}" />
+ <mkdir dir="${war.dir}" />
+</target>
- <target name="jar" depends="compile,copyclasses"
- description="Build the distribution .jar file">
- <copy todir="${jar.dir}">
- <fileset dir="${basedir}/resources">
- <include name="seam.properties" />
- <include name="jboss-esb-console.properties" />
- </fileset>
- </copy>
- <copy todir="${jar.dir}/META-INF">
- <fileset dir="${basedir}/resources/META-INF">
- <include name="ejb-jar.xml" />
- </fileset>
- </copy>
- <copy tofile="${jar.dir}/META-INF/persistence.xml"
- file="${basedir}/resources/META-INF/persistence.xml"
- overwrite="true"/>
- <copy tofile="${jar.dir}/import.sql"
- file="${basedir}/resources/import.sql"
- overwrite="true"/>
- </target>
+<target name="compile" depends="init"
+ description="Compile the Java source code"
+ unless="eclipse.running">
+
+ <javac classpathref="build.classpath"
+ destdir="${jar.dir}"
+ debug="${javac.debug}"
+ deprecation="${javac.deprecation}"
+ nowarn="on">
+ <src path="${src.java.dir}" />
+ </javac>
+</target>
- <target name="war" depends="compile"
- description="Build the distribution .war file">
- <copy todir="${war.dir}">
- <fileset dir="${basedir}/view" />
- </copy>
- <copy todir="${war.dir}/WEB-INF">
- <fileset dir="${basedir}/resources/WEB-INF">
- <include name="*.*"/>
- <include name="classes/**/*.*"/>
- <exclude name="classes/**/*.class"/>
- </fileset>
- <filterset>
- <filter token="jndiPattern" value="${project.name}/#{ejbName}/local" />
- <filter token="embeddedEjb" value="false" />
- </filterset>
- </copy>
- <copy todir="${war.dir}/WEB-INF">
- <fileset dir="${basedir}/resources/WEB-INF">
- <include name="lib/*.*"/>
- <include name="classes/**/*.class"/>
- </fileset>
- </copy>
- <copy todir="${war.dir}/WEB-INF/lib">
- <fileset dir="${lib.dir}">
- <include name="jsf-facelets.jar" />
- <include name="jboss-seam-*.jar" />
- <exclude name="jboss-seam-gen.jar" />
- </fileset>
- </copy>
- <copy todir="${war.dir}/WEB-INF/classes">
- <fileset dir="${basedir}/resources">
- <include name="messages*.properties"/>
- </fileset>
- </copy>
- </target>
+<target name="copyclasses" depends="init"
+ description="Copy the classes that were compiled by eclipse"
+ if="eclipse.running">
+ <copy todir="${jar.dir}">
+ <fileset dir="${test.dir}">
+ <include name="**/*.class"/>
+ </fileset>
+ </copy>
+</target>
- <target name="ear" description="Build the EAR">
- <property name="contract.dir" value="${basedir}/contract-web"/>
- <ant antfile="contract-web/build.xml" target="war"/>
+<target name="jar" depends="compile,copyclasses"
+ description="Build the distribution .jar file">
+ <copy todir="${jar.dir}">
+ <fileset dir="${basedir}/resources">
+ <include name="seam.properties" />
+ <include name="jboss-esb-console.properties" />
+ </fileset>
+ </copy>
+ <copy todir="${jar.dir}/META-INF">
+ <fileset dir="${basedir}/resources/META-INF">
+ <include name="ejb-jar.xml" />
+ </fileset>
+ </copy>
+ <copy tofile="${jar.dir}/META-INF/persistence.xml"
+ file="${basedir}/resources/META-INF/persistence.xml"
+ overwrite="true"/>
+ <copy tofile="${jar.dir}/import.sql"
+ file="${basedir}/resources/import.sql"
+ overwrite="true"/>
+</target>
+
+<target name="war" depends="compile"
+ description="Build the distribution .war file">
+ <copy todir="${war.dir}">
+ <fileset dir="${basedir}/view" />
+ </copy>
+ <copy todir="${war.dir}/WEB-INF">
+ <fileset dir="${basedir}/resources/WEB-INF">
+ <include name="*.*"/>
+ <include name="classes/**/*.*"/>
+ <exclude name="classes/**/*.class"/>
+ </fileset>
+ <filterset>
+ <filter token="jndiPattern" value="${project.name}/#{ejbName}/local" />
+ <filter token="embeddedEjb" value="false" />
+ </filterset>
+ </copy>
+ <copy todir="${war.dir}/WEB-INF">
+ <fileset dir="${basedir}/resources/WEB-INF">
+ <include name="lib/*.*"/>
+ <include name="classes/**/*.class"/>
+ </fileset>
+ </copy>
+ <copy todir="${war.dir}/WEB-INF/lib">
+ <fileset dir="${lib.dir}">
+ <include name="jsf-facelets.jar" />
+ <include name="jboss-seam-*.jar" />
+ <exclude name="jboss-seam-gen.jar" />
+ </fileset>
+ </copy>
+ <copy todir="${war.dir}/WEB-INF/classes">
+ <fileset dir="${basedir}/resources">
+ <include name="messages*.properties"/>
+ </fileset>
+ </copy>
+</target>
+
+<target name="ear" description="Build the EAR">
+ <property name="contract.dir" value="${basedir}/contract-web"/>
+ <ant antfile="contract-web/build.xml" target="war"/>
<copy todir="${ear.dir}">
<fileset dir="contract-web/build">
<include name="*.war"/>
@@ -185,12 +185,12 @@
</copy>
</target>
- <target name="dist" depends="jar,war,ear,test">
- <property name="install.console.dir" location="${install.tools.dir}/console" />
- <property name="install.management.dir" location="${install.tools.dir}"/>
- <mkdir dir="${install.console.dir}"/>
+ <target name="dist" depends="jar,war,ear,test">
+ <property name="install.console.dir" location="${install.tools.dir}/console" />
+ <property name="install.management.dir" location="${install.tools.dir}"/>
+ <mkdir dir="${install.console.dir}"/>
- <mkdir dir="${install.management.dir}"/>
+ <mkdir dir="${install.management.dir}"/>
<copy todir="${install.management.dir}">
<fileset dir="${basedir}">
<include name="MANAGEMENT-README.txt"/>
@@ -207,8 +207,29 @@
<copy file="distro/distro-build.xml" tofile="${install.tools.dir}/build.xml" />
<copy file="distro/distro-CONSOLE-README.TXT" tofile="${install.tools.dir}/CONSOLE-README.TXT" />
<copy file="resources/import.sql" tofile="${install.tools.dir}/CONSOLE-import.sql" />
- </target>
+ </target>
+
+ <target name="deploy-mgmt-console"
+ description="Deploy the management console">
+ <property name="db" value="hsqldb"/>
+ <echo>CONSOLE.DIR=[${console.dir}]</echo>
+ <ant antfile="${console.dir}/management-esb/build.xml" target="esb">
+ <property name="console.dir" location="${console.dir}"/>
+ </ant>
+ <copy file="${console.dir}/management-esb/src/main/resources/jbossesbmanagement-service.xml"
+ todir="${org.jboss.esb.internal.dest}/${esb.server.name}/server/default/deploy"
+ overwrite="true">
+ <filterset>
+ <filter token="db.datasource" value="${db.datasource}"/>
+ <filter token="connection.datasource" value="${connection.datasource}"/>
+ </filterset>
+ </copy>
+ <copy file="${console.dir}/management-esb/build/management.esb"
+ todir="${org.jboss.esb.internal.dest}/${esb.server.name}/server/default/deploy"
+ overwrite="true"/>
+ </target>
+
<target name="explode" depends="jar,war,ear,datasource"
description="Deploy the exploded archive">
<fail unless="jboss.home">jboss.home not set</fail>
Modified: labs/jbossesb/trunk/product/tools/console/management-esb/build.xml
===================================================================
--- labs/jbossesb/trunk/product/tools/console/management-esb/build.xml 2007-09-11 21:41:45 UTC (rev 15028)
+++ labs/jbossesb/trunk/product/tools/console/management-esb/build.xml 2007-09-11 21:43:07 UTC (rev 15029)
@@ -7,7 +7,7 @@
<property name="install.dir" value="${product.dir}/install"/>
<property file="${install.dir}/deployment.properties"/>
- <property name="mgmt.esb.dir" location="."/>
+ <property name="mgmt.esb.dir" value="${console.dir}/management-esb"/>
<property file="${mgmt.esb.dir}/db.properties"/>
<property file="${console.dir}/management/${db}.properties"/>
<property name="build.dir" location="${mgmt.esb.dir}/build"/>
More information about the jboss-svn-commits
mailing list