[jboss-svn-commits] JBL Code SVN: r5156 - in labs/jbossesb/trunk: . ESBCore ESBCore/Tests ESBCore/common ESBCore/common/tests ESBCore/listeners ESBCore/processors ESBCore/services ESBCore/services/src/META-INF

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Tue Jul 18 15:51:15 EDT 2006


Author: mark.little at jboss.com
Date: 2006-07-18 15:51:05 -0400 (Tue, 18 Jul 2006)
New Revision: 5156

Modified:
   labs/jbossesb/trunk/ESBCore/Tests/build.xml
   labs/jbossesb/trunk/ESBCore/build.xml
   labs/jbossesb/trunk/ESBCore/common/build.xml
   labs/jbossesb/trunk/ESBCore/common/tests/build.xml
   labs/jbossesb/trunk/ESBCore/listeners/build.xml
   labs/jbossesb/trunk/ESBCore/processors/build.xml
   labs/jbossesb/trunk/ESBCore/services/build.xml
   labs/jbossesb/trunk/ESBCore/services/src/META-INF/ejb-jar.xml
   labs/jbossesb/trunk/build.xml
Log:
Refactored the build files.

Modified: labs/jbossesb/trunk/ESBCore/Tests/build.xml
===================================================================
--- labs/jbossesb/trunk/ESBCore/Tests/build.xml	2006-07-18 18:57:34 UTC (rev 5155)
+++ labs/jbossesb/trunk/ESBCore/Tests/build.xml	2006-07-18 19:51:05 UTC (rev 5156)
@@ -2,7 +2,7 @@
 <project name="BuildEsbTests" default="org.jboss.esb.tests.compile" basedir=".">
 
 	<property name="org.jboss.esb.tests.bin.dir" value="${org.jboss.esb.internal.dest}/tests"/>
-	<property name="org.jboss.esb.core.bin.dir" value="${org.jboss.esb.internal.dest}/classes"/>
+	<property name="org.jboss.esb.core.classes.dir" value="${org.jboss.esb.internal.dest}/classes"/>
     <property name="org.jboss.esb.tests.src.dir" value="${basedir}/src"/>
 	<property name="org.jboss.esb.root.dir" value="../.."/>
     <property environment="env"/>
@@ -13,8 +13,11 @@
 	</condition>
 	
 	<path id="org.jboss.esb.tests.base.classpath">
-    		<fileset dir="${org.jboss.esb.ext.lib.dir}" includes="activation.jar jbossall-client.jar log4j.jar mail.jar"/>
-		<pathelement location="${org.jboss.esb.core.bin.dir}"/>
+        <fileset dir="${org.jboss.esb.ext.lib.dir}" includes="activation.jar jbossall-client.jar log4j.jar mail.jar"/>
+		<pathelement location="${org.jboss.esb.core.classes.dir}/common"/>
+		<pathelement location="${org.jboss.esb.core.classes.dir}/listeners"/>
+		<pathelement location="${org.jboss.esb.core.classes.dir}/services"/>
+		<pathelement location="${org.jboss.esb.core.classes.dir}/processors"/>
     </path>
 	
     <target name="org.jboss.esb.tests.init">

Modified: labs/jbossesb/trunk/ESBCore/build.xml
===================================================================
--- labs/jbossesb/trunk/ESBCore/build.xml	2006-07-18 18:57:34 UTC (rev 5155)
+++ labs/jbossesb/trunk/ESBCore/build.xml	2006-07-18 19:51:05 UTC (rev 5156)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
     <!-- =================================================================== -->
-    <!-- build.xml  -   Builds all subprojects in child directories           -->
+    <!-- build.xml  -   Builds all subprojects in child directories          -->
     <!-- =================================================================== -->
 
 <project name="JbossEsb" default="org.jboss.esb.core.compile" basedir=".">
@@ -23,7 +23,7 @@
     <!-- =================================================================== -->
     <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"/>
+	<mkdir dir="${org.jboss.esb.internal.dest}/dist/lib"/>
     </target>
 
     <!-- =================================================================== -->
@@ -55,7 +55,7 @@
     <!-- =================================================================== -->
     <!-- Assemble  jars                                                      -->
     <!-- =================================================================== -->
