Author: anil.saldhana(a)jboss.com Date: 2011-03-22 19:01:33 -0400 (Tue, 22 Mar 2011) New Revision: 830 Added: integration-tests/trunk/picketlink-sts-jbas51-cxf/ integration-tests/trunk/picketlink-sts-jbas51-cxf/pom.xml integration-tests/trunk/picketlink-sts-jbas51-native/ integration-tests/trunk/picketlink-sts-jbas51-native/pom.xml Modified: integration-tests/trunk/ant-scripts/ant-build.xml integration-tests/trunk/picketlink-saml-jbas51/pom.xml integration-tests/trunk/picketlink-saml-jbas6/pom.xml integration-tests/trunk/picketlink-saml-tests/pom.xml integration-tests/trunk/picketlink-sts-tests/pom.xml integration-tests/trunk/pom.xml Log: split sts tests into modules Modified: integration-tests/trunk/ant-scripts/ant-build.xml =================================================================== --- integration-tests/trunk/ant-scripts/ant-build.xml 2011-03-22 21:11:39 UTC (rev 829) +++ integration-tests/trunk/ant-scripts/ant-build.xml 2011-03-22 23:01:33 UTC (rev 830) @@ -7,6 +7,8 @@ <property name="TOMCAT6" location="${basedir}/target/apache-tomcat-6.0.26/" /> <property name="TOMCAT6_DEPLOY" location="${basedir}/target/apache-tomcat-6.0.26/webapps/" /> <property name="TOMCAT6_LIB" location="${basedir}/target/apache-tomcat-6.0.26/lib/" /> + <property name="JBWS_CXF_ZIP" location="${basedir}/../common-dist/jbossws/3.3.1.GA/jbossws-cxf-3.3.1.GA.zip"/> + <property name="JBWS_CXF_HOME" location="${basedir}/target/jbossws-cxf-bin-dist/"/> <property environment="env" /> <target name="init-jboss5"> @@ -29,7 +31,6 @@ dest="${basedir}/target"/> </target> - <target name="tomcat6-thirdparty-deps" depends="init-tomcat6" > <copy file="${localRepository}/apache-log4j/log4j/1.2.14/log4j-1.2.14.jar" todir="${TOMCAT6_LIB}"/> </target> @@ -71,7 +72,7 @@ </target> - <target name="copy-picketlink-jbas5" depends="init-jboss5" > + <target name="copy-picketlink-jbas5"> <antcall target="copy-picketlink-jboss"> <param name="deploy" value="${JBAS5_DEPLOY}"/> <param name="jbossas" value="${basedir}/target/jboss-5.1.0.GA"/> @@ -90,13 +91,21 @@ --> </target> - <target name="copy-picketlink-jbas6" depends="init-jboss6" > + <target name="copy-picketlink-jbas6"> <antcall target="copy-picketlink-jboss"> <param name="deploy" value="${JBAS6_DEPLOY}"/> <param name="jbossas" value="${basedir}/target/jboss-6.0.0.Final"/> </antcall> </target> + <target name="copy-sts-props-jbas5"> + <copy file="${basedir}/../picketlink-sts-tests/src/test/resources/sts-config.properties" todir="${JBAS5_DEPLOY}/../conf/"/> + </target> + + <target name="copy-sts-props-jbas6"> + <copy file="${basedir}/../picketlink-sts-tests/src/test/resources/sts-config.properties" todir="${JBAS6_DEPLOY}/../conf/"/> + </target> + <target name="start-jboss"> <echo>Starting Local 8080 </echo> <exec executable="${jbossas}/bin/run.sh" @@ -162,4 +171,15 @@ <exec executable="${TOMCAT6_DEPLOY}/../bin/shutdown.sh" osfamily="unix" /> </target> + + <target name="install-jbws-cxf-jbas5"> + <echo>Installing JBoss WS CXF Stack</echo> + <!-- Unzip JBoss WS CXF --> + <unzip src="${JBWS_CXF_ZIP}" dest="${basedir}/target"/> + <!-- Copy the ant.properties file that will be used by JBoss WS installation --> + <copy file="${basedir}/../common-dist/jbossws/ant.properties" todir="${JBWS_CXF_HOME}"/> + <!-- Invoke the installation ant target --> + <ant dir="${JBWS_CXF_HOME}" target="deploy-jboss510" /> + </target> + </project> Modified: integration-tests/trunk/picketlink-saml-jbas51/pom.xml =================================================================== --- integration-tests/trunk/picketlink-saml-jbas51/pom.xml 2011-03-22 21:11:39 UTC (rev 829) +++ integration-tests/trunk/picketlink-saml-jbas51/pom.xml 2011-03-22 23:01:33 UTC (rev 830) @@ -8,7 +8,7 @@ <modelVersion>4.0.0</modelVersion> <artifactId>picketlink-integration-saml-tests-JBAS51</artifactId> <packaging>jar</packaging> - <name>PicketLink Integration Tests for SAML</name> + <name>PicketLink Integration Tests for SAML - JBoss AS 5.1</name> <url>http://labs.jboss.org/portal/picketlink/</url> <description>PicketLink Federation Tests to be run in a continous integration environment such as Hudson</description> <licenses> @@ -59,6 +59,7 @@ <property name="depclasspath" refid="maven.dependency.classpath"/> <property name="version" value="${project.version}"/> <property name="localRepository" value="${user.home}/.m2/repository"/> + <ant antfile="${basedir}/../ant-scripts/ant-build.xml" target="init-jboss5" /> <ant antfile="${basedir}/../ant-scripts/ant-build.xml" target="start-jboss5" /> </tasks> </configuration> Modified: integration-tests/trunk/picketlink-saml-jbas6/pom.xml =================================================================== --- integration-tests/trunk/picketlink-saml-jbas6/pom.xml 2011-03-22 21:11:39 UTC (rev 829) +++ integration-tests/trunk/picketlink-saml-jbas6/pom.xml 2011-03-22 23:01:33 UTC (rev 830) @@ -8,7 +8,7 @@ <modelVersion>4.0.0</modelVersion> <artifactId>picketlink-integration-saml-tests-JBAS6</artifactId> <packaging>jar</packaging> - <name>PicketLink Integration Tests for SAML</name> + <name>PicketLink Integration Tests for SAML - JBoss AS 6</name> <url>http://labs.jboss.org/portal/picketlink/</url> <description>PicketLink Federation Tests to be run in a continous integration environment such as Hudson</description> <licenses> @@ -59,6 +59,7 @@ <property name="depclasspath" refid="maven.dependency.classpath"/> <property name="version" value="${project.version}"/> <property name="localRepository" value="${user.home}/.m2/repository"/> + <ant antfile="${basedir}/../ant-scripts/ant-build.xml" target="init-jboss6" /> <ant antfile="${basedir}/../ant-scripts/ant-build.xml" target="start-jboss6" /> </tasks> </configuration> Modified: integration-tests/trunk/picketlink-saml-tests/pom.xml =================================================================== --- integration-tests/trunk/picketlink-saml-tests/pom.xml 2011-03-22 21:11:39 UTC (rev 829) +++ integration-tests/trunk/picketlink-saml-tests/pom.xml 2011-03-22 23:01:33 UTC (rev 830) @@ -8,7 +8,7 @@ <modelVersion>4.0.0</modelVersion> <artifactId>picketlink-integration-saml-tests</artifactId> <packaging>jar</packaging> - <name>PicketLink Integration Tests for SAML</name> + <name>PicketLink Integration Tests for SAML - Tests</name> <url>http://labs.jboss.org/portal/picketlink/</url> <description>PicketLink Federation Tests to be run in a continous integration environment such as Hudson</description> <licenses> Added: integration-tests/trunk/picketlink-sts-jbas51-cxf/pom.xml =================================================================== --- integration-tests/trunk/picketlink-sts-jbas51-cxf/pom.xml (rev 0) +++ integration-tests/trunk/picketlink-sts-jbas51-cxf/pom.xml 2011-03-22 23:01:33 UTC (rev 830) @@ -0,0 +1,207 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <parent> + <groupId>org.picketlink</groupId> + <artifactId>picketlink-integration-tests-parent</artifactId> + <version>2.0.0-SNAPSHOT</version> + <relativePath>../parent</relativePath> + </parent> + <modelVersion>4.0.0</modelVersion> + <artifactId>picketlink-integration-sts-jbas51-cxf</artifactId> + <packaging>jar</packaging> + <name>PicketLink Integration Tests for WS-Trust (STS) - JBoss AS 5.1 - CXF Stack</name> + <url>http://labs.jboss.org/portal/picketlink/</url> + <description>PicketLink Federation Tests to be run in a continous integration environment such as Hudson</description> + <licenses> + <license> + <name>lgpl</name> + <url>http://repository.jboss.com/licenses/lgpl.txt</url> + </license> + </licenses> + <organization> + <name>JBoss Inc.</name> + <url>http://www.jboss.org</url> + </organization> + <build> + <plugins> + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <version>2.4.3</version> + <configuration> + <phase>test</phase> + <!-- <skipTests>true</skipTests> --> + <testClassesDirectory>${basedir}/../picketlink-sts-tests/target/test-classes</testClassesDirectory> + <printSummary>true</printSummary> + <disableXmlReport>false</disableXmlReport> + <includes> + <include>**/**TestCase.java</include> + </includes> + <forkMode>pertest</forkMode> + <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> + </plugin> +<!-- + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <phase>test</phase> + <testClassesDirectory>${baseDir}/../picketlink-sts-tests/target/test-classes</testClassesDirectory> + <testResourcesDirectory>${baseDir}/../picketlink-sts-tests/src/test/resources</testResourcesDirectory> + <includes> + <include>**/**TestCase.java</include> + </includes> + <forkMode>pertest</forkMode> + <trimStackTrace>false</trimStackTrace> + <reportsDirectory>${project.build.directory}/surefire-reports-native</reportsDirectory> + </configuration> + </plugin> +--> + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <id>phase-1</id> + <phase>compile</phase> + <configuration> + <tasks> + <property name="version" value="${project.version}"/> + <property name="depclasspath" refid="maven.dependency.classpath"/> + <property name="localRepository" value="${user.home}/.m2/repository"/> + <ant antfile="${basedir}/../ant-scripts/ant-build.xml" target="init-jboss5" /> + <ant antfile="${basedir}/../ant-scripts/ant-build.xml" target="install-jbws-cxf-jbas5"/> + <ant antfile="${basedir}/../ant-scripts/ant-build.xml" target="copy-sts-props-jbas5"/> + <ant antfile="${basedir}/../ant-scripts/ant-build.xml" target="start-jboss5" /> + </tasks> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + <execution> + <id>phase-2</id> + <phase>test</phase> + <configuration> + <tasks> + <ant antfile="${basedir}/../ant-scripts/ant-build.xml" target="stop-jboss5" /> + </tasks> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + + <dependencies> + <dependency> + <groupId>org.picketlink</groupId> + <artifactId>picketlink-fed</artifactId> + <version>${version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.jboss.security</groupId> + <artifactId>jbosssx-client</artifactId> + <version>2.0.4.SP6</version> + <scope>test</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> + <exclusions> + <exclusion> + <groupId>trove</groupId> + <artifactId>trove</artifactId> + </exclusion> + <exclusion> + <groupId>wutka-dtdparser</groupId> + <artifactId>dtdparser121</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.jboss.jbossas</groupId> + <artifactId>jboss-as-server</artifactId> + <classifier>client</classifier> + <version>5.1.0.GA</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>httpunit</groupId> + <artifactId>httpunit</artifactId> + <version>1.7</version> + <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> + </dependency> + <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> + </dependency> + <dependency> + <groupId>ant-contrib</groupId> + <artifactId>ant-contrib</artifactId> + <version>1.0b2</version> + </dependency> + + </dependencies> + + <reporting> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-javadoc-plugin</artifactId> + <configuration> + <doclet>org.jboss.apiviz.APIviz</doclet> + <docletArtifact> + <groupId>org.jboss.apiviz</groupId> + <artifactId>apiviz</artifactId> + <version>1.2.5.GA</version> + </docletArtifact> + <additionalparam> + -charset UTF-8 + -docencoding UTF-8 + -version + -author + -breakiterator + -windowtitle "${project.name} ${project.version} API Reference" + -doctitle "${project.name} ${project.version} API Reference" + -bottom "Copyright © ${project.inceptionYear}-Present ${project.organization.name}. All Rights Reserved." + -link http://java.sun.com/javase/6/docs/api/ + -sourceclasspath ${project.build.outputDirectory} + </additionalparam> + <encoding>UTF-8</encoding> + </configuration> + </plugin> + </plugins> + </reporting> +</project> Added: integration-tests/trunk/picketlink-sts-jbas51-native/pom.xml =================================================================== --- integration-tests/trunk/picketlink-sts-jbas51-native/pom.xml (rev 0) +++ integration-tests/trunk/picketlink-sts-jbas51-native/pom.xml 2011-03-22 23:01:33 UTC (rev 830) @@ -0,0 +1,207 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <parent> + <groupId>org.picketlink</groupId> + <artifactId>picketlink-integration-tests-parent</artifactId> + <version>2.0.0-SNAPSHOT</version> + <relativePath>../parent</relativePath> + </parent> + <modelVersion>4.0.0</modelVersion> + <artifactId>picketlink-integration-sts-jbas51-native</artifactId> + <packaging>jar</packaging> + <name>PicketLink Integration Tests for WS-Trust (STS) - JBoss AS 5.1 - Native Stack</name> + <url>http://labs.jboss.org/portal/picketlink/</url> + <description>PicketLink Federation Tests to be run in a continous integration environment such as Hudson</description> + <licenses> + <license> + <name>lgpl</name> + <url>http://repository.jboss.com/licenses/lgpl.txt</url> + </license> + </licenses> + <organization> + <name>JBoss Inc.</name> + <url>http://www.jboss.org</url> + </organization> + <build> + <plugins> + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <version>2.4.3</version> + <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> + <disableXmlReport>false</disableXmlReport> + <includes> + <include>**/**TestCase.java</include> + </includes> + <forkMode>pertest</forkMode> + <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> + </plugin> +<!-- + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <phase>test</phase> + <testClassesDirectory>${baseDir}/../picketlink-sts-tests/target/test-classes</testClassesDirectory> + <testResourcesDirectory>${baseDir}/../picketlink-sts-tests/src/test/resources</testResourcesDirectory> + <includes> + <include>**/**TestCase.java</include> + </includes> + <forkMode>pertest</forkMode> + <trimStackTrace>false</trimStackTrace> + <reportsDirectory>${project.build.directory}/surefire-reports-native</reportsDirectory> + </configuration> + </plugin> +--> + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <id>phase-1</id> + <phase>compile</phase> + <configuration> + <tasks> + <property name="version" value="${project.version}"/> + <property name="depclasspath" refid="maven.dependency.classpath"/> + <property name="localRepository" value="${user.home}/.m2/repository"/> + <ant antfile="${basedir}/../ant-scripts/ant-build.xml" target="init-jboss5" /> + <ant antfile="${basedir}/../ant-scripts/ant-build.xml" target="copy-sts-props-jbas5" /> + <ant antfile="${basedir}/../ant-scripts/ant-build.xml" target="start-jboss5" /> + </tasks> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + <execution> + <id>phase-2</id> + <phase>test</phase> + <configuration> + <tasks> + <ant antfile="${basedir}/../ant-scripts/ant-build.xml" target="stop-jboss5" /> + </tasks> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + + <dependencies> + <dependency> + <groupId>org.picketlink</groupId> + <artifactId>picketlink-fed</artifactId> + <version>${version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.jboss.security</groupId> + <artifactId>jbosssx-client</artifactId> + <version>2.0.4.SP6</version> + <scope>test</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> + <exclusions> + <exclusion> + <groupId>trove</groupId> + <artifactId>trove</artifactId> + </exclusion> + <exclusion> + <groupId>wutka-dtdparser</groupId> + <artifactId>dtdparser121</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.jboss.jbossas</groupId> + <artifactId>jboss-as-server</artifactId> + <classifier>client</classifier> + <version>5.1.0.GA</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>httpunit</groupId> + <artifactId>httpunit</artifactId> + <version>1.7</version> + <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> + </dependency> + <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> + </dependency> + <dependency> + <groupId>ant-contrib</groupId> + <artifactId>ant-contrib</artifactId> + <version>1.0b2</version> + </dependency> + + </dependencies> + + <reporting> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-javadoc-plugin</artifactId> + <configuration> + <doclet>org.jboss.apiviz.APIviz</doclet> + <docletArtifact> + <groupId>org.jboss.apiviz</groupId> + <artifactId>apiviz</artifactId> + <version>1.2.5.GA</version> + </docletArtifact> + <additionalparam> + -charset UTF-8 + -docencoding UTF-8 + -version + -author + -breakiterator + -windowtitle "${project.name} ${project.version} API Reference" + -doctitle "${project.name} ${project.version} API Reference" + -bottom "Copyright © ${project.inceptionYear}-Present ${project.organization.name}. All Rights Reserved." + -link http://java.sun.com/javase/6/docs/api/ + -sourceclasspath ${project.build.outputDirectory} + </additionalparam> + <encoding>UTF-8</encoding> + </configuration> + </plugin> + </plugins> + </reporting> +</project> Modified: integration-tests/trunk/picketlink-sts-tests/pom.xml =================================================================== --- integration-tests/trunk/picketlink-sts-tests/pom.xml 2011-03-22 21:11:39 UTC (rev 829) +++ integration-tests/trunk/picketlink-sts-tests/pom.xml 2011-03-22 23:01:33 UTC (rev 830) @@ -23,6 +23,26 @@ </organization> <build> <plugins> + + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <version>2.4.3</version> + <configuration> + <phase>test</phase> + <skipTests>true</skipTests> + <printSummary>true</printSummary> + <disableXmlReport>false</disableXmlReport> + <includes> + <include>**/**TestCase.java</include> + </includes> + <forkMode>pertest</forkMode> + <argLine>-Djava.endorsed.dirs=${basedir}/src/test/resources/endorsed</argLine> + <useFile>false</useFile> + <trimStackTrace>false</trimStackTrace> + </configuration> + </plugin> + +<!-- <plugin> <artifactId>maven-surefire-plugin</artifactId> <version>2.4.3</version> @@ -121,6 +141,7 @@ </execution> </executions> </plugin> +--> </plugins> </build> Modified: integration-tests/trunk/pom.xml =================================================================== --- integration-tests/trunk/pom.xml 2011-03-22 21:11:39 UTC (rev 829) +++ integration-tests/trunk/pom.xml 2011-03-22 23:01:33 UTC (rev 830) @@ -20,6 +20,8 @@ <module>picketlink-saml-jbas6</module> <module>picketlink-saml-tomcat6</module> <module>picketlink-sts-tests</module> + <module>picketlink-sts-jbas51-native</module> + <module>picketlink-sts-jbas51-cxf</module> <module>picketlink-openid-tests</module> <module>picketlink-pdp-tests</module> </modules>