Author: pskopek(a)redhat.com Date: 2012-05-02 12:30:39 -0400 (Wed, 02 May 2012) New Revision: 1558 Added: integration-tests/branches/eap6/picketlink-pdp-tests/arquillian.xml Removed: integration-tests/branches/eap6/picketlink-pdp-tests/ant-build.xml Modified: integration-tests/branches/eap6/picketlink-pdp-tests/pom.xml Log: pdp forgotten files Deleted: integration-tests/branches/eap6/picketlink-pdp-tests/ant-build.xml =================================================================== --- integration-tests/branches/eap6/picketlink-pdp-tests/ant-build.xml 2012-05-02 16:28:15 UTC (rev 1557) +++ integration-tests/branches/eap6/picketlink-pdp-tests/ant-build.xml 2012-05-02 16:30:39 UTC (rev 1558) @@ -1,40 +0,0 @@ -<project default="install-jboss" name="PicketLink Federation Integration Test Suite"> - - <property name="JBAS_ZIP" location="${basedir}/../common-dist/jbossas/5.1.0.GA/jboss-5.1.0.GA-jdk6.zip"/> - <property name="JBAS_DEPLOY" location="${basedir}/target/jboss-5.1.0.GA/server/default/deploy/" /> - <property name="OPENID4JAVA_VERSION" value="0.9.5" /> - - <property environment="env" /> - - <target name="install-jboss"> - <echo>Installing JBOSS AS 5.1.0.GA</echo> - <unzip src="${JBAS_ZIP}" dest="${basedir}/target"/> - - <!-- Copy PicketLink jars and webapps to JBoss AS --> - <mkdir dir="${JBAS_DEPLOY}/picketlink" /> - <copy file="${localRepository}/org/picketlink/picketlink-bindings/${version}/picketlink-bindings-${version}.jar" todir="${JBAS_DEPLOY}/picketlink"/> - <copy file="${localRepository}/org/picketlink/picketlink-bindings-jboss/${version}/picketlink-bindings-jboss-${version}.jar" todir="${JBAS_DEPLOY}/picketlink"/> - <copy file="${localRepository}/org/picketlink/picketlink-fed/${version}/picketlink-fed-${version}.jar" todir="${JBAS_DEPLOY}/picketlink"/> - <copy file="${localRepository}/org/openid4java/openid4java-nodeps/${OPENID4JAVA_VERSION}/openid4java-nodeps-${OPENID4JAVA_VERSION}.jar" todir="${JBAS_DEPLOY}/picketlink"/> - <unzip src="${localRepository}/org/picketlink/picketlink-fed-webapps-assembly/${version}/picketlink-fed-webapps-assembly-${version}.zip" - dest="${JBAS_DEPLOY}"/> - <chmod file="${basedir}/target/jboss-5.1.0.GA/bin/run.sh" perm="700"/> - </target> - - <target name="start-jboss"> - <echo>Starting Local 8080</echo> - <exec executable="${basedir}/target/jboss-5.1.0.GA/bin/run.sh" - osfamily="unix" spawn="true" /> - <waitfor maxwait="1" maxwaitunit="minute" - checkevery="100" checkeveryunit="millisecond"> - <http url="http://localhost:8080" /> - </waitfor> - <echo>Local 8080 Started</echo> - </target> - - <target name="stop-jboss"> - <echo>Stopping Local 8080</echo> - <echo>Going to Kill the JBoss Process</echo> - <exec executable="${basedir}/../common-dist/scripts/stopjboss.sh" osfamily="unix"/> - </target> -</project> Added: integration-tests/branches/eap6/picketlink-pdp-tests/arquillian.xml =================================================================== --- integration-tests/branches/eap6/picketlink-pdp-tests/arquillian.xml (rev 0) +++ integration-tests/branches/eap6/picketlink-pdp-tests/arquillian.xml 2012-05-02 16:30:39 UTC (rev 1558) @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="UTF-8"?> +<arquillian xmlns="http://jboss.org/schema/arquillian" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://jboss.org/schema/arquillian http://jboss.org/schema/arquillian/arquillian_1_0.xsd"> + + <container qualifier="jboss" default="true"> + <configuration> + <property name="jbossHome">target/jbossas</property> + <!-- property name="javaHome">/opt/sun/jdk1.6.0_27</property --> + <!-- property name="javaVmArguments">${server.jvm.args}</property --> + <property name="serverConfig">${server.config:standalone.xml}</property> + <!-- property name="allowConnectingToRunningServer">true</property --> + </configuration> + </container> +</arquillian> Modified: integration-tests/branches/eap6/picketlink-pdp-tests/pom.xml =================================================================== --- integration-tests/branches/eap6/picketlink-pdp-tests/pom.xml 2012-05-02 16:28:15 UTC (rev 1557) +++ integration-tests/branches/eap6/picketlink-pdp-tests/pom.xml 2012-05-02 16:30:39 UTC (rev 1558) @@ -21,79 +21,208 @@ <name>JBoss Inc.</name> <url>http://www.jboss.org</url> </organization> - <build> - <plugins> - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <phase>test</phase> - <includes> - <include>**/**TestCase.java</include> - </includes> - <forkMode>pertest</forkMode> - <trimStackTrace>false</trimStackTrace> - <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> - <additionalClasspathElement>${eap-home}/lib/endorsed/xercesImpl.jar</additionalClasspathElement> - </additionalClasspathElements> - </configuration> - </plugin> - <plugin> - <artifactId>maven-antrun-plugin</artifactId> - <executions> - <execution> - <id>phase-1</id> - <phase>compile</phase> - <configuration> - <target> - <ant antfile="${basedir}/../ant-scripts/ant-build.xml" target="init-eap5"> - <property name="depclasspath" refid="maven.dependency.classpath"/> - <property name="version" value="${pl-version}"/> - <property name="pl-fed-webapps-assembly-version" value="${pl-fed-webapps-assembly-version}"/> - <property name="localRepository" value="${user.home}/.m2/repository"/> - <property name="EAP_ZIP" value="${EAP_ZIP}" /> - </ant> - <ant antfile="${basedir}/../ant-scripts/ant-build.xml" target="start-eap5"> - <property name="depclasspath" refid="maven.dependency.classpath"/> - <property name="version" value="${pl-version}"/> - <property name="pl-fed-webapps-assembly-version" value="${pl-fed-webapps-assembly-version}"/> - <property name="localRepository" value="${user.home}/.m2/repository"/> - <property name="EAP_ZIP" value="${EAP_ZIP}" /> - </ant> - </target> - </configuration> - <goals> - <goal>run</goal> - </goals> - </execution> - <execution> - <id>phase-2</id> - <phase>test</phase> - <configuration> - <target> - <ant antfile="${basedir}/../ant-scripts/ant-build.xml" target="stop-eap5"> - <property name="depclasspath" refid="maven.dependency.classpath"/> - <property name="version" value="${pl-version}"/> - <property name="localRepository" value="${user.home}/.m2/repository"/> - </ant> - </target> - </configuration> - <goals> - <goal>run</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> + + <profiles> + + <profile> + <id>eap6.profile</id> + + <build> + <plugins> + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <phase>test</phase> + <includes> + <include>**/**TestCase.java</include> + </includes> + <forkMode>once</forkMode> + <trimStackTrace>false</trimStackTrace> + <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> + <systemPropertyVariables> + <arquillian.xml>arquillian.xml</arquillian.xml> + <arquillian.launch>jboss</arquillian.launch> + <server.config>standalone-picketlink.xml</server.config> + </systemPropertyVariables> + <additionalClasspathElements> + <!-- needed for Arquillian to find its config file --> + <additionalClasspathElement>${basedir}</additionalClasspathElement> + + <!-- for EAP6 --> + <!-- additionalClasspathElement>${eap6-home}/modules/org/jboss/security/xacml/main/jbossxacml-2.0.6.Final-redhat-1.jar</additionalClasspathElement> + <additionalClasspathElement>${eap6-home}/modules/org/picketlink/main/picketlink-core-${pl-version}.jar</additionalClasspathElement> + <additionalClasspathElement>${eap6-home}/modules/org/apache/xerces/main/xercesImpl-2.9.1-redhat-1.jar</additionalClasspathElement --> + + <!-- for AS7 --> + <additionalClasspathElement>${eap6-home}/modules/org/jboss/security/xacml/main/jbossxacml-2.0.6.Final.jar</additionalClasspathElement> + <additionalClasspathElement>${eap6-home}/modules/org/picketlink/main/picketlink-fed-2.0.1.final.jar</additionalClasspathElement> + <additionalClasspathElement>${eap6-home}/modules/org/picketlink/main/picketlink-bindings-2.0.1.final.jar</additionalClasspathElement> + <additionalClasspathElement>${eap6-home}/modules/org/picketlink/main/picketlink-bindings-jboss-2.0.1.final.jar</additionalClasspathElement> + <additionalClasspathElement>${eap6-home}/modules/org/apache/xerces/main/xercesImpl-2.9.1-jbossas-1.jar</additionalClasspathElement> + </additionalClasspathElements> + <reportNameSuffix>PDP-EAP6</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="pl-webapps-main-version" value="${pl-webapps-main-version}"/> + <property name="pl-fed-webapps-assembly-version" value="${pl-fed-webapps-assembly-version}"/> + <property name="localRepository" value="${user.home}/.m2/repository"/> + <property name="jboss.dist" value="${jboss6.dist}" /> + <property name="EAP_ZIP" value="${EAP6_ZIP}" /> + <property name="EAP_URL" value="${EAP6_URL}" /> + <property name="EAP_DIR" value="${EAP_DIR}" /> + <ant antfile="${basedir}/../ant-scripts/ant-build.xml" target="init-eap6" /> + </tasks> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + + <dependencies> + <dependency> + <groupId>org.picketlink.product</groupId> + <artifactId>picketlink-core</artifactId> + <version>${pl-version}</version> + <scope>system</scope> + <systemPath>${jboss6.dist}/modules/org/picketlink/main/picketlink-core-${pl-version}.jar</systemPath> + </dependency> + <dependency> + <groupId>org.jboss.as</groupId> + <artifactId>jboss-as-arquillian-container-managed</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.jboss.remoting3</groupId> + <artifactId>jboss-remoting</artifactId> + <scope>test</scope> + </dependency> + + </dependencies> + </profile> + + <profile> + <id>eap5.profile</id> + <activation> + <property> + <name>eap5</name> + </property> + </activation> + + + <build> + <plugins> + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <phase>test</phase> + <includes> + <include>**/**TestCase.java</include> + </includes> + <forkMode>pertest</forkMode> + <trimStackTrace>false</trimStackTrace> + <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>${eap5-home}/common/lib/jbossxacml.jar</additionalClasspathElement> + <additionalClasspathElement>${eap5-home}/common/lib/picketlink-core-${pl-version}.jar</additionalClasspathElement> + <additionalClasspathElement>${eap5-home}/lib/endorsed/xercesImpl.jar</additionalClasspathElement> + </additionalClasspathElements> + <reportNameSuffix>PDP-EAP5</reportNameSuffix> + </configuration> + </plugin> + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <id>phase-1</id> + <phase>compile</phase> + <configuration> + <target> + <ant antfile="${basedir}/../ant-scripts/ant-build.xml" target="init-eap5"> + <property name="depclasspath" refid="maven.dependency.classpath"/> + <property name="version" value="${pl-version}"/> + <property name="pl-fed-webapps-assembly-version" value="${pl-fed-webapps-assembly-version}"/> + <property name="localRepository" value="${user.home}/.m2/repository"/> + <property name="EAP_ZIP" value="${EAP5_ZIP}" /> + </ant> + <ant antfile="${basedir}/../ant-scripts/ant-build.xml" target="start-eap5"> + <property name="depclasspath" refid="maven.dependency.classpath"/> + <property name="version" value="${pl-version}"/> + <property name="pl-fed-webapps-assembly-version" value="${pl-fed-webapps-assembly-version}"/> + <property name="localRepository" value="${user.home}/.m2/repository"/> + <property name="EAP_ZIP" value="${EAP5_ZIP}" /> + </ant> + </target> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + <execution> + <id>phase-2</id> + <phase>test</phase> + <configuration> + <target> + <ant antfile="${basedir}/../ant-scripts/ant-build.xml" target="stop-eap5"> + <property name="depclasspath" refid="maven.dependency.classpath"/> + <property name="version" value="${pl-version}"/> + <property name="localRepository" value="${user.home}/.m2/repository"/> + </ant> + </target> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + + + + + <dependencies> + <dependency> + <groupId>org.picketlink.product</groupId> + <artifactId>picketlink-core</artifactId> + <version>${pl-version}</version> + <scope>system</scope> + <systemPath>${jboss.dist}/picketlink/picketlink-federation/picketlink-core-${pl-version}.jar</systemPath> + </dependency> + </dependencies> + + </profile> + + + + </profiles> + + <dependencies> <dependency> <groupId>org.jboss.security</groupId> @@ -102,13 +231,6 @@ <scope>compile</scope> </dependency> <dependency> - <groupId>org.picketlink.product</groupId> - <artifactId>picketlink-core</artifactId> - <version>${pl-version}</version> - <scope>system</scope> - <systemPath>${jboss.dist}/picketlink/picketlink-federation/picketlink-core-${pl-version}.jar</systemPath> - </dependency> - <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <scope>test</scope> @@ -142,7 +264,18 @@ <artifactId>ant-contrib</artifactId> <version>1.0b2</version> </dependency> - + <dependency> + <groupId>org.jboss.arquillian.junit</groupId> + <artifactId>arquillian-junit-container</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.picketlink</groupId> + <artifactId>picketlink-fed-webapps-assembly</artifactId> + <version>${pl-fed-webapps-assembly-version}</version> + <type>zip</type> + <scope>test</scope> + </dependency> </dependencies> <reporting>