-    <target name="jar" depends="org.jboss.esb.core.compile" description="arma los jars">
+    <target name="jar" depends="org.jboss.esb.core.compile" description="Build jar files">
     		<echo message="Building jar"/>
     		<ant dir="common" target="jar"/>
     		<ant dir="listeners" target="jar"/>
@@ -65,10 +65,10 @@
     </target>
 
     <target name="-ear">
-        <ear    destfile="${org.jboss.esb.internal.dest}/dist/jbossesb-appl.ear"
+        <ear    destfile="${org.jboss.esb.internal.dest}/dist/lib/jbossesb-appl.ear"
 		appxml="services/src/META-INF/application.xml"
         >
-	    <fileset dir="${org.jboss.esb.internal.dest}/dist"
+	    <fileset dir="${org.jboss.esb.internal.dest}/dist/lib"
 	    	includes="*.jar"
 		/>
 	</ear>

Modified: labs/jbossesb/trunk/ESBCore/common/build.xml
===================================================================
--- labs/jbossesb/trunk/ESBCore/common/build.xml	2006-07-18 18:57:34 UTC (rev 5155)
+++ labs/jbossesb/trunk/ESBCore/common/build.xml	2006-07-18 19:51:05 UTC (rev 5156)
@@ -3,7 +3,7 @@
 
 	<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.classes.dir" value="${org.jboss.esb.internal.dest}/classes/common"/>
     <property name="org.jboss.esb.common.src.dir" value="${basedir}/src"/>
 	<property name="org.jboss.esb.root.dir" value="../.."/>
     <property environment="env"/>
@@ -19,20 +19,21 @@
 
     <target name="org.jboss.esb.common.init">
         <tstamp>
-            <format property="TODAY" pattern="d-MM-yy"/>
+            <format property="TODAY" pattern="dd-MM-yy"/>
         </tstamp>
     </target>
 
     <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.classes.dir}"/>
         <mkdir dir="${org.jboss.esb.common.distrib.dir}"/>
+    	<mkdir dir="${org.jboss.esb.common.distrib.dir}/lib"/>
     </target>
 
-    <target name="clean" description="Remove bin directory">
+    <target name="clean" description="Remove classes directory">
+    	<delete dir="${org.jboss.esb.common.classes.dir}"/>
     </target>
 
 	<target name="purge" depends="clean">
-		<delete dir="${org.jboss.esb.common.bin.dir}"/>
 	</target>
 
 
@@ -48,7 +49,7 @@
         description="Compile all classes">
 
         <javac
-            destdir="${org.jboss.esb.common.bin.dir}"
+            destdir="${org.jboss.esb.common.classes.dir}"
             classpathref="org.jboss.esb.common.base.classpath"
             debug="${org.jboss.esb.debug}"
             optimize="${org.jboss.esb.optimize}"
@@ -62,9 +63,9 @@
         description="Clean and compile"/>
 
     <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}" 
+    	<delete file="${org.jboss.esb.common.distrib.dir}/lib/${org.jboss.esb.common.jar.name}.jar" />
+        <jar    destfile="${org.jboss.esb.common.distrib.dir}/lib/${org.jboss.esb.common.jar.name}.jar" 
+                basedir="${org.jboss.esb.common.classes.dir}" 
                 includes="**/*.class"
 		excludes="test/**"
                 />

Modified: labs/jbossesb/trunk/ESBCore/common/tests/build.xml
===================================================================
--- labs/jbossesb/trunk/ESBCore/common/tests/build.xml	2006-07-18 18:57:34 UTC (rev 5155)
+++ labs/jbossesb/trunk/ESBCore/common/tests/build.xml	2006-07-18 19:51:05 UTC (rev 5156)
@@ -1,9 +1,9 @@
 <?xml version="1.0"?>
 <project name="build.common.tests" default="org.jboss.esb.common.tests.compile" basedir=".">
 
-    <property name="org.jboss.esb.tests.bin.dir" value="${org.jboss.esb.internal.dest}/tests"/>
+    <property name="org.jboss.esb.tests.classes.dir" value="${org.jboss.esb.internal.dest}/tests"/>
     <property name="org.jboss.esb.tests.report.dir" value="${org.jboss.esb.internal.dest}/tests/junit"/>
