Author: anil.saldhana(a)jboss.com Date: 2012-02-17 15:05:14 -0500 (Fri, 17 Feb 2012) New Revision: 1411 Added: integration-tests/trunk/picketlink-saml-jbas7/ integration-tests/trunk/picketlink-saml-jbas7/pom.xml Modified: integration-tests/trunk/ant-scripts/ant-build.xml Log: PLFED-209: as7 integration testsuite Modified: integration-tests/trunk/ant-scripts/ant-build.xml =================================================================== --- integration-tests/trunk/ant-scripts/ant-build.xml 2012-02-17 20:04:21 UTC (rev 1410) +++ integration-tests/trunk/ant-scripts/ant-build.xml 2012-02-17 20:05:14 UTC (rev 1411) @@ -5,6 +5,8 @@ <property name="JBAS5_DEPLOY" location="${basedir}/target/jboss-5.1.0.GA/server/default/deploy/" /> <property name="JBAS5_DEPLOYER" location="${basedir}/target/jboss-5.1.0.GA/server/default/deployers/" /> <property name="JBAS6_DEPLOY" location="${basedir}/target/jboss-6.0.0.Final/server/default/deploy/" /> + <property name="JBAS7_DEPLOY" location="${basedir}/target/jboss-as-7.1.0.Final/standalone/deployments/" /> + <property name="JBAS7_MODULES" location="${basedir}/target/jboss-as-7.1.0.Final/modules/" /> <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/" /> @@ -28,6 +30,14 @@ <copy file="${basedir}/../common-dist/files/jboss-logging.xml" todir="${basedir}/target/jboss-6.0.0.Final/server/default/deploy"/> </target> + <target name="init-jboss7"> + <!-- Unzip JBoss AS7 --> + <echo>Unzip JBOSS AS 7.0.1.Final</echo> + <unzip src="${basedir}/../common-dist/jbossas/7.1/jboss-as-7.1.0.Final.zip" + dest="${basedir}/target"/> + <chmod dir="${basedir}/target/jboss-as-7.1.0.Final/bin" perm="ugo+rx" includes="**/*.sh"/> + </target> + <target name="init-tomcat6"> <echo>Unzip Apache Tomcat 6.0.26</echo> <unzip src="${basedir}/../common-dist/tomcat/6.0.26/apache-tomcat-6.0.26.zip" @@ -107,6 +117,26 @@ <copy file="${basedir}/../picketlink-int-webapps/authenticator/target/authenticator.war" todir="${JBAS6_DEPLOY}/picketlink/"/> </target> + <target name="copy-picketlink-jbas7"> + <copy file="${basedir}/../common-dist/files/standalone.xml" todir="${JBAS7_DEPLOY}/../configuration/" /> + + <mkdir dir="${JBAS7_DEPLOY}/picketlink" /> + <copy file="${localRepository}/org/picketlink/picketlink-bindings/${version}/picketlink-bindings-${version}.jar" todir="${JBAS7_MODULES}/org/picketlink/main/"/> + <copy file="${localRepository}/org/picketlink/picketlink-bindings-jboss/${version}/picketlink-bindings-jboss-${version}.jar" todir="${JBAS7_MODULES}/org/picketlink/main/"/> + <copy file="${localRepository}/org/picketlink/picketlink-fed/${version}/picketlink-fed-${version}.jar" todir="${JBAS7_MODULES}/org/picketlink/main/"/> + + <replace file="${JBAS7_MODULES}/org/picketlink/main/module.xml" token="picketlink-fed-2.0.1.final.jar" value="picketlink-fed-${version}.jar"/> + <replace file="${JBAS7_MODULES}/org/picketlink/main/module.xml" token="picketlink-bindings-2.0.1.final.jar" value="picketlink-bindings-${version}.jar"/> + <replace file="${JBAS7_MODULES}/org/picketlink/main/module.xml" token="picketlink-bindings-jboss-2.0.1.final.jar" value="picketlink-bindings-jboss-${version}.jar"/> + + <unzip src="${localRepository}/org/picketlink/picketlink-fed-webapps-as7-assembly/${version}/picketlink-fed-webapps-as7-assembly-${version}.zip" dest="${JBAS7_DEPLOY}"/> + + <antcall target="copy-claims-archive-jboss7"/> + <!-- + <copy file="${basedir}/../picketlink-int-webapps/authenticator/target/authenticator.war" todir="${JBAS7_DEPLOY}/picketlink/"/> + --> + </target> + <target name="copy-sts-props-jbas5"> <copy file="${basedir}/../picketlink-sts-tests/src/test/resources/sts-config.properties" todir="${JBAS5_DEPLOY}/../conf/"/> </target> @@ -126,13 +156,23 @@ <copy file="${basedir}/../common-dist/files/war-deployers-jboss-beans.xml" todir="${JBAS5_DEPLOYER}/jbossweb.deployer/META-INF" /> </target> + <target name="copy-claims-archive-jboss7"> + + <jar destfile="${JBAS7_DEPLOY}/picketlink/claims.war"> + <zipfileset src="${basedir}/../picketlink-int-webapps/claims/target/claims.war"/> + <zipfileset dir="${basedir}/../common-dist/files/" includes="jboss-deployment-structure.xml" prefix="META-INF/"/> + </jar> + + </target> + + <target name="start-jboss" depends="stop-jboss"> <echo>Starting Local 8080 </echo> <exec executable="${jbossas}/bin/run.sh" osfamily="unix" spawn="true" /> <waitfor maxwait="1" maxwaitunit="minute" checkevery="100" checkeveryunit="millisecond"> - <http url="http://localhost:8080" /> + <http url="http://localhost:8080/idp/" /> </waitfor> <echo>:Local 8080 Started</echo> </target> @@ -141,24 +181,25 @@ <antcall target="start-jboss"> <param name="jbossas" value="${basedir}/target/jboss-5.1.0.GA"/> </antcall> - <!-- + </target> + + <target name="start-jboss6" depends="copy-picketlink-jbas6" > + <antcall target="start-jboss"> + <param name="jbossas" value="${basedir}/target/jboss-6.0.0.Final"/> + </antcall> + </target> + + <target name="start-jboss7" depends="copy-picketlink-jbas7" > <echo>Starting Local 8080 </echo> - <exec executable="${basedir}/target/jboss-5.1.0.GA/bin/run.sh" + <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" /> + <http url="http://localhost:8080/idp/" /> </waitfor> <echo>:Local 8080 Started</echo> - --> </target> - <target name="start-jboss6" depends="copy-picketlink-jbas6" > - <antcall target="start-jboss"> - <param name="jbossas" value="${basedir}/target/jboss-6.0.0.Final"/> - </antcall> - </target> - <target name="start-tomcat6" depends="copy-picketlink-tomcat6,stop-tomcat6" > <echo>Starting Local 8080 </echo> <exec executable="${TOMCAT6_DEPLOY}/../bin/startup.sh" @@ -187,6 +228,10 @@ <antcall target="stop-jboss"/> </target> + <target name="stop-jboss7"> + <antcall target="stop-jboss"/> + </target> + <target name="stop-tomcat6"> <echo>Stopping Local 8080 </echo> <echo>Going to stop tomcat</echo> Added: integration-tests/trunk/picketlink-saml-jbas7/pom.xml =================================================================== --- integration-tests/trunk/picketlink-saml-jbas7/pom.xml (rev 0) +++ integration-tests/trunk/picketlink-saml-jbas7/pom.xml 2012-02-17 20:05:14 UTC (rev 1411) @@ -0,0 +1,160 @@ +<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-saml-tests-JBAS7</artifactId> + <packaging>jar</packaging> + <name>PicketLink Integration Tests for SAML - JBoss AS 7.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> + <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> + <properties> + <java.endorsed.dirs>${basedir}/../picketlink-saml-tests/src/test/resources/endorsed</java.endorsed.dirs> + <SERVICE_1_URL>http://localhost:8080/sales-post/</SERVICE_1_URL> + <SERVICE_2_URL>http://localhost:8080/employee-post/</SERVICE_2_URL> + <SERVICE_3_URL>http://localhost:8080/sales/</SERVICE_3_URL> + <SERVICE_4_URL>http://localhost:8080/employee/</SERVICE_4_URL> + </properties> + <build> + <plugins> + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <phase>test</phase> + <!-- <skipTests>true</skipTests> --> + <testClassesDirectory>${basedir}/../picketlink-saml-tests/target/test-classes</testClassesDirectory> + <printSummary>true</printSummary> + <disableXmlReport>false</disableXmlReport> + <excludes> + <exclude>**/Standalone**TestCase.java</exclude> + </excludes> + <includes> + <include>**/**TestCase.java</include> + </includes> + <forkMode>pertest</forkMode> + <argLine>-Djava.endorsed.dirs=${basedir}/../picketlink-saml-tests/src/test/resources/endorsed</argLine> + <useFile>false</useFile> + <trimStackTrace>false</trimStackTrace> + <reportNameSuffix>SAML-JBAS7</reportNameSuffix> + </configuration> + </plugin> + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <id>phase-1</id> + <phase>compile</phase> + <configuration> + <tasks> + <property name="depclasspath" refid="maven.dependency.classpath"/> + <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="start-jboss7" /> + </tasks> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + <execution> + <id>phase-2</id> + <phase>test</phase> + <configuration> + <tasks> + <property name="depclasspath" refid="maven.dependency.classpath"/> + <property name="version" value="${pl-version}"/> + <property name="localRepository" value="${user.home}/.m2/repository"/> + <ant antfile="${basedir}/../ant-scripts/ant-build.xml" target="stop-jboss7" /> + </tasks> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + + <dependencies> + <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>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>