Author: pskopek(a)redhat.com Date: 2011-09-08 07:51:16 -0400 (Thu, 08 Sep 2011) New Revision: 1210 Modified: integration-tests/branches/product/picketlink-sts-eap5-cxf/pom.xml integration-tests/branches/product/picketlink-sts-eap5-native/pom.xml Log: fixing client side classpath for PL int. STS eap5 native and cxf Modified: integration-tests/branches/product/picketlink-sts-eap5-cxf/pom.xml =================================================================== --- integration-tests/branches/product/picketlink-sts-eap5-cxf/pom.xml 2011-09-08 11:13:23 UTC (rev 1209) +++ integration-tests/branches/product/picketlink-sts-eap5-cxf/pom.xml 2011-09-08 11:51:16 UTC (rev 1210) @@ -27,7 +27,6 @@ <artifactId>maven-surefire-plugin</artifactId> <configuration> <phase>test</phase> - <!-- <skipTests>true</skipTests> --> <testClassesDirectory>${basedir}/../picketlink-sts-tests/target/test-classes</testClassesDirectory> <printSummary>true</printSummary> <disableXmlReport>false</disableXmlReport> @@ -38,8 +37,16 @@ <argLine>-Djava.endorsed.dirs=${basedir}/../picketlink-sts-tests/src/test/resources/endorsed</argLine> <useFile>false</useFile> <trimStackTrace>false</trimStackTrace> - <reportsDirectory>${project.build.directory}/surefire-reports-cxf</reportsDirectory> - </configuration> + <reportsDirectory>${project.build.directory}/surefire-reports</reportsDirectory> + <classpathDependencyScopeExclude>compile</classpathDependencyScopeExclude> + <additionalClasspathElements> + <additionalClasspathElement>${eap-home}/client/jbosssx-client.jar</additionalClasspathElement> + <additionalClasspathElement>${eap-home}/client/jmx-invoker-adaptor-client.jar</additionalClasspathElement> + <additionalClasspathElement>${eap-home}/client/jbossall-client.jar</additionalClasspathElement> + <additionalClasspathElement>${eap-home}/common/lib/picketlink-core-${pl-version}.jar</additionalClasspathElement> + <additionalClasspathElement>${eap-home}/lib/endorsed/xercesImpl.jar</additionalClasspathElement> + </additionalClasspathElements> + </configuration> </plugin> <!-- <plugin> @@ -103,20 +110,20 @@ <groupId>org.picketlink.product</groupId> <artifactId>picketlink-core</artifactId> <version>${pl-version}</version> - <scope>test</scope> + <scope>compile</scope> </dependency> <dependency> <groupId>org.jboss.security</groupId> <artifactId>jbosssx-client</artifactId> <version>2.0.4.SP6</version> - <scope>test</scope> + <scope>compile</scope> </dependency> <dependency> <groupId>org.jboss.jbossas</groupId> <artifactId>jboss-as-server</artifactId> <classifier>jmx-invoker-adaptor-client</classifier> <version>5.1.0.GA</version> - <scope>test</scope> + <scope>compile</scope> <exclusions> <exclusion> <groupId>trove</groupId> @@ -133,7 +140,7 @@ <artifactId>jboss-as-server</artifactId> <classifier>client</classifier> <version>5.1.0.GA</version> - <scope>test</scope> + <scope>compile</scope> </dependency> <dependency> <groupId>junit</groupId> @@ -160,14 +167,13 @@ <dependency> <groupId>nekohtml</groupId> <artifactId>nekohtml</artifactId> - <version>1.9.12</version> <scope>test</scope> </dependency> <dependency> <groupId>apache-xerces</groupId> <artifactId>xercesImpl</artifactId> <version>2.9.1</version> - <scope>test</scope> + <scope>compile</scope> </dependency> <dependency> <groupId>ant-contrib</groupId> Modified: integration-tests/branches/product/picketlink-sts-eap5-native/pom.xml =================================================================== --- integration-tests/branches/product/picketlink-sts-eap5-native/pom.xml 2011-09-08 11:13:23 UTC (rev 1209) +++ integration-tests/branches/product/picketlink-sts-eap5-native/pom.xml 2011-09-08 11:51:16 UTC (rev 1210) @@ -27,7 +27,6 @@ <artifactId>maven-surefire-plugin</artifactId> <configuration> <phase>test</phase> - <!-- <skipTests>true</skipTests> --> <testClassesDirectory>${basedir}/../picketlink-sts-tests/target/test-classes</testClassesDirectory> <testResourcesDirectory>${basedir}/../picketlink-sts-tests/target/test-classes</testResourcesDirectory> <printSummary>true</printSummary> @@ -39,8 +38,16 @@ <argLine>-Djava.endorsed.dirs=${basedir}/../picketlink-sts-tests/src/test/resources/endorsed</argLine> <useFile>false</useFile> <trimStackTrace>false</trimStackTrace> - <reportsDirectory>${project.build.directory}/surefire-reports-native</reportsDirectory> - </configuration> + <reportsDirectory>${project.build.directory}/surefire-reports</reportsDirectory> + <classpathDependencyScopeExclude>compile</classpathDependencyScopeExclude> + <additionalClasspathElements> + <additionalClasspathElement>${eap-home}/client/jbosssx-client.jar</additionalClasspathElement> + <additionalClasspathElement>${eap-home}/client/jmx-invoker-adaptor-client.jar</additionalClasspathElement> + <additionalClasspathElement>${eap-home}/client/jbossall-client.jar</additionalClasspathElement> + <additionalClasspathElement>${eap-home}/common/lib/picketlink-core-${pl-version}.jar</additionalClasspathElement> + <additionalClasspathElement>${eap-home}/lib/endorsed/xercesImpl.jar</additionalClasspathElement> + </additionalClasspathElements> + </configuration> </plugin> <!-- <plugin> @@ -104,20 +111,20 @@ <groupId>org.picketlink.product</groupId> <artifactId>picketlink-core</artifactId> <version>${pl-version}</version> - <scope>test</scope> + <scope>compile</scope> </dependency> <dependency> <groupId>org.jboss.security</groupId> <artifactId>jbosssx-client</artifactId> <version>2.0.4.SP6</version> - <scope>test</scope> + <scope>compile</scope> </dependency> <dependency> <groupId>org.jboss.jbossas</groupId> <artifactId>jboss-as-server</artifactId> <classifier>jmx-invoker-adaptor-client</classifier> <version>5.1.0.GA</version> - <scope>test</scope> + <scope>compile</scope> <exclusions> <exclusion> <groupId>trove</groupId> @@ -134,7 +141,7 @@ <artifactId>jboss-as-server</artifactId> <classifier>client</classifier> <version>5.1.0.GA</version> - <scope>test</scope> + <scope>compile</scope> </dependency> <dependency> <groupId>junit</groupId> @@ -161,14 +168,13 @@ <dependency> <groupId>nekohtml</groupId> <artifactId>nekohtml</artifactId> - <version>1.9.12</version> <scope>test</scope> </dependency> <dependency> <groupId>apache-xerces</groupId> <artifactId>xercesImpl</artifactId> <version>2.9.1</version> - <scope>test</scope> + <scope>compile</scope> </dependency> <dependency> <groupId>ant-contrib</groupId>