-    <property name="org.jboss.esb.core.bin.dir" value="${org.jboss.esb.internal.dest}/classes"/>
+    <property name="org.jboss.esb.core.classes.dir" value="${org.jboss.esb.internal.dest}/classes/common"/>
     <property name="org.jboss.esb.tests.src.dir" value="${basedir}/src"/>
     <property name="org.jboss.esb.root.dir" value="../.."/>
     <property environment="env"/>
@@ -16,28 +16,28 @@
     <path id="org.jboss.esb.tests.base.classpath">
         <fileset dir="../${org.jboss.esb.ext.lib.dir}"
                  includes="activation.jar jbossall-client.jar log4j.jar mail.jar junit.jar"/>
-        <pathelement location="${org.jboss.esb.core.bin.dir}"/>
+        <pathelement location="${org.jboss.esb.core.classes.dir}"/>
     </path>
 
     <target name="org.jboss.esb.tests.init">
         <tstamp>
-            <format property="TODAY" pattern="d-MM-yy"/>
+            <format property="TODAY" pattern="dd-MM-yy"/>
         </tstamp>
 
-        <mkdir dir="${org.jboss.esb.tests.bin.dir}"/>
+        <mkdir dir="${org.jboss.esb.tests.classes.dir}"/>
         <mkdir dir="${org.jboss.esb.tests.report.dir}"/>
     </target>
 
     <target name="clean"/>
 
     <target name="purge" depends="clean">
-        <delete dir="${org.jboss.esb.tests.bin.dir}"/>
+        <delete dir="${org.jboss.esb.tests.classes.dir}"/>
     </target>
 
     <target name="org.jboss.esb.common.tests.compile" if="org.jboss.esb.buildtests" depends="org.jboss.esb.tests.init">
 
         <javac
-                destdir="${org.jboss.esb.tests.bin.dir}"
+                destdir="${org.jboss.esb.tests.classes.dir}"
                 classpathref="org.jboss.esb.tests.base.classpath"
                 debug="${org.jboss.esb.debug}"
                 optimize="${org.jboss.esb.optimize}"
@@ -66,14 +66,14 @@
             <formatter type="plain" usefile="false"/>
             <formatter type="xml"/>
             <batchtest todir="${org.jboss.esb.tests.report.dir}">
-                <fileset dir="${org.jboss.esb.tests.bin.dir}">
+                <fileset dir="${org.jboss.esb.tests.classes.dir}">
                     <include name="**/**/common/**/**UnitTest.class"/>
                 </fileset>
             </batchtest>
             <classpath>
                 <path refid="org.jboss.esb.tests.base.classpath"/>
-                <pathelement location="${org.jboss.esb.core.bin.dir}"/>
-                <pathelement location="${org.jboss.esb.tests.bin.dir}"/>
+                <pathelement location="${org.jboss.esb.core.classes.dir}"/>
+                <pathelement location="${org.jboss.esb.tests.classes.dir}"/>
             </classpath>
         </junit>
         <junitreport>
@@ -95,14 +95,14 @@
             <formatter type="plain" usefile="false"/>
             <formatter type="xml"/>
             <batchtest todir="${org.jboss.esb.tests.report.dir}">
-                <fileset dir="${org.jboss.esb.tests.bin.dir}">
+                <fileset dir="${org.jboss.esb.tests.classes.dir}">
                     <include name="**/**/common/**/**FuncTest.class"/>
                 </fileset>
             </batchtest>
             <classpath>
                 <path refid="org.jboss.esb.tests.base.classpath"/>
-                <pathelement location="${org.jboss.esb.core.bin.dir}"/>
-                <pathelement location="${org.jboss.esb.tests.bin.dir}"/>
+                <pathelement location="${org.jboss.esb.core.classes.dir}"/>
+                <pathelement location="${org.jboss.esb.tests.classes.dir}"/>
             </classpath>
         </junit>
         <junitreport>

