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

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

Author: ALRubinger
Date: 2008-03-03 17:34:38 -0500 (Mon, 03 Mar 2008)
New Revision: 70340

Modified:
   projects/ejb3/trunk/core/build-test.xml
   projects/ejb3/trunk/core/pom.xml
Log:
Use explicit copying of specific dependencies needed for test client (instead of killall), add Apache Commons HttpClient, add HttpClient to Test Client CP

Modified: projects/ejb3/trunk/core/build-test.xml
===================================================================
--- projects/ejb3/trunk/core/build-test.xml	2008-03-03 22:09:01 UTC (rev 70339)
+++ projects/ejb3/trunk/core/build-test.xml	2008-03-03 22:34:38 UTC (rev 70340)
@@ -95,6 +95,7 @@
   <property name="location.dependencies.lib.jboss-test:jboss-test" value="${location.dependencies.lib}/jboss-test.jar"/>
   <property name="location.dependencies.lib.junit:junit" value="${location.dependencies.lib}/junit.jar"/>
   <property name="location.dependencies.lib.hsqldb:hsqldb" value="${location.dependencies.lib}/hsqldb.jar"/>
+  <property name="location.dependencies.lib.apache-httpclient:commons-httpclient" value="${location.dependencies.lib}/commons-httpclient.jar"/>
   <property name="location.client.lib" value="${jboss.dist}/client"/>
   <property name="location.client.lib.jbossall" value="${location.client.lib}/jbossall-client.jar"/>
     
@@ -213,6 +214,9 @@
 
     <!-- HSQL DB -->
     <pathelement path="${location.dependencies.lib.hsqldb:hsqldb}" />
+    
+    <!-- Apache HttpClient -->
+    <pathelement path="${location.dependencies.lib.apache-httpclient:commons-httpclient}" />
 
     <!-- Root of jndi.properties -->
     <pathelement location="${resources}/test" />

Modified: projects/ejb3/trunk/core/pom.xml
===================================================================
--- projects/ejb3/trunk/core/pom.xml	2008-03-03 22:09:01 UTC (rev 70339)
+++ projects/ejb3/trunk/core/pom.xml	2008-03-03 22:34:38 UTC (rev 70340)
@@ -149,18 +149,36 @@
             </configuration>
           </execution>
 
-          <!-- Copy all dependencies -->
+          <!-- Copy dependencies necessary of Test Clients -->
           <execution>
             <id>copy-core-dependencies</id>
             <phase>process-resources</phase>
             <goals>
-              <goal>copy-dependencies</goal>
+              <goal>copy</goal>
             </goals>
             <configuration>
+              <artifactItems>
+                <artifactItem>
+                  <groupId>org.jboss</groupId>
+                  <artifactId>jboss-test</artifactId>
+                </artifactItem>
+                <artifactItem>
+                  <groupId>hsqldb</groupId>
+                  <artifactId>hsqldb</artifactId>
+                </artifactItem>
+                <artifactItem>
+                  <groupId>junit</groupId>
+                  <artifactId>junit</artifactId>
+                </artifactItem>
+                <artifactItem>
+                  <groupId>apache-httpclient</groupId>
+                  <artifactId>commons-httpclient</artifactId>
+                </artifactItem>
+              </artifactItems>
               <outputDirectory>${project.build.directory}/dependencies/lib</outputDirectory>
               <overWriteIfNewer>true</overWriteIfNewer>
               <stripVersion>true</stripVersion>
-              <excludeTransitive>true</excludeTransitive>
+              <!-- <excludeTransitive>true</excludeTransitive>  -->
             </configuration>
           </execution>