[jboss-svn-commits] JBL Code SVN: r6531 - in labs/jbossesb/trunk: product product/core/listeners product/core/rosetta product/core/rosetta/tests product/core/rosetta/tests/src/org/jboss/soa/esb/common/tests product/core/services product/core/services/tests product/lib product/lib/ext qa/junit

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Mon Oct 2 15:58:29 EDT 2006


Author: kurt.stam at jboss.com
Date: 2006-10-02 15:58:24 -0400 (Mon, 02 Oct 2006)
New Revision: 6531

Added:
   labs/jbossesb/trunk/product/lib/ext/ejb3/
   labs/jbossesb/trunk/product/lib/ext/ejb3_embedded/
Removed:
   labs/jbossesb/trunk/product/lib/ejb3/
   labs/jbossesb/trunk/product/lib/ejb3_embedded/
Modified:
   labs/jbossesb/trunk/product/build.xml
   labs/jbossesb/trunk/product/core/listeners/build.xml
   labs/jbossesb/trunk/product/core/rosetta/build.xml
   labs/jbossesb/trunk/product/core/rosetta/tests/build.xml
   labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/soa/esb/common/tests/BaseTest.java
   labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/soa/esb/common/tests/EJBContainerSetup.java
   labs/jbossesb/trunk/product/core/services/build.xml
   labs/jbossesb/trunk/product/core/services/tests/build.xml
   labs/jbossesb/trunk/qa/junit/build.xml
Log:
moving ejb3 jar directories into ext

Modified: labs/jbossesb/trunk/product/build.xml
===================================================================
--- labs/jbossesb/trunk/product/build.xml	2006-10-02 19:11:09 UTC (rev 6530)
+++ labs/jbossesb/trunk/product/build.xml	2006-10-02 19:58:24 UTC (rev 6531)
@@ -135,7 +135,7 @@
 			<classpath>
 				<path path="${org.jboss.esb.internal.src}"/>
 				<fileset dir="lib/ext" includes="*.jar" />
-				<fileset dir="lib/ejb3" includes="*.jar" />
+				<fileset dir="lib/ext/ejb3" includes="*.jar" />
 			</classpath>
 		</javadoc>
 	</target>

Modified: labs/jbossesb/trunk/product/core/listeners/build.xml
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/build.xml	2006-10-02 19:11:09 UTC (rev 6530)
+++ labs/jbossesb/trunk/product/core/listeners/build.xml	2006-10-02 19:58:24 UTC (rev 6531)
@@ -9,7 +9,7 @@
     <property environment="env"/>
 
 	<property name="org.jboss.esb.ext.lib.dir" value="${org.jboss.esb.root.dir}/lib/ext"/>
-	<property name="org.jboss.esb.ejb3.lib.dir" value="${org.jboss.esb.root.dir}/lib/ejb3"/>
+	<property name="org.jboss.esb.ejb3.lib.dir" value="${org.jboss.esb.root.dir}/lib/ext/ejb3"/>
 	<condition property="org.jboss.esb.ext.lib.dir" value="{org.jboss.esb.jboss.home}/client">
 		<equals arg1="${org.jboss.esb.frominstall}" arg2="yes"/>
 	</condition>

Modified: labs/jbossesb/trunk/product/core/rosetta/build.xml
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/build.xml	2006-10-02 19:11:09 UTC (rev 6530)
+++ labs/jbossesb/trunk/product/core/rosetta/build.xml	2006-10-02 19:58:24 UTC (rev 6531)
@@ -9,7 +9,7 @@
     <property environment="env"/>
 
 	<property name="org.jboss.esb.ext.lib.dir" value="${org.jboss.esb.root.dir}/lib/ext"/>
-	<property name="org.jboss.esb.ejb3.lib.dir" value="${org.jboss.esb.root.dir}/lib/ejb3"/>
+	<property name="org.jboss.esb.ejb3.lib.dir" value="${org.jboss.esb.root.dir}/lib/ext/ejb3"/>
 	<condition property="org.jboss.esb.ext.lib.dir" value="{org.jboss.esb.jboss.home}/client">
 		<equals arg1="${org.jboss.esb.frominstall}" arg2="yes"/>
 	</condition>

Modified: labs/jbossesb/trunk/product/core/rosetta/tests/build.xml
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/tests/build.xml	2006-10-02 19:11:09 UTC (rev 6530)
+++ labs/jbossesb/trunk/product/core/rosetta/tests/build.xml	2006-10-02 19:58:24 UTC (rev 6531)
@@ -11,7 +11,7 @@
     <property name="org.jboss.esb.module.tests.coverage.dir" value="${org.jboss.esb.internal.dest}/tests/coverage/rosetta"/>
     <property name="org.jboss.esb.module.classes.instr.dir" value="${org.jboss.esb.module.tests.coverage.dir}/instr" />
     <property environment="env"/>
-	<property name="org.jboss.esb.ejb3_embedded.lib.dir" value="${org.jboss.esb.root.dir}/../lib/ejb3_embedded"/>
+	<property name="org.jboss.esb.ejb3_embedded.lib.dir" value="${org.jboss.esb.root.dir}/../lib/ext/ejb3_embedded"/>
     <property name="org.jboss.esb.ext.lib.dir" value="${org.jboss.esb.root.dir}/lib/ext"/>
 	<property name="org.jboss.esb.deploy.lib.dir" value="${org.jboss.esb.root.dir}/config/lib/"/>
 	