Modified: labs/jbossesb/trunk/ESBCore/listeners/build.xml
===================================================================
--- labs/jbossesb/trunk/ESBCore/listeners/build.xml	2006-07-18 18:57:34 UTC (rev 5155)
+++ labs/jbossesb/trunk/ESBCore/listeners/build.xml	2006-07-18 19:51:05 UTC (rev 5156)
@@ -3,7 +3,7 @@
 
 	<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.classes.dir" value="${org.jboss.esb.internal.dest}/classes/listeners"/>
     <property name="org.jboss.esb.listeners.src.dir" value="${basedir}/src"/>
 	<property name="org.jboss.esb.root.dir" value="../.."/>
     <property environment="env"/>
@@ -19,7 +19,10 @@
 
 	<path id="org.jboss.esb.listeners.default.classpath">
         <path refid="org.jboss.esb.listeners.base.classpath"/>
-		<pathelement location="${org.jboss.esb.internal.dest}/classes"/>
+		<pathelement location="${org.jboss.esb.classes.dir}"/>
+		<pathelement location="${org.jboss.esb.internal.dest}/classes/common"/>
+		<pathelement location="${org.jboss.esb.internal.dest}/classes/processors"/>
+		<pathelement location="${org.jboss.esb.internal.dest}/classes/services"/>
     </path>
 
     <target name="org.jboss.esb.listeners.init">
@@ -29,15 +32,16 @@
     </target>
 
     <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.classes.dir}"/>
         <mkdir dir="${org.jboss.esb.listeners.distrib.dir}"/>
+        <mkdir dir="${org.jboss.esb.listeners.distrib.dir}/lib"/>
     </target>
 
-    <target name="clean" description="Remove bin directory">
+    <target name="clean" description="Remove classes directory">
+		<delete dir="${org.jboss.esb.listeners.classes.dir}"/>
     </target>
 	
 	<target name="purge" depends="clean">
-		<delete dir="${org.jboss.esb.listeners.bin.dir}"/>
 	</target>
 
 
@@ -55,7 +59,7 @@
         description="Compile all classes">
 
         <javac
-            destdir="${org.jboss.esb.listeners.bin.dir}"
+            destdir="${org.jboss.esb.listeners.classes.dir}"
             classpathref="org.jboss.esb.listeners.default.classpath"
             debug="${org.jboss.esb.debug}"
             optimize="${org.jboss.esb.optimize}"
@@ -69,9 +73,9 @@
         description="Clean and compile"/>
 
     <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}" 
+    	<delete file="${org.jboss.esb.listeners.distrib.dir}/lib/${org.jboss.esb.listeners.jar.name}.jar" />
+        <jar    destfile="${org.jboss.esb.listeners.distrib.dir}/lib/${org.jboss.esb.listeners.jar.name}.jar" 
+                basedir="${org.jboss.esb.listeners.classes.dir}" 
                 includes="**/*.class"
 		excludes="test/**"
                 />

Modified: labs/jbossesb/trunk/ESBCore/processors/build.xml
===================================================================
--- labs/jbossesb/trunk/ESBCore/processors/build.xml	2006-07-18 18:57:34 UTC (rev 5155)
+++ labs/jbossesb/trunk/ESBCore/processors/build.xml	2006-07-18 19:51:05 UTC (rev 5156)
@@ -3,7 +3,7 @@
 
 	<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.classes.dir" value="${org.jboss.esb.internal.dest}/classes/processors"/>
     <property name="org.jboss.esb.processors.src.dir" value="${basedir}/src"/>
 	<property name="org.jboss.esb.root.dir" value="../.."/>
     <property environment="env"/>
@@ -19,7 +19,9 @@
 
     <path id="org.jboss.esb.processors.default.classpath">
         <path refid="org.jboss.esb.processors.base.classpath"/>
-		<pathelement location="${org.jboss.esb.internal.dest}/classes"/>
+    	<pathelement location="${org.jboss.esb.internal.dest}/classes/common"/>
+    	<pathelement location="${org.jboss.esb.internal.dest}/classes/listeners"/>
+    	<pathelement location="${org.jboss.esb.internal.dest}/classes/services"/>
     </path>
 
 	<target name="org.jboss.esb.processors.init">
@@ -29,15 +31,16 @@
     </target>
 
     <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.classes.dir}"/>
         <mkdir dir="${org.jboss.esb.processors.distrib.dir}"/>
+        <mkdir dir="${org.jboss.esb.processors.distrib.dir}/lib"/>
     </target>
 
