[jboss-svn-commits] JBL Code SVN: r7926 - in labs/jbossesb/trunk/product: . console console/distro console/resources/WEB-INF/classes
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed Nov 29 06:34:33 EST 2006
Author: tfennelly
Date: 2006-11-29 06:34:21 -0500 (Wed, 29 Nov 2006)
New Revision: 7926
Added:
labs/jbossesb/trunk/product/console/distro/
labs/jbossesb/trunk/product/console/distro/distro-CONSOLE-README.TXT
labs/jbossesb/trunk/product/console/distro/distro-build.xml
labs/jbossesb/trunk/product/console/distro/postgres-distro-build.xml
labs/jbossesb/trunk/product/console/distro/postgres-jboss-beans.xml
Removed:
labs/jbossesb/trunk/product/console/resources/WEB-INF/classes/jboss-beans.xml
Modified:
labs/jbossesb/trunk/product/build.xml
labs/jbossesb/trunk/product/console/build.properties
labs/jbossesb/trunk/product/console/build.xml
Log:
Added packaging build scripts for the console for the "dist" release target.
Modified: labs/jbossesb/trunk/product/build.xml
===================================================================
--- labs/jbossesb/trunk/product/build.xml 2006-11-29 08:58:33 UTC (rev 7925)
+++ labs/jbossesb/trunk/product/build.xml 2006-11-29 11:34:21 UTC (rev 7926)
@@ -1,238 +1,238 @@
-<project name="JBESB" default="test" basedir=".">
- <!-- class path behaviour -->
- <property name="build.sysclasspath" value="last"/>
-
- <!-- Set module name -->
- <property name="org.jboss.esb.internal.modulename" value="jbesb"/>
-
- <property name="org.jboss.esb.jboss.home" location="."/>
-
- <!-- Product properties file -->
- <property name="org.jboss.esb.product.properties" value="jbossesb-properties.xml"/>
-
- <!-- Set default properties filename -->
- <property name="org.jboss.esb.properties" location="product.properties"/>
- <property name="org.jboss.esb.deployment.properties" location="install/deployment.properties"/>
-
- <!-- Some default build locations -->
- <property name="org.jboss.esb.internal.dest" location="build"/>
- <property name="org.jboss.esb.internal.jar.dest" location="build/dist/lib"/>
-
- <!-- Load Build Properties File -->
- <property file="${org.jboss.esb.properties}"/>
- <property file="${org.jboss.esb.deployment.properties}"/>
-
- <!-- Set internal property defaults -->
- <property name="org.jboss.esb.installationdirectory" location="build/dist"/>
-
- <!-- Exclude from javadocs -->
- <property name="org.jboss.esb.javadocs.exclude" value="org.jboss.soa.esb.internal.*, org.jboss.soa.esb.services.beans.*"/>
-
- <!-- Compile with debugging? -->
- <property name="org.jboss.esb.debug" value="yes"/>
- <condition property="org.jboss.esb.debug" value="no">
- <equals arg1="${org.jboss.esb.build.debug}" arg2="no"/>
- </condition>
-
- <!-- Compile with deprecation? -->
- <property name="org.jboss.esb.deprecation" value="no"/>
- <condition property="org.jboss.esb.deprecation" value="yes">
- <equals arg1="${org.jboss.esb.build.deprecation}" arg2="yes"/>
- </condition>
-
- <!-- Compile with optimization? -->
- <property name="org.jboss.esb.optimize" value="on"/>
- <condition property="org.jboss.esb.optimize" value="off">
- <equals arg1="${org.jboss.esb.build.optimize}" arg2="off"/>
- </condition>
-
- <!-- Build from local libs? -->
- <property name="org.jboss.esb.frominstall" value="no"/>
- <condition property="org.jboss.esb.frominstall" value="yes">
- <equals arg1="${org.jboss.esb.build.frominstall}" arg2="yes"/>
- </condition>
-
- <!-- Build tests? -->
- <property name="org.jboss.esb.buildtests" value="no"/>
- <condition property="org.jboss.esb.buildtests" value="yes">
- <equals arg1="${org.jboss.esb.build.tests}" arg2="yes"/>
- </condition>
-
- <!-- Path names -->
- <property name="org.jboss.esb.internal.core" value="esb"/>
- <property name="org.jboss.esb.internal.dest" location="build"/>
- <property name="org.jboss.esb.internal.jar" location="lib"/>
- <property name="org.jboss.esb.internal.javadocs.dest" location="javadocs"/>
- <property name="org.jboss.esb.internal.samples.javadocs.dest" location="samples/javadocs"/>
-
- <!-- Initialisation -->
- <target name="org.jboss.esb.internal.init">
- <!-- Define default build properties -->
- <tstamp>
- <format property="org.jboss.esb.date" pattern="yyyy/mm/dd hh:mm aa"/>
- </tstamp>
- <!-- Make the destination directory -->
- <mkdir dir="${org.jboss.esb.internal.dest}"/>
- </target>
-
- <!-- Compilation targets -->
-
- <target name="org.jboss.esb.compile"
- depends="org.jboss.esb.internal.init, org.jboss.esb.core.compile"/>
-
- <target name="org.jboss.esb.jar" depends="org.jboss.esb.internal.init, org.jboss.esb.core.jar"/>
-
- <target name="org.jboss.esb.core.compile" depends="org.jboss.esb.internal.init">
- <echo message="Compiling modules"/>
- <ant dir="core"/>
- </target>
-
- <!-- Test targets -->
- <target name="org.jboss.esb.test" depends="org.jboss.esb.compile">
- <echo message="Testing modules"/>
- <ant dir="core" target="org.jboss.esb.core.test"/>
- </target>
-
- <!-- javadocs paths -->
- <path id="org.jboss.esb.javadocs.path">
- <pathelement path="core/rosetta/src"/>
- <pathelement path="core/listeners/src"/>
- <pathelement path="core/services/src/"/>
- </path>
-
- <path id="org.jboss.esb.samples.javadocs.path">
- <pathelement path="samples/trailblazer/bankloanbrokerdemo/banks/test"/>
- </path>
-
- <property name="org.jboss.esb.javadocs.list"
- value="org.jboss.soa.*"/>
-
- <property name="org.jboss.esb.samples.javadocs.list"
- value="org.jboss.soa.esb.samples.*"/>
-
- <!-- Jar targets -->
- <target name="org.jboss.esb.core.jar" depends="org.jboss.esb.compile">
- <echo message="Building jar file"/>
- <ant dir="core" target="jar"/>
- </target>
-
- <target name="org.jboss.esb.javadocs"
- depends="org.jboss.esb.internal.init">
- <echo message="Building javadocs"/>
- <mkdir dir="${org.jboss.esb.internal.javadocs.dest}"/>
- <path id="org.jboss.esb.internal.javadocs.path">
- <path refid="org.jboss.esb.javadocs.path"/>
- </path>
-
- <javadoc
- sourcepathref="org.jboss.esb.internal.javadocs.path"
- destdir="${org.jboss.esb.internal.javadocs.dest}"
- packagenames="${org.jboss.esb.javadocs.list}"
- excludepackagenames="${org.jboss.esb.javadocs.exclude}"
- >
- <classpath>
- <path path="${org.jboss.esb.internal.src}"/>
- <fileset dir="lib/ext" includes="*.jar" />
- <fileset dir="lib/ext/ejb3" includes="*.jar" />
- </classpath>
- </javadoc>
- </target>
-
- <target name="org.jboss.esb.samples.javadocs"
- depends="org.jboss.esb.internal.init">
- <echo message="Building samples javadocs"/>
- <mkdir dir="${org.jboss.esb.internal.samples.javadocs.dest}"/>
- <path id="org.jboss.esb.internal.samples.javadocs.path">
- <path refid="org.jboss.esb.samples.javadocs.path"/>
- </path>
-
- <javadoc
- sourcepathref="org.jboss.esb.internal.samples.javadocs.path"
- destdir="${org.jboss.esb.internal.samples.javadocs.dest}"
- packagenames="${org.jboss.esb.samples.javadocs.list}"
- >
- <classpath>
- <path path="${org.jboss.esb.internal.src}"/>
- <fileset dir="lib/ext" includes="*.jar" />
- <fileset dir="samples/trailblazer/bankloanbrokerdemo/banks/lib/ext" includes="*.jar"/>
- <fileset dir="lib/ext/ejb3" includes="*.jar" />
- </classpath>
- </javadoc>
- </target>
-
- <!-- produce a basic installation (minus docs and samples) -->
-
- <target name="install" depends="org.jboss.esb.jar">
-
- <echo message="Installation directory : ${org.jboss.esb.installationdirectory}"/>
-
- <echo message="Installing jar files"/>
- <mkdir dir="${org.jboss.esb.installationdirectory}/lib"/>
- <copy
- todir="${org.jboss.esb.installationdirectory}/lib">
- <fileset dir="lib">
- <include name="*.jar"/>
- </fileset>
- </copy>
-
- <echo message="Installing xml ${org.jboss.esb.installationdirectory}"/>
- <mkdir dir="${org.jboss.esb.installationdirectory}/xml"/>
- <copy
- todir="${org.jboss.esb.installationdirectory}/xml"
- >
- <fileset dir="etc/schemas/xml"/>
+<project name="JBESB" default="test" basedir=".">
+ <!-- class path behaviour -->
+ <property name="build.sysclasspath" value="last"/>
+
+ <!-- Set module name -->
+ <property name="org.jboss.esb.internal.modulename" value="jbesb"/>
+
+ <property name="org.jboss.esb.jboss.home" location="."/>
+
+ <!-- Product properties file -->
+ <property name="org.jboss.esb.product.properties" value="jbossesb-properties.xml"/>
+
+ <!-- Set default properties filename -->
+ <property name="org.jboss.esb.properties" location="product.properties"/>
+ <property name="org.jboss.esb.deployment.properties" location="install/deployment.properties"/>
+
+ <!-- Some default build locations -->
+ <property name="org.jboss.esb.internal.dest" location="build"/>
+ <property name="org.jboss.esb.internal.jar.dest" location="build/dist/lib"/>
+
+ <!-- Load Build Properties File -->
+ <property file="${org.jboss.esb.properties}"/>
+ <property file="${org.jboss.esb.deployment.properties}"/>
+
+ <!-- Set internal property defaults -->
+ <property name="org.jboss.esb.installationdirectory" location="build/dist"/>
+
+ <!-- Exclude from javadocs -->
+ <property name="org.jboss.esb.javadocs.exclude" value="org.jboss.soa.esb.internal.*, org.jboss.soa.esb.services.beans.*"/>
+
+ <!-- Compile with debugging? -->
+ <property name="org.jboss.esb.debug" value="yes"/>
+ <condition property="org.jboss.esb.debug" value="no">
+ <equals arg1="${org.jboss.esb.build.debug}" arg2="no"/>
+ </condition>
+
+ <!-- Compile with deprecation? -->
+ <property name="org.jboss.esb.deprecation" value="no"/>
+ <condition property="org.jboss.esb.deprecation" value="yes">
+ <equals arg1="${org.jboss.esb.build.deprecation}" arg2="yes"/>
+ </condition>
+
+ <!-- Compile with optimization? -->
+ <property name="org.jboss.esb.optimize" value="on"/>
+ <condition property="org.jboss.esb.optimize" value="off">
+ <equals arg1="${org.jboss.esb.build.optimize}" arg2="off"/>
+ </condition>
+
+ <!-- Build from local libs? -->
+ <property name="org.jboss.esb.frominstall" value="no"/>
+ <condition property="org.jboss.esb.frominstall" value="yes">
+ <equals arg1="${org.jboss.esb.build.frominstall}" arg2="yes"/>
+ </condition>
+
+ <!-- Build tests? -->
+ <property name="org.jboss.esb.buildtests" value="no"/>
+ <condition property="org.jboss.esb.buildtests" value="yes">
+ <equals arg1="${org.jboss.esb.build.tests}" arg2="yes"/>
+ </condition>
+
+ <!-- Path names -->
+ <property name="org.jboss.esb.internal.core" value="esb"/>
+ <property name="org.jboss.esb.internal.dest" location="build"/>
+ <property name="org.jboss.esb.internal.jar" location="lib"/>
+ <property name="org.jboss.esb.internal.javadocs.dest" location="javadocs"/>
+ <property name="org.jboss.esb.internal.samples.javadocs.dest" location="samples/javadocs"/>
+
+ <!-- Initialisation -->
+ <target name="org.jboss.esb.internal.init">
+ <!-- Define default build properties -->
+ <tstamp>
+ <format property="org.jboss.esb.date" pattern="yyyy/mm/dd hh:mm aa"/>
+ </tstamp>
+ <!-- Make the destination directory -->
+ <mkdir dir="${org.jboss.esb.internal.dest}"/>
+ </target>
+
+ <!-- Compilation targets -->
+
+ <target name="org.jboss.esb.compile"
+ depends="org.jboss.esb.internal.init, org.jboss.esb.core.compile"/>
+
+ <target name="org.jboss.esb.jar" depends="org.jboss.esb.internal.init, org.jboss.esb.core.jar"/>
+
+ <target name="org.jboss.esb.core.compile" depends="org.jboss.esb.internal.init">
+ <echo message="Compiling modules"/>
+ <ant dir="core"/>
+ </target>
+
+ <!-- Test targets -->
+ <target name="org.jboss.esb.test" depends="org.jboss.esb.compile">
+ <echo message="Testing modules"/>
+ <ant dir="core" target="org.jboss.esb.core.test"/>
+ </target>
+
+ <!-- javadocs paths -->
+ <path id="org.jboss.esb.javadocs.path">
+ <pathelement path="core/rosetta/src"/>
+ <pathelement path="core/listeners/src"/>
+ <pathelement path="core/services/src/"/>
+ </path>
+
+ <path id="org.jboss.esb.samples.javadocs.path">
+ <pathelement path="samples/trailblazer/bankloanbrokerdemo/banks/test"/>
+ </path>
+
+ <property name="org.jboss.esb.javadocs.list"
+ value="org.jboss.soa.*"/>
+
+ <property name="org.jboss.esb.samples.javadocs.list"
+ value="org.jboss.soa.esb.samples.*"/>
+
+ <!-- Jar targets -->
+ <target name="org.jboss.esb.core.jar" depends="org.jboss.esb.compile">
+ <echo message="Building jar file"/>
+ <ant dir="core" target="jar"/>
+ </target>
+
+ <target name="org.jboss.esb.javadocs"
+ depends="org.jboss.esb.internal.init">
+ <echo message="Building javadocs"/>
+ <mkdir dir="${org.jboss.esb.internal.javadocs.dest}"/>
+ <path id="org.jboss.esb.internal.javadocs.path">
+ <path refid="org.jboss.esb.javadocs.path"/>
+ </path>
+
+ <javadoc
+ sourcepathref="org.jboss.esb.internal.javadocs.path"
+ destdir="${org.jboss.esb.internal.javadocs.dest}"
+ packagenames="${org.jboss.esb.javadocs.list}"
+ excludepackagenames="${org.jboss.esb.javadocs.exclude}"
+ >
+ <classpath>
+ <path path="${org.jboss.esb.internal.src}"/>
+ <fileset dir="lib/ext" includes="*.jar" />
+ <fileset dir="lib/ext/ejb3" includes="*.jar" />
+ </classpath>
+ </javadoc>
+ </target>
+
+ <target name="org.jboss.esb.samples.javadocs"
+ depends="org.jboss.esb.internal.init">
+ <echo message="Building samples javadocs"/>
+ <mkdir dir="${org.jboss.esb.internal.samples.javadocs.dest}"/>
+ <path id="org.jboss.esb.internal.samples.javadocs.path">
+ <path refid="org.jboss.esb.samples.javadocs.path"/>
+ </path>
+
+ <javadoc
+ sourcepathref="org.jboss.esb.internal.samples.javadocs.path"
+ destdir="${org.jboss.esb.internal.samples.javadocs.dest}"
+ packagenames="${org.jboss.esb.samples.javadocs.list}"
+ >
+ <classpath>
+ <path path="${org.jboss.esb.internal.src}"/>
+ <fileset dir="lib/ext" includes="*.jar" />
+ <fileset dir="samples/trailblazer/bankloanbrokerdemo/banks/lib/ext" includes="*.jar"/>
+ <fileset dir="lib/ext/ejb3" includes="*.jar" />
+ </classpath>
+ </javadoc>
+ </target>
+
+ <!-- produce a basic installation (minus docs and samples) -->
+
+ <target name="install" depends="org.jboss.esb.jar">
+
+ <echo message="Installation directory : ${org.jboss.esb.installationdirectory}"/>
+
+ <echo message="Installing jar files"/>
+ <mkdir dir="${org.jboss.esb.installationdirectory}/lib"/>
+ <copy
+ todir="${org.jboss.esb.installationdirectory}/lib">
+ <fileset dir="lib">
+ <include name="*.jar"/>
+ </fileset>
</copy>
+
+ <echo message="Installing xml ${org.jboss.esb.installationdirectory}"/>
+ <mkdir dir="${org.jboss.esb.installationdirectory}/xml"/>
+ <copy
+ todir="${org.jboss.esb.installationdirectory}/xml"
+ >
+ <fileset dir="etc/schemas/xml"/>
+ </copy>
<echo message="Installed EULA"/>
- <copy file="../JBossORG-EULA.txt" todir="${org.jboss.esb.installationdirectory}"/>
- </target>
-
- <!-- produce a product distribution -->
+ <copy file="../JBossORG-EULA.txt" todir="${org.jboss.esb.installationdirectory}"/>
+ </target>
+
+ <!-- produce a product distribution -->
- <target name="dist" depends="install, org.jboss.esb.javadocs, org.jboss.esb.samples.javadocs">
-
- <echo message="Installation directory : ${org.jboss.esb.installationdirectory}"/>
-
- <echo message="Installing jar files"/>
- <mkdir dir="${org.jboss.esb.installationdirectory}/lib"/>
- <copy
- todir="${org.jboss.esb.installationdirectory}/lib">
- <fileset dir="lib">
- <include name="*.jar"/>
- </fileset>
- </copy>
-
- <echo message="Installing install files"/>
- <mkdir dir="${org.jboss.esb.installationdirectory}/install"/>
- <copy
- todir="${org.jboss.esb.installationdirectory}/install">
- <fileset dir="install"/>
- </copy>
-
- <echo message="Installing xml ${org.jboss.esb.installationdirectory}"/>
- <mkdir dir="${org.jboss.esb.installationdirectory}/xml"/>
- <copy
- todir="${org.jboss.esb.installationdirectory}/xml"
- >
- <fileset dir="etc/schemas/xml"/>
- </copy>
-
- <echo message="Installing javadocs"/>
- <mkdir dir="${org.jboss.esb.installationdirectory}/javadocs"/>
- <copy
- todir="${org.jboss.esb.installationdirectory}/javadocs"
- >
- <fileset dir="javadocs"/>
- </copy>
-
- <echo message="Installing docs"/>
- <mkdir dir="${org.jboss.esb.installationdirectory}/docs"/>
- <copy
- todir="${org.jboss.esb.installationdirectory}/docs"
+ <target name="dist" depends="install, org.jboss.esb.javadocs, org.jboss.esb.samples.javadocs, tools">
+
+ <echo message="Installation directory : ${org.jboss.esb.installationdirectory}"/>
+
+ <echo message="Installing jar files"/>
+ <mkdir dir="${org.jboss.esb.installationdirectory}/lib"/>
+ <copy
+ todir="${org.jboss.esb.installationdirectory}/lib">
+ <fileset dir="lib">
+ <include name="*.jar"/>
+ </fileset>
+ </copy>
+
+ <echo message="Installing install files"/>
+ <mkdir dir="${org.jboss.esb.installationdirectory}/install"/>
+ <copy
+ todir="${org.jboss.esb.installationdirectory}/install">
+ <fileset dir="install"/>
+ </copy>
+
+ <echo message="Installing xml ${org.jboss.esb.installationdirectory}"/>
+ <mkdir dir="${org.jboss.esb.installationdirectory}/xml"/>
+ <copy
+ todir="${org.jboss.esb.installationdirectory}/xml"
+ >
+ <fileset dir="etc/schemas/xml"/>
+ </copy>
+
+ <echo message="Installing javadocs"/>
+ <mkdir dir="${org.jboss.esb.installationdirectory}/javadocs"/>
+ <copy
+ todir="${org.jboss.esb.installationdirectory}/javadocs"
+ >
+ <fileset dir="javadocs"/>
+ </copy>
+
+ <echo message="Installing docs"/>
+ <mkdir dir="${org.jboss.esb.installationdirectory}/docs"/>
+ <copy
+ todir="${org.jboss.esb.installationdirectory}/docs"
>
- <fileset dir="docs">
- <include name="*.pdf"/>
- </fileset>
+ <fileset dir="docs">
+ <include name="*.pdf"/>
+ </fileset>
</copy>
<echo message="Installing samples"/>
@@ -253,45 +253,54 @@
<fileset dir="samples/docs">
<include name="*.pdf"/>
</fileset>
- </copy>
- </target>
-
- <!-- Clean targets -->
- <target name="org.jboss.esb.clean">
- <echo message="Cleaning modules"/>
-
- <echo message="Cleaning core"/>
- <ant dir="core" target="clean"/>
- </target>
-
- <target name="org.jboss.esb.purge">
- <echo message="Purging modules"/>
-
- <ant dir="core" target="purge"/>
-
- <delete dir="${org.jboss.esb.internal.dest}"/>
- <delete dir="${org.jboss.esb.internal.dest.root}"/>
- <delete dir="${org.jboss.esb.internal.javadocs.dest}"/>
- </target>
-
- <!-- Short target names -->
- <target name="compile" depends="org.jboss.esb.compile"/>
- <target name="test" depends="org.jboss.esb.test"/>
- <target name="jar" depends="org.jboss.esb.jar"/>
- <target name="clean" depends="org.jboss.esb.clean"/>
+ </copy>
+ </target>
+
+ <!-- Build the tools into the main dist -->
+ <target name="tools">
+ <!-- Build the admin console webapp. -->
+ <ant dir="console" target="build">
+ <property name="build.dir" value="${org.jboss.esb.installationdirectory}/tools/console"/>
+ <property name="prepare.release.distro" value="true"/>
+ </ant>
+ </target>
+
+ <!-- Clean targets -->
+ <target name="org.jboss.esb.clean">
+ <echo message="Cleaning modules"/>
+
+ <echo message="Cleaning core"/>
+ <ant dir="core" target="clean"/>
+ </target>
+
+ <target name="org.jboss.esb.purge">
+ <echo message="Purging modules"/>
+
+ <ant dir="core" target="purge"/>
+
+ <delete dir="${org.jboss.esb.internal.dest}"/>
+ <delete dir="${org.jboss.esb.internal.dest.root}"/>
+ <delete dir="${org.jboss.esb.internal.javadocs.dest}"/>
+ </target>
+
+ <!-- Short target names -->
+ <target name="compile" depends="org.jboss.esb.compile"/>
+ <target name="test" depends="org.jboss.esb.test"/>
+ <target name="jar" depends="org.jboss.esb.jar"/>
+ <target name="clean" depends="org.jboss.esb.clean"/>
<target name="purge" depends="org.jboss.esb.purge"/>
- <target name="javadoc" depends="org.jboss.esb.javadocs"/>
-
- <target name="deploy">
- <echo message="****" />
- <echo message="**** DEPRECATED TARGET:" />
- <echo message="**** No longer deploying a J2EE EAR file. All hard dependencies on an Application Server have been removed!" />
- <echo message="**** Just run the 'install' target instead!" />
- <echo message="****" />
- </target>
-
- <target name="instr-report">
- <ant dir="core" target="instr-report"/>
- </target>
+ <target name="javadoc" depends="org.jboss.esb.javadocs"/>
+
+ <target name="deploy">
+ <echo message="****" />
+ <echo message="**** DEPRECATED TARGET:" />
+ <echo message="**** No longer deploying a J2EE EAR file. All hard dependencies on an Application Server have been removed!" />
+ <echo message="**** Just run the 'install' target instead!" />
+ <echo message="****" />
+ </target>
+
+ <target name="instr-report">
+ <ant dir="core" target="instr-report"/>
+ </target>
-</project>
+</project>
Modified: labs/jbossesb/trunk/product/console/build.properties
===================================================================
--- labs/jbossesb/trunk/product/console/build.properties 2006-11-29 08:58:33 UTC (rev 7925)
+++ labs/jbossesb/trunk/product/console/build.properties 2006-11-29 11:34:21 UTC (rev 7926)
@@ -1,2 +1,8 @@
#deploy.dir=/home/tfennelly/jboss-4.0.4.GA/server/default/deploy
deploy.dir=/home/tfennelly/packages/apache-tomcat-5.5.20/webapps
+
+db.host=localhost
+db.port=5432
+db.name=jbossesb
+db.username=postgres
+db.password=password
Modified: labs/jbossesb/trunk/product/console/build.xml
===================================================================
--- labs/jbossesb/trunk/product/console/build.xml 2006-11-29 08:58:33 UTC (rev 7925)
+++ labs/jbossesb/trunk/product/console/build.xml 2006-11-29 11:34:21 UTC (rev 7926)
@@ -10,13 +10,14 @@
<!-- Structure -->
<property name="src.dir" value="src"/>
- <property name="build.dir" value="build" />
+ <property name="build.dir" value="build" /> <!-- Note that build.dir is overridden from the product/build.xml "tools" target. -->
<property name="classes.dir" value="${build.dir}/WEB-INF/classes" />
<property name="test.src.dir" value="test/src"/>
<property name="test.classes.dir" value="${build.dir}/test/classes" />
<property name="test.report.dir" value="${build.dir}/test/report" />
<property name="resources.dir" value="resources" />
<property name="view.dir" value="view" />
+ <property name="distro.dir" value="distro" />
<property name="product.lib.ext.dir" value="../lib/ext" />
<target name="build" description="Compile, test and package (war) the application.">
@@ -45,6 +46,9 @@
<ant target="assertTestsFailed" />
<!-- Package -->
+ <copy file="distro/postgres-jboss-beans.xml" tofile="${resources.dir}/WEB-INF/classes/jboss-beans.xml" overwrite="true">
+ <filterset filtersfile="build.properties" />
+ </copy>
<delete file="${build.dir}/${package.name}.war" />
<copy todir="${resources.dir}/WEB-INF/lib">
<fileset dir="${product.lib.ext.dir}" includes="milyn*.jar" />
@@ -53,8 +57,12 @@
<fileset dir="${build.dir}" excludes="test/**" />
<fileset dir="${resources.dir}" includes="WEB-INF/**" />
<fileset dir="${view.dir}" />
+ <fileset dir="./" includes="distro/**" />
</jar>
<delete dir="${resources.dir}/WEB-INF/lib" includes="milyn*.jar" />
+
+ <!-- Conditional - Set to true when the build is called from the product/build.xml "tools" target. -->
+ <antcall target="prepare.release.distro" />
</target>
<target name="assertTestsFailed" if="test.failed">
@@ -64,6 +72,19 @@
<target name="deploy" depends="build" description="Run tests on the application.">
<copy file="${build.dir}/${package.name}.war" todir="${deploy.dir}" />
</target>
+
+ <target name="prepare.release.distro" if="prepare.release.distro">
+ <delete dir="${build.dir}/test" />
+ <delete dir="${build.dir}/WEB-INF" />
+
+ <!-- Unjar the war. Will be rejared from the distro by the tools/build.xml. -->
+ <unjar src="${build.dir}/${package.name}.war" dest="${build.dir}" />
+ <delete file="${build.dir}/${package.name}.war" />
+
+ <!-- Copy the build related files to the "tools" folder. -->
+ <copy file="${build.dir}/distro/distro-build.xml" tofile="${build.dir}/../build.xml" />
+ <copy file="${build.dir}/distro/distro-CONSOLE-README.TXT" tofile="${build.dir}/../CONSOLE-README.TXT" />
+ </target>
<target name="clean" description="Delete the build folder..">
<mkdir dir="${build.dir}" />
Added: labs/jbossesb/trunk/product/console/distro/distro-CONSOLE-README.TXT
===================================================================
--- labs/jbossesb/trunk/product/console/distro/distro-CONSOLE-README.TXT 2006-11-29 08:58:33 UTC (rev 7925)
+++ labs/jbossesb/trunk/product/console/distro/distro-CONSOLE-README.TXT 2006-11-29 11:34:21 UTC (rev 7926)
@@ -0,0 +1,5 @@
+JBoss ESB Adminsitration Console:
+=================================
+To package the JBoss ESB Adminsitration Console application (in the tools/console folder) for your local environment, simply run the Ant build.xml
+script found in this folder. The default target builds the this application. You will be asked questions about your database configuration.
+On answering these questions, the script will package the application appropriately for your environment and drop it in the root of the "tools" folder.
\ No newline at end of file
Added: labs/jbossesb/trunk/product/console/distro/distro-build.xml
===================================================================
--- labs/jbossesb/trunk/product/console/distro/distro-build.xml 2006-11-29 08:58:33 UTC (rev 7925)
+++ labs/jbossesb/trunk/product/console/distro/distro-build.xml 2006-11-29 11:34:21 UTC (rev 7926)
@@ -0,0 +1,23 @@
+<?xml version="1.0"?>
+
+<!--
+ NOTICE:
+ This file is only used for packaging the console from a release distro. It should only be run
+ from a distribution.
+
+ This file gets copied to the root of the "tools" folder as "build.xml".
+-->
+
+<project name="JBoss ESB Administration Console" default="build" basedir=".">
+
+ <target name="build" description="Package the Jboss ESB Administration Console.">
+
+ <!--
+ We can add support for other database types here - add a section to ask the user which db type they're interested in etc.
+ For now we just support Postgres.
+ -->
+ <ant dir="console/distro" antfile="postgres-distro-build.xml" />
+
+ </target>
+
+</project>
Added: labs/jbossesb/trunk/product/console/distro/postgres-distro-build.xml
===================================================================
--- labs/jbossesb/trunk/product/console/distro/postgres-distro-build.xml 2006-11-29 08:58:33 UTC (rev 7925)
+++ labs/jbossesb/trunk/product/console/distro/postgres-distro-build.xml 2006-11-29 11:34:21 UTC (rev 7926)
@@ -0,0 +1,50 @@
+<?xml version="1.0"?>
+
+<!--
+ NOTICE:
+ This file is only used for packaging the console from a release distro. It captures the
+ postgres database details from the user and generates the appropriate files for the app.
+-->
+
+<project name="JBoss ESB Administration Console" default="build" basedir=".">
+
+ <property name="package.name" value="jboss-esb-console"/>
+
+ <target name="build" description="Capture Postgres DB config from user and package the app.">
+
+ <echo message="----------------------------------------------------------------------------------------------------------------" />
+ <echo message="| |" />
+ <echo message="| J B O S S E S B A D M I N I S T R A T I O N C O N S O L E C O N F I G |" />
+ <echo message="| |" />
+ <echo message="----------------------------------------------------------------------------------------------------------------" />
+ <echo message="" />
+ <echo message="" />
+ <input message="This script will help you configure your JBoss ESB Administration Console Application. You can reconfigure at any time by re-running this script. ${line.separator}Press enter to start..." />
+ <echo message="" />
+ <input addproperty="db.host" message='Enter the host address of your Postgres database (for "localhost" simply press return):' defaultvalue="localhost" />
+ <echo message="" />
+ <input addproperty="db.port" message='Enter the host port of your Postgres database (for "5432" simply press return):' defaultvalue="5432" />
+ <echo message="" />
+ <input addproperty="db.name" message='Enter the database name (on "${db.host}:${db.port}") which will contain the ESB Administration Console data tables (for "jbossesb" simply press return):' defaultvalue="jbossesb" />
+ <echo message="" />
+ <input addproperty="db.username" message='Enter the database username that the ESB Administration Console should use to access "${db.host}:${db.port}/${db.name}" (for "postgres" simply press return):' defaultvalue="postgres" />
+ <echo message="" />
+ <input addproperty="db.password" message='Enter the password associated with the "${db.username}" database username (for "password" simply press return):' defaultvalue="password" />
+ <echo message="" />
+
+ <!-- Package -->
+ <copy file="postgres-jboss-beans.xml" tofile="../WEB-INF/classes/jboss-beans.xml" overwrite="true">
+ <filterset>
+ <filter token="db.host" value="${db.host}"/>
+ <filter token="db.port" value="${db.port}"/>
+ <filter token="db.name" value="${db.name}"/>
+ <filter token="db.username" value="${db.username}"/>
+ <filter token="db.password" value="${db.password}"/>
+ </filterset>
+ </copy>
+ <jar destfile="../../${package.name}.war">
+ <fileset dir="../" excludes="distro/**" />
+ </jar>
+ </target>
+
+</project>
Added: labs/jbossesb/trunk/product/console/distro/postgres-jboss-beans.xml
===================================================================
--- labs/jbossesb/trunk/product/console/distro/postgres-jboss-beans.xml 2006-11-29 08:58:33 UTC (rev 7925)
+++ labs/jbossesb/trunk/product/console/distro/postgres-jboss-beans.xml 2006-11-29 11:34:21 UTC (rev 7926)
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd"
+ xmlns="urn:jboss:bean-deployer">
+
+ <bean name="Naming" class="org.jnp.server.SingletonNamingServer"/>
+
+ <bean name="TransactionManagerFactory" class="org.jboss.seam.microcontainer.TransactionManagerFactory"/>
+ <bean name="TransactionManager" class="java.lang.Object">
+ <constructor factoryMethod="getTransactionManager">
+ <factory bean="TransactionManagerFactory"/>
+ </constructor>
+ </bean>
+
+ <bean name="esbDatasourceFactory" class="org.jboss.seam.microcontainer.DataSourceFactory">
+ <property name="driverClass">org.postgresql.Driver</property>
+ <property name="connectionUrl">jdbc:postgresql://@db.host@:@db.port@/@db.name@</property>
+ <property name="userName">@db.username@</property>
+ <property name="password">@db.password@</property>
+ <property name="jndiName">java:/hibernateDatasource</property>
+ <property name="minSize">0</property>
+ <property name="maxSize">10</property>
+ <property name="blockingTimeout">1000</property>
+ <property name="idleTimeout">100000</property>
+ <property name="transactionManager"><inject bean="TransactionManager"/></property>
+ </bean>
+ <bean name="esbDatasource" class="java.lang.Object">
+ <constructor factoryMethod="getDataSource">
+ <factory bean="esbDatasourceFactory"/>
+ </constructor>
+ </bean>
+
+ <bean name="esbDatabaseFactory" class="org.jboss.seam.microcontainer.HibernateFactory"/>
+ <bean name="esbDatabase" class="java.lang.Object">
+ <constructor factoryMethod="getSessionFactory">
+ <factory bean="esbDatabaseFactory"/>
+ </constructor>
+ <depends>esbDatasource</depends>
+ </bean>
+
+</deployment>
\ No newline at end of file
Deleted: labs/jbossesb/trunk/product/console/resources/WEB-INF/classes/jboss-beans.xml
===================================================================
--- labs/jbossesb/trunk/product/console/resources/WEB-INF/classes/jboss-beans.xml 2006-11-29 08:58:33 UTC (rev 7925)
+++ labs/jbossesb/trunk/product/console/resources/WEB-INF/classes/jboss-beans.xml 2006-11-29 11:34:21 UTC (rev 7926)
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd"
- xmlns="urn:jboss:bean-deployer">
-
- <bean name="Naming" class="org.jnp.server.SingletonNamingServer"/>
-
- <bean name="TransactionManagerFactory" class="org.jboss.seam.microcontainer.TransactionManagerFactory"/>
- <bean name="TransactionManager" class="java.lang.Object">
- <constructor factoryMethod="getTransactionManager">
- <factory bean="TransactionManagerFactory"/>
- </constructor>
- </bean>
-
- <bean name="esbDatasourceFactory" class="org.jboss.seam.microcontainer.DataSourceFactory">
- <property name="driverClass">org.postgresql.Driver</property>
- <property name="connectionUrl">jdbc:postgresql://localhost:5432/jbossesb</property>
- <property name="userName">postgres</property>
- <property name="password">password</property>
- <property name="jndiName">java:/hibernateDatasource</property>
- <property name="minSize">0</property>
- <property name="maxSize">10</property>
- <property name="blockingTimeout">1000</property>
- <property name="idleTimeout">100000</property>
- <property name="transactionManager"><inject bean="TransactionManager"/></property>
- </bean>
- <bean name="esbDatasource" class="java.lang.Object">
- <constructor factoryMethod="getDataSource">
- <factory bean="esbDatasourceFactory"/>
- </constructor>
- </bean>
-
- <bean name="esbDatabaseFactory" class="org.jboss.seam.microcontainer.HibernateFactory"/>
- <bean name="esbDatabase" class="java.lang.Object">
- <constructor factoryMethod="getSessionFactory">
- <factory bean="esbDatabaseFactory"/>
- </constructor>
- <depends>esbDatasource</depends>
- </bean>
-
-</deployment>
\ No newline at end of file
More information about the jboss-svn-commits
mailing list