Modified: labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/soa/esb/common/tests/BaseTest.java
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/soa/esb/common/tests/BaseTest.java	2006-10-02 19:11:09 UTC (rev 6530)
+++ labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/soa/esb/common/tests/BaseTest.java	2006-10-02 19:58:24 UTC (rev 6531)
@@ -28,7 +28,6 @@
 
 import org.apache.log4j.Logger;
 import org.apache.log4j.Priority;
-import org.jboss.soa.esb.common.Configuration;
 import org.jboss.soa.esb.common.Environment;
 import org.jboss.soa.esb.common.ModulePropertyManager;
 

Modified: labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/soa/esb/common/tests/EJBContainerSetup.java
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/soa/esb/common/tests/EJBContainerSetup.java	2006-10-02 19:11:09 UTC (rev 6530)
+++ labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/soa/esb/common/tests/EJBContainerSetup.java	2006-10-02 19:58:24 UTC (rev 6531)
@@ -40,7 +40,6 @@
 
 import org.apache.log4j.Logger;
 import org.jboss.ejb3.embedded.EJB3StandaloneBootstrap;
-import org.jboss.soa.esb.common.Configuration;
 import org.jboss.soa.esb.common.ModulePropertyManager;
 
 public class EJBContainerSetup extends TestSetup {

Modified: labs/jbossesb/trunk/product/core/services/build.xml
===================================================================
--- labs/jbossesb/trunk/product/core/services/build.xml	2006-10-02 19:11:09 UTC (rev 6530)
+++ labs/jbossesb/trunk/product/core/services/build.xml	2006-10-02 19:58:24 UTC (rev 6531)
@@ -20,7 +20,7 @@
 	</condition>
 	
 	<property name="org.jboss.esb.ext.lib.dir" value="${org.jboss.esb.root.dir}/lib/ext"/>
-	<property name="org.jboss.esb.ejb3.lib.dir" value="${org.jboss.esb.root.dir}/lib/ejb3"/>
+	<property name="org.jboss.esb.ejb3.lib.dir" value="${org.jboss.esb.root.dir}/lib/ext/ejb3"/>
 	<condition property="org.jboss.esb.ext.lib.dir" value="${org.jboss.esb.jboss.home}/lib">
 		<equals arg1="${org.jboss.esb.frominstall}" arg2="yes"/>
 	</condition>

Modified: labs/jbossesb/trunk/product/core/services/tests/build.xml
===================================================================
--- labs/jbossesb/trunk/product/core/services/tests/build.xml	2006-10-02 19:11:09 UTC (rev 6530)
+++ labs/jbossesb/trunk/product/core/services/tests/build.xml	2006-10-02 19:58:24 UTC (rev 6531)
@@ -15,7 +15,7 @@
     <property environment="env"/>
 
     <property name="org.jboss.esb.ext.lib.dir" value="${org.jboss.esb.root.dir}/lib/ext"/>
-	<property name="org.jboss.esb.ejb3_embedded.lib.dir" value="${org.jboss.esb.root.dir}/../lib/ejb3_embedded"/>
+	<property name="org.jboss.esb.ejb3_embedded.lib.dir" value="${org.jboss.esb.root.dir}/../lib/ext/ejb3_embedded"/>
 	<property name="org.jboss.esb.ejb3_conf.tests.src.dir" value="${org.jboss.esb.root.dir}/rosetta/tests/resources/conf"/>
     <condition property="org.jboss.esb.ext.lib.dir" value="{org.jboss.esb.jboss.home}/client">
         <equals arg1="${org.jboss.esb.frominstall}" arg2="yes"/>

Copied: labs/jbossesb/trunk/product/lib/ext/ejb3 (from rev 6526, labs/jbossesb/trunk/product/lib/ejb3)

Copied: labs/jbossesb/trunk/product/lib/ext/ejb3_embedded (from rev 6526, labs/jbossesb/trunk/product/lib/ejb3_embedded)

Modified: labs/jbossesb/trunk/qa/junit/build.xml
===================================================================
--- labs/jbossesb/trunk/qa/junit/build.xml	2006-10-02 19:11:09 UTC (rev 6530)
+++ labs/jbossesb/trunk/qa/junit/build.xml	2006-10-02 19:58:24 UTC (rev 6531)
@@ -16,7 +16,7 @@
 		<fileset dir="${coverage}/all/" includes="jbossesb-instr-all.jar" />
 		<fileset dir="${qa.lib}/ext" includes="*.jar" />
 		<fileset dir="${build.lib}/ext" includes="*.jar" />
-		<fileset dir="${build.lib}/ejb3" includes="*.jar" />
+		<fileset dir="${build.lib}/ext/ejb3" includes="*.jar" />
 		<fileset dir="${product}/config/lib" includes="*.jar" />
 		<pathelement location="../" />
 	</path>




More information about the jboss-svn-commits mailing list