-    <target name="clean" description="Remove bin directory">
+    <target name="clean" description="Remove classes directory">
+		<delete dir="${org.jboss.esb.processors.classes.dir}"/>
     </target>
 	
 	<target name="purge" depends="clean">
-		<delete dir="${org.jboss.esb.processors.bin.dir}"/>
 	</target>
 
 
@@ -53,7 +56,7 @@
         description="Compile all classes">
 
         <javac
-            destdir="${org.jboss.esb.processors.bin.dir}"
+            destdir="${org.jboss.esb.processors.classes.dir}"
             classpathref="org.jboss.esb.processors.default.classpath"
             debug="${org.jboss.esb.debug}"
             optimize="${org.jboss.esb.optimize}"
@@ -67,9 +70,9 @@
         description="Clean and compile"/>
 
     <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}" 
+    	<delete file="${org.jboss.esb.processors.distrib.dir}/lib/${org.jboss.esb.processors.jar.name}.jar" />
+        <jar    destfile="${org.jboss.esb.processors.distrib.dir}/lib/${org.jboss.esb.processors.jar.name}.jar" 
+                basedir="${org.jboss.esb.processors.classes.dir}" 
                 includes="**/*.class"
 		excludes="test/**"
                 />

Modified: labs/jbossesb/trunk/ESBCore/services/build.xml
===================================================================
--- labs/jbossesb/trunk/ESBCore/services/build.xml	2006-07-18 18:57:34 UTC (rev 5155)
+++ labs/jbossesb/trunk/ESBCore/services/build.xml	2006-07-18 19:51:05 UTC (rev 5156)
@@ -3,10 +3,11 @@
 <project name="JbossEsbServices" default="org.jboss.esb.services.compile" basedir=".">
 
     <property name="org.jboss.esb.services.name.jar" value="${ant.project.name}.jar"/>
+	<property name="org.jboss.esb.services.dist.dir" value="${org.jboss.esb.internal.dest}/dist"/>
     <property name="org.jboss.esb.services.appl.dir" value="../.."/>
     <property name="org.jboss.esb.services.metainf.dir" value="src/META-INF"/>
 
-	<property name="org.jboss.esb.services.classes.dir" value="${org.jboss.esb.internal.dest}/classes"/>
+	<property name="org.jboss.esb.services.classes.dir" value="${org.jboss.esb.internal.dest}/classes/services"/>
 	<property name="org.jboss.esb.services.src.dir" value="${basedir}/src"/>
 	<property name="org.jboss.esb.root.dir" value="../.."/>
 	<property environment="env"/>
@@ -92,11 +93,11 @@
 	    <!-- =================================================================== -->
 	    <!-- Clean                                                               -->
 	    <!-- =================================================================== -->
-	    <target name="clean" description="Remove clases directory">
+	    <target name="clean" description="Remove classes directory">
+			<delete dir="${org.jboss.esb.services.classes.dir}"/>
 	    </target>
 	
 		<target name="purge" depends="clean">
-			<delete dir="${org.jboss.esb.services.classes.dir}"/>
 		</target>
 
 	    <!-- =================================================================== -->
@@ -106,7 +107,9 @@
 	
     <path id="org.jboss.esb.services.default.classpath">
         <path refid="org.jboss.esb.services.base.classpath"/>
-		<pathelement location="${org.jboss.esb.internal.dest}/classes"/>
+		<pathelement location="${org.jboss.esb.internal.dest}/classes/common"/>
+    	<pathelement location="${org.jboss.esb.internal.dest}/classes/processors"/>
+    	<pathelement location="${org.jboss.esb.internal.dest}/classes/listeners"/>
     </path>
 
     <path id="xdoclet.class.path">
@@ -182,13 +185,13 @@
     <target name="jar" description="Assemble jar files"
     	depends="org.jboss.esb.services.compile,ejbdoclet"
 	>
-        <jar    destfile="${org.jboss.esb.internal.dest}/dist/jbossesb-services-client.jar"
-                basedir="${org.jboss.esb.internal.dest}/classes"
+        <jar    destfile="${org.jboss.esb.services.dist.dir}/lib/jbossesb-services-client.jar"
+                basedir="${org.jboss.esb.services.classes.dir}"
                 includes="**/*.class"
 		excludes="**/EJBs/*Bean*"
                 />
