[picketlink-commits] Picketlink SVN: r1433 - in integration-tests/trunk: ant-scripts and 3 other directories.

Author: anil.saldhana(a)jboss.com Date: 2012-02-23 11:50:33 -0500 (Thu, 23 Feb 2012) New Revision: 1433 Added: integration-tests/trunk/picketlink-sts-jbas7-cxf/ integration-tests/trunk/picketlink-sts-jbas7-cxf/pom.xml Modified: integration-tests/trunk/ant-scripts/ant-build.xml integration-tests/trunk/common-dist/files/standalone.xml integration-tests/trunk/picketlink-saml-jbas7/pom.xml Log: module for PL sts tests on jbas71 Modified: integration-tests/trunk/ant-scripts/ant-build.xml =================================================================== --- integration-tests/trunk/ant-scripts/ant-build.xml 2012-02-23 16:01:44 UTC (rev 1432) +++ integration-tests/trunk/ant-scripts/ant-build.xml 2012-02-23 16:50:33 UTC (rev 1433) @@ -145,6 +145,17 @@ <copy file="${basedir}/../picketlink-sts-tests/src/test/resources/sts-config.properties" todir="${JBAS6_DEPLOY}/../conf/"/> </target> + <target name="copy-sts-props-jbas7"> + <jar destfile="${JBAS7_DEPLOY}/picketlink/picketlink-sts-1.war"> + <zipfileset src="${JBAS7_DEPLOY}/picketlink/picketlink-sts.war"/> + <zipfileset dir="${basedir}/../picketlink-sts-tests/src/test/resources/" includes="sts-config.properties" prefix="WEB-INF/classes/"/> + <zipfileset dir="${basedir}/../picketlink-trust-tests/src/test/resources/props/" includes="sts-users.properties" prefix="WEB-INF/classes/"/> + <zipfileset dir="${basedir}/../picketlink-trust-tests/src/test/resources/props/" includes="sts-roles.properties" prefix="WEB-INF/classes/"/> + </jar> + <delete file="${JBAS7_DEPLOY}/picketlink/picketlink-sts.war" failonerror="true" verbose="true"/> + <move file="${JBAS7_DEPLOY}/picketlink/picketlink-sts-1.war" tofile="${JBAS7_DEPLOY}/picketlink/picketlink-sts.war"/> + </target> + <target name="copy-trust-settings-jbas5"> <copy file="${basedir}/../picketlink-trust-tests/src/test/resources/domains/sts-jboss-beans.xml" todir="${JBAS5_DEPLOY}/picketlink" /> <copy file="${basedir}/../picketlink-trust-tests/target/picketlink-wstest-tests.jar" todir="${JBAS5_DEPLOY}/picketlink" /> @@ -172,9 +183,12 @@ osfamily="unix" spawn="true" /> <waitfor maxwait="1" maxwaitunit="minute" checkevery="100" checkeveryunit="millisecond"> - <http url="http://localhost:8080/idp/" /> + <http url="http://localhost:8080/idp-sig/" /> </waitfor> <echo>:Local 8080 Started</echo> + <echo>Going to wait 5 seconds for server to fully start up</echo> + <sleep seconds="5"/> + <echo>Sleep of 5 seconds Done.</echo> </target> <target name="start-jboss5" depends="copy-picketlink-jbas5" > @@ -189,15 +203,18 @@ </antcall> </target> - <target name="start-jboss7" depends="copy-picketlink-jbas7" > + <target name="start-jboss7"> <echo>Starting Local 8080 </echo> <exec executable="${basedir}/target/jboss-as-7.1.0.Final/bin/standalone.sh" osfamily="unix" spawn="true" /> <waitfor maxwait="1" maxwaitunit="minute" checkevery="100" checkeveryunit="millisecond"> - <http url="http://localhost:8080/idp/" /> + <http url="http://localhost:8080/idp-sig/" /> </waitfor> <echo>:Local 8080 Started</echo> + <echo>Going to wait 5 seconds for server to fully start up</echo> + <sleep seconds="5"/> + <echo>Sleep of 5 seconds Done.</echo> </target> <target name="start-tomcat6" depends="copy-picketlink-tomcat6,stop-tomcat6" > Modified: integration-tests/trunk/common-dist/files/standalone.xml =================================================================== --- integration-tests/trunk/common-dist/files/standalone.xml 2012-02-23 16:01:44 UTC (rev 1432) +++ integration-tests/trunk/common-dist/files/standalone.xml 2012-02-23 16:50:33 UTC (rev 1433) @@ -255,11 +255,11 @@ </login-module> </authentication> </security-domain> - <security-domain name="jmx-console" cache-type="default"> + <security-domain name="picketlink-sts" cache-type="default"> <authentication> <login-module code="UsersRoles" flag="required"> - <module-option name="usersProperties" value="users.properties"/> - <module-option name="rolesProperties" value="roles.properties"/> + <module-option name="usersProperties" value="sts-users.properties"/> + <module-option name="rolesProperties" value="sts-roles.properties"/> </login-module> </authentication> </security-domain> Modified: integration-tests/trunk/picketlink-saml-jbas7/pom.xml =================================================================== --- integration-tests/trunk/picketlink-saml-jbas7/pom.xml 2012-02-23 16:01:44 UTC (rev 1432) +++ integration-tests/trunk/picketlink-saml-jbas7/pom.xml 2012-02-23 16:50:33 UTC (rev 1433) @@ -63,6 +63,7 @@ <property name="version" value="${pl-version}"/> <property name="localRepository" value="${user.home}/.m2/repository"/> <ant antfile="${basedir}/../ant-scripts/ant-build.xml" target="init-jboss7" /> + <ant antfile="${basedir}/../ant-scripts/ant-build.xml" target="copy-picketlink-jbas7" /> <ant antfile="${basedir}/../ant-scripts/ant-build.xml" target="start-jboss7" /> </tasks> </configuration> Added: integration-tests/trunk/picketlink-sts-jbas7-cxf/pom.xml =================================================================== --- integration-tests/trunk/picketlink-sts-jbas7-cxf/pom.xml (rev 0) +++ integration-tests/trunk/picketlink-sts-jbas7-cxf/pom.xml 2012-02-23 16:50:33 UTC (rev 1433) @@ -0,0 +1,185 @@ +<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.2-SNAPSHOT</version> + <relativePath>../parent</relativePath> + </parent> + <modelVersion>4.0.0</modelVersion> + <artifactId>picketlink-integration-sts-jbas7-cxf</artifactId> + <packaging>jar</packaging> + <name>PicketLink Integration Tests for WS-Trust (STS) - JBoss AS 7 - 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> + <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> + <reportNameSuffix>STS-JBAS7-CXF</reportNameSuffix> + </configuration> + </plugin> + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <id>phase-1</id> + <phase>compile</phase> + <configuration> + <tasks> + <property name="version" value="${pl-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-jboss7" /> + <ant antfile="${basedir}/../ant-scripts/ant-build.xml" target="copy-picketlink-jbas7" /> + <ant antfile="${basedir}/../ant-scripts/ant-build.xml" target="copy-sts-props-jbas7" /> + <ant antfile="${basedir}/../ant-scripts/ant-build.xml" target="start-jboss7" /> + </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-jboss6" /> + </tasks> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + + <dependencies> + <dependency> + <groupId>org.picketlink</groupId> + <artifactId>picketlink-fed</artifactId> + <version>${pl-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>6.0.0.Final</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>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>