Picketlink SVN: r1561 - in integration-tests/branches/eap6: picketlink-sts-eap6 and 1 other directory.
by picketlink-commits＠lists.jboss.org
Author: pskopek(a)redhat.com
Date: 2012-05-02 12:34:48 -0400 (Wed, 02 May 2012)
New Revision: 1561
Added:
integration-tests/branches/eap6/picketlink-sts-eap6/
integration-tests/branches/eap6/picketlink-sts-eap6/arquillian.xml
integration-tests/branches/eap6/picketlink-sts-eap6/pom.xml
Log:
sts eap6 pom and arq settings.
Property changes on: integration-tests/branches/eap6/picketlink-sts-eap6
___________________________________________________________________
Added: svn:ignore
+ target
Added: integration-tests/branches/eap6/picketlink-sts-eap6/arquillian.xml
===================================================================
--- integration-tests/branches/eap6/picketlink-sts-eap6/arquillian.xml (rev 0)
+++ integration-tests/branches/eap6/picketlink-sts-eap6/arquillian.xml 2012-05-02 16:34:48 UTC (rev 1561)
@@ -0,0 +1,12 @@
+<?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="serverConfig">${server.config:standalone.xml}</property>
+ <property name="allowConnectingToRunningServer">true</property>
+ </configuration>
+ </container>
+</arquillian>
Added: integration-tests/branches/eap6/picketlink-sts-eap6/pom.xml
===================================================================
--- integration-tests/branches/eap6/picketlink-sts-eap6/pom.xml (rev 0)
+++ integration-tests/branches/eap6/picketlink-sts-eap6/pom.xml 2012-05-02 16:34:48 UTC (rev 1561)
@@ -0,0 +1,223 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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/xsd/maven-4.0.0.xsd">
+
+ <parent>
+ <groupId>org.picketlink.product</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-tests-eap6</artifactId>
+ <packaging>jar</packaging>
+ <name>PicketLink Integration Tests for WS-Trust (STS) - EAP 6</name>
+ <url>http://labs.jboss.org/portal/picketlink/</url>
+ <description>PicketLink Federation Tests for STS features against EAP6</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>once</forkMode>
+ <argLine>-Djava.endorsed.dirs=${basedir}/../picketlink-saml-tests/src/test/resources/endorsed</argLine>
+ <useFile>false</useFile>
+ <trimStackTrace>false</trimStackTrace>
+ <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-${jbossxacml-version}</additionalClasspathElement>
+ <additionalClasspathElement>${eap6-home}/modules/org/picketlink/main/picketlink-core-${pl-version}.jar</additionalClasspathElement>
+ <additionalClasspathElement>${eap6-home}/modules/org/apache/xerces/main/xercesImpl-${xerces-version}.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 -->
+
+ <!-- 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>
+ <reportNameSuffix>STS-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="${jboss.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" />
+ <!-- init-eap6 -->
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.remoting3</groupId>
+ <artifactId>jboss-remoting</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.arquillian.junit</groupId>
+ <artifactId>arquillian-junit-container</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.as</groupId>
+ <artifactId>jboss-as-arquillian-container-managed</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>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>ant-contrib</groupId>
+ <artifactId>ant-contrib</artifactId>
+ <version>1.0b2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.picketlink</groupId>
+ <artifactId>picketlink-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.picketlink</groupId>
+ <artifactId>idp-as7</artifactId>
+ <type>war</type>
+ </dependency>
+ <dependency>
+ <groupId>org.picketlink</groupId>
+ <artifactId>pdp-as7</artifactId>
+ <type>war</type>
+ </dependency>
+ <dependency>
+ <groupId>org.picketlink</groupId>
+ <artifactId>picketlink-sts-as7</artifactId>
+ <type>war</type>
+ </dependency>
+ <dependency>
+ <groupId>org.picketlink</groupId>
+ <artifactId>picketlink-fed-webapps-as7-assembly</artifactId>
+ <type>zip</type>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.security</groupId>
+ <artifactId>jboss-xacml</artifactId>
+ <scope>test</scope>
+ </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>
\ No newline at end of file
12 years, 7 months
- 1
- 0
Picketlink SVN: r1560 - integration-tests/branches/eap6.
by picketlink-commits＠lists.jboss.org
Author: pskopek(a)redhat.com
Date: 2012-05-02 12:32:47 -0400 (Wed, 02 May 2012)
New Revision: 1560
Modified:
integration-tests/branches/eap6/pom.xml
Log:
main pom changes
Modified: integration-tests/branches/eap6/pom.xml
===================================================================
--- integration-tests/branches/eap6/pom.xml 2012-05-02 16:31:48 UTC (rev 1559)
+++ integration-tests/branches/eap6/pom.xml 2012-05-02 16:32:47 UTC (rev 1560)
@@ -20,17 +20,16 @@
<module>picketlink-int-webapps</module>
<module>picketlink-saml-tests</module>
- <module>picketlink-saml-eap5</module>
+ <module>picketlink-saml-eap6</module>
<module>picketlink-sts-tests</module>
- <module>picketlink-sts-eap5-native</module>
- <module>picketlink-sts-eap5-cxf</module>
+ <module>picketlink-sts-eap6</module>
- <module>picketlink-pdp-tests</module>
+ <!-- module>picketlink-pdp-tests</module -->
- <module>picketlink-trust-tests</module>
- <module>picketlink-trust-eap5-native</module>
- <module>picketlink-trust-eap5-cxf</module>
+ <!-- module>picketlink-trust-tests</module -->
+ <!-- module>picketlink-trust-eap5-native</module -->
+ <!-- module>picketlink-trust-eap5-cxf</module -->
</modules>
</project>
12 years, 7 months
- 1
- 0
Picketlink SVN: r1559 - integration-tests/branches/eap6/picketlink-pdp-tests/src/test/java/org/picketlink/test/integration/pdp.
by picketlink-commits＠lists.jboss.org
Author: pskopek(a)redhat.com
Date: 2012-05-02 12:31:48 -0400 (Wed, 02 May 2012)
New Revision: 1559
Added:
integration-tests/branches/eap6/picketlink-pdp-tests/src/test/java/org/picketlink/test/integration/pdp/PDPTestsDeployerHelper.java
Modified:
integration-tests/branches/eap6/picketlink-pdp-tests/src/test/java/org/picketlink/test/integration/pdp/SOAPSAMLXACMLUnitTestCase.java
Log:
pdp test sources
Added: integration-tests/branches/eap6/picketlink-pdp-tests/src/test/java/org/picketlink/test/integration/pdp/PDPTestsDeployerHelper.java
===================================================================
--- integration-tests/branches/eap6/picketlink-pdp-tests/src/test/java/org/picketlink/test/integration/pdp/PDPTestsDeployerHelper.java (rev 0)
+++ integration-tests/branches/eap6/picketlink-pdp-tests/src/test/java/org/picketlink/test/integration/pdp/PDPTestsDeployerHelper.java 2012-05-02 16:31:48 UTC (rev 1559)
@@ -0,0 +1,34 @@
+package org.picketlink.test.integration.pdp;
+
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+
+import java.io.File;
+import java.io.IOException;
+
+/**
+ * <p>
+ * Class that manages deployments for Arquillian based tests.
+ * </p>
+ * <p>
+ * <b>Note:</b> This class can be super class of test case classes that wish to deploy all deployments or
+ * simply use static calls and pick deployments one needs.
+ * </p>
+ *
+ * @author pskopek(a)redhat.com
+ * @since Nov 28, 2011
+ */
+
+public class PDPTestsDeployerHelper {
+
+ public static String WEBAPPS_LOCATION = "target/picketlink";
+
+ @Deployment(name = "pdp.war", order = 1, testable = false)
+ public static WebArchive importPdpWar() {
+ return ShrinkWrap.createFromZipFile(WebArchive.class,
+ new File(WEBAPPS_LOCATION + "/pdp.war"));
+ }
+
+
+}
Modified: integration-tests/branches/eap6/picketlink-pdp-tests/src/test/java/org/picketlink/test/integration/pdp/SOAPSAMLXACMLUnitTestCase.java
===================================================================
--- integration-tests/branches/eap6/picketlink-pdp-tests/src/test/java/org/picketlink/test/integration/pdp/SOAPSAMLXACMLUnitTestCase.java 2012-05-02 16:30:39 UTC (rev 1558)
+++ integration-tests/branches/eap6/picketlink-pdp-tests/src/test/java/org/picketlink/test/integration/pdp/SOAPSAMLXACMLUnitTestCase.java 2012-05-02 16:31:48 UTC (rev 1559)
@@ -30,6 +30,8 @@
import javax.xml.datatype.DatatypeFactory;
import javax.xml.datatype.XMLGregorianCalendar;
+import org.jboss.arquillian.container.test.api.RunAsClient;
+import org.jboss.arquillian.junit.Arquillian;
import org.jboss.security.xacml.core.model.context.ActionType;
import org.jboss.security.xacml.core.model.context.AttributeType;
import org.jboss.security.xacml.core.model.context.AttributeValueType;
@@ -39,6 +41,7 @@
import org.jboss.security.xacml.core.model.context.SubjectType;
import org.jboss.security.xacml.factories.RequestAttributeFactory;
import org.junit.Test;
+import org.junit.runner.RunWith;
import org.picketlink.identity.federation.api.soap.SOAPSAMLXACML;
import org.picketlink.identity.federation.api.soap.SOAPSAMLXACML.Result;
@@ -47,8 +50,11 @@
* @author Anil.Saldhana(a)redhat.com
* @since Jul 31, 2009
*/
-public class SOAPSAMLXACMLUnitTestCase
+(a)RunWith(Arquillian.class)
+@RunAsClient
+public class SOAPSAMLXACMLUnitTestCase extends PDPTestsDeployerHelper
{
+
//Change it to true when you have an end point running locally
private boolean sendRequest = true;
12 years, 7 months
- 1
- 0
Picketlink SVN: r1558 - integration-tests/branches/eap6/picketlink-pdp-tests.
by picketlink-commits＠lists.jboss.org
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>
12 years, 7 months
- 1
- 0
Picketlink SVN: r1557 - in integration-tests/branches/eap6: picketlink-saml-eap6 and 1 other directory.
by picketlink-commits＠lists.jboss.org
Author: pskopek(a)redhat.com
Date: 2012-05-02 12:28:15 -0400 (Wed, 02 May 2012)
New Revision: 1557
Added:
integration-tests/branches/eap6/picketlink-saml-eap6/
integration-tests/branches/eap6/picketlink-saml-eap6/arquillian.xml
integration-tests/branches/eap6/picketlink-saml-eap6/pom.xml
Log:
forgotten files for saml eap6 tests
Added: integration-tests/branches/eap6/picketlink-saml-eap6/arquillian.xml
===================================================================
--- integration-tests/branches/eap6/picketlink-saml-eap6/arquillian.xml (rev 0)
+++ integration-tests/branches/eap6/picketlink-saml-eap6/arquillian.xml 2012-05-02 16:28:15 UTC (rev 1557)
@@ -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>
Added: integration-tests/branches/eap6/picketlink-saml-eap6/pom.xml
===================================================================
--- integration-tests/branches/eap6/picketlink-saml-eap6/pom.xml (rev 0)
+++ integration-tests/branches/eap6/picketlink-saml-eap6/pom.xml 2012-05-02 16:28:15 UTC (rev 1557)
@@ -0,0 +1,207 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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/xsd/maven-4.0.0.xsd">
+
+ <parent>
+ <groupId>org.picketlink.product</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-saml-tests-eap6</artifactId>
+ <packaging>jar</packaging>
+ <name>PicketLink Integration Tests for SAML - EAP 6</name>
+ <url>http://labs.jboss.org/portal/picketlink/</url>
+ <description>PicketLink Federation Tests for SAML features against EAP6</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}/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>once</forkMode>
+ <argLine>-Djava.endorsed.dirs=${basedir}/../picketlink-saml-tests/src/test/resources/endorsed</argLine>
+ <useFile>false</useFile>
+ <trimStackTrace>false</trimStackTrace>
+ <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>
+ <additionalClasspathElement>${eap6-home}/modules/org/picketlink/main/picketlink-core-${pl-version}.jar</additionalClasspathElement>
+ <additionalClasspathElement>${eap6-home}/modules/org/apache/xerces/main/xercesImpl-${xerces-version}.jar</additionalClasspathElement>
+ </additionalClasspathElements>
+ <reportNameSuffix>SAML-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="${jboss.dist}" />
+ <property name="EAP_ZIP" value="${EAP6_ZIP}" />
+ <property name="EAP_URL" value="${EAP6_URL}" />
+ <property name="EAP_DIR" value="${EAP6_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.jboss.remoting3</groupId>
+ <artifactId>jboss-remoting</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.arquillian.junit</groupId>
+ <artifactId>arquillian-junit-container</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.as</groupId>
+ <artifactId>jboss-as-arquillian-container-managed</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>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>ant-contrib</groupId>
+ <artifactId>ant-contrib</artifactId>
+ <version>1.0b2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.picketlink</groupId>
+ <artifactId>picketlink-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.picketlink</groupId>
+ <artifactId>idp-as7</artifactId>
+ <type>war</type>
+ </dependency>
+ <dependency>
+ <groupId>org.picketlink</groupId>
+ <artifactId>pdp-as7</artifactId>
+ <type>war</type>
+ </dependency>
+ <dependency>
+ <groupId>org.picketlink</groupId>
+ <artifactId>picketlink-sts-as7</artifactId>
+ <type>war</type>
+ </dependency>
+ <dependency>
+ <groupId>org.picketlink</groupId>
+ <artifactId>picketlink-fed-webapps-as7-assembly</artifactId>
+ <type>zip</type>
+ </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>
\ No newline at end of file
12 years, 7 months
- 1
- 0
Picketlink SVN: r1556 - integration-tests/branches/eap6/ant-scripts.
by picketlink-commits＠lists.jboss.org
Author: pskopek(a)redhat.com
Date: 2012-05-02 12:27:08 -0400 (Wed, 02 May 2012)
New Revision: 1556
Modified:
integration-tests/branches/eap6/ant-scripts/ant-build.xml
Log:
ant-run changes
Modified: integration-tests/branches/eap6/ant-scripts/ant-build.xml
===================================================================
--- integration-tests/branches/eap6/ant-scripts/ant-build.xml 2012-05-02 16:24:03 UTC (rev 1555)
+++ integration-tests/branches/eap6/ant-scripts/ant-build.xml 2012-05-02 16:27:08 UTC (rev 1556)
@@ -1,200 +1,347 @@
<project name="PicketLink Federation Integration Test Suite">
- <taskdef resource="net/sf/antcontrib/antlib.xml">
- <classpath path="${depclasspath}"/>
- </taskdef>
-
- <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="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.4.1.GA/jbossws-cxf-3.4.1.GA.zip"/>
- <property name="JBWS_CXF_HOME" location="${basedir}/target/jbossws-cxf-bin-dist/"/>
- <property environment="env" />
+ <taskdef resource="net/sf/antcontrib/antlib.xml">
+ <classpath path="${depclasspath}"/>
+ </taskdef>
- <!--
- <property name="EAP_ZIP" value="jboss-eap-noauth-5.1.2-ER1.zip" />
- <property name="CXF_INSTALLER_ZIP" value="jboss-ep-ws-cxf-5.1.2-ER1-installer.zip" />
- <property name="EAP_URL" value="file:///mnt/jqa/eap/5.1.2.ER1/${EAP_ZIP}" />
- <property name="CXF_INSTALLER_URL" value="file:///mnt/jqa/eap/5.1.2.ER1/${CXF_INSTALLER_ZIP}" />
- <property name="EAP_DIR" value="jboss-eap-5.1" />
- <property name="jboss.profile" value="default" />
- <property name="pl-fed-webapps-assembly-version" value="2.0.1.1.final" />
--->
- <property name="DIST_DIR" value="${basedir}/../common-dist/target" />
- <property name="EAP_DIR" value="jboss-eap-5.1" />
+ <!-- task for easy xml manipulation
+ @see: http://today.java.net/pub/a/today/2006/11/01/xml-manipulation-using-xmlta...
+ -->
+ <taskdef name="xmltask"
+ classpath="${basedir}/../product-preparation/lib/xmltask.jar"
+ classname="com.oopsconsultancy.xmltask.ant.XmlTask"/>
- <target name="download-eap">
- <if>
- <available file="${DIST_DIR}/${EAP_ZIP}"/>
- <then>
- <echo>${EAP_ZIP} is already in place skipping download.</echo>
- </then>
- <else>
- <mkdir dir="${DIST_DIR}" />
- <get dest="${DIST_DIR}">
- <url url="${EAP_URL}"/>
- </get>
- </else>
- </if>
-
- </target>
-
- <target name="download-cxf">
- <if>
- <available file="${DIST_DIR}/${CXF_INSTALLER_ZIP}"/>
- <then>
- <echo>${CXF_INSTALLER_ZIP} is already in place skipping download.</echo>
- </then>
- <else>
- <mkdir dir="${DIST_DIR}" />
- <get dest="${DIST_DIR}">
- <url url="${CXF_INSTALLER_URL}"/>
- </get>
- </else>
- </if>
- </target>
+ <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="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.4.1.GA/jbossws-cxf-3.4.1.GA.zip"/>
+ <property name="JBWS_CXF_HOME" location="${basedir}/target/jbossws-cxf-bin-dist/"/>
+ <property environment="env"/>
- <target name="unzip-jboss-distributed-test-deps" depends="download-eap">
- <unzip src="${DIST_DIR}/${EAP_ZIP}"
- dest="${basedir}/target">
- <patternset>
- <include name="jboss-eap-5.1/picketlink/**"/>
- </patternset>
- </unzip>
-
- </target>
+ <property name="EAP_ZIP" value="jboss-eap-noauth-5.1.2-ER1.zip"/>
+ <property name="CXF_INSTALLER_ZIP" value="jboss-ep-ws-cxf-5.1.2-ER1-installer.zip"/>
+ <property name="EAP_URL" value="file:///mnt/jqa/eap/5.1.2.ER1/${EAP_ZIP}"/>
+ <property name="CXF_INSTALLER_URL" value="file:///mnt/jqa/eap/5.1.2.ER1/${CXF_INSTALLER_ZIP}"/>
+ <property name="DIST_DIR" value="${basedir}/../common-dist/target"/>
+ <!-- property name="EAP_DIR" value="jboss-eap-5.1"/ -->
+ <property name="EAP_DIR" value="jboss-as-7.1.0.CR1-SNAPSHOT"/>
+ <property name="jboss.profile" value="default"/>
+ <property name="pl-fed-webapps-assembly-version" value="2.0.1.1.final"/>
+
+ <target name="download-eap">
+ <if>
+ <available file="${DIST_DIR}/${EAP_ZIP}"/>
+ <then>
+ <echo>${EAP_ZIP} is already in place skipping download.</echo>
+ </then>
+ <else>
+ <mkdir dir="${DIST_DIR}"/>
+ <get dest="${DIST_DIR}">
+ <url url="${EAP_URL}"/>
+ </get>
+ </else>
+ </if>
+
+ </target>
+
+ <target name="download-cxf">
+ <if>
+ <available file="${DIST_DIR}/${CXF_INSTALLER_ZIP}"/>
+ <then>
+ <echo>${CXF_INSTALLER_ZIP} is already in place skipping download.</echo>
+ </then>
+ <else>
+ <mkdir dir="${DIST_DIR}"/>
+ <get dest="${DIST_DIR}">
+ <url url="${CXF_INSTALLER_URL}"/>
+ </get>
+ </else>
+ </if>
+ </target>
+
+ <target name="unzip-jboss-distributed-test-deps" depends="download-eap">
+ <!--
+ <mkdir dir="${basedir}/target"/>
+ <unzip src="${DIST_DIR}/${EAP_ZIP}"
+ dest="${basedir}/target">
+ <patternset>
+ <include name="jboss-eap-6.0/**"/>
+ </patternset>
+ </unzip>
+ -->
+ </target>
- <target name="init-eap5" depends="download-eap">
- <!-- Unzip JBoss EAP -->
- <echo>Unzip JBOSS EAP: ${EAP_ZIP}</echo>
+ <target name="noop">
+ </target>
- <unzip src="${DIST_DIR}/${EAP_ZIP}"
- dest="${basedir}/target"/>
-
- <chmod file="${basedir}/target/${EAP_DIR}/jboss-as/bin/run.sh" perm="775"/>
+ <target name="init-eap6">
+ <property name="webapps-binding" value="jboss"/>
+ <property name="webapps-binding-version" value="as7"/>
+
+ <if>
+ <available file="${EAP_DIR}" type="dir"/>
+ <then>
+ <!-- Copy EAP_DIR from dev. env. - use only for development -->
+ <echo>${EAP_DIR} exists copying content to target (not using ${EAP_ZIP}).</echo>
-
- <!-- install PicketLink in versions prior to 5.1.2 -->
- <!-- later as we have EAP 5.1.2 build it has to be build in -->
- <copy file="${jboss.dist}/picketlink/picketlink-federation/picketlink-core-${version}.jar"
- todir="${basedir}/target/${EAP_DIR}/jboss-as/common/lib"/>
-
- <mkdir dir="${basedir}/target/${EAP_DIR}/jboss-as/server/${jboss.profile}/deploy/picketlink"/>
+ <mkdir dir="${basedir}/target/jbossas"/>
+ <copy todir="${basedir}/target/jbossas">
+ <fileset dir="${EAP_DIR}">
+ <include name="**"/>
+ </fileset>
+ </copy>
- <!-- deploy test apps -->
- <unzip src="${localRepository}/org/picketlink/picketlink-fed-webapps-assembly/${pl-fed-webapps-assembly-version}/picketlink-fed-webapps-assembly-${pl-fed-webapps-assembly-version}.zip"
- dest="${basedir}/target/${EAP_DIR}/jboss-as/server/${jboss.profile}/deploy">
- <patternset id="pl-fed-webapps-assembly-files"
- excludes="**/pdp.war,**/idp.war,**/picketlink-sts.war"/>
- </unzip>
-
- <copy file="${basedir}/../picketlink-int-webapps/claims/target/claims.war" todir="${basedir}/target/${EAP_DIR}/jboss-as/server/${jboss.profile}/deploy/picketlink/"/>
+ </then>
+ <else>
+ <!-- Unzip JBoss EAP -->
+ <echo>Unzip JBOSS EAP: ${EAP_ZIP}</echo>
- <!-- copy webapps from distribution -->
- <copy todir="${basedir}/target/${EAP_DIR}/jboss-as/server/${jboss.profile}/deploy/picketlink">
- <fileset dir="${jboss.dist}/picketlink/picketlink-federation-webapps" >
- <include name="idp.war/**/*"/>
- </fileset>
- <fileset dir="${jboss.dist}/picketlink/picketlink-federation-webapps" >
- <include name="pdp.war/**/*"/>
- </fileset>
- <fileset dir="${jboss.dist}/picketlink/picketlink-federation-webapps" >
- <include name="picketlink-sts.war/**/*"/>
- </fileset>
- </copy>
+ <unzip src="${DIST_DIR}/${EAP_ZIP}"
+ dest="${basedir}/target"/>
+ <move file="${basedir}/target/jboss-eap-6.0" tofile="${basedir}/target/jbossas" />
+ </else>
+ </if>
- </target>
- <target name="init-eap5-cxf" depends="init-eap5,download-cxf">
- <!-- Unzip JBoss EAP CXF -->
- <echo>Unzip JBOSS EAP CXF: ${CXF_INSTALLER_ZIP}</echo>
- <unzip src="${DIST_DIR}/${CXF_INSTALLER_ZIP}"
- dest="${basedir}/target/${EAP_DIR}/jboss-as"/>
-
- <!-- Install CXF into EAP -->
- <ant target="install-noauth"
- antfile="${basedir}/target/${EAP_DIR}/jboss-as/jbossws-cxf-installer/build.xml"
- dir="${basedir}/target/${EAP_DIR}/jboss-as/jbossws-cxf-installer"
- />
+ <mkdir dir="${basedir}/target/picketlink"/>
- </target>
- <target name="copy-sts-props-eap5">
- <copy file="${basedir}/../picketlink-sts-tests/src/test/resources/sts-config.properties"
- todir="${basedir}/target/${EAP_DIR}/jboss-as/server/${jboss.profile}/conf/"/>
- </target>
-
+ <xmltask source="target/jbossas/standalone/configuration/standalone.xml"
+ dest="target/jbossas/standalone/configuration/standalone-picketlink.xml"
+ report="false"
+ failWithoutMatch="true"
+ >
+ <!-- unsecure the interfaces -->
+ <remove path="/:server/:management/:management-interfaces/:native-interface/@security-realm"/>
+ <remove path="/:server/:management/:management-interfaces/:http-interface/@security-realm"/>
- <target name="copy-trust-settings-eap5">
- <copy file="${basedir}/../picketlink-trust-tests/src/test/resources/domains/sts-jboss-beans.xml"
- todir="${basedir}/target/${EAP_DIR}/jboss-as/server/${jboss.profile}/deploy/picketlink" />
- <copy file="${basedir}/../picketlink-trust-tests/target/picketlink-wstest-tests.jar"
- todir="${basedir}/target/${EAP_DIR}/jboss-as/server/${jboss.profile}/deploy/picketlink" />
- <copy file="${basedir}/../picketlink-trust-tests/target/pojo-test.war"
- todir="${basedir}/target/${EAP_DIR}/jboss-as/server/${jboss.profile}/deploy/picketlink" />
- <copy file="${basedir}/../picketlink-trust-tests/target/binary-test.war"
- todir="${basedir}/target/${EAP_DIR}/jboss-as/server/${jboss.profile}/deploy/picketlink" />
- <copy file="${basedir}/../picketlink-trust-tests/src/test/resources/props/sts-users.properties"
- todir="${basedir}/target/${EAP_DIR}/jboss-as/server/${jboss.profile}/conf" />
- <copy file="${basedir}/../picketlink-trust-tests/src/test/resources/props/sts-roles.properties"
- todir="${basedir}/target/${EAP_DIR}/jboss-as/server/${jboss.profile}/conf" />
+ <!-- disable console logging -->
+ <!-- replace path="/*[name()='server']/*[name()='profile']/*[name()='subsystem']/*[name()='console-handler']/*[name()='level']/@name"
+ withText="OFF"/ -->
- <!-- copy file="${localRepository}/org/picketlink/picketlink-trust-jbossws/${pl-trust-version}/picketlink-trust-jbossws-${pl-trust-version}.jar"
- todir="${basedir}/target/${EAP_DIR}/jboss-as/server/${jboss.profile}/deploy/picketlink"/ -->
-
- <!-- TODO: once JBPAPP-7325 is resolved this can be deleted -->
- <copy file="${basedir}/../common-dist/files/eap/5.1.1/war-deployers-jboss-beans.xml"
- todir="${basedir}/target/${EAP_DIR}/jboss-as/server/${jboss.profile}/deployers/jbossweb.deployer/META-INF"
- overwrite="true"/>
+ <!-- insert security domains need for the tests -->
+ <insert path="/*[name()='server']/*[name()='profile']/*[name()='subsystem']/*[name()='security-domains']/*[name()='security-domain'][@name='jboss-ejb-policy']"
+ position="after">
+ <![CDATA[
+ <security-domain name="picketlink-sts" cache-type="default">
+ <authentication>
+ <login-module code="UsersRoles" flag="required">
+ <module-option name="usersProperties" value="sts-users.properties"/>
+ <module-option name="rolesProperties" value="sts-roles.properties"/>
+ </login-module>
+ </authentication>
+ </security-domain>
+ <security-domain name="idp" cache-type="default">
+ <authentication>
+ <login-module code="UsersRoles" flag="required">
+ <module-option name="usersProperties" value="users.properties"/>
+ <module-option name="rolesProperties" value="roles.properties"/>
+ </login-module>
+ </authentication>
+ </security-domain>
+ <security-domain name="sp" cache-type="default">
+ <authentication>
+ <login-module code="org.picketlink.identity.federation.bindings.jboss.auth.SAML2LoginModule" flag="required"/>
+ </authentication>
+ </security-domain>
+ ]]>
+ </insert>
- <copy file="${basedir}/../common-dist/files/eap/5.1.1/jboss-log4j.xml"
- todir="${basedir}/target/${EAP_DIR}/jboss-as/server/${jboss.profile}/conf"
- overwrite="true"/>
-
- </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" />
- </waitfor>
- <echo>:Local 8080 Started</echo>
- </target>
+ </xmltask>
- <target name="start-eap5" >
- <antcall target="start-jboss">
- <param name="jbossas" value="${basedir}/target/${EAP_DIR}/jboss-as"/>
- </antcall>
- <!--
- <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>
+ <chmod file="${basedir}/target/jbossas/bin/*.sh" perm="775"/>
+ <!-- missing webapps from old assembly -->
+ <unzip src="${localRepository}/org/picketlink/picketlink-fed-webapps-as7-assembly/${pl-fed-webapps-assembly-version}/picketlink-fed-webapps-as7-assembly-${pl-fed-webapps-assembly-version}.zip"
+ dest="${basedir}/target">
+ <patternset id="pl-fed-webapps-assembly-files"
+ excludes="**/pdp.war,**/idp.war,**/picketlink-sts.war"/>
+ </unzip>
+
+
+ <!-- unzip test apps - later deployed using Arquillian -->
+ <unzip src="${localRepository}/org/picketlink/picketlink-quickstarts/${pl-webapps-main-version}/picketlink-quickstarts-${pl-webapps-main-version}-webapps-${webapps-binding}-${webapps-binding-version}.zip"
+ dest="${basedir}/target">
+ <patternset id="pl-fed-webapps-files"
+ includes="**/pdp*.war,**/idp*.war,**/picketlink-sts*.war"/>
+ </unzip>
- <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>
+
+
+ <echo>using web apps from EAP6 repository mead tagged one</echo>
+ <move file="${basedir}/target/picketlink/picketlink-sts-${pl-webapps-main-version}-${webapps-binding}-${webapps-binding-version}.war"
+ tofile="${basedir}/target/picketlink/picketlink-sts.war"/>
+ <move file="${basedir}/target/picketlink/pdp-${pl-webapps-main-version}-${webapps-binding}-${webapps-binding-version}.war"
+ tofile="${basedir}/target/picketlink/pdp.war"/>
+ <move file="${basedir}/target/picketlink/idp-${pl-webapps-main-version}-${webapps-binding}-${webapps-binding-version}.war"
+ tofile="${basedir}/target/picketlink/idp.war"/>
+ <move file="${basedir}/target/picketlink/idp-sig-${pl-webapps-main-version}-${webapps-binding}-${webapps-binding-version}.war"
+ tofile="${basedir}/target/picketlink/idp-sig.war"/>
+ <!--
+ <move file="${basedir}/target/picketlink/employee-${pl-webapps-main-version}-${webapps-binding}-${webapps-binding-version}.war"
+ tofile="${basedir}/target/picketlink/employee.war"/>
+ <move file="${basedir}/target/picketlink/employee-sig-${pl-webapps-main-version}-${webapps-binding}-${webapps-binding-version}.war"
+ tofile="${basedir}/target/picketlink/employee-sig.war"/>
+ <move file="${basedir}/target/picketlink/sales-post-${pl-webapps-main-version}-${webapps-binding}-${webapps-binding-version}.war"
+ tofile="${basedir}/target/picketlink/sales-post.war"/>
+ <move file="${basedir}/target/picketlink/sales-post-sig-${pl-webapps-main-version}-${webapps-binding}-${webapps-binding-version}.war"
+ tofile="${basedir}/target/picketlink/sales-post-sig.war"/>
+ -->
+
+ <!--
+ <copy file="${localRepository}/org/picketlink/idp/${pl-webapps-main-version}/idp-${pl-webapps-main-version}.war"
+ tofile="${basedir}/target/picketlink/idp.war"/>
+ <copy file="${localRepository}/org/picketlink/pdp/${pl-webapps-main-version}/pdp-${pl-webapps-main-version}.war"
+ tofile="${basedir}/target/picketlink/pdp.war"/>
+ <copy file="${localRepository}/org/picketlink/picketlink-sts/${pl-webapps-main-version}/picketlink-sts-${pl-webapps-main-version}.war"
+ tofile="${basedir}/target/picketlink/picketlink-sts.war"/>
+ -->
+ <!-- additional configuration of picketlink-sts.war to be able to log in -->
+ <jar destfile="${basedir}/target/picketlink/picketlink-sts-1.war">
+ <zipfileset src="${basedir}/target/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="${basedir}/target/picketlink/picketlink-sts.war" failonerror="true" verbose="true"/>
+ <move file="${basedir}/target/picketlink/picketlink-sts-1.war" tofile="${basedir}/target/picketlink/picketlink-sts.war"/>
+ <!-- copy file="/home/pskopek/Downloads/picketlink-sts.war" tofile="${basedir}/target/picketlink/picketlink-sts.war"/ -->
+
+
+ </target>
- <target name="stop-eap5">
- <antcall target="stop-jboss"/>
- </target>
+ <target name="init-eap5" depends="download-eap">
+ <!-- Unzip JBoss EAP -->
+ <echo>Unzip JBOSS EAP: ${EAP_ZIP}</echo>
+ <unzip src="${DIST_DIR}/${EAP_ZIP}"
+ dest="${basedir}/target"/>
+ <chmod file="${basedir}/target/${EAP_DIR}/jboss-as/bin/run.sh" perm="775"/>
+
+ <!-- install PicketLink in versions prior to 5.1.2 -->
+ <!-- later as we have EAP 5.1.2 build it has to be build in -->
+ <copy file="${jboss.dist}/picketlink/picketlink-federation/picketlink-core-${version}.jar"
+ todir="${basedir}/target/${EAP_DIR}/jboss-as/common/lib"/>
+
+ <mkdir dir="${basedir}/target/${EAP_DIR}/jboss-as/server/${jboss.profile}/deploy/picketlink"/>
+
+ <!-- deploy test apps -->
+ <unzip src="${localRepository}/org/picketlink/picketlink-fed-webapps-assembly/${pl-fed-webapps-assembly-version}/picketlink-fed-webapps-assembly-${pl-fed-webapps-assembly-version}.zip"
+ dest="${basedir}/target/${EAP_DIR}/jboss-as/server/${jboss.profile}/deploy">
+ <patternset id="pl-fed-webapps-assembly-files"
+ excludes="**/pdp.war,**/idp.war,**/picketlink-sts.war"/>
+ </unzip>
+
+ <copy file="${basedir}/../picketlink-int-webapps/claims/target/claims.war"
+ todir="${basedir}/target/${EAP_DIR}/jboss-as/server/${jboss.profile}/deploy/picketlink/"/>
+
+ <!-- copy webapps from distribution -->
+ <copy todir="${basedir}/target/${EAP_DIR}/jboss-as/server/${jboss.profile}/deploy/picketlink">
+ <fileset dir="${jboss.dist}/picketlink/picketlink-federation-webapps">
+ <include name="idp.war/**/*"/>
+ </fileset>
+ <fileset dir="${jboss.dist}/picketlink/picketlink-federation-webapps">
+ <include name="pdp.war/**/*"/>
+ </fileset>
+ <fileset dir="${jboss.dist}/picketlink/picketlink-federation-webapps">
+ <include name="picketlink-sts.war/**/*"/>
+ </fileset>
+ </copy>
+
+
+ </target>
+
+ <target name="init-eap5-cxf" depends="init-eap5,download-cxf">
+ <!-- Unzip JBoss EAP CXF -->
+ <echo>Unzip JBOSS EAP CXF: ${CXF_INSTALLER_ZIP}</echo>
+ <unzip src="${DIST_DIR}/${CXF_INSTALLER_ZIP}"
+ dest="${basedir}/target/${EAP_DIR}/jboss-as"/>
+
+ <!-- Install CXF into EAP -->
+ <ant target="install-noauth"
+ antfile="${basedir}/target/${EAP_DIR}/jboss-as/jbossws-cxf-installer/build.xml"
+ dir="${basedir}/target/${EAP_DIR}/jboss-as/jbossws-cxf-installer"
+ />
+
+ </target>
+
+ <target name="copy-sts-props-eap5">
+ <copy file="${basedir}/../picketlink-sts-tests/src/test/resources/sts-config.properties"
+ todir="${basedir}/target/${EAP_DIR}/jboss-as/server/${jboss.profile}/conf/"/>
+ </target>
+
+
+ <target name="copy-trust-settings-eap5">
+ <copy file="${basedir}/../picketlink-trust-tests/src/test/resources/domains/sts-jboss-beans.xml"
+ todir="${basedir}/target/${EAP_DIR}/jboss-as/server/${jboss.profile}/deploy/picketlink"/>
+ <copy file="${basedir}/../picketlink-trust-tests/target/picketlink-wstest-tests.jar"
+ todir="${basedir}/target/${EAP_DIR}/jboss-as/server/${jboss.profile}/deploy/picketlink"/>
+ <copy file="${basedir}/../picketlink-trust-tests/target/pojo-test.war"
+ todir="${basedir}/target/${EAP_DIR}/jboss-as/server/${jboss.profile}/deploy/picketlink"/>
+ <copy file="${basedir}/../picketlink-trust-tests/target/binary-test.war"
+ todir="${basedir}/target/${EAP_DIR}/jboss-as/server/${jboss.profile}/deploy/picketlink"/>
+ <copy file="${basedir}/../picketlink-trust-tests/src/test/resources/props/sts-users.properties"
+ todir="${basedir}/target/${EAP_DIR}/jboss-as/server/${jboss.profile}/conf"/>
+ <copy file="${basedir}/../picketlink-trust-tests/src/test/resources/props/sts-roles.properties"
+ todir="${basedir}/target/${EAP_DIR}/jboss-as/server/${jboss.profile}/conf"/>
+
+ <!-- copy file="${localRepository}/org/picketlink/picketlink-trust-jbossws/${pl-trust-version}/picketlink-trust-jbossws-${pl-trust-version}.jar"
+ todir="${basedir}/target/${EAP_DIR}/jboss-as/server/${jboss.profile}/deploy/picketlink"/ -->
+
+ <!-- TODO: once JBPAPP-7325 is resolved this can be deleted -->
+ <copy file="${basedir}/../common-dist/files/eap/5.1.1/war-deployers-jboss-beans.xml"
+ todir="${basedir}/target/${EAP_DIR}/jboss-as/server/${jboss.profile}/deployers/jbossweb.deployer/META-INF"
+ overwrite="true"/>
+
+ <copy file="${basedir}/../common-dist/files/eap/5.1.1/jboss-log4j.xml"
+ todir="${basedir}/target/${EAP_DIR}/jboss-as/server/${jboss.profile}/conf"
+ overwrite="true"/>
+
+ </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"/>
+ </waitfor>
+ <echo>:Local 8080 Started</echo>
+ </target>
+
+ <target name="start-eap5">
+ <antcall target="start-jboss">
+ <param name="jbossas" value="${basedir}/target/${EAP_DIR}/jboss-as"/>
+ </antcall>
+ <!--
+ <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>
+
+ <target name="stop-eap5">
+ <antcall target="stop-jboss"/>
+ </target>
+
+
</project>
12 years, 7 months
- 1
- 0
Picketlink SVN: r1555 - in integration-tests/branches/eap6: picketlink-int-webapps/claims/src/main/webapp and 9 other directories.
by picketlink-commits＠lists.jboss.org
Author: pskopek(a)redhat.com
Date: 2012-05-02 12:24:03 -0400 (Wed, 02 May 2012)
New Revision: 1555
Added:
integration-tests/branches/eap6/picketlink-int-webapps/claims/src/main/webapp/META-INF/
integration-tests/branches/eap6/picketlink-int-webapps/claims/src/main/webapp/META-INF/jboss-deployment-structure.xml
integration-tests/branches/eap6/picketlink-saml-tests/src/test/java/org/picketlink/test/integration/SAMLTestsDeployerHelper.java
integration-tests/branches/eap6/picketlink-saml-tests/src/test/java/org/picketlink/test/integration/saml2/SAML2MixedBindingGlobalLogOutUnitTestCase.java
integration-tests/branches/eap6/picketlink-saml-tests/src/test/java/org/picketlink/test/integration/saml2/SAML2PostBindingGlobalLogOutUnitTestCase.java
integration-tests/branches/eap6/picketlink-saml-tests/src/test/java/org/picketlink/test/integration/saml2/SAML2PostSignatureGLOUnitTestCase.java
integration-tests/branches/eap6/picketlink-saml-tests/src/test/java/org/picketlink/test/integration/saml2/SAML2RedirectBindingGlobalLogOutUnitTestCase.java
integration-tests/branches/eap6/picketlink-saml-tests/src/test/java/org/picketlink/test/integration/saml2/SAML2ResponseParsingUnitTestCase.java
integration-tests/branches/eap6/picketlink-saml-tests/src/test/java/org/picketlink/test/integration/saml2/StandaloneSAMLUnitTestCase.java
integration-tests/branches/eap6/picketlink-sts-tests/src/test/java/org/picketlink/test/integration/STSTestsDeployerHelper.java
integration-tests/branches/eap6/product-preparation/roles.properties
integration-tests/branches/eap6/product-preparation/users.properties
Removed:
integration-tests/branches/eap6/picketlink-saml-tests/src/test/java/org/picketlink/test/integration/saml2/SAML2MixedBindingGlobalLogOutUnitTestCase.java
integration-tests/branches/eap6/picketlink-saml-tests/src/test/java/org/picketlink/test/integration/saml2/SAML2PostBindingGlobalLogOutUnitTestCase.java
integration-tests/branches/eap6/picketlink-saml-tests/src/test/java/org/picketlink/test/integration/saml2/SAML2PostSignatureGLOUnitTestCase.java
integration-tests/branches/eap6/picketlink-saml-tests/src/test/java/org/picketlink/test/integration/saml2/SAML2RedirectBindingGlobalLogOutUnitTestCase.java
integration-tests/branches/eap6/picketlink-saml-tests/src/test/java/org/picketlink/test/integration/saml2/SAML2ResponseParsingUnitTestCase.java
integration-tests/branches/eap6/picketlink-saml-tests/src/test/java/org/picketlink/test/integration/saml2/StandaloneSAMLUnitTestCase.java
Modified:
integration-tests/branches/eap6/parent/pom.xml
integration-tests/branches/eap6/picketlink-saml-tests/pom.xml
integration-tests/branches/eap6/picketlink-saml-tests/src/test/java/org/picketlink/test/integration/saml11/SAML11IDPFirstUnitTestCase.java
integration-tests/branches/eap6/picketlink-sts-tests/.classpath
integration-tests/branches/eap6/picketlink-sts-tests/pom.xml
integration-tests/branches/eap6/picketlink-sts-tests/src/test/java/org/picketlink/test/integration/sts/CacheInvalidationUnitTestCase.java
integration-tests/branches/eap6/picketlink-sts-tests/src/test/java/org/picketlink/test/integration/sts/PicketLinkSTSIntegrationUnitTestCase.java
integration-tests/branches/eap6/product-preparation/
integration-tests/branches/eap6/product-preparation/pom.xml
Log:
EAP6 fixes
Modified: integration-tests/branches/eap6/parent/pom.xml
===================================================================
--- integration-tests/branches/eap6/parent/pom.xml 2012-04-23 09:59:53 UTC (rev 1554)
+++ integration-tests/branches/eap6/parent/pom.xml 2012-05-02 16:24:03 UTC (rev 1555)
@@ -1,5 +1,5 @@
<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>
+ <parent>
<groupId>org.jboss</groupId>
<artifactId>jboss-parent</artifactId>
<version>5</version>
@@ -11,7 +11,7 @@
<version>2.0.0-SNAPSHOT</version>
<name>PicketLink Integration Tests - Parent</name>
<url>http://labs.jboss.org/portal/picketlink/</url>
- <description>PicketLink is a cross-cutting project that handles identity needs for the JEMS projects</description>
+ <description>PicketLink is a cross-cutting project that handles identity needs for the JEMS projects</description>
<licenses>
<license>
<name>lgpl</name>
@@ -28,20 +28,50 @@
</scm>
<properties>
- <pl-version>2.0.0</pl-version>
- <pl-trust-version>2.0.0.final</pl-trust-version>
- <pl-fed-webapps-assembly-version>2.0.1.1.final</pl-fed-webapps-assembly-version>
- <maven.compiler.target>1.6</maven.compiler.target>
- <eap-home>${basedir}/target/jboss-eap-5.1/jboss-as</eap-home>
- <EAP_ZIP>jboss-eap-noauth-5.1.1.zip</EAP_ZIP>
- <!-- EAP_ZIP>jboss-eap-noauth-5.1.2-ER1.zip</EAP_ZIP -->
- <CXF_INSTALLER_ZIP>jboss-ep-ws-cxf-5.1.2-ER1-installer.zip</CXF_INSTALLER_ZIP>
- <downloadURL.prefix>file:///mnt/jqa/eap/5.1.2.ER1</downloadURL.prefix>
- <EAP_URL>${downloadURL.prefix}/${EAP_ZIP}</EAP_URL>
- <CXF_INSTALLER_URL>${downloadURL.prefix}/${CXF_INSTALLER_ZIP}</CXF_INSTALLER_URL>
- <jboss.profile>default</jboss.profile>
- <jboss.dist>${basedir}/../product-preparation/target/jboss-eap-5.1</jboss.dist>
- <property name="localRepository" value="${user.home}/.m2/repository"/>
+ <!-- MEAD repo tag -->
+ <mead-repo>http://download.lab.bos.redhat.com/rel-eng/repos/jb-eap-6-rhel-6-build/JB...</mead-repo>
+
+ <!-- PicketLink version default values -->
+ <pl-version>2.1.0-SNAPSHOT</pl-version>
+ <!-- pl-webapps-main-version>${pl-version}</pl-webapps-main-version -->
+ <pl-webapps-main-version>2.1.0-SNAPSHOT</pl-webapps-main-version>
+ <pl-trust-version>2.0.0.final</pl-trust-version>
+ <pl-fed-webapps-assembly-version>2.0.3.Final</pl-fed-webapps-assembly-version>
+ <xerces-version>2.9.1-redhat-1</xerces-version>
+ <jbossxacml-version>2.0.7.Final-redhat-1</jbossxacml-version>
+
+ <!-- PicketLink for AS7 values
+ <pl-version>2.0.1.final</pl-version>
+ <pl-trust-version>2.0.1.final</pl-trust-version>
+ <pl-fed-webapps-assembly-version>2.0.1.1.final</pl-fed-webapps-assembly-version>
+ -->
+
+ <maven.compiler.target>1.6</maven.compiler.target>
+ <eap5-home>${basedir}/target/jboss-eap-5.1/jboss-as</eap5-home>
+ <eap6-home>${basedir}/target/jbossas</eap6-home>
+ <!-- EAP_DIR>/home/pskopek/projects/as7.work/jboss-as/build/target/jboss-as-7.1.0.CR1-SNAPSHOT</EAP_DIR -->
+
+ <EAP5_ZIP>jboss-eap-noauth-5.1.2-ER1.zip</EAP5_ZIP>
+ <downloadURL5.prefix>file:///mnt/jqa/eap/5.1.2.ER1</downloadURL5.prefix>
+
+ <EAP6_ZIP>jboss-eap-6.0.0.ER6-pl-2.1.0.zip</EAP6_ZIP>
+ <!-- downloadURL6.prefix>file:///mnt/globalsync/rhel/devel/candidates/JBEAP/JBEAP-6.0.0-ER5</downloadURL6.prefix -->
+ <downloadURL6.prefix>file:///home/pskopek/tmp/eap6/er6</downloadURL6.prefix>
+
+ <EAP6_URL>${downloadURL6.prefix}/${EAP6_ZIP}</EAP6_URL>
+ <EAP5_URL>${downloadURL5.prefix}/${EAP5_ZIP}</EAP5_URL>
+
+ <CXF_INSTALLER_ZIP>jboss-ep-ws-cxf-5.1.2-ER1-installer.zip</CXF_INSTALLER_ZIP>
+ <CXF_INSTALLER_URL>${downloadURL5.prefix}/${CXF_INSTALLER_ZIP}</CXF_INSTALLER_URL>
+ <jboss.profile>default</jboss.profile>
+
+ <jboss.dist>${basedir}/../product-preparation/target/jboss-eap-5.1</jboss.dist>
+ <jboss6.dist>${basedir}/../product-preparation/target/jbossas</jboss6.dist>
+
+
+ <arquillian.version>1.0.0.Final</arquillian.version>
+ <version.arg.jbossas.managed>7.1.1.Final</version.arg.jbossas.managed>
+ <property name="localRepository" value="${user.home}/.m2/repository"/>
</properties>
@@ -75,7 +105,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
- <version>1.7</version>
+ <version>1.4</version>
</plugin>
<!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
<plugin>
@@ -93,7 +123,7 @@
<artifactId>
maven-antrun-plugin
</artifactId>
- <versionRange>[1.7,)</versionRange>
+ <versionRange>[1.4,)</versionRange>
<goals>
<goal>run</goal>
</goals>
@@ -115,7 +145,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-report-plugin</artifactId>
- <version>2.9</version>
+ <version>2.10</version>
</plugin>
</plugins>
</reporting>
@@ -156,30 +186,92 @@
<enabled>false</enabled>
</releases>
</repository>
+ <repository>
+ <id>mead.jboss.org</id>
+ <name>JBoss MEAD tag Repository</name>
+ <layout>default</layout>
+ <url>${mead-repo}</url>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+
</repositories>
<dependencyManagement>
<dependencies>
<dependency>
+ <groupId>org.picketlink</groupId>
+ <artifactId>picketlink-core</artifactId>
+ <version>${pl-version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.picketlink</groupId>
+ <artifactId>idp-as7</artifactId>
+ <version>${pl-version}</version>
+ <type>war</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.picketlink</groupId>
+ <artifactId>pdp-as7</artifactId>
+ <version>${pl-version}</version>
+ <type>war</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.picketlink</groupId>
+ <artifactId>picketlink-sts-as7</artifactId>
+ <version>${pl-version}</version>
+ <type>war</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.picketlink</groupId>
+ <artifactId>picketlink-fed-webapps-as7-assembly</artifactId>
+ <version>${pl-fed-webapps-assembly-version}</version>
+ <type>zip</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ <version>${xerces-version}</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<version>2.1.1</version>
</dependency>
<dependency>
+ <groupId>javax.enterprise</groupId>
+ <artifactId>cdi-api</artifactId>
+ <version>1.0-SP4</version>
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.4</version>
+ <version>4.10-redhat-1</version>
<scope>test</scope>
</dependency>
+ <!-- Arquillian bill of materials, used to configure Arquillian versions -->
+ <dependency>
+ <groupId>org.jboss.arquillian</groupId>
+ <artifactId>arquillian-bom</artifactId>
+ <version>${arquillian.version}</version>
+ <scope>import</scope>
+ <type>pom</type>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.as</groupId>
+ <artifactId>jboss-as-arquillian-container-managed</artifactId>
+ <version>${version.arg.jbossas.managed}</version>
+ <scope>test</scope>
+ </dependency>
<dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.14</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>org.apache</groupId>
+ <groupId>org.apache.santuario</groupId>
<artifactId>xmlsec</artifactId>
- <version>1.4.3</version>
+ <version>1.5.1-redhat-1</version>
<optional>true</optional>
</dependency>
<dependency>
@@ -188,6 +280,18 @@
<version>1.0.3</version>
<optional>true</optional>
</dependency>
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging</artifactId>
+ <version>3.1.0.GA-redhat-1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.14</version>
+ <optional>true</optional>
+ </dependency>
<dependency>
<groupId>javax.persistence</groupId>
<artifactId>persistence-api</artifactId>
@@ -208,8 +312,8 @@
</dependency>
<dependency>
<groupId>org.jboss.security</groupId>
- <artifactId>jbossxacml</artifactId>
- <version>2.0.4</version>
+ <artifactId>jboss-xacml</artifactId>
+ <version>${jbossxacml-version}</version>
</dependency>
<dependency>
<groupId>org.openid4java</groupId>
@@ -234,6 +338,12 @@
<version>6.1.18</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.jboss.remoting3</groupId>
+ <artifactId>jboss-remoting</artifactId>
+ <version>3.2.4.GA-redhat-1</version>
+ </dependency>
+
</dependencies>
</dependencyManagement>
Added: integration-tests/branches/eap6/picketlink-int-webapps/claims/src/main/webapp/META-INF/jboss-deployment-structure.xml
===================================================================
--- integration-tests/branches/eap6/picketlink-int-webapps/claims/src/main/webapp/META-INF/jboss-deployment-structure.xml (rev 0)
+++ integration-tests/branches/eap6/picketlink-int-webapps/claims/src/main/webapp/META-INF/jboss-deployment-structure.xml 2012-05-02 16:24:03 UTC (rev 1555)
@@ -0,0 +1,10 @@
+<jboss-deployment-structure>
+
+ <deployment>
+ <!-- Add picketlink module dependency -->
+ <dependencies>
+ <module name="org.picketlink" />
+ </dependencies>
+ </deployment>
+</jboss-deployment-structure>
+
Modified: integration-tests/branches/eap6/picketlink-saml-tests/pom.xml
===================================================================
--- integration-tests/branches/eap6/picketlink-saml-tests/pom.xml 2012-04-23 09:59:53 UTC (rev 1554)
+++ integration-tests/branches/eap6/picketlink-saml-tests/pom.xml 2012-05-02 16:24:03 UTC (rev 1555)
@@ -38,7 +38,7 @@
<printSummary>true</printSummary>
<disableXmlReport>false</disableXmlReport>
<includes>
- <include>**/**TestCase.java</include>
+ <include>**/*TestCase.java</include>
</includes>
<forkMode>pertest</forkMode>
<argLine>-Djava.endorsed.dirs=${basedir}/src/test/resources/endorsed</argLine>
@@ -55,6 +55,11 @@
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.jboss.arquillian.junit</groupId>
+ <artifactId>arquillian-junit-container</artifactId>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>httpunit</groupId>
<artifactId>httpunit</artifactId>
@@ -74,10 +79,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>apache-xerces</groupId>
+ <groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
- <version>2.9.1</version>
- <scope>compile</scope>
</dependency>
<dependency>
<groupId>ant-contrib</groupId>
Added: integration-tests/branches/eap6/picketlink-saml-tests/src/test/java/org/picketlink/test/integration/SAMLTestsDeployerHelper.java
===================================================================
--- integration-tests/branches/eap6/picketlink-saml-tests/src/test/java/org/picketlink/test/integration/SAMLTestsDeployerHelper.java (rev 0)
+++ integration-tests/branches/eap6/picketlink-saml-tests/src/test/java/org/picketlink/test/integration/SAMLTestsDeployerHelper.java 2012-05-02 16:24:03 UTC (rev 1555)
@@ -0,0 +1,105 @@
+package org.picketlink.test.integration;
+
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+
+import java.io.File;
+import java.io.IOException;
+
+/**
+ * <p>
+ * Class that manages deployments for Arquillian based tests.
+ * </p>
+ * <p>
+ * <b>Note:</b> This class can be super class of test case classes that wish to deploy all deployments or
+ * simply use static calls and pick deployments one needs.
+ * </p>
+ *
+ * @author pskopek(a)redhat.com
+ * @since Nov 28, 2011
+ */
+
+public class SAMLTestsDeployerHelper {
+
+ public static String WEBAPPS_LOCATION = "target/picketlink";
+
+ @Deployment(name = "pdp.war", order = 1, testable = false)
+ public static WebArchive importPdpWar() {
+ return ShrinkWrap.createFromZipFile(WebArchive.class,
+ new File(WEBAPPS_LOCATION + "/pdp.war"));
+ }
+
+ @Deployment(name = "idp.war", order = 2, testable = false)
+ public static WebArchive importIdpWar() {
+ return ShrinkWrap.createFromZipFile(WebArchive.class,
+ new File(WEBAPPS_LOCATION + "/idp.war"));
+ }
+
+ @Deployment(name = "idp-sig.war", order = 3, testable = false)
+ public static WebArchive importIdpSigWar() {
+ return ShrinkWrap.createFromZipFile(WebArchive.class,
+ new File(WEBAPPS_LOCATION + "/idp-sig.war"));
+ }
+
+ @Deployment(name = "picketlink-sts.war", order = 4, testable = false)
+ public static WebArchive importStsWar() {
+ return ShrinkWrap.createFromZipFile(WebArchive.class,
+ new File(WEBAPPS_LOCATION + "/picketlink-sts.war"));
+ }
+
+ @Deployment(name = "sales.war", order = 5, testable = false)
+ public static WebArchive importSalesWar() throws IOException {
+ return ShrinkWrap.createFromZipFile(WebArchive.class,
+ new File(WEBAPPS_LOCATION + "/sales.war"));
+ }
+
+ @Deployment(name = "sales-post.war", order = 6, testable = false)
+ public static WebArchive importSalesPostWar() {
+ return ShrinkWrap.createFromZipFile(WebArchive.class,
+ new File(WEBAPPS_LOCATION + "/sales-post.war"));
+ }
+
+ @Deployment(name = "sales-post-sig.war", order = 7, testable = false)
+ public static WebArchive importSalesPostSigWar() {
+ return ShrinkWrap.createFromZipFile(WebArchive.class,
+ new File(WEBAPPS_LOCATION + "/sales-post-sig.war"));
+ }
+
+ @Deployment(name = "employee.war", order = 8, testable = false)
+ public static WebArchive importEmployeeWar() throws IOException {
+ return ShrinkWrap.createFromZipFile(WebArchive.class,
+ new File(WEBAPPS_LOCATION + "/employee.war"));
+ }
+
+ @Deployment(name = "employee-post.war", order = 9, testable = false)
+ public static WebArchive importEmployeePostWar() {
+ return ShrinkWrap.createFromZipFile(WebArchive.class,
+ new File(WEBAPPS_LOCATION + "/employee-post.war"));
+ }
+
+ @Deployment(name = "employee-post-sig.war", order = 10, testable = false)
+ public static WebArchive importEmployeePostSigWar() {
+ return ShrinkWrap.createFromZipFile(WebArchive.class,
+ new File(WEBAPPS_LOCATION + "/employee-post-sig.war"));
+ }
+
+ @Deployment(name = "claims.war", order = 11, testable = false)
+ public static WebArchive importClaimsWar() {
+ return ShrinkWrap.createFromZipFile(WebArchive.class,
+ new File("../picketlink-int-webapps/claims/target/claims.war"));
+ }
+
+ @Deployment(name = "sales-saml11.war", order = 12, testable = false)
+ public static WebArchive importSalesSaml11War() {
+ return ShrinkWrap.createFromZipFile(WebArchive.class,
+ new File(WEBAPPS_LOCATION + "/sales-saml11.war"));
+ }
+
+ @Deployment(name = "employee-saml11.war", order = 13, testable = false)
+ public static WebArchive importEmployeeSaml11War() {
+ return ShrinkWrap.createFromZipFile(WebArchive.class,
+ new File(WEBAPPS_LOCATION + "/employee-saml11.war"));
+ }
+
+}
Modified: integration-tests/branches/eap6/picketlink-saml-tests/src/test/java/org/picketlink/test/integration/saml11/SAML11IDPFirstUnitTestCase.java
===================================================================
--- integration-tests/branches/eap6/picketlink-saml-tests/src/test/java/org/picketlink/test/integration/saml11/SAML11IDPFirstUnitTestCase.java 2012-04-23 09:59:53 UTC (rev 1554)
+++ integration-tests/branches/eap6/picketlink-saml-tests/src/test/java/org/picketlink/test/integration/saml11/SAML11IDPFirstUnitTestCase.java 2012-05-02 16:24:03 UTC (rev 1555)
@@ -23,6 +23,10 @@
import static org.junit.Assert.assertTrue;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.container.test.api.RunAsClient;
+import org.jboss.arquillian.junit.Arquillian;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
import org.junit.Test;
import com.meterware.httpunit.GetMethodWebRequest;
@@ -32,6 +36,8 @@
import com.meterware.httpunit.WebLink;
import com.meterware.httpunit.WebRequest;
import com.meterware.httpunit.WebResponse;
+import org.junit.runner.RunWith;
+import org.picketlink.test.integration.SAMLTestsDeployerHelper;
/**
* <p>
@@ -47,11 +53,23 @@
* @author Anil.Saldhana(a)redhat.com
* @since Jul 7, 2011
*/
+(a)RunWith(Arquillian.class)
public class SAML11IDPFirstUnitTestCase
{
String IDP_URL = System.getProperty( "IDP_URL", "http://localhost:8080/idp/" );
-
+
+ @Deployment(name = "idp.war", order = 1, testable = false)
+ public static WebArchive importIdpWar() {
+ return SAMLTestsDeployerHelper.importIdpWar();
+ }
+
+ @Deployment(name = "sales-saml11.war", order = 2, testable = false)
+ public static WebArchive importSalesSaml11War() {
+ return SAMLTestsDeployerHelper.importSalesSaml11War();
+ }
+
@Test
+ @RunAsClient
public void testSAML11() throws Exception
{
System.out.println("Trying "+ IDP_URL);
Deleted: integration-tests/branches/eap6/picketlink-saml-tests/src/test/java/org/picketlink/test/integration/saml2/SAML2MixedBindingGlobalLogOutUnitTestCase.java
===================================================================
--- integration-tests/branches/eap6/picketlink-saml-tests/src/test/java/org/picketlink/test/integration/saml2/SAML2MixedBindingGlobalLogOutUnitTestCase.java 2012-04-23 09:59:53 UTC (rev 1554)
+++ integration-tests/branches/eap6/picketlink-saml-tests/src/test/java/org/picketlink/test/integration/saml2/SAML2MixedBindingGlobalLogOutUnitTestCase.java 2012-05-02 16:24:03 UTC (rev 1555)
@@ -1,124 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.picketlink.test.integration.saml2;
-
-import static org.junit.Assert.assertTrue;
-
-import org.junit.Test;
-
-import com.meterware.httpunit.GetMethodWebRequest;
-import com.meterware.httpunit.SubmitButton;
-import com.meterware.httpunit.WebConversation;
-import com.meterware.httpunit.WebForm;
-import com.meterware.httpunit.WebRequest;
-import com.meterware.httpunit.WebResponse;
-
-/**
- * <p>
- * Unit test the SAML2 Global Log Out scenarios.
- * </p>
- * <p>
- * <b>Note:</b> This test expects that a set of endpoints that are configured
- * for the test are available. You may have to start web containers offline
- * for the endpoints to be live.
- * </p>
- *
- * @author Anil.Saldhana(a)redhat.com
- * @since Apr 8, 2010
- */
-public class SAML2MixedBindingGlobalLogOutUnitTestCase
-{
- String SERVICE_1_URL = System.getProperty( "SERVICE_1_URL", "http://localhost:8080/sales-post/" );
- String SERVICE_2_URL = System.getProperty( "SERVICE_2_URL", "http://localhost:8080/employee-post/" );
-
- String SERVICE_3_URL = System.getProperty( "SERVICE_3_URL", "http://localhost:8080/sales/" );
- String SERVICE_4_URL = System.getProperty( "SERVICE_4_URL", "http://localhost:8080/employee/" );
-
- String LOGOUT_URL = "?GLO=true";
-
- @Test
- public void testSAMLMixedBindingWithPostFirstGlobalLogOut() throws Exception
- {
- hitURLs(SERVICE_1_URL, SERVICE_2_URL, SERVICE_3_URL, SERVICE_4_URL);
- }
-
- @Test
- public void testSAMLMixedBindingWithRedirectFirstGlobalLogOut() throws Exception
- {
- hitURLs(SERVICE_3_URL, SERVICE_4_URL, SERVICE_1_URL, SERVICE_2_URL);
- }
-
-
- private void hitURLs( String url1, String url2, String url3, String url4 ) throws Exception
- {
- System.out.println("Trying "+ url1);
- //Sales post Application Login
- WebRequest serviceRequest1 = new GetMethodWebRequest( url1 );
- WebConversation webConversation = new WebConversation();
-
- WebResponse webResponse = webConversation.getResponse( serviceRequest1 );
- WebForm loginForm = webResponse.getForms()[0];
- loginForm.setParameter("j_username", "tomcat" );
- loginForm.setParameter("j_password", "tomcat" );
- SubmitButton submitButton = loginForm.getSubmitButtons()[0];
- submitButton.click();
-
- webResponse = webConversation.getCurrentPage();
- assertTrue( " Reached the sales index page ", webResponse.getText().contains( "SalesTool" ));
-
- //Employee post Application Login
- System.out.println("Trying "+ url2);
- webResponse = webConversation.getResponse( url2 );
- assertTrue( " Reached the employee index page ", webResponse.getText().contains( "EmployeeDashboard" ));
-
- //Sales Application Login
- System.out.println("Trying "+ url3);
- webResponse = webConversation.getResponse( url3 );
- assertTrue( " Reached the employee index page ", webResponse.getText().contains( "SalesTool" ));
-
- //Employee Application Login
- System.out.println("Trying "+ url4);
- webResponse = webConversation.getResponse( url4 );
- assertTrue( " Reached the employee index page ", webResponse.getText().contains( "EmployeeDashboard" ));
-
- //Logout from sales
- System.out.println("Trying "+ url1 + LOGOUT_URL);
- webResponse = webConversation.getResponse( url1 + LOGOUT_URL );
- assertTrue( "Reached logged out page", webResponse.getText().contains( "logged" ) );
-
- //Hit the Sales Apps again
- System.out.println("Trying "+ url1);
- webResponse = webConversation.getResponse( url1 );
- assertTrue( " Reached the Login page ", webResponse.getText().contains( "Login" ));
- System.out.println("Trying "+ url3);
- webResponse = webConversation.getResponse( url3 );
- assertTrue( " Reached the Login page ", webResponse.getText().contains( "Login" ));
-
- //Hit the Employee Apps again
- System.out.println("Trying "+ url2);
- webResponse = webConversation.getResponse( url2 );
- assertTrue( " Reached the Login page ", webResponse.getText().contains( "Login" ));
- System.out.println("Trying "+ url2);
- webResponse = webConversation.getResponse( url2 );
- assertTrue( " Reached the Login page ", webResponse.getText().contains( "Login" ));
- }
-}
Added: integration-tests/branches/eap6/picketlink-saml-tests/src/test/java/org/picketlink/test/integration/saml2/SAML2MixedBindingGlobalLogOutUnitTestCase.java
===================================================================
--- integration-tests/branches/eap6/picketlink-saml-tests/src/test/java/org/picketlink/test/integration/saml2/SAML2MixedBindingGlobalLogOutUnitTestCase.java (rev 0)
+++ integration-tests/branches/eap6/picketlink-saml-tests/src/test/java/org/picketlink/test/integration/saml2/SAML2MixedBindingGlobalLogOutUnitTestCase.java 2012-05-02 16:24:03 UTC (rev 1555)
@@ -0,0 +1,130 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.picketlink.test.integration.saml2;
+
+import static org.junit.Assert.assertTrue;
+
+import org.jboss.arquillian.container.test.api.RunAsClient;
+import org.jboss.arquillian.junit.Arquillian;
+import org.junit.runner.RunWith;
+
+import org.junit.Test;
+import com.meterware.httpunit.GetMethodWebRequest;
+import com.meterware.httpunit.SubmitButton;
+import com.meterware.httpunit.WebConversation;
+import com.meterware.httpunit.WebForm;
+import com.meterware.httpunit.WebRequest;
+import com.meterware.httpunit.WebResponse;
+import org.picketlink.test.integration.SAMLTestsDeployerHelper;
+
+/**
+ * <p>
+ * Unit test the SAML2 Global Log Out scenarios.
+ * </p>
+ * <p>
+ * <b>Note:</b> This test expects that a set of endpoints that are configured
+ * for the test are available. You may have to start web containers offline
+ * for the endpoints to be live.
+ * </p>
+ *
+ * @author Anil.Saldhana(a)redhat.com
+ * @since Apr 8, 2010
+ */
+(a)RunWith(Arquillian.class)
+public class SAML2MixedBindingGlobalLogOutUnitTestCase extends SAMLTestsDeployerHelper
+{
+ String SERVICE_1_URL = System.getProperty( "SERVICE_1_URL", "http://localhost:8080/sales-post/" );
+ String SERVICE_2_URL = System.getProperty( "SERVICE_2_URL", "http://localhost:8080/employee-post/" );
+
+ String SERVICE_3_URL = System.getProperty( "SERVICE_3_URL", "http://localhost:8080/sales/" );
+ String SERVICE_4_URL = System.getProperty( "SERVICE_4_URL", "http://localhost:8080/employee/" );
+
+ String LOGOUT_URL = "?GLO=true";
+
+ @Test
+ @RunAsClient
+ public void testSAMLMixedBindingWithPostFirstGlobalLogOut() throws Exception
+ {
+ hitURLs(SERVICE_1_URL, SERVICE_2_URL, SERVICE_3_URL, SERVICE_4_URL);
+ }
+
+ @Test
+ @RunAsClient
+ public void testSAMLMixedBindingWithRedirectFirstGlobalLogOut() throws Exception
+ {
+ hitURLs(SERVICE_3_URL, SERVICE_4_URL, SERVICE_1_URL, SERVICE_2_URL);
+ }
+
+ private void hitURLs( String url1, String url2, String url3, String url4 ) throws Exception
+ {
+ System.out.println("Trying "+ url1);
+ //Sales post Application Login
+ WebRequest serviceRequest1 = new GetMethodWebRequest( url1 );
+ WebConversation webConversation = new WebConversation();
+
+ WebResponse webResponse = webConversation.getResponse( serviceRequest1 );
+ WebForm loginForm = webResponse.getForms()[0];
+ loginForm.setParameter("j_username", "tomcat" );
+ loginForm.setParameter("j_password", "tomcat" );
+ SubmitButton submitButton = loginForm.getSubmitButtons()[0];
+ submitButton.click();
+
+ webResponse = webConversation.getCurrentPage();
+ assertTrue( " Reached the sales index page ", webResponse.getText().contains( "SalesTool" ));
+
+ //Employee post Application Login
+ System.out.println("Trying "+ url2);
+ webResponse = webConversation.getResponse( url2 );
+ assertTrue( " Reached the employee index page ", webResponse.getText().contains( "EmployeeDashboard" ));
+
+ //Sales Application Login
+ System.out.println("Trying "+ url3);
+ webResponse = webConversation.getResponse( url3 );
+ assertTrue( " Reached the employee index page ", webResponse.getText().contains( "SalesTool" ));
+
+ //Employee Application Login
+ System.out.println("Trying "+ url4);
+ webResponse = webConversation.getResponse( url4 );
+ assertTrue( " Reached the employee index page ", webResponse.getText().contains( "EmployeeDashboard" ));
+
+ //Logout from sales
+ System.out.println("Trying "+ url1 + LOGOUT_URL);
+ webResponse = webConversation.getResponse( url1 + LOGOUT_URL );
+ assertTrue( "Reached logged out page", webResponse.getText().contains( "logged" ) );
+
+ //Hit the Sales Apps again
+ System.out.println("Trying "+ url1);
+ webResponse = webConversation.getResponse( url1 );
+ assertTrue( " Reached the Login page ", webResponse.getText().contains( "Login" ));
+ System.out.println("Trying "+ url3);
+ webResponse = webConversation.getResponse( url3 );
+ assertTrue( " Reached the Login page ", webResponse.getText().contains( "Login" ));
+
+ //Hit the Employee Apps again
+ System.out.println("Trying "+ url2);
+ webResponse = webConversation.getResponse( url2 );
+ assertTrue( " Reached the Login page ", webResponse.getText().contains( "Login" ));
+ System.out.println("Trying "+ url2);
+ webResponse = webConversation.getResponse( url2 );
+ assertTrue( " Reached the Login page ", webResponse.getText().contains( "Login" ));
+ }
+}
Deleted: integration-tests/branches/eap6/picketlink-saml-tests/src/test/java/org/picketlink/test/integration/saml2/SAML2PostBindingGlobalLogOutUnitTestCase.java
===================================================================
--- integration-tests/branches/eap6/picketlink-saml-tests/src/test/java/org/picketlink/test/integration/saml2/SAML2PostBindingGlobalLogOutUnitTestCase.java 2012-04-23 09:59:53 UTC (rev 1554)
+++ integration-tests/branches/eap6/picketlink-saml-tests/src/test/java/org/picketlink/test/integration/saml2/SAML2PostBindingGlobalLogOutUnitTestCase.java 2012-05-02 16:24:03 UTC (rev 1555)
@@ -1,102 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.picketlink.test.integration.saml2;
-
-import static org.junit.Assert.assertTrue;
-
-import org.junit.Test;
-
-import com.meterware.httpunit.GetMethodWebRequest;
-import com.meterware.httpunit.SubmitButton;
-import com.meterware.httpunit.WebConversation;
-import com.meterware.httpunit.WebForm;
-import com.meterware.httpunit.WebRequest;
-import com.meterware.httpunit.WebResponse;
-
-/**
- * <p>
- * Unit test the SAML2 Global Log Out scenarios.
- * </p>
- * <p>
- * <b>Note:</b> This test expects that a set of endpoints that are configured
- * for the test are available. You may have to start web containers offline
- * for the endpoints to be live.
- * </p>
- *
- * @author Anil.Saldhana(a)redhat.com
- * @since Apr 8, 2010
- */
-public class SAML2PostBindingGlobalLogOutUnitTestCase
-{
- String SERVICE_1_URL = System.getProperty( "SERVICE_1_URL", "http://localhost:8080/sales-post/" );
- String SERVICE_2_URL = System.getProperty( "SERVICE_2_URL", "http://localhost:8080/employee-post/" );
- String LOGOUT_URL = "?GLO=true";
-
- @Test
- public void testSAMLPostBindingGlobalLogOut() throws Exception
- {
- //Sales Application Login
- System.out.println("Trying "+ getService1URL());
- WebRequest serviceRequest1 = new GetMethodWebRequest( getService1URL() );
- WebConversation webConversation = new WebConversation();
-
- WebResponse webResponse = webConversation.getResponse( serviceRequest1 );
- WebForm loginForm = webResponse.getForms()[0];
- loginForm.setParameter("j_username", "tomcat" );
- loginForm.setParameter("j_password", "tomcat" );
- SubmitButton submitButton = loginForm.getSubmitButtons()[0];
- submitButton.click();
-
- webResponse = webConversation.getCurrentPage();
- assertTrue( " Reached the sales index page ", webResponse.getText().contains( "SalesTool" ));
-
- //Employee Application Login
- System.out.println("Trying "+ getService2URL());
- webResponse = webConversation.getResponse( getService2URL() );
- assertTrue( " Reached the employee index page ", webResponse.getText().contains( "EmployeeDashboard" ));
-
- //Logout from sales
-
- System.out.println("Trying "+ getService1URL() + LOGOUT_URL);
- webResponse = webConversation.getResponse( getService1URL() + LOGOUT_URL );
- assertTrue( "Reached logged out page", webResponse.getText().contains( "logged" ) );
-
- //Hit the Sales App again
- System.out.println("Trying "+ getService1URL());
- webResponse = webConversation.getResponse( getService1URL() );
- assertTrue( " Reached the Login page ", webResponse.getText().contains( "Login" ));
-
- //Hit the Employee App again
- System.out.println("Trying "+ getService2URL());
- webResponse = webConversation.getResponse( getService2URL() );
- assertTrue( " Reached the Login page ", webResponse.getText().contains( "Login" ));
- }
-
- public String getService1URL()
- {
- return SERVICE_1_URL;
- }
- public String getService2URL()
- {
- return SERVICE_2_URL;
- }
-}
\ No newline at end of file
Added: integration-tests/branches/eap6/picketlink-saml-tests/src/test/java/org/picketlink/test/integration/saml2/SAML2PostBindingGlobalLogOutUnitTestCase.java
===================================================================
--- integration-tests/branches/eap6/picketlink-saml-tests/src/test/java/org/picketlink/test/integration/saml2/SAML2PostBindingGlobalLogOutUnitTestCase.java (rev 0)
+++ integration-tests/branches/eap6/picketlink-saml-tests/src/test/java/org/picketlink/test/integration/saml2/SAML2PostBindingGlobalLogOutUnitTestCase.java 2012-05-02 16:24:03 UTC (rev 1555)
@@ -0,0 +1,109 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.picketlink.test.integration.saml2;
+
+import static org.junit.Assert.assertTrue;
+
+import org.jboss.arquillian.container.test.api.RunAsClient;
+import org.jboss.arquillian.junit.Arquillian;
+import org.junit.Test;
+
+import com.meterware.httpunit.GetMethodWebRequest;
+import com.meterware.httpunit.SubmitButton;
+import com.meterware.httpunit.WebConversation;
+import com.meterware.httpunit.WebForm;
+import com.meterware.httpunit.WebRequest;
+import com.meterware.httpunit.WebResponse;
+import org.junit.runner.RunWith;
+import org.picketlink.test.integration.SAMLTestsDeployerHelper;
+
+/**
+ * <p>
+ * Unit test the SAML2 Global Log Out scenarios.
+ * </p>
+ * <p>
+ * <b>Note:</b> This test expects that a set of endpoints that are configured
+ * for the test are available. You may have to start web containers offline
+ * for the endpoints to be live.
+ * </p>
+ *
+ * @author Anil.Saldhana(a)redhat.com
+ * @since Apr 8, 2010
+ */
+
+(a)RunWith(Arquillian.class)
+public class SAML2PostBindingGlobalLogOutUnitTestCase extends SAMLTestsDeployerHelper
+{
+ String SERVICE_1_URL = System.getProperty( "SERVICE_1_URL", "http://localhost:8080/sales-post/" );
+ String SERVICE_2_URL = System.getProperty( "SERVICE_2_URL", "http://localhost:8080/employee-post/" );
+ String LOGOUT_URL = "?GLO=true";
+
+ @Test
+ @RunAsClient
+ public void testSAMLPostBindingGlobalLogOut() throws Exception
+ {
+ //Sales Application Login
+ System.out.println("Trying "+ getService1URL());
+ WebRequest serviceRequest1 = new GetMethodWebRequest( getService1URL() );
+ WebConversation webConversation = new WebConversation();
+
+ WebResponse webResponse = webConversation.getResponse( serviceRequest1 );
+ WebForm loginForm = webResponse.getForms()[0];
+ loginForm.setParameter("j_username", "tomcat" );
+ loginForm.setParameter("j_password", "tomcat" );
+ SubmitButton submitButton = loginForm.getSubmitButtons()[0];
+ submitButton.click();
+
+ webResponse = webConversation.getCurrentPage();
+ assertTrue( " Reached the sales index page ", webResponse.getText().contains( "SalesTool" ));
+
+ //Employee Application Login
+ System.out.println("Trying "+ getService2URL());
+ webResponse = webConversation.getResponse( getService2URL() );
+ assertTrue( " Reached the employee index page ", webResponse.getText().contains( "EmployeeDashboard" ));
+
+ //Logout from sales
+
+ System.out.println("Trying "+ getService1URL() + LOGOUT_URL);
+ webResponse = webConversation.getResponse( getService1URL() + LOGOUT_URL );
+ assertTrue( "Reached logged out page", webResponse.getText().contains( "logged" ) );
+
+ //Hit the Sales App again
+ System.out.println("Trying "+ getService1URL());
+ webResponse = webConversation.getResponse( getService1URL() );
+ assertTrue( " Reached the Login page ", webResponse.getText().contains( "Login" ));
+
+ //Hit the Employee App again
+ System.out.println("Trying "+ getService2URL());
+ webResponse = webConversation.getResponse( getService2URL() );
+ assertTrue( " Reached the Login page ", webResponse.getText().contains( "Login" ));
+ }
+
+ public String getService1URL()
+ {
+ return SERVICE_1_URL;
+ }
+ public String getService2URL()
+ {
+ return SERVICE_2_URL;
+ }
+}
\ No newline at end of file
Deleted: integration-tests/branches/eap6/picketlink-saml-tests/src/test/java/org/picketlink/test/integration/saml2/SAML2PostSignatureGLOUnitTestCase.java
===================================================================
--- integration-tests/branches/eap6/picketlink-saml-tests/src/test/java/org/picketlink/test/integration/saml2/SAML2PostSignatureGLOUnitTestCase.java 2012-04-23 09:59:53 UTC (rev 1554)
+++ integration-tests/branches/eap6/picketlink-saml-tests/src/test/java/org/picketlink/test/integration/saml2/SAML2PostSignatureGLOUnitTestCase.java 2012-05-02 16:24:03 UTC (rev 1555)
@@ -1,43 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2011, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.picketlink.test.integration.saml2;
-
-/**
- * Unit test the GLO scenarios involving two endpoints with SAML2 Post
- * and Signature binding
- * @author anil saldhana
- */
-public class SAML2PostSignatureGLOUnitTestCase extends SAML2PostBindingGlobalLogOutUnitTestCase
-{
- String SERVICE_5_URL = System.getProperty( "SERVICE_5_URL", "http://localhost:8080/sales-post-sig/" );
- String SERVICE_6_URL = System.getProperty( "SERVICE_6_URL", "http://localhost:8080/employee-post-sig/" );
- @Override
- public String getService1URL()
- {
- return SERVICE_5_URL;
- }
- @Override
- public String getService2URL()
- {
- return SERVICE_6_URL;
- }
-}
\ No newline at end of file
Added: integration-tests/branches/eap6/picketlink-saml-tests/src/test/java/org/picketlink/test/integration/saml2/SAML2PostSignatureGLOUnitTestCase.java
===================================================================
--- integration-tests/branches/eap6/picketlink-saml-tests/src/test/java/org/picketlink/test/integration/saml2/SAML2PostSignatureGLOUnitTestCase.java (rev 0)
+++ integration-tests/branches/eap6/picketlink-saml-tests/src/test/java/org/picketlink/test/integration/saml2/SAML2PostSignatureGLOUnitTestCase.java 2012-05-02 16:24:03 UTC (rev 1555)
@@ -0,0 +1,47 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2011, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.picketlink.test.integration.saml2;
+
+import org.jboss.arquillian.junit.Arquillian;
+import org.junit.runner.RunWith;
+
+/**
+ * Unit test the GLO scenarios involving two endpoints with SAML2 Post
+ * and Signature binding
+ * @author anil saldhana
+ */
+(a)RunWith(Arquillian.class)
+public class SAML2PostSignatureGLOUnitTestCase extends SAML2PostBindingGlobalLogOutUnitTestCase
+{
+ String SERVICE_5_URL = System.getProperty( "SERVICE_5_URL", "http://localhost:8080/sales-post-sig/" );
+ String SERVICE_6_URL = System.getProperty( "SERVICE_6_URL", "http://localhost:8080/employee-post-sig/" );
+ @Override
+ public String getService1URL()
+ {
+ return SERVICE_5_URL;
+ }
+ @Override
+ public String getService2URL()
+ {
+ return SERVICE_6_URL;
+ }
+}
\ No newline at end of file
Deleted: integration-tests/branches/eap6/picketlink-saml-tests/src/test/java/org/picketlink/test/integration/saml2/SAML2RedirectBindingGlobalLogOutUnitTestCase.java
===================================================================
--- integration-tests/branches/eap6/picketlink-saml-tests/src/test/java/org/picketlink/test/integration/saml2/SAML2RedirectBindingGlobalLogOutUnitTestCase.java 2012-04-23 09:59:53 UTC (rev 1554)
+++ integration-tests/branches/eap6/picketlink-saml-tests/src/test/java/org/picketlink/test/integration/saml2/SAML2RedirectBindingGlobalLogOutUnitTestCase.java 2012-05-02 16:24:03 UTC (rev 1555)
@@ -1,95 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.picketlink.test.integration.saml2;
-
-import static org.junit.Assert.assertTrue;
-
-import org.junit.Test;
-
-import com.meterware.httpunit.GetMethodWebRequest;
-import com.meterware.httpunit.SubmitButton;
-import com.meterware.httpunit.WebConversation;
-import com.meterware.httpunit.WebForm;
-import com.meterware.httpunit.WebRequest;
-import com.meterware.httpunit.WebResponse;
-
-/**
- * <p>
- * Unit test the SAML2 Global Log Out scenarios.
- * </p>
- * <p>
- * <b>Note:</b> This test expects that a set of endpoints that are configured
- * for the test are available. You may have to start web containers offline
- * for the endpoints to be live.
- * </p>
- *
- * @author Anil.Saldhana(a)redhat.com
- * @since Apr 8, 2010
- */
-public class SAML2RedirectBindingGlobalLogOutUnitTestCase
-{
-
- String SERVICE_1_URL = System.getProperty( "SERVICE_3_URL", "http://localhost:8080/sales/" );
- String SERVICE_2_URL = System.getProperty( "SERVICE_4_URL", "http://localhost:8080/employee/" );
-
- @Test
- public void testSAMLRedirectBindingGLO() throws Exception
- {
- String LOGOUT_URL = "?GLO=true";
-
- //Sales Application Login
-
- System.out.println("Trying "+ SERVICE_1_URL);
- WebRequest serviceRequest1 = new GetMethodWebRequest( SERVICE_1_URL );
- WebConversation webConversation = new WebConversation();
-
- WebResponse webResponse = webConversation.getResponse( serviceRequest1 );
- WebForm loginForm = webResponse.getForms()[0];
- loginForm.setParameter("j_username", "tomcat" );
- loginForm.setParameter("j_password", "tomcat" );
- SubmitButton submitButton = loginForm.getSubmitButtons()[0];
- submitButton.click();
-
- webResponse = webConversation.getCurrentPage();
- assertTrue( " Reached the sales index page ", webResponse.getText().contains( "SalesTool" ));
-
- //Employee Application Login
- System.out.println("Trying "+ SERVICE_2_URL);
- webResponse = webConversation.getResponse( SERVICE_2_URL );
- assertTrue( " Reached the employee index page ", webResponse.getText().contains( "EmployeeDashboard" ));
-
- //Logout from sales
- System.out.println("Trying "+ SERVICE_1_URL + LOGOUT_URL);
- webResponse = webConversation.getResponse( SERVICE_1_URL + LOGOUT_URL );
- assertTrue( "Reached logged out page", webResponse.getText().contains( "logged" ) );
-
- //Hit the Sales App again
- System.out.println("Trying "+ SERVICE_1_URL);
- webResponse = webConversation.getResponse( SERVICE_1_URL );
- assertTrue( " Reached the Login page ", webResponse.getText().contains( "Login" ));
-
- //Hit the Employee App again
- System.out.println("Trying "+ SERVICE_2_URL);
- webResponse = webConversation.getResponse( SERVICE_2_URL );
- assertTrue( " Reached the Login page ", webResponse.getText().contains( "Login" ));
- }
-}
\ No newline at end of file
Added: integration-tests/branches/eap6/picketlink-saml-tests/src/test/java/org/picketlink/test/integration/saml2/SAML2RedirectBindingGlobalLogOutUnitTestCase.java
===================================================================
--- integration-tests/branches/eap6/picketlink-saml-tests/src/test/java/org/picketlink/test/integration/saml2/SAML2RedirectBindingGlobalLogOutUnitTestCase.java (rev 0)
+++ integration-tests/branches/eap6/picketlink-saml-tests/src/test/java/org/picketlink/test/integration/saml2/SAML2RedirectBindingGlobalLogOutUnitTestCase.java 2012-05-02 16:24:03 UTC (rev 1555)
@@ -0,0 +1,101 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.picketlink.test.integration.saml2;
+
+import static org.junit.Assert.assertTrue;
+
+import org.jboss.arquillian.container.test.api.RunAsClient;
+import org.jboss.arquillian.junit.Arquillian;
+import org.junit.Test;
+
+import com.meterware.httpunit.GetMethodWebRequest;
+import com.meterware.httpunit.SubmitButton;
+import com.meterware.httpunit.WebConversation;
+import com.meterware.httpunit.WebForm;
+import com.meterware.httpunit.WebRequest;
+import com.meterware.httpunit.WebResponse;
+import org.junit.runner.RunWith;
+import org.picketlink.test.integration.SAMLTestsDeployerHelper;
+
+/**
+ * <p>
+ * Unit test the SAML2 Global Log Out scenarios.
+ * </p>
+ * <p>
+ * <b>Note:</b> This test expects that a set of endpoints that are configured
+ * for the test are available. You may have to start web containers offline
+ * for the endpoints to be live.
+ * </p>
+ *
+ * @author Anil.Saldhana(a)redhat.com
+ * @since Apr 8, 2010
+ */
+(a)RunWith(Arquillian.class)
+public class SAML2RedirectBindingGlobalLogOutUnitTestCase extends SAMLTestsDeployerHelper
+{
+
+ String SERVICE_1_URL = System.getProperty( "SERVICE_3_URL", "http://localhost:8080/sales/" );
+ String SERVICE_2_URL = System.getProperty( "SERVICE_4_URL", "http://localhost:8080/employee/" );
+
+ @Test
+ @RunAsClient
+ public void testSAMLRedirectBindingGLO() throws Exception
+ {
+ String LOGOUT_URL = "?GLO=true";
+
+ //Sales Application Login
+
+ System.out.println("Trying "+ SERVICE_1_URL);
+ WebRequest serviceRequest1 = new GetMethodWebRequest( SERVICE_1_URL );
+ WebConversation webConversation = new WebConversation();
+
+ WebResponse webResponse = webConversation.getResponse( serviceRequest1 );
+ WebForm loginForm = webResponse.getForms()[0];
+ loginForm.setParameter("j_username", "tomcat" );
+ loginForm.setParameter("j_password", "tomcat" );
+ SubmitButton submitButton = loginForm.getSubmitButtons()[0];
+ submitButton.click();
+
+ webResponse = webConversation.getCurrentPage();
+ assertTrue( " Reached the sales index page ", webResponse.getText().contains( "SalesTool" ));
+
+ //Employee Application Login
+ System.out.println("Trying "+ SERVICE_2_URL);
+ webResponse = webConversation.getResponse( SERVICE_2_URL );
+ assertTrue( " Reached the employee index page ", webResponse.getText().contains( "EmployeeDashboard" ));
+
+ //Logout from sales
+ System.out.println("Trying "+ SERVICE_1_URL + LOGOUT_URL);
+ webResponse = webConversation.getResponse( SERVICE_1_URL + LOGOUT_URL );
+ assertTrue( "Reached logged out page", webResponse.getText().contains( "logged" ) );
+
+ //Hit the Sales App again
+ System.out.println("Trying "+ SERVICE_1_URL);
+ webResponse = webConversation.getResponse( SERVICE_1_URL );
+ assertTrue( " Reached the Login page ", webResponse.getText().contains( "Login" ));
+
+ //Hit the Employee App again
+ System.out.println("Trying "+ SERVICE_2_URL);
+ webResponse = webConversation.getResponse( SERVICE_2_URL );
+ assertTrue( " Reached the Login page ", webResponse.getText().contains( "Login" ));
+ }
+}
\ No newline at end of file
Deleted: integration-tests/branches/eap6/picketlink-saml-tests/src/test/java/org/picketlink/test/integration/saml2/SAML2ResponseParsingUnitTestCase.java
===================================================================
--- integration-tests/branches/eap6/picketlink-saml-tests/src/test/java/org/picketlink/test/integration/saml2/SAML2ResponseParsingUnitTestCase.java 2012-04-23 09:59:53 UTC (rev 1554)
+++ integration-tests/branches/eap6/picketlink-saml-tests/src/test/java/org/picketlink/test/integration/saml2/SAML2ResponseParsingUnitTestCase.java 2012-05-02 16:24:03 UTC (rev 1555)
@@ -1,54 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.picketlink.test.integration.saml2;
-
-import static org.junit.Assert.assertEquals;
-
-import org.junit.Test;
-
-import com.meterware.httpunit.GetMethodWebRequest;
-import com.meterware.httpunit.WebConversation;
-import com.meterware.httpunit.WebRequest;
-import com.meterware.httpunit.WebResponse;
-
-/**
- * Test for parsing the SAML2 Response
- * @author Anil.Saldhana(a)redhat.com
- * @since Jul 26, 2011
- */
-public class SAML2ResponseParsingUnitTestCase
-{
- String CLAIMS_URL = "http://localhost:8080/claims/claimsprocess.jsp";
-
- /**
- * PLFED-214: Uses the claims.war in the picketlink-int-webapps setup
- */
- @Test
- public void testADFSClaims() throws Exception
- {
- WebRequest serviceRequest1 = new GetMethodWebRequest( CLAIMS_URL );
- WebConversation webConversation = new WebConversation();
-
- WebResponse webResponse = webConversation.getResponse( serviceRequest1 );
- assertEquals( 200, webResponse.getResponseCode());
- }
-}
\ No newline at end of file
Added: integration-tests/branches/eap6/picketlink-saml-tests/src/test/java/org/picketlink/test/integration/saml2/SAML2ResponseParsingUnitTestCase.java
===================================================================
--- integration-tests/branches/eap6/picketlink-saml-tests/src/test/java/org/picketlink/test/integration/saml2/SAML2ResponseParsingUnitTestCase.java (rev 0)
+++ integration-tests/branches/eap6/picketlink-saml-tests/src/test/java/org/picketlink/test/integration/saml2/SAML2ResponseParsingUnitTestCase.java 2012-05-02 16:24:03 UTC (rev 1555)
@@ -0,0 +1,60 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.picketlink.test.integration.saml2;
+
+import static org.junit.Assert.assertEquals;
+
+import org.jboss.arquillian.container.test.api.RunAsClient;
+import org.jboss.arquillian.junit.Arquillian;
+import org.junit.Test;
+
+import com.meterware.httpunit.GetMethodWebRequest;
+import com.meterware.httpunit.WebConversation;
+import com.meterware.httpunit.WebRequest;
+import com.meterware.httpunit.WebResponse;
+import org.junit.runner.RunWith;
+import org.picketlink.test.integration.SAMLTestsDeployerHelper;
+
+/**
+ * Test for parsing the SAML2 Response
+ * @author Anil.Saldhana(a)redhat.com
+ * @since Jul 26, 2011
+ */
+(a)RunWith(Arquillian.class)
+public class SAML2ResponseParsingUnitTestCase extends SAMLTestsDeployerHelper
+{
+ String CLAIMS_URL = "http://localhost:8080/claims/claimsprocess.jsp";
+
+ /**
+ * PLFED-214: Uses the claims.war in the picketlink-int-webapps setup
+ */
+ @Test
+ @RunAsClient
+ public void testADFSClaims() throws Exception
+ {
+ WebRequest serviceRequest1 = new GetMethodWebRequest( CLAIMS_URL );
+ WebConversation webConversation = new WebConversation();
+
+ WebResponse webResponse = webConversation.getResponse( serviceRequest1 );
+ assertEquals( 200, webResponse.getResponseCode());
+ }
+}
\ No newline at end of file
Deleted: integration-tests/branches/eap6/picketlink-saml-tests/src/test/java/org/picketlink/test/integration/saml2/StandaloneSAMLUnitTestCase.java
===================================================================
--- integration-tests/branches/eap6/picketlink-saml-tests/src/test/java/org/picketlink/test/integration/saml2/StandaloneSAMLUnitTestCase.java 2012-04-23 09:59:53 UTC (rev 1554)
+++ integration-tests/branches/eap6/picketlink-saml-tests/src/test/java/org/picketlink/test/integration/saml2/StandaloneSAMLUnitTestCase.java 2012-05-02 16:24:03 UTC (rev 1555)
@@ -1,95 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.picketlink.test.integration.saml2;
-
-import static org.junit.Assert.assertTrue;
-
-import org.junit.Test;
-
-import com.meterware.httpunit.GetMethodWebRequest;
-import com.meterware.httpunit.SubmitButton;
-import com.meterware.httpunit.WebConversation;
-import com.meterware.httpunit.WebForm;
-import com.meterware.httpunit.WebRequest;
-import com.meterware.httpunit.WebResponse;
-
-/**
- * SAML Test for Standalone Web Containers
- * @author Anil.Saldhana(a)redhat.com
- * @since Aug 9, 2011
- */
-public class StandaloneSAMLUnitTestCase
-{
- String SERVICE_1_URL = System.getProperty( "SERVICE_1_URL", "http://localhost:8080/sales-standalone/" );
- String SERVICE_2_URL = System.getProperty( "SERVICE_2_URL", "http://localhost:8080/employee-standalone/" );
- String LOGOUT_URL = "?GLO=true";
-
-
- public String getService1URL()
- {
- return SERVICE_1_URL;
- }
- public String getService2URL()
- {
- return SERVICE_2_URL;
- }
-
- @Test
- public void testSAMLStandalone() throws Exception
- {
- //Sales Application Login
- System.out.println("Trying "+ getService1URL());
- WebRequest serviceRequest1 = new GetMethodWebRequest( getService1URL() );
- WebConversation webConversation = new WebConversation();
-
- WebResponse webResponse = webConversation.getResponse( serviceRequest1 );
- WebForm loginForm = webResponse.getForms()[0];
- loginForm.setParameter("JBID_USERNAME", "manager" );
- loginForm.setParameter("JBID_PASSWORD", "tomcat" );
- SubmitButton submitButton = loginForm.getSubmitButtons()[0];
- submitButton.click();
-
- webResponse = webConversation.getCurrentPage();
- assertTrue( " Reached the sales index page ", webResponse.getText().contains( "SalesTool" ));
-
- //Employee Application Login
- System.out.println("Trying "+ getService2URL());
- webResponse = webConversation.getResponse( getService2URL() );
- assertTrue( " Reached the employee index page ", webResponse.getText().contains( "EmployeeDashboard" ));
-
- //Logout from sales
-
- System.out.println("Trying "+ getService1URL() + LOGOUT_URL);
- webResponse = webConversation.getResponse( getService1URL() + LOGOUT_URL );
- assertTrue( "Reached logged out page", webResponse.getText().contains( "logged" ) );
-
- //Hit the Sales App again
- System.out.println("Trying "+ getService1URL());
- webResponse = webConversation.getResponse( getService1URL() );
- assertTrue( " Reached the Login page ", webResponse.getText().contains( "Login" ));
-
- //Hit the Employee App again
- System.out.println("Trying "+ getService2URL());
- webResponse = webConversation.getResponse( getService2URL() );
- assertTrue( " Reached the Login page ", webResponse.getText().contains( "Login" ));
- }
-}
\ No newline at end of file
Added: integration-tests/branches/eap6/picketlink-saml-tests/src/test/java/org/picketlink/test/integration/saml2/StandaloneSAMLUnitTestCase.java
===================================================================
--- integration-tests/branches/eap6/picketlink-saml-tests/src/test/java/org/picketlink/test/integration/saml2/StandaloneSAMLUnitTestCase.java (rev 0)
+++ integration-tests/branches/eap6/picketlink-saml-tests/src/test/java/org/picketlink/test/integration/saml2/StandaloneSAMLUnitTestCase.java 2012-05-02 16:24:03 UTC (rev 1555)
@@ -0,0 +1,101 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.picketlink.test.integration.saml2;
+
+import static org.junit.Assert.assertTrue;
+
+import org.jboss.arquillian.container.test.api.RunAsClient;
+import org.jboss.arquillian.junit.Arquillian;
+import org.junit.Test;
+
+import com.meterware.httpunit.GetMethodWebRequest;
+import com.meterware.httpunit.SubmitButton;
+import com.meterware.httpunit.WebConversation;
+import com.meterware.httpunit.WebForm;
+import com.meterware.httpunit.WebRequest;
+import com.meterware.httpunit.WebResponse;
+import org.junit.runner.RunWith;
+import org.picketlink.test.integration.SAMLTestsDeployerHelper;
+
+/**
+ * SAML Test for Standalone Web Containers
+ * @author Anil.Saldhana(a)redhat.com
+ * @since Aug 9, 2011
+ */
+(a)RunWith(Arquillian.class)
+public class StandaloneSAMLUnitTestCase extends SAMLTestsDeployerHelper
+{
+ String SERVICE_1_URL = System.getProperty( "SERVICE_1_URL", "http://localhost:8080/sales-standalone/" );
+ String SERVICE_2_URL = System.getProperty( "SERVICE_2_URL", "http://localhost:8080/employee-standalone/" );
+ String LOGOUT_URL = "?GLO=true";
+
+
+ public String getService1URL()
+ {
+ return SERVICE_1_URL;
+ }
+ public String getService2URL()
+ {
+ return SERVICE_2_URL;
+ }
+
+ @Test
+ @RunAsClient
+ public void testSAMLStandalone() throws Exception
+ {
+ //Sales Application Login
+ System.out.println("Trying "+ getService1URL());
+ WebRequest serviceRequest1 = new GetMethodWebRequest( getService1URL() );
+ WebConversation webConversation = new WebConversation();
+
+ WebResponse webResponse = webConversation.getResponse( serviceRequest1 );
+ WebForm loginForm = webResponse.getForms()[0];
+ loginForm.setParameter("JBID_USERNAME", "manager" );
+ loginForm.setParameter("JBID_PASSWORD", "tomcat" );
+ SubmitButton submitButton = loginForm.getSubmitButtons()[0];
+ submitButton.click();
+
+ webResponse = webConversation.getCurrentPage();
+ assertTrue( " Reached the sales index page ", webResponse.getText().contains( "SalesTool" ));
+
+ //Employee Application Login
+ System.out.println("Trying "+ getService2URL());
+ webResponse = webConversation.getResponse( getService2URL() );
+ assertTrue( " Reached the employee index page ", webResponse.getText().contains( "EmployeeDashboard" ));
+
+ //Logout from sales
+
+ System.out.println("Trying "+ getService1URL() + LOGOUT_URL);
+ webResponse = webConversation.getResponse( getService1URL() + LOGOUT_URL );
+ assertTrue( "Reached logged out page", webResponse.getText().contains( "logged" ) );
+
+ //Hit the Sales App again
+ System.out.println("Trying "+ getService1URL());
+ webResponse = webConversation.getResponse( getService1URL() );
+ assertTrue( " Reached the Login page ", webResponse.getText().contains( "Login" ));
+
+ //Hit the Employee App again
+ System.out.println("Trying "+ getService2URL());
+ webResponse = webConversation.getResponse( getService2URL() );
+ assertTrue( " Reached the Login page ", webResponse.getText().contains( "Login" ));
+ }
+}
\ No newline at end of file
Modified: integration-tests/branches/eap6/picketlink-sts-tests/.classpath
===================================================================
--- integration-tests/branches/eap6/picketlink-sts-tests/.classpath 2012-04-23 09:59:53 UTC (rev 1554)
+++ integration-tests/branches/eap6/picketlink-sts-tests/.classpath 2012-05-02 16:24:03 UTC (rev 1555)
@@ -2,7 +2,7 @@
<classpath>
<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
Modified: integration-tests/branches/eap6/picketlink-sts-tests/pom.xml
===================================================================
--- integration-tests/branches/eap6/picketlink-sts-tests/pom.xml 2012-04-23 09:59:53 UTC (rev 1554)
+++ integration-tests/branches/eap6/picketlink-sts-tests/pom.xml 2012-05-02 16:24:03 UTC (rev 1555)
@@ -46,11 +46,8 @@
<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>
+ <groupId>org.picketlink</groupId>
+ <artifactId>picketlink-core</artifactId>
</dependency>
<dependency>
<groupId>org.jboss.security</groupId>
@@ -121,6 +118,11 @@
<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>
</dependencies>
Added: integration-tests/branches/eap6/picketlink-sts-tests/src/test/java/org/picketlink/test/integration/STSTestsDeployerHelper.java
===================================================================
--- integration-tests/branches/eap6/picketlink-sts-tests/src/test/java/org/picketlink/test/integration/STSTestsDeployerHelper.java (rev 0)
+++ integration-tests/branches/eap6/picketlink-sts-tests/src/test/java/org/picketlink/test/integration/STSTestsDeployerHelper.java 2012-05-02 16:24:03 UTC (rev 1555)
@@ -0,0 +1,34 @@
+package org.picketlink.test.integration;
+
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+
+import java.io.File;
+import java.io.IOException;
+
+/**
+ * <p>
+ * Class that manages deployments for Arquillian based tests.
+ * </p>
+ * <p>
+ * <b>Note:</b> This class can be super class of test case classes that wish to deploy all deployments or
+ * simply use static calls and pick deployments one needs.
+ * </p>
+ *
+ * @author pskopek(a)redhat.com
+ * @since Nov 28, 2011
+ */
+
+public class STSTestsDeployerHelper {
+
+ public static String WEBAPPS_LOCATION = "target/picketlink";
+
+ @Deployment(name = "picketlink-sts.war", order = 1, testable = false)
+ public static WebArchive importStsWar() {
+ return ShrinkWrap.createFromZipFile(WebArchive.class,
+ new File(WEBAPPS_LOCATION + "/picketlink-sts.war"));
+ }
+
+
+}
Modified: integration-tests/branches/eap6/picketlink-sts-tests/src/test/java/org/picketlink/test/integration/sts/CacheInvalidationUnitTestCase.java
===================================================================
--- integration-tests/branches/eap6/picketlink-sts-tests/src/test/java/org/picketlink/test/integration/sts/CacheInvalidationUnitTestCase.java 2012-04-23 09:59:53 UTC (rev 1554)
+++ integration-tests/branches/eap6/picketlink-sts-tests/src/test/java/org/picketlink/test/integration/sts/CacheInvalidationUnitTestCase.java 2012-05-02 16:24:03 UTC (rev 1555)
@@ -25,9 +25,13 @@
import javax.management.ObjectName;
import javax.naming.InitialContext;
+import org.jboss.arquillian.container.test.api.RunAsClient;
+import org.jboss.arquillian.junit.Arquillian;
import org.jboss.security.SimplePrincipal;
import org.junit.Assert;
+import org.junit.Ignore;
import org.junit.Test;
+import org.junit.runner.RunWith;
import org.picketlink.identity.federation.api.wstrust.WSTrustClient;
import org.picketlink.identity.federation.api.wstrust.WSTrustClient.SecurityInfo;
import org.picketlink.identity.federation.core.wstrust.SamlCredential;
@@ -35,6 +39,7 @@
import org.picketlink.identity.federation.core.wstrust.WSTrustUtil;
import org.picketlink.identity.federation.core.wstrust.plugins.saml.SAMLUtil;
import org.picketlink.identity.federation.core.wstrust.wrappers.RequestSecurityToken;
+import org.picketlink.test.integration.STSTestsDeployerHelper;
import org.w3c.dom.Element;
/**
@@ -48,7 +53,10 @@
* @author <a href="mailto:sguilhen@redhat.com">Stefan Guilhen</a>
* @since Jun 8, 2010
*/
-public class CacheInvalidationUnitTestCase
+(a)RunWith(Arquillian.class)
+@RunAsClient
+@Ignore
+public class CacheInvalidationUnitTestCase extends STSTestsDeployerHelper
{
/**
* <p>
Modified: integration-tests/branches/eap6/picketlink-sts-tests/src/test/java/org/picketlink/test/integration/sts/PicketLinkSTSIntegrationUnitTestCase.java
===================================================================
--- integration-tests/branches/eap6/picketlink-sts-tests/src/test/java/org/picketlink/test/integration/sts/PicketLinkSTSIntegrationUnitTestCase.java 2012-04-23 09:59:53 UTC (rev 1554)
+++ integration-tests/branches/eap6/picketlink-sts-tests/src/test/java/org/picketlink/test/integration/sts/PicketLinkSTSIntegrationUnitTestCase.java 2012-05-02 16:24:03 UTC (rev 1555)
@@ -39,8 +39,12 @@
import junit.framework.Assert;
+import org.jboss.arquillian.container.test.api.RunAsClient;
+import org.jboss.arquillian.junit.Arquillian;
import org.junit.BeforeClass;
+import org.junit.Ignore;
import org.junit.Test;
+import org.junit.runner.RunWith;
import org.picketlink.identity.federation.api.wstrust.WSTrustClient;
import org.picketlink.identity.federation.api.wstrust.WSTrustClient.SecurityInfo;
import org.picketlink.identity.federation.core.saml.v1.SAML11Constants;
@@ -73,6 +77,7 @@
import org.picketlink.identity.xmlsec.w3.xmldsig.RSAKeyValueType;
import org.picketlink.identity.xmlsec.w3.xmldsig.X509CertificateType;
import org.picketlink.identity.xmlsec.w3.xmldsig.X509DataType;
+import org.picketlink.test.integration.STSTestsDeployerHelper;
import org.w3c.dom.Element;
/**
@@ -84,12 +89,15 @@
* @author <a href="mailto:sguilhen@redhat.com">Stefan Guilhen</a>
* @since Jun 8, 2010
*/
-public class PicketLinkSTSIntegrationUnitTestCase
+(a)RunWith(Arquillian.class)
+@RunAsClient
+public class PicketLinkSTSIntegrationUnitTestCase extends STSTestsDeployerHelper
{
private static WSTrustClient client;
private static Certificate certificate;
+
@BeforeClass
public static void initClient() throws Exception
{
@@ -115,6 +123,7 @@
* if an error occurs while running the test.
*/
@Test
+ //@Ignore
public void testIssueSAML11() throws Exception
{
Element assertionElement = client.issueToken(SAMLUtil.SAML11_TOKEN_TYPE);
Property changes on: integration-tests/branches/eap6/product-preparation
___________________________________________________________________
Modified: svn:ignore
- .settings
target
.project
+ .settings
target
.project
lib
webapps
Modified: integration-tests/branches/eap6/product-preparation/pom.xml
===================================================================
--- integration-tests/branches/eap6/product-preparation/pom.xml 2012-04-23 09:59:53 UTC (rev 1554)
+++ integration-tests/branches/eap6/product-preparation/pom.xml 2012-05-02 16:24:03 UTC (rev 1555)
@@ -19,19 +19,20 @@
<id>phase-1</id>
<phase>compile</phase>
<configuration>
- <target>
- <ant antfile="${basedir}/../ant-scripts/ant-build.xml" target="unzip-jboss-distributed-test-deps">
- <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="pl-trust-version" value="${pl-trust-version}"/>
- <property name="downloadURL.prefix" value="${downloadURL.prefix}"/>
- <property name="jboss.profile" value="${jboss.profile}"/>
- <property name="CXF_INSTALLER_ZIP" value="${CXF_INSTALLER_ZIP}"/>
- <property name="EAP_ZIP" value="${EAP_ZIP}"/>
- </ant>
- </target>
+ <tasks>
+ <property name="depclasspath" refid="maven.dependency.classpath"/>
+ <property name="version" value="${pl-version}"/>
+ <property name="localRepository" value="${user.home}/.m2/repository"/>
+ <property name="pl-fed-webapps-assembly-version" value="${pl-fed-webapps-assembly-version}"/>
+ <property name="localRepository" value="${user.home}/.m2/repository"/>
+ <property name="pl-trust-version" value="${pl-trust-version}"/>
+ <property name="downloadURL.prefix" value="${downloadURL6.prefix}"/>
+ <property name="jboss.profile" value="${jboss.profile}"/>
+ <property name="EAP_ZIP" value="${EAP6_ZIP}" />
+ <property name="EAP_URL" value="${EAP6_URL}" />
+ <property name="EAP_DIR" value="${EAP6_DIR}" />
+ <ant antfile="${basedir}/../ant-scripts/ant-build.xml" target="download-eap" />
+ </tasks>
</configuration>
<goals>
<goal>run</goal>
Added: integration-tests/branches/eap6/product-preparation/roles.properties
===================================================================
--- integration-tests/branches/eap6/product-preparation/roles.properties (rev 0)
+++ integration-tests/branches/eap6/product-preparation/roles.properties 2012-05-02 16:24:03 UTC (rev 1555)
@@ -0,0 +1,2 @@
+# A sample roles.properties file for use with the UsersRolesLoginModule
+admin=JBossAdmin,HttpInvoker
Added: integration-tests/branches/eap6/product-preparation/users.properties
===================================================================
--- integration-tests/branches/eap6/product-preparation/users.properties (rev 0)
+++ integration-tests/branches/eap6/product-preparation/users.properties 2012-05-02 16:24:03 UTC (rev 1555)
@@ -0,0 +1,2 @@
+# A sample users.properties file for use with the UsersRolesLoginModule
+admin=admin
12 years, 7 months
- 1
- 0
- ← Newer
- 1
- Older →