-        <jar    destfile="${org.jboss.esb.internal.dest}/dist/jbossesb-services.jar"
-                basedir="${org.jboss.esb.internal.dest}/classes"
+        <jar    destfile="${org.jboss.esb.services.dist.dir}/lib/jbossesb-services.jar"
+                basedir="${org.jboss.esb.services.classes.dir}"
                  includes="**/EJBs/*.class"
 		manifest="${org.jboss.esb.services.metainf.dir}/manifest.server"
                 >
@@ -201,9 +204,9 @@
     </target>
 
     <target name="-ear">
-        <ear destfile="${org.jboss.esb.internal.dest}/dist/jbossesb-appl.ear"
+        <ear destfile="${org.jboss.esb.services.dist.dir}/lib/jbossesb-appl.ear"
 		appxml="${org.jboss.esb.services.metainf.dir}/application.xml">
-	    <fileset dir="${org.jboss.esb.internal.dest}/dist"
+	    <fileset dir="${org.jboss.esb.services.dist.dir}"
 	    	includes="jbossesb-common.jar
 		,CQ3ServicesClient.jar
 		,CQ3Services.jar

Modified: labs/jbossesb/trunk/ESBCore/services/src/META-INF/ejb-jar.xml
===================================================================
--- labs/jbossesb/trunk/ESBCore/services/src/META-INF/ejb-jar.xml	2006-07-18 18:57:34 UTC (rev 5155)
+++ labs/jbossesb/trunk/ESBCore/services/src/META-INF/ejb-jar.xml	2006-07-18 19:51:05 UTC (rev 5156)
@@ -40,12 +40,6 @@
          <session-type>Stateless</session-type>
          <transaction-type>Bean</transaction-type>
 
-         <env-entry>
-            <env-entry-name>datasource</env-entry-name>
-            <env-entry-type>java.lang.String</env-entry-type>
-            <env-entry-value><![CDATA[java:RosettaDS]]></env-entry-value>
-         </env-entry>
-
       </session>
 
       <session >

Modified: labs/jbossesb/trunk/build.xml
===================================================================
--- labs/jbossesb/trunk/build.xml	2006-07-18 18:57:34 UTC (rev 5155)
+++ labs/jbossesb/trunk/build.xml	2006-07-18 19:51:05 UTC (rev 5156)
@@ -12,13 +12,17 @@
 	
 	<!-- Set default properties filename -->
 	<property name="org.jboss.esb.properties" value="product.properties"/>
-
+
+	<!-- Some default build locations -->
+	<property name="org.jboss.esb.internal.dest" value="${basedir}/build"/>
+	<property name="org.jboss.esb.internal.jar.dest" value="${basedir}/build/dist/lib"/>
+
 	<!-- Load Build Properties File -->
 	<property file="${org.jboss.esb.properties}"/>
 
 	<!-- Set internal property defaults -->
 
-	<property name="org.jboss.esb.installationdirectory" value="${basedir}/build/install"/>
+	<property name="org.jboss.esb.installationdirectory" value="${basedir}/build/dist"/>
 	
 	<!-- Compile with debugging? -->
 	<property name="org.jboss.esb.debug" value="yes"/>
@@ -98,8 +102,9 @@
 	<target name="org.jboss.esb.core.jar" depends="org.jboss.esb.compile">
 		<echo message="Building jar file"/>
 		<ant dir="ESBCore" target="jar"/>
-		<mkdir dir="${org.jboss.esb.internal.jar.dest}"/>
 	</target>
+	
+	<!-- add ear file rule -->
 
 	<target name="org.jboss.esb.javadocs"
 				depends="org.jboss.esb.internal.init">
@@ -142,6 +147,7 @@
 			<fileset dir="xml"/>
 		</copy>
 
+		<!--
 		<echo message="Installing javadocs"/>
 		<mkdir dir="${org.jboss.esb.installationdirectory}/javadocs"/>
 		<copy
@@ -149,6 +155,7 @@
 		>
 			<fileset dir="javadocs"/>
 		</copy>
+		-->
 
 	</target>
 




More information about the jboss-svn-commits mailing list