[jboss-cvs] Picketlink SVN: r1206 - in integration-tests/branches/product: picketlink-pdp-tests and 1 other directory.

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

Author: pskopek at redhat.com
Date: 2011-09-08 06:29:04 -0400 (Thu, 08 Sep 2011)
New Revision: 1206

Modified:
   integration-tests/branches/product/parent/pom.xml
   integration-tests/branches/product/picketlink-pdp-tests/pom.xml
Log:
fixing test classpath to have only binaries produced by EAP

Modified: integration-tests/branches/product/parent/pom.xml
===================================================================
--- integration-tests/branches/product/parent/pom.xml	2011-09-08 07:27:28 UTC (rev 1205)
+++ integration-tests/branches/product/parent/pom.xml	2011-09-08 10:29:04 UTC (rev 1206)
@@ -32,6 +32,7 @@
      <pl-trust-version>2.0.0.final</pl-trust-version>
      <pl-fed-webapps-assembly-version>2.0.1-SNAPSHOT</pl-fed-webapps-assembly-version>
      <maven.compiler.target>1.6</maven.compiler.target>
+     <eap-home>${basedir}/target/jboss-eap-5.1/jboss-as</eap-home>
    </properties>
 
   

Modified: integration-tests/branches/product/picketlink-pdp-tests/pom.xml
===================================================================
--- integration-tests/branches/product/picketlink-pdp-tests/pom.xml	2011-09-08 07:27:28 UTC (rev 1205)
+++ integration-tests/branches/product/picketlink-pdp-tests/pom.xml	2011-09-08 10:29:04 UTC (rev 1206)
@@ -32,7 +32,16 @@
            </includes>
            <forkMode>pertest</forkMode>
            <trimStackTrace>false</trimStackTrace>
-           <reportsDirectory>${project.build.directory}/surefire-reports-native</reportsDirectory>
+           <reportsDirectory>${project.build.directory}/surefire-reports</reportsDirectory>
+           <!-- classpathDependencyExcludes>
+             <exclude>org.jboss.security:jbossxacml</exclude>
+             <exclude>org.picketlink.product:picketlink-core</exclude>
+           </classpathDependencyExcludes -->
+           <classpathDependencyScopeExclude>compile</classpathDependencyScopeExclude>
+           <additionalClasspathElements>
+              <additionalClasspathElement>${eap-home}/common/lib/jbossxacml.jar</additionalClasspathElement>
+              <additionalClasspathElement>${eap-home}/common/lib/picketlink-core-${pl-version}.jar</additionalClasspathElement>
+           </additionalClasspathElements>
          </configuration>
         </plugin>
         <plugin>
@@ -80,13 +89,13 @@
          <groupId>org.jboss.security</groupId>
          <artifactId>jbossxacml</artifactId>
          <version>2.0.4</version>
-         <scope>test</scope>
+         <scope>compile</scope>
       </dependency>
       <dependency>
       	<groupId>org.picketlink.product</groupId>
       	<artifactId>picketlink-core</artifactId>
       	<version>${pl-version}</version>
-      	<scope>test</scope>
+      	<scope>compile</scope>
       </dependency>
       <dependency>
          <groupId>junit</groupId>
@@ -100,15 +109,10 @@
         <scope>test</scope>
       </dependency>
       <dependency>
-        <groupId>rhino</groupId>
-        <artifactId>js</artifactId>
-        <version>1.6R7</version>
-        <scope>test</scope>
-      </dependency>
-      <dependency>
         <groupId>apache-log4j</groupId>
         <artifactId>log4j</artifactId>
         <version>1.2.14</version>
+        <scope>test</scope>
       </dependency>
       <dependency>
         <groupId>nekohtml</groupId>