[jboss-cvs] JBossAS SVN: r69915 - projects/ejb3/trunk/core.

[jboss-cvs-commits at lists.jboss.org]

Author: ALRubinger
Date: 2008-02-18 18:17:05 -0500 (Mon, 18 Feb 2008)
New Revision: 69915

Modified:
   projects/ejb3/trunk/core/.project
   projects/ejb3/trunk/core/build-test.xml
Log:
Centralized Test Client Classpath, fixed one-test

Modified: projects/ejb3/trunk/core/.project
===================================================================
--- projects/ejb3/trunk/core/.project	2008-02-18 23:11:23 UTC (rev 69914)
+++ projects/ejb3/trunk/core/.project	2008-02-18 23:17:05 UTC (rev 69915)
@@ -6,6 +6,11 @@
 	</projects>
 	<buildSpec>
 		<buildCommand>
+			<name>org.maven.ide.eclipse.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
 			<name>org.eclipse.jdt.core.javabuilder</name>
 			<arguments>
 			</arguments>
@@ -13,5 +18,6 @@
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.maven.ide.eclipse.maven2Nature</nature>
 	</natures>
 </projectDescription>

Modified: projects/ejb3/trunk/core/build-test.xml
===================================================================
--- projects/ejb3/trunk/core/build-test.xml	2008-02-18 23:11:23 UTC (rev 69914)
+++ projects/ejb3/trunk/core/build-test.xml	2008-02-18 23:17:05 UTC (rev 69915)
@@ -155,7 +155,32 @@
    <!-- ========= -->
    <!-- Libraries -->
    <!-- ========= -->
+  
+    <!--
+    
+    Classpath used by the Test Client
+    
+    -->
+    <path id="test.client.classpath">
+      <!-- JBoss Client Binaries -->
+      <pathelement path="${location.client.lib.jbossall}" />
 
+      <!-- EJB3 TestSuite -->
+      <pathelement path="${location.artifact.tests}" />
+
+      <!-- JBoss Test Project -->
+      <pathelement path="${location.dependencies.lib.jboss-test:jboss-test}" />
+
+      <!-- JUnit -->
+      <pathelement path="${location.dependencies.lib.junit:junit}" />
+
+      <!-- HSQL DB -->
+      <pathelement path="${location.dependencies.lib.hsqldb:hsqldb}" />
+
+      <!-- Root of jndi.properties -->
+      <pathelement location="${resources}/test" />
+    </path>
+
    <!-- The combined library classpath -->
    <path id="library.classpath">
       <path refid="sun.jaf.classpath"/>
@@ -4221,6 +4246,10 @@
 
          <jvmarg line="${jvmargs}" />
          <classpath>
+           
+           <path refid="test.client.classpath" />
+           
+           <!--
             <path refid="hibernate.hibernate.classpath"/>
             <pathelement location="${build.classes}"/>
             <path refid="${client.run.classpath}"/>
@@ -4244,17 +4273,17 @@
             <path refid="jboss.aop.classpath"/>
             <path refid="jboss.aspects.classpath"/>
             <path refid="jboss.jbossxb.classpath"/>
-         	<!-- for Corba -->
+         	 for Corba 
             <path refid="jboss.iiop.classpath"/>
          	<path refid="jacorb.jacorb.classpath"/>
          	<path refid="apache.avalon.classpath"/>
          	<path refid="apache.avalon.logkit.classpath"/>
 
-            <!-- EJBTHREE-485 needs javassist -->
+             EJBTHREE-485 needs javassist
             <path refid="javassist.classpath"/>
 
-            <!-- For clustered entities -->
-            <path refid="hsqldb.hsqldb.classpath"/>
+             For clustered entities 
+            <path refid="hsqldb.hsqldb.classpath"/> -->
          </classpath>
 
          <formatter type="plain" usefile="true"/>