Menu
▾
▴
[Jboss-svn-commits] JBL Code SVN: r4901 - in labs/jbossesb/branches/JBESB-51: . ESBCore ESBCore/common ESBCore/listeners ESBCore/processors ESBCore/services
|
From: <jbo...@li...> - 2006-07-03 14:30:21
|
Author: mar...@jb...
Date: 2006-07-03 10:29:57 -0400 (Mon, 03 Jul 2006)
New Revision: 4901
Added:
labs/jbossesb/branches/JBESB-51/Build.txt
labs/jbossesb/branches/JBESB-51/product.properties
Removed:
labs/jbossesb/branches/JBESB-51/ESBCore/services/buildOne.xml
Modified:
labs/jbossesb/branches/JBESB-51/ESBCore/build.xml
labs/jbossesb/branches/JBESB-51/ESBCore/common/build.xml
labs/jbossesb/branches/JBESB-51/ESBCore/listeners/build.xml
labs/jbossesb/branches/JBESB-51/ESBCore/processors/build.xml
labs/jbossesb/branches/JBESB-51/ESBCore/services/build.xml
labs/jbossesb/branches/JBESB-51/Readme.txt
labs/jbossesb/branches/JBESB-51/build.xml
Log:
New build structure.
Added: labs/jbossesb/branches/JBESB-51/Build.txt
===================================================================
--- labs/jbossesb/branches/JBESB-51/Build.txt 2006-07-02 16:18:04 UTC (rev 4900)
+++ labs/jbossesb/branches/JBESB-51/Build.txt 2006-07-03 14:29:57 UTC (rev 4901)
@@ -0,0 +1,5 @@
+Use the root build.xml in conjuntion with product.properties, where various properties used
+in the build can be set for convenience. The lib/ext directory contains the most recently tested
+libs needed to build the system. You are free to use these, or your own versions of the jars
+from a JBossAS 4.0.3SP1 installation. If the latter, then set org.jboss.esb.frominstall to true
+and org.jboss.esb.jboss.home to the root of your JBossAS installation.
\ No newline at end of file
Modified: labs/jbossesb/branches/JBESB-51/ESBCore/build.xml
===================================================================
--- labs/jbossesb/branches/JBESB-51/ESBCore/build.xml 2006-07-02 16:18:04 UTC (rev 4900)
+++ labs/jbossesb/branches/JBESB-51/ESBCore/build.xml 2006-07-03 14:29:57 UTC (rev 4901)
@@ -4,15 +4,15 @@
<!-- build.xml - Builds all subprojects in child directories -->
<!-- =================================================================== -->
-<project name="JbossEsb" default="compile" basedir=".">
+<project name="JbossEsb" default="org.jboss.esb.core.compile" basedir=".">
- <property name="name.jar" value="name.jar-NOT_SET.jar"/>
+ <property name="org.jboss.esb.core.name.jar" value="name.jar-NOT_SET.jar"/>
<property environment="env"/>
<!-- =================================================================== -->
<!-- Initialize -->
<!-- =================================================================== -->
- <target name="init">
+ <target name="org.jboss.esb.core.init">
<tstamp>
<format property="TODAY" pattern="d-MM-yy"/>
</tstamp>
@@ -21,36 +21,32 @@
<!-- =================================================================== -->
<!-- Prepares the directory structure -->
<!-- =================================================================== -->
- <target name="prepare" depends="init">
- <mkdir dir="dist"/>
- <mkdir dir="lib"/>
+ <target name="org.jboss.esb.core.prepare" depends="org.jboss.esb.core.init">
+ <mkdir dir="${org.jboss.esb.internal.dest}/dist"/>
+ <mkdir dir="${org.jboss.esb.internal.dest}/lib"/>
</target>
<!-- =================================================================== -->
<!-- Compiles all the classes -->
<!-- =================================================================== -->
- <target name="compile" depends="prepare" description="Compile subprojects">
- <subant target="compile">
- <property name="name.jar" value="${name.jar}"/>
- <fileset file="common/build.xml"/>
- <fileset file="services/build.xml"/>
- <fileset file="processors/build.xml"/>
- <fileset file="listeners/build.xml"/>
- </subant>
+ <target name="org.jboss.esb.core.compile" depends="org.jboss.esb.core.prepare" description="Compile subprojects">
+ <echo message="Compiling submodules"/>
+ <ant dir="common"/>
+ <ant dir="services"/>
+ <ant dir="processors"/>
+ <ant dir="listeners"/>
</target>
<!-- =================================================================== -->
<!-- Assemble jars -->
<!-- =================================================================== -->
- <target name="jar" depends="compile" description="arma los jars">
- <subant target="jar">
- <!-- Always services as last jar -->
- <fileset dir="." includes="*/build.xml"
- excludes="EsbServices/*"
- />
- <fileset file="EsbServices/build.xml"/>
- </subant>
+ <target name="jar" depends="org.jboss.esb.core.compile" description="arma los jars">
+ <echo message="Building jar"/>
+ <ant dir="common" target="jar"/>
+ <ant dir="listeners" target="jar"/>
+ <ant dir="processors" target="jar"/>
+ <ant dir="services" target="jar"/>
<antcall target="-ear"/>
</target>
@@ -58,7 +54,7 @@
<ear destfile="dist/JbossEsbAppl.ear"
appxml="EsbServices/src/META-INF/application.xml"
>
- <fileset dir="dist"
+ <fileset dir="../${org.jboss.esb.internal.dest}/dist"
includes="*.jar"
/>
</ear>
@@ -68,17 +64,21 @@
<!-- =================================================================== -->
<!-- Clean all -->
<!-- =================================================================== -->
- <target name="clean" description="Clean dist directory, and cleans subprojects">
- <subant target="clean">
- <fileset dir="." includes="*/build.xml" />
- </subant>
- <delete dir="dist" />
+ <target name="clean" description="Clean dist directory and cleans subprojects">
+ <ant dir="common" target="clean"/>
+ <ant dir="listeners" target="clean"/>
+ <ant dir="processors" target="clean"/>
+ <ant dir="services" target="clean"/>
</target>
+
+ <target name="purge" depends="clean">
+ <delete dir="../${org.jboss.esb.internal.dest}/dist"/>
+ </target>
<!-- =================================================================== -->
<!-- Rebuild everything from scratch -->
<!-- =================================================================== -->
<target name="all" depends="clean,jar" />
- <target name="recompile" depends="clean,compile" />
+ <target name="recompile" depends="clean,org.jboss.esb.core.compile" />
</project>
Modified: labs/jbossesb/branches/JBESB-51/ESBCore/common/build.xml
===================================================================
--- labs/jbossesb/branches/JBESB-51/ESBCore/common/build.xml 2006-07-02 16:18:04 UTC (rev 4900)
+++ labs/jbossesb/branches/JBESB-51/ESBCore/common/build.xml 2006-07-03 14:29:57 UTC (rev 4901)
@@ -1,53 +1,61 @@
<?xml version="1.0"?>
-<project name="BuildJbossEsbCommon" default="compile" basedir=".">
+<project name="BuildJbossEsbCommon" default="org.jboss.esb.common.compile" basedir=".">
- <property name="jar.name" value="jbossesb-common"/>
- <property name="distrib.dir" value="../dist"/>
- <property name="bin.dir" value="${basedir}/bin"/>
- <property name="src.dir" value="${basedir}/src"/>
- <property name="root.dir" value="../.."/>
+ <property name="org.jboss.esb.common.jar.name" value="jbossesb-common"/>
+ <property name="org.jboss.esb.common.distrib.dir" value="${org.jboss.esb.internal.dest}/dist"/>
+ <property name="org.jboss.esb.common.bin.dir" value="${org.jboss.esb.internal.dest}/classes"/>
+ <property name="org.jboss.esb.common.src.dir" value="${basedir}/src"/>
+ <property name="org.jboss.esb.root.dir" value="../.."/>
<property environment="env"/>
- <path id="base.class.path">
- <fileset dir="${root.dir}/lib/ext" includes="activation.jar jbossall-client.jar log4j.jar mail.jar"/>
+ <property name="org.jboss.esb.ext.lib.dir" value="${org.jboss.esb.root.dir}/lib/ext"/>
+ <condition property="org.jboss.esb.ext.lib.dir" value="{org.jboss.esb.jboss.home}/client">
+ <equals arg1="${org.jboss.esb.frominstall}" arg2="yes"/>
+ </condition>
+
+ <path id="org.jboss.esb.common.base.classpath">
+ <fileset dir="${org.jboss.esb.ext.lib.dir}" includes="activation.jar jbossall-client.jar log4j.jar mail.jar"/>
</path>
- <target name="init">
+ <target name="org.jboss.esb.common.init">
<tstamp>
<format property="TODAY" pattern="d-MM-yy"/>
</tstamp>
</target>
- <target name="prepare" depends="init">
- <mkdir dir="${bin.dir}"/>
- <mkdir dir="${distrib.dir}"/>
+ <target name="org.jboss.esb.common.prepare" depends="org.jboss.esb.common.init">
+ <mkdir dir="${org.jboss.esb.common.bin.dir}"/>
+ <mkdir dir="${org.jboss.esb.common.distrib.dir}"/>
</target>
<target name="clean" description="Remove bin directory">
- <delete dir="${bin.dir}"/>
</target>
- <target name="compile" depends="prepare"
+ <target name="purge" depends="clean">
+ <delete dir="${org.jboss.esb.common.bin.dir}"/>
+ </target>
+
+ <target name="org.jboss.esb.common.compile" depends="org.jboss.esb.common.prepare"
description="Compile all classes">
<javac
- destdir="${bin.dir}"
- classpathref="base.class.path"
+ destdir="${org.jboss.esb.common.bin.dir}"
+ classpathref="org.jboss.esb.common.base.classpath"
debug="on"
optimize="off"
>
- <src path="${src.dir}"/>
+ <src path="${org.jboss.esb.common.src.dir}"/>
</javac>
</target>
- <target name="recompile" depends="clean,compile"
+ <target name="recompile" depends="clean,org.jboss.esb.common.compile"
description="Clean and compile"/>
- <target name="jar" depends="compile" description="Assemble jar files">
- <delete file="${distrib.dir}/${jar.name}.jar" />
- <jar destfile="${distrib.dir}/${jar.name}.jar"
- basedir="${bin.dir}"
+ <target name="jar" depends="org.jboss.esb.common.compile" description="Assemble jar files">
+ <delete file="${org.jboss.esb.common.distrib.dir}/${org.jboss.esb.common.jar.name}.jar" />
+ <jar destfile="${org.jboss.esb.common.distrib.dir}/${org.jboss.esb.common.jar.name}.jar"
+ basedir="${org.jboss.esb.common.bin.dir}"
includes="**/*.class"
excludes="test/**"
/>
Modified: labs/jbossesb/branches/JBESB-51/ESBCore/listeners/build.xml
===================================================================
--- labs/jbossesb/branches/JBESB-51/ESBCore/listeners/build.xml 2006-07-02 16:18:04 UTC (rev 4900)
+++ labs/jbossesb/branches/JBESB-51/ESBCore/listeners/build.xml 2006-07-03 14:29:57 UTC (rev 4901)
@@ -1,60 +1,66 @@
<?xml version="1.0"?>
-<project name="BuildJbossEsbListeners" default="compile" basedir=".">
+<project name="BuildJbossEsbListeners" default="org.jboss.esb.listeners.compile" basedir=".">
- <property name="jar.name" value="jbossesb-listeners"/>
- <property name="distrib.dir" value="../dist"/>
- <property name="bin.dir" value="${basedir}/bin"/>
- <property name="src.dir" value="${basedir}/src"/>
- <property name="root.dir" value="../.."/>
+ <property name="org.jboss.esb.listeners.jar.name" value="jbossesb-listeners"/>
+ <property name="org.jboss.esb.listeners.distrib.dir" value="${org.jboss.esb.internal.dest}/dist"/>
+ <property name="org.jboss.esb.listeners.bin.dir" value="${org.jboss.esb.internal.dest}/classes"/>
+ <property name="org.jboss.esb.listeners.src.dir" value="${basedir}/src"/>
+ <property name="org.jboss.esb.root.dir" value="../.."/>
<property environment="env"/>
- <path id="base.class.path">
- <fileset dir="${root.dir}/lib/ext" includes="activation.jar jbossall-client.jar log4j.jar mail.jar"/>
+ <property name="org.jboss.esb.ext.lib.dir" value="${org.jboss.esb.root.dir}/lib/ext"/>
+ <condition property="org.jboss.esb.ext.lib.dir" value="{org.jboss.esb.jboss.home}/client">
+ <equals arg1="${org.jboss.esb.frominstall}" arg2="yes"/>
+ </condition>
+
+ <path id="org.jboss.esb.listeners.base.classpath">
+ <fileset dir="${org.jboss.esb.ext.lib.dir}" includes="activation.jar jbossall-client.jar log4j.jar mail.jar"/>
</path>
<path id="default.class.path">
- <path refid="base.class.path"/>
- <pathelement location="../common/bin"/>
- <pathelement location="../services/bin"/>
- <pathelement location="../processors/bin"/>
+ <path refid="org.jboss.esb.listeners.base.classpath"/>
+ <pathelement location="${org.jboss.esb.internal.dest}/classes"/>
</path>
- <target name="init">
+ <target name="org.jboss.esb.listeners.init">
<tstamp>
<format property="TODAY" pattern="d-MM-yy"/>
</tstamp>
</target>
- <target name="prepare" depends="init">
- <mkdir dir="${bin.dir}"/>
- <mkdir dir="${distrib.dir}"/>
+ <target name="org.jboss.esb.listeners.prepare" depends="org.jboss.esb.listeners.init">
+ <mkdir dir="${org.jboss.esb.listeners.bin.dir}"/>
+ <mkdir dir="${org.jboss.esb.listeners.distrib.dir}"/>
</target>
<target name="clean" description="Remove bin directory">
- <delete dir="${bin.dir}"/>
</target>
+
+ <target name="purge" depends="clean">
+ <delete dir="${org.jboss.esb.listeners.bin.dir}"/>
+ </target>
- <target name="compile" depends="prepare"
+ <target name="org.jboss.esb.listeners.compile" depends="org.jboss.esb.listeners.prepare"
description="Compile all classes">
<javac
- destdir="${bin.dir}"
+ destdir="${org.jboss.esb.listeners.bin.dir}"
classpathref="default.class.path"
debug="on"
optimize="off"
>
- <src path="${src.dir}"/>
+ <src path="${org.jboss.esb.listeners.src.dir}"/>
</javac>
</target>
- <target name="recompile" depends="clean,compile"
+ <target name="recompile" depends="clean,org.jboss.esb.listeners.compile"
description="Clean and compile"/>
- <target name="jar" depends="compile" description="Assemble jar files">
- <delete file="${distrib.dir}/${jar.name}.jar" />
- <jar destfile="${distrib.dir}/${jar.name}.jar"
- basedir="${bin.dir}"
+ <target name="jar" depends="org.jboss.esb.listeners.compile" description="Assemble jar files">
+ <delete file="${org.jboss.esb.listeners.distrib.dir}/${org.jboss.esb.listeners.jar.name}.jar" />
+ <jar destfile="${org.jboss.esb.listeners.distrib.dir}/${org.jboss.esb.listeners.jar.name}.jar"
+ basedir="${org.jboss.esb.listeners.bin.dir}"
includes="**/*.class"
excludes="test/**"
/>
Modified: labs/jbossesb/branches/JBESB-51/ESBCore/processors/build.xml
===================================================================
--- labs/jbossesb/branches/JBESB-51/ESBCore/processors/build.xml 2006-07-02 16:18:04 UTC (rev 4900)
+++ labs/jbossesb/branches/JBESB-51/ESBCore/processors/build.xml 2006-07-03 14:29:57 UTC (rev 4901)
@@ -1,59 +1,66 @@
<?xml version="1.0"?>
-<project name="BuildJbossEsbProcessors" default="compile" basedir=".">
+<project name="BuildJbossEsbProcessors" default="org.jboss.esb.processors.compile" basedir=".">
- <property name="jar.name" value="jbossesb-processors"/>
- <property name="distrib.dir" value="../dist"/>
- <property name="bin.dir" value="${basedir}/bin"/>
- <property name="src.dir" value="${basedir}/src"/>
- <property name="root.dir" value="../.."/>
+ <property name="org.jboss.esb.processors.jar.name" value="jbossesb-processors"/>
+ <property name="org.jboss.esb.processors.distrib.dir" value="${org.jboss.esb.internal.dest}/dist"/>
+ <property name="org.jboss.esb.processors.bin.dir" value="${org.jboss.esb.internal.dest}/classes"/>
+ <property name="org.jboss.esb.processors.src.dir" value="${basedir}/src"/>
+ <property name="org.jboss.esb.root.dir" value="../.."/>
<property environment="env"/>
- <path id="base.class.path">
- <fileset dir="${root.dir}/lib/ext" includes="activation.jar jbossall-client.jar log4j.jar mail.jar"/>
+ <property name="org.jboss.esb.ext.lib.dir" value="${org.jboss.esb.root.dir}/lib/ext"/>
+ <condition property="org.jboss.esb.ext.lib.dir" value="{org.jboss.esb.jboss.home}/client">
+ <equals arg1="${org.jboss.esb.frominstall}" arg2="yes"/>
+ </condition>
+
+ <path id="org.jboss.esb.processors.base.classpath">
+ <fileset dir="${org.jboss.esb.ext.lib.dir}" includes="activation.jar jbossall-client.jar log4j.jar mail.jar"/>
</path>
<path id="default.class.path">
- <path refid="base.class.path"/>
- <pathelement location="../common/bin"/>
- <pathelement location="../services/bin"/>
+ <path refid="org.jboss.esb.processors.base.classpath"/>
+ <pathelement location="${org.jboss.esb.internal.dest}/classes"/>
</path>
- <target name="init">
+ <target name="org.jboss.esb.processors.init">
<tstamp>
<format property="TODAY" pattern="d-MM-yy"/>
</tstamp>
</target>
- <target name="prepare" depends="init">
- <mkdir dir="${bin.dir}"/>
- <mkdir dir="${distrib.dir}"/>
+ <target name="org.jboss.esb.processors.prepare" depends="org.jboss.esb.processors.init">
+ <mkdir dir="${org.jboss.esb.processors.bin.dir}"/>
+ <mkdir dir="${org.jboss.esb.processors.distrib.dir}"/>
</target>
<target name="clean" description="Remove bin directory">
- <delete dir="${bin.dir}"/>
</target>
+
+ <target name="purge" depends="clean">
+ <delete dir="${org.jboss.esb.processors.bin.dir}"/>
+ </target>
- <target name="compile" depends="prepare"
+ <target name="org.jboss.esb.processors.compile" depends="org.jboss.esb.processors.prepare"
description="Compile all classes">
<javac
- destdir="${bin.dir}"
+ destdir="${org.jboss.esb.processors.bin.dir}"
classpathref="default.class.path"
debug="on"
optimize="off"
>
- <src path="${src.dir}"/>
+ <src path="${org.jboss.esb.processors.src.dir}"/>
</javac>
</target>
- <target name="recompile" depends="clean,compile"
+ <target name="recompile" depends="clean,org.jboss.esb.processors.compile"
description="Clean and compile"/>
- <target name="jar" depends="compile" description="Assemble jar files">
- <delete file="${distrib.dir}/${jar.name}.jar" />
- <jar destfile="${distrib.dir}/${jar.name}.jar"
- basedir="${bin.dir}"
+ <target name="jar" depends="org.jboss.esb.processors.compile" description="Assemble jar files">
+ <delete file="${org.jboss.esb.processors.distrib.dir}/${org.jboss.esb.processors.jar.name}.jar" />
+ <jar destfile="${org.jboss.esb.processors.distrib.dir}/${org.jboss.esb.processors.jar.name}.jar"
+ basedir="${org.jboss.esb.processors.bin.dir}"
includes="**/*.class"
excludes="test/**"
/>
Modified: labs/jbossesb/branches/JBESB-51/ESBCore/services/build.xml
===================================================================
--- labs/jbossesb/branches/JBESB-51/ESBCore/services/build.xml 2006-07-02 16:18:04 UTC (rev 4900)
+++ labs/jbossesb/branches/JBESB-51/ESBCore/services/build.xml 2006-07-03 14:29:57 UTC (rev 4901)
@@ -1,15 +1,97 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<project name="JbossEsbServices" default="compile" basedir=".">
+<project name="JbossEsbServices" default="org.jboss.esb.services.compile" basedir=".">
- <property name="name.jar" value="${ant.project.name}.jar"/>
- <property name="appl.dir" value=".."/>
- <property name="metainf.dir" value="src/META-INF"/>
+ <property name="org.jboss.esb.services.name.jar" value="${ant.project.name}.jar"/>
+ <property name="org.jboss.esb.services.appl.dir" value="../.."/>
+ <property name="org.jboss.esb.services.metainf.dir" value="src/META-INF"/>
- <import file="buildOne.xml"/>
+ <property name="org.jboss.esb.services.classes.dir" value="${org.jboss.esb.internal.dest}/classes"/>
+ <property name="org.jboss.esb.services.src.dir" value="${basedir}/src"/>
+ <property name="root.dir" value="../.."/>
+ <property environment="env"/>
- <path id="default.class.path">
- <path refid="base.class.path"/>
+ <property name="org.jboss.esb.ext.serverlib.dir" value="${root.dir}/lib/ext"/>
+ <condition property="org.jboss.esb.ext.serverlib.dir" value="{org.jboss.esb.jboss.home}/server/all/lib">
+ <equals arg1="${org.jboss.esb.frominstall}" arg2="yes"/>
+ </condition>
+
+ <property name="org.jboss.esb.ext.lib.dir" value="${root.dir}/lib/ext"/>
+ <condition property="org.jboss.esb.ext.lib.dir" value="{org.jboss.esb.jboss.home}/lib">
+ <equals arg1="${org.jboss.esb.frominstall}" arg2="yes"/>
+ </condition>
+
+ <!-- =================================================================== -->
+ <!-- Define the class path -->
+ <!-- =================================================================== -->
+ <path id="org.jboss.esb.services.base.classpath">
+ <fileset dir="${org.jboss.esb.services.appl.dir}/lib" includes="*.jar,*.zip"/>
+ <fileset dir="${org.jboss.esb.ext.serverlib.dir}"
+ includes="*.jar,*.zip"
+ />
+ <fileset dir="${org.jboss.esb.ext.lib.dir}"
+ includes="jboss-jmx.jar"
+ />
+ </path>
+
+ <!-- =================================================================== -->
+ <!-- Initialize -->
+ <!-- =================================================================== -->
+ <target name="org.jboss.esb.services.init">
+ <tstamp>
+ <format property="TODAY" pattern="d-MM-yy"/>
+ </tstamp>
+ </target>
+
+ <!-- =================================================================== -->
+ <!-- Prepares the directory structure -->
+ <!-- =================================================================== -->
+ <target name="org.jboss.esb.services.prepare" depends="org.jboss.esb.services.init">
+ <mkdir dir="${org.jboss.esb.services.classes.dir}"/>
+ </target>
+
+ <!-- =================================================================== -->
+ <!-- Compiles all the classes -->
+ <!-- =================================================================== -->
+
+ <target name="org.jboss.esb.services.compile" depends="org.jboss.esb.services.prepare"
+ description="Compile all classes">
+
+ <javac
+ destdir="${org.jboss.esb.services.classes.dir}"
+ classpathref="org.jboss.esb.services.default.classpath"
+ debug="on"
+ optimize="off"
+ >
+ <src path="${org.jboss.esb.services.src.dir}"/>
+ </javac>
+
+ </target>
+
+ <!-- =================================================================== -->
+ <!-- Recompiles all the classes -->
+ <!-- =================================================================== -->
+
+ <target name="recompile" depends="clean,org.jboss.esb.services.compile"
+ description="Clean and compile"/>
+
+ <!-- =================================================================== -->
+ <!-- Clean -->
+ <!-- =================================================================== -->
+ <target name="clean" description="Remove clases directory">
+ </target>
+
+ <target name="purge" depends="clean">
+ <delete dir="${org.jboss.esb.services.classes.dir}"/>
+ </target>
+
+ <!-- =================================================================== -->
+ <!-- Rebuild everything from scratch -->
+ <!-- =================================================================== -->
+ <target name="all" depends="recompile,jar" />
+
+ <path id="org.jboss.esb.services.default.classpath">
+ <path refid="org.jboss.esb.services.base.classpath"/>
<pathelement location="../common/bin"/>
</path>
@@ -17,13 +99,13 @@
<fileset dir="${env.XDOCLET_HOME}/lib">
<include name="*.jar"/>
</fileset>
- <path refid="default.class.path"/>
+ <path refid="org.jboss.esb.services.default.classpath"/>
</path>
<!-- =================================================================== -->
<!-- Initialise xdoclet tasks -->
<!-- =================================================================== -->
- <target name="initXdoclet">
+ <target name="org.jboss.esb.services.initXdoclet">
<taskdef
name="ejbdoclet"
classname="xdoclet.modules.ejb.EjbDocletTask"
@@ -35,7 +117,7 @@
<!-- =================================================================== -->
<!-- Initialise -->
<!-- =================================================================== -->
- <target name="ejbdoclet" depends="initXdoclet">
+ <target name="ejbdoclet" depends="org.jboss.esb.services.initXdoclet">
<echo>+---------------------------------------------------+</echo>
<echo>| |</echo>
@@ -63,7 +145,7 @@
</fileset>
<deploymentdescriptor
- destdir="${metainf.dir}"
+ destdir="${org.jboss.esb.services.metainf.dir}"
validatexml="true"
mergedir="fake-to-debug"
description="Jboss ESB"
@@ -73,7 +155,7 @@
<jboss
version="3.2"
xmlencoding="iso-8859-1"
- destdir="${metainf.dir}"
+ destdir="${org.jboss.esb.services.metainf.dir}"
validatexml="true"
/>
@@ -84,19 +166,19 @@
<!-- Jar -->
<!-- =================================================================== -->
<target name="jar" description="Assemble jar files"
- depends="compile,ejbdoclet"
+ depends="org.jboss.esb.services.compile,ejbdoclet"
>
- <jar destfile="../dist/JbossEsbServicesClient.jar"
- basedir="bin"
+ <jar destfile="../${org.jboss.esb.internal.dest}/dist/JbossEsbServicesClient.jar"
+ basedir="../${org.jboss.esb.internal.dest}/bin"
includes="**/*.class"
excludes="**/EJBs/*Bean*"
/>
- <jar destfile="../dist/JbossEsbServices.jar"
- basedir="bin"
+ <jar destfile="../${org.jboss.esb.internal.dest}/dist/JbossEsbServices.jar"
+ basedir="../${org.jboss.esb.internal.dest}/bin"
includes="**/EJBs/*.class,**/dbtables/*.class,**/crypto/*.class"
- manifest="${metainf.dir}/manifest.server"
+ manifest="${org.jboss.esb.services.metainf.dir}/manifest.server"
>
- <metainf dir="${metainf.dir}" includes="*.xml"
+ <metainf dir="${org.jboss.esb.services.metainf.dir}" includes="*.xml"
excludes="application.xml"
/>
</jar>
@@ -106,10 +188,10 @@
<target name="-ear">
- <ear destfile="../dist/JbossEsbAppl.ear"
- appxml="${metainf.dir}/application.xml"
+ <ear destfile="../${org.jboss.esb.internal.dest}/dist/JbossEsbAppl.ear"
+ appxml="${org.jboss.esb.services.metainf.dir}/application.xml"
>
- <fileset dir="../dist"
+ <fileset dir="../${org.jboss.esb.internal.dest}/dist"
includes="jbossesb-common.jar
,CQ3ServicesClient.jar
,CQ3Services.jar
Deleted: labs/jbossesb/branches/JBESB-51/ESBCore/services/buildOne.xml
===================================================================
--- labs/jbossesb/branches/JBESB-51/ESBCore/services/buildOne.xml 2006-07-02 16:18:04 UTC (rev 4900)
+++ labs/jbossesb/branches/JBESB-51/ESBCore/services/buildOne.xml 2006-07-03 14:29:57 UTC (rev 4901)
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
<!-- =================================================================== -->
<!-- buildOne.xml - Invoked from child directories -->
<!-- =================================================================== -->
<project name="JbossEsb-module" default="compile" basedir=".">
<property name="classes.dir" value="${basedir}/bin"/>
<property name="src.dir" value="${basedir}/src"/>
<property name="root.dir" value="../.."/>
<property environment="env"/>
<!-- =================================================================== -->
<!-- Define the class path -->
<!-- =================================================================== -->
<path id="base.class.path">
<fileset dir="${appl.dir}/lib" includes="*.jar,*.zip"/>
<fileset dir="${root.dir}/lib/ext"
includes="*.jar,*.zip"
/>
<fileset dir="${root.dir}/lib/ext"
includes="jboss-jmx.jar"
/>
</path>
<!-- =================================================================== -->
<!-- Initialize -->
<!-- =================================================================== -->
<target name="init">
<tstamp>
<format property="TODAY" pattern="d-MM-yy"/>
</tstamp>
</target>
<!-- =================================================================== -->
<!-- Prepares the directory structure -->
<!-- =================================================================== -->
<target name="prepare" depends="init">
<mkdir dir="${classes.dir}"/>
</target>
<!-- =================================================================== -->
<!-- Compiles all the classes -->
<!-- =================================================================== -->
<target name="compile" depends="prepare"
description="Compile all classes">
<javac
destdir="${classes.dir}"
classpathref="default.class.path"
debug="on"
optimize="off"
>
<src path="${src.dir}"/>
</javac>
</target>
<!-- =================================================================== -->
<!-- Recompiles all the classes -->
<!-- =================================================================== -->
<target name="recompile" depends="clean,compile"
description="Clean and compile"/>
<!-- =================================================================== -->
<!-- Jar -->
<!-- =================================================================== -->
<target name="jar" description="Assemble jar files">
<jar destfile="../dist/${name.jar}"
basedir="bin"
includes="**/*.class"
/>
</target>
<!-- =================================================================== -->
<!-- Clean -->
<!-- =================================================================== -->
<target name="clean" description="Remove clases directory">
<delete dir="${classes.dir}"/>
</target>
<!-- =================================================================== -->
<!-- Rebuild everything from scratch -->
<!-- =================================================================== -->
<target name="all" depends="recompile,jar" />
</project>
\ No newline at end of file
Modified: labs/jbossesb/branches/JBESB-51/Readme.txt
===================================================================
--- labs/jbossesb/branches/JBESB-51/Readme.txt 2006-07-02 16:18:04 UTC (rev 4900)
+++ labs/jbossesb/branches/JBESB-51/Readme.txt 2006-07-03 14:29:57 UTC (rev 4901)
@@ -1,2 +1,4 @@
This is the source code repository for JBossESB. This is a work in progress, so the structure may change.
+For more information on JBossESB, visit http://labs.jboss.com/portal/jbossesb/?prjlist=false
+
Modified: labs/jbossesb/branches/JBESB-51/build.xml
===================================================================
--- labs/jbossesb/branches/JBESB-51/build.xml 2006-07-02 16:18:04 UTC (rev 4900)
+++ labs/jbossesb/branches/JBESB-51/build.xml 2006-07-03 14:29:57 UTC (rev 4901)
@@ -5,29 +5,43 @@
<!-- Set module name -->
<property name="org.jboss.esb.internal.modulename" value="jbesb"/>
+ <property name="org.jboss.esb.jboss.home" value="."/>
+
+ <!-- Product properties file -->
+ <property name="org.jboss.esb.product.properties" value="jbossesb-properties.xml"/>
+
+ <!-- Set default properties filename -->
+ <property name="org.jboss.esb.properties" value="product.properties"/>
+
<!-- Load Build Properties File -->
<property file="${org.jboss.esb.properties}"/>
<!-- Set internal property defaults -->
- <property name="org.jboss.esb.installationdirectory" value="build/install"/>
+ <property name="org.jboss.esb.installationdirectory" value="${basedir}/build/install"/>
<!-- Compile with debugging? -->
+ <property name="org.jboss.esb.debug" value="yes"/>
<condition property="org.jboss.esb.debug" value="no">
<equals arg1="${org.jboss.esb.debug}" arg2="no"/>
</condition>
- <property name="org.jboss.esb.debug" value="yes"/>
<!-- Compile with deprecation? -->
+ <property name="org.jboss.esb.deprecation" value="no"/>
<condition property="org.jboss.esb.deprecation" value="yes">
<equals arg1="${org.jboss.esb.deprecation}" arg2="yes"/>
</condition>
- <property name="org.jboss.esb.deprecation" value="no"/>
+ <!-- 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.frominstall}" arg2="yes"/>
+ </condition>
+
<!-- Path names -->
<property name="org.jboss.esb.internal.core" value="ESBCore"/>
- <property name="org.jboss.esb.internal.build.dest" value="build"/>
- <property name="org.jboss.esb.internal.jar.dest" value="lib"/>
+ <property name="org.jboss.esb.internal.dest" value="${basedir}/build"/>
+ <property name="org.jboss.esb.internal.jar.dest" value="${basedir}/lib"/>
<property name="org.jboss.esb.internal.javadocs.dest" value="javadocs"/>
<!-- Initialisation -->
@@ -48,7 +62,7 @@
<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 module"/>
+ <echo message="Compiling modules"/>
<ant dir="ESBCore"/>
</target>
@@ -120,15 +134,25 @@
<!-- Clean targets -->
<target name="org.jboss.esb.clean">
- <echo message="Cleaning module"/>
+ <echo message="Cleaning modules"/>
+
+ <echo message="Compiling modules"/>
+ <ant dir="ESBCore" target="clean"/>
+ </target>
+
+ <target name="org.jboss.esb.purge">
+ <echo message="Purging modules"/>
+
+ <ant dir="ESBCore" 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}"/>
- <delete dir="${org.jboss.esb.internal.jar.dest}"/>
</target>
<!-- Short target names -->
<target name="compile" depends="org.jboss.esb.compile"/>
<target name="jar" depends="org.jboss.esb.jar"/>
<target name="clean" depends="org.jboss.esb.clean"/>
+ <target name="purge" depends="org.jboss.esb.purge"/>
</project>
Added: labs/jbossesb/branches/JBESB-51/product.properties
===================================================================
--- labs/jbossesb/branches/JBESB-51/product.properties 2006-07-02 16:18:04 UTC (rev 4900)
+++ labs/jbossesb/branches/JBESB-51/product.properties 2006-07-03 14:29:57 UTC (rev 4901)
@@ -0,0 +1,7 @@
+# JBossESB ant properties file
+# $Id$
+#
+org.jboss.esb.deprecation=yes
+org.jboss.esb.alltests.build=yes
+org.jboss.esb.frominstall=no
+org.jboss.esb.jboss.home=.
|
