March 2011 - picketlink-commits - Jboss List Archives

Picketlink SVN: r829 - in integration-tests/trunk: ant-scripts and 8 other directories.

by picketlink-commits＠lists.jboss.org

Author: anil.saldhana(a)jboss.com Date: 2011-03-22 17:11:39 -0400 (Tue, 22 Mar 2011) New Revision: 829 Added: integration-tests/trunk/ant-scripts/ integration-tests/trunk/ant-scripts/ant-build.xml integration-tests/trunk/common-dist/jbossas/6.0/ integration-tests/trunk/common-dist/jbossas/6.0/jboss-as-distribution-6.0.0.Final.zip integration-tests/trunk/picketlink-saml-jbas51/ integration-tests/trunk/picketlink-saml-jbas51/pom.xml integration-tests/trunk/picketlink-saml-jbas6/ integration-tests/trunk/picketlink-saml-jbas6/pom.xml integration-tests/trunk/picketlink-saml-tomcat6/ integration-tests/trunk/picketlink-saml-tomcat6/pom.xml Modified: integration-tests/trunk/picketlink-openid-tests/.classpath integration-tests/trunk/picketlink-saml-tests/pom.xml integration-tests/trunk/picketlink-sts-tests/.classpath integration-tests/trunk/pom.xml Log: split the integration tests Added: integration-tests/trunk/ant-scripts/ant-build.xml =================================================================== --- integration-tests/trunk/ant-scripts/ant-build.xml (rev 0) +++ integration-tests/trunk/ant-scripts/ant-build.xml 2011-03-22 21:11:39 UTC (rev 829) @@ -0,0 +1,165 @@ +<project default="init" 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="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 environment="env" /> + + <target name="init-jboss5"> +  + <echo>Unzip JBOSS AS 5.1.0.GA</echo> + <unzip src="${basedir}/../common-dist/jbossas/5.1.0.GA/jboss-5.1.0.GA-jdk6.zip" + dest="${basedir}/target"/> + </target> + + <target name="init-jboss6"> +  + <echo>Unzip JBOSS AS 6.0.0.Final</echo> + <unzip src="${basedir}/../common-dist/jbossas/6.0/jboss-as-distribution-6.0.0.Final.zip" + dest="${basedir}/target"/> + </target> + + <target name="init-tomcat6"> + <echo>Unzip Apache Tomcat 6.0.26</echo> + <unzip src="${basedir}/../common-dist/tomcat/6.0.26/apache-tomcat-6.0.26.zip" + dest="${basedir}/target"/> + </target> + + + <target name="tomcat6-thirdparty-deps" depends="init-tomcat6" > + <copy file="${localRepository}/apache-log4j/log4j/1.2.14/log4j-1.2.14.jar" todir="${TOMCAT6_LIB}"/> + </target> + + <target name="copy-picketlink-tomcat6" depends="tomcat6-thirdparty-deps" > + <copy file="${localRepository}/org/picketlink/picketlink-bindings/${version}/picketlink-bindings-${version}.jar" todir="${TOMCAT6_LIB}"/> + <copy file="${localRepository}/org/picketlink/picketlink-bindings-jboss/${version}/picketlink-bindings-jboss-${version}.jar" todir="${TOMCAT6_LIB}"/> + <copy file="${localRepository}/org/picketlink/picketlink-fed/${version}/picketlink-fed-${version}.jar" todir="${TOMCAT6_LIB}"/> + + <copy file="${localRepository}/org/openid4java/openid4java-nodeps/0.9.5/openid4java-nodeps-0.9.5.jar" todir="${TOMCAT6_LIB}"/> + <unzip src="${localRepository}/org/picketlink/picketlink-fed-webapps-assembly/${version}/picketlink-fed-webapps-assembly-${version}.zip" + dest="${TOMCAT6_DEPLOY}"/> + + <move todir="${TOMCAT6_DEPLOY}"> + <fileset dir="${TOMCAT6_DEPLOY}/picketlink"> + <include name="**/*.war"/> + </fileset> + </move> + + <copy file="${basedir}/../common-dist/tomcat/tomcat-users.xml" + todir="${TOMCAT6}/conf" /> + <copy file="${basedir}/../common-dist/tomcat/log4j.xml" + todir="${TOMCAT6}/lib" /> + <chmod dir="${basedir}/target/apache-tomcat-6.0.26/bin" perm="700" includes="**/*.sh"/> + <chmod dir="${basedir}/target/apache-tomcat-6.0.26/bin" perm="700" includes="**/*.jar"/> + </target> + + <target name="copy-picketlink-jboss"> + <mkdir dir="${deploy}/picketlink" /> + <copy file="${localRepository}/org/picketlink/picketlink-bindings/${version}/picketlink-bindings-${version}.jar" todir="${deploy}/picketlink"/> + <copy file="${localRepository}/org/picketlink/picketlink-bindings-jboss/${version}/picketlink-bindings-jboss-${version}.jar" todir="${deploy}/picketlink"/> + <copy file="${localRepository}/org/picketlink/picketlink-fed/${version}/picketlink-fed-${version}.jar" todir="${deploy}/picketlink"/> + <unzip src="${localRepository}/org/picketlink/picketlink-fed-webapps-assembly/${version}/picketlink-fed-webapps-assembly-${version}.zip" + dest="${deploy}"/> + <copy file="${localRepository}/org/openid4java/openid4java-nodeps/0.9.5/openid4java-nodeps-0.9.5.jar" todir="${deploy}/picketlink"/> + + <chmod file="${jbossas}/bin/run.sh" perm="700"/> + + </target> + + + <target name="copy-picketlink-jbas5" depends="init-jboss5" > + <antcall target="copy-picketlink-jboss"> + <param name="deploy" value="${JBAS5_DEPLOY}"/> + <param name="jbossas" value="${basedir}/target/jboss-5.1.0.GA"/> + </antcall> + +  + </target> + + <target name="copy-picketlink-jbas6" depends="init-jboss6" > + <antcall target="copy-picketlink-jboss"> + <param name="deploy" value="${JBAS6_DEPLOY}"/> + <param name="jbossas" value="${basedir}/target/jboss-6.0.0.Final"/> + </antcall> + </target> + + <target name="start-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-jboss5" depends="copy-picketlink-jbas5" > + <antcall target="start-jboss"> + <param name="jbossas" value="${basedir}/target/jboss-5.1.0.GA"/> + </antcall> +  + </target> + + <target name="start-jboss6" depends="copy-picketlink-jbas6" > + <antcall target="start-jboss"> + <param name="jbossas" value="${basedir}/target/jboss-6.0.0.Final"/> + </antcall> + </target> + + <target name="start-tomcat6" depends="copy-picketlink-tomcat6" > + <echo>Starting Local 8080 </echo> + <exec executable="${TOMCAT6_DEPLOY}/../bin/startup.sh" + osfamily="unix" spawn="true" /> + <waitfor maxwait="25" maxwaitunit="second" + 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-jboss5"> + <antcall target="stop-jboss"/> + </target> + + <target name="stop-jboss6"> + <antcall target="stop-jboss"/> + </target> + + <target name="stop-tomcat6"> + <echo>Stopping Local 8080 </echo> + <echo>Going to stop tomcat</echo> + <exec executable="${TOMCAT6_DEPLOY}/../bin/shutdown.sh" + osfamily="unix" /> + </target> +</project> Added: integration-tests/trunk/common-dist/jbossas/6.0/jboss-as-distribution-6.0.0.Final.zip =================================================================== (Binary files differ) Property changes on: integration-tests/trunk/common-dist/jbossas/6.0/jboss-as-distribution-6.0.0.Final.zip ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Modified: integration-tests/trunk/picketlink-openid-tests/.classpath =================================================================== --- integration-tests/trunk/picketlink-openid-tests/.classpath 2011-03-22 18:52:29 UTC (rev 828) +++ integration-tests/trunk/picketlink-openid-tests/.classpath 2011-03-22 21:11:39 UTC (rev 829) @@ -12,6 +12,7 @@ <classpathentry kind="var" path="M2_REPO/cssparser/cssparser/0.9.4/cssparser-0.9.4.jar"/> <classpathentry kind="var" path="M2_REPO/htmlunit/htmlunit/2.1/htmlunit-2.1.jar"/> <classpathentry kind="var" path="M2_REPO/rhino/js/1.6R7/js-1.6R7.jar"/> + <classpathentry kind="var" path="M2_REPO/jstl/jstl/1.2/jstl-1.2.jar" sourcepath="M2_REPO/jstl/jstl/1.2/jstl-1.2-sources.jar"/> <classpathentry kind="var" path="M2_REPO/junit/junit/4.4/junit-4.4.jar" sourcepath="M2_REPO/junit/junit/4.4/junit-4.4-sources.jar"/> <classpathentry kind="var" path="M2_REPO/nekohtml/nekohtml/1.9.12/nekohtml-1.9.12.jar"/> <classpathentry kind="var" path="M2_REPO/xalan/serializer/2.7.1/serializer-2.7.1.jar"/> Added: integration-tests/trunk/picketlink-saml-jbas51/pom.xml =================================================================== --- integration-tests/trunk/picketlink-saml-jbas51/pom.xml (rev 0) +++ integration-tests/trunk/picketlink-saml-jbas51/pom.xml 2011-03-22 21:11:39 UTC (rev 829) @@ -0,0 +1,156 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <parent> + <groupId>org.picketlink</groupId> + <artifactId>picketlink-integration-tests-parent</artifactId> + <version>2.0.0-SNAPSHOT</version> + <relativePath>../parent</relativePath> + </parent> + <modelVersion>4.0.0</modelVersion> + <artifactId>picketlink-integration-saml-tests-JBAS51</artifactId> + <packaging>jar</packaging> + <name>PicketLink Integration Tests for SAML</name> + <url>http://labs.jboss.org/portal/picketlink/</url> + <description>PicketLink Federation Tests to be run in a continous integration environment such as Hudson</description> + <licenses> + <license> + <name>lgpl</name> + <url>http://repository.jboss.com/licenses/lgpl.txt</url> + </license> + </licenses> + <organization> + <name>JBoss Inc.</name> + <url>http://www.jboss.org</url> + </organization> + <properties> + <java.endorsed.dirs>${basedir}/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> + <version>2.4.3</version> + <configuration> + <phase>test</phase> +  + <testClassesDirectory>${basedir}/../picketlink-saml-tests/target/test-classes</testClassesDirectory> + <printSummary>true</printSummary> + <disableXmlReport>false</disableXmlReport> + <includes> + <include>**/**TestCase.java</include> + </includes> + <forkMode>pertest</forkMode> + <argLine>-Djava.endorsed.dirs=${basedir}/../picketlink-saml-tests/src/test/resources/endorsed</argLine> + <useFile>false</useFile> + <trimStackTrace>false</trimStackTrace> + </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="${project.version}"/> + <property name="localRepository" value="${user.home}/.m2/repository"/> + <ant antfile="${basedir}/../ant-scripts/ant-build.xml" target="start-jboss5" /> + </tasks> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + <execution> + <id>phase-2</id> + <phase>test</phase> + <configuration> + <tasks> + <property name="depclasspath" refid="maven.dependency.classpath"/> + <property name="version" value="${version}"/> + <property name="localRepository" value="${user.home}/.m2/repository"/> + <ant antfile="${basedir}/../ant-scripts/ant-build.xml" target="stop-jboss5" /> + </tasks> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + + <dependencies> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>httpunit</groupId> + <artifactId>httpunit</artifactId> + <version>1.7</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>rhino</groupId> + <artifactId>js</artifactId> + <version>1.6R7</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>nekohtml</groupId> + <artifactId>nekohtml</artifactId> + <version>1.9.12</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>apache-xerces</groupId> + <artifactId>xercesImpl</artifactId> + <version>2.9.1</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>ant-contrib</groupId> + <artifactId>ant-contrib</artifactId> + <version>1.0b2</version> + </dependency> + + </dependencies> + + <reporting> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-javadoc-plugin</artifactId> + <configuration> + <doclet>org.jboss.apiviz.APIviz</doclet> + <docletArtifact> + <groupId>org.jboss.apiviz</groupId> + <artifactId>apiviz</artifactId> + <version>1.2.5.GA</version> + </docletArtifact> + <additionalparam> + -charset UTF-8 + -docencoding UTF-8 + -version + -author + -breakiterator + -windowtitle "${project.name} ${project.version} API Reference" + -doctitle "${project.name} ${project.version} API Reference" + -bottom "Copyright © ${project.inceptionYear}-Present ${project.organization.name}. All Rights Reserved." + -link http://java.sun.com/javase/6/docs/api/ + -sourceclasspath ${project.build.outputDirectory} + </additionalparam> + <encoding>UTF-8</encoding> + </configuration> + </plugin> + </plugins> + </reporting> +</project> Added: integration-tests/trunk/picketlink-saml-jbas6/pom.xml =================================================================== --- integration-tests/trunk/picketlink-saml-jbas6/pom.xml (rev 0) +++ integration-tests/trunk/picketlink-saml-jbas6/pom.xml 2011-03-22 21:11:39 UTC (rev 829) @@ -0,0 +1,156 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <parent> + <groupId>org.picketlink</groupId> + <artifactId>picketlink-integration-tests-parent</artifactId> + <version>2.0.0-SNAPSHOT</version> + <relativePath>../parent</relativePath> + </parent> + <modelVersion>4.0.0</modelVersion> + <artifactId>picketlink-integration-saml-tests-JBAS6</artifactId> + <packaging>jar</packaging> + <name>PicketLink Integration Tests for SAML</name> + <url>http://labs.jboss.org/portal/picketlink/</url> + <description>PicketLink Federation Tests to be run in a continous integration environment such as Hudson</description> + <licenses> + <license> + <name>lgpl</name> + <url>http://repository.jboss.com/licenses/lgpl.txt</url> + </license> + </licenses> + <organization> + <name>JBoss Inc.</name> + <url>http://www.jboss.org</url> + </organization> + <properties> + <java.endorsed.dirs>${basedir}/../picketlink-saml-tests/src/test/resources/endorsed</java.endorsed.dirs> + <SERVICE_1_URL>http://localhost:8080/sales-post/</SERVICE_1_URL> + <SERVICE_2_URL>http://localhost:8080/employee-post/</SERVICE_2_URL> + <SERVICE_3_URL>http://localhost:8080/sales/</SERVICE_3_URL> + <SERVICE_4_URL>http://localhost:8080/employee/</SERVICE_4_URL> + </properties> + <build> + <plugins> + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <version>2.4.3</version> + <configuration> + <phase>test</phase> +  + <testClassesDirectory>${basedir}/../picketlink-saml-tests/target/test-classes</testClassesDirectory> + <printSummary>true</printSummary> + <disableXmlReport>false</disableXmlReport> + <includes> + <include>**/**TestCase.java</include> + </includes> + <forkMode>pertest</forkMode> + <argLine>-Djava.endorsed.dirs=${basedir}/../picketlink-saml-tests/src/test/resources/endorsed</argLine> + <useFile>false</useFile> + <trimStackTrace>false</trimStackTrace> + </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="${project.version}"/> + <property name="localRepository" value="${user.home}/.m2/repository"/> + <ant antfile="${basedir}/../ant-scripts/ant-build.xml" target="start-jboss6" /> + </tasks> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + <execution> + <id>phase-2</id> + <phase>test</phase> + <configuration> + <tasks> + <property name="depclasspath" refid="maven.dependency.classpath"/> + <property name="version" value="${version}"/> + <property name="localRepository" value="${user.home}/.m2/repository"/> + <ant antfile="${basedir}/../ant-scripts/ant-build.xml" target="stop-jboss6" /> + </tasks> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + + <dependencies> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>httpunit</groupId> + <artifactId>httpunit</artifactId> + <version>1.7</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>rhino</groupId> + <artifactId>js</artifactId> + <version>1.6R7</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>nekohtml</groupId> + <artifactId>nekohtml</artifactId> + <version>1.9.12</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>apache-xerces</groupId> + <artifactId>xercesImpl</artifactId> + <version>2.9.1</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>ant-contrib</groupId> + <artifactId>ant-contrib</artifactId> + <version>1.0b2</version> + </dependency> + + </dependencies> + + <reporting> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-javadoc-plugin</artifactId> + <configuration> + <doclet>org.jboss.apiviz.APIviz</doclet> + <docletArtifact> + <groupId>org.jboss.apiviz</groupId> + <artifactId>apiviz</artifactId> + <version>1.2.5.GA</version> + </docletArtifact> + <additionalparam> + -charset UTF-8 + -docencoding UTF-8 + -version + -author + -breakiterator + -windowtitle "${project.name} ${project.version} API Reference" + -doctitle "${project.name} ${project.version} API Reference" + -bottom "Copyright © ${project.inceptionYear}-Present ${project.organization.name}. All Rights Reserved." + -link http://java.sun.com/javase/6/docs/api/ + -sourceclasspath ${project.build.outputDirectory} + </additionalparam> + <encoding>UTF-8</encoding> + </configuration> + </plugin> + </plugins> + </reporting> +</project> Modified: integration-tests/trunk/picketlink-saml-tests/pom.xml =================================================================== --- integration-tests/trunk/picketlink-saml-tests/pom.xml 2011-03-22 18:52:29 UTC (rev 828) +++ integration-tests/trunk/picketlink-saml-tests/pom.xml 2011-03-22 21:11:39 UTC (rev 829) @@ -35,10 +35,9 @@ <version>2.4.3</version> <configuration> <phase>test</phase> -  + <skipTests>true</skipTests> <printSummary>true</printSummary> <disableXmlReport>false</disableXmlReport> - <testFailureIgnore>true</testFailureIgnore> <includes> <include>**/**TestCase.java</include> </includes> @@ -47,70 +46,7 @@ <useFile>false</useFile> <trimStackTrace>false</trimStackTrace> </configuration> - <executions> - <execution> - <id>surefire-it</id> - <phase>integration-test</phase> - <goals> - <goal>test</goal> - </goals> - <configuration> - <skip>false</skip> - </configuration> - </execution> - </executions> </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="${project.version}"/> - <property name="localRepository" value="${user.home}/.m2/repository"/> - <ant antfile="${basedir}/ant-build.xml" target="start-jboss" /> - </tasks> - </configuration> - <goals> - <goal>run</goal> - </goals> - </execution> - <execution> - <id>phase-2</id> - <phase>test</phase> - <configuration> - <tasks> - <property name="depclasspath" refid="maven.dependency.classpath"/> - <property name="version" value="${version}"/> - <property name="localRepository" value="${user.home}/.m2/repository"/> - <ant antfile="${basedir}/ant-build.xml" target="stop-jboss" /> - <ant antfile="${basedir}/ant-build.xml" target="start-tomcat" /> - </tasks> - </configuration> - <goals> - <goal>run</goal> - </goals> - </execution> - <execution> - <id>phase-3</id> - <phase>integration-test</phase> - <configuration> - <tasks> - <property name="depclasspath" refid="maven.dependency.classpath"/> - <property name="version" value="${version}"/> - <property name="localRepository" value="${user.home}/.m2/repository"/> - <ant antfile="${basedir}/ant-build.xml" target="stop-tomcat" /> - </tasks> - </configuration> - <goals> - <goal>run</goal> - </goals> - </execution> - </executions> - </plugin> </plugins> </build> Added: integration-tests/trunk/picketlink-saml-tomcat6/pom.xml =================================================================== --- integration-tests/trunk/picketlink-saml-tomcat6/pom.xml (rev 0) +++ integration-tests/trunk/picketlink-saml-tomcat6/pom.xml 2011-03-22 21:11:39 UTC (rev 829) @@ -0,0 +1,156 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <parent> + <groupId>org.picketlink</groupId> + <artifactId>picketlink-integration-tests-parent</artifactId> + <version>2.0.0-SNAPSHOT</version> + <relativePath>../parent</relativePath> + </parent> + <modelVersion>4.0.0</modelVersion> + <artifactId>picketlink-integration-saml-tests-tomcat6</artifactId> + <packaging>jar</packaging> + <name>PicketLink Integration Tests for SAML</name> + <url>http://labs.jboss.org/portal/picketlink/</url> + <description>PicketLink Federation Tests to be run in a continous integration environment such as Hudson</description> + <licenses> + <license> + <name>lgpl</name> + <url>http://repository.jboss.com/licenses/lgpl.txt</url> + </license> + </licenses> + <organization> + <name>JBoss Inc.</name> + <url>http://www.jboss.org</url> + </organization> + <properties> + <java.endorsed.dirs>${basedir}/../picketlink-saml-tests/src/test/resources/endorsed</java.endorsed.dirs> + <SERVICE_1_URL>http://localhost:8080/sales-post/</SERVICE_1_URL> + <SERVICE_2_URL>http://localhost:8080/employee-post/</SERVICE_2_URL> + <SERVICE_3_URL>http://localhost:8080/sales/</SERVICE_3_URL> + <SERVICE_4_URL>http://localhost:8080/employee/</SERVICE_4_URL> + </properties> + <build> + <plugins> + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <version>2.4.3</version> + <configuration> + <phase>test</phase> +  + <testClassesDirectory>${basedir}/../picketlink-saml-tests/target/test-classes</testClassesDirectory> + <printSummary>true</printSummary> + <disableXmlReport>false</disableXmlReport> + <includes> + <include>**/**TestCase.java</include> + </includes> + <forkMode>pertest</forkMode> + <argLine>-Djava.endorsed.dirs=${basedir}/../picketlink-saml-tests/src/test/resources/endorsed</argLine> + <useFile>false</useFile> + <trimStackTrace>false</trimStackTrace> + </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="${project.version}"/> + <property name="localRepository" value="${user.home}/.m2/repository"/> + <ant antfile="${basedir}/../ant-scripts/ant-build.xml" target="start-tomcat6" /> + </tasks> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + <execution> + <id>phase-2</id> + <phase>test</phase> + <configuration> + <tasks> + <property name="depclasspath" refid="maven.dependency.classpath"/> + <property name="version" value="${version}"/> + <property name="localRepository" value="${user.home}/.m2/repository"/> + <ant antfile="${basedir}/../ant-scripts/ant-build.xml" target="stop-tomcat6" /> + </tasks> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + + <dependencies> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>httpunit</groupId> + <artifactId>httpunit</artifactId> + <version>1.7</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>rhino</groupId> + <artifactId>js</artifactId> + <version>1.6R7</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>nekohtml</groupId> + <artifactId>nekohtml</artifactId> + <version>1.9.12</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>apache-xerces</groupId> + <artifactId>xercesImpl</artifactId> + <version>2.9.1</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>ant-contrib</groupId> + <artifactId>ant-contrib</artifactId> + <version>1.0b2</version> + </dependency> + + </dependencies> + + <reporting> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-javadoc-plugin</artifactId> + <configuration> + <doclet>org.jboss.apiviz.APIviz</doclet> + <docletArtifact> + <groupId>org.jboss.apiviz</groupId> + <artifactId>apiviz</artifactId> + <version>1.2.5.GA</version> + </docletArtifact> + <additionalparam> + -charset UTF-8 + -docencoding UTF-8 + -version + -author + -breakiterator + -windowtitle "${project.name} ${project.version} API Reference" + -doctitle "${project.name} ${project.version} API Reference" + -bottom "Copyright © ${project.inceptionYear}-Present ${project.organization.name}. All Rights Reserved." + -link http://java.sun.com/javase/6/docs/api/ + -sourceclasspath ${project.build.outputDirectory} + </additionalparam> + <encoding>UTF-8</encoding> + </configuration> + </plugin> + </plugins> + </reporting> +</project> Modified: integration-tests/trunk/picketlink-sts-tests/.classpath =================================================================== --- integration-tests/trunk/picketlink-sts-tests/.classpath 2011-03-22 18:52:29 UTC (rev 828) +++ integration-tests/trunk/picketlink-sts-tests/.classpath 2011-03-22 21:11:39 UTC (rev 829) @@ -1,20 +1,114 @@ -<?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry including="**/*.java" kind="src" output="target/test-classes" path="src/test/java"/> - <classpathentry excluding="**/*.java" kind="src" output="target/test-classes" path="src/test/resources"/> - <classpathentry kind="var" path="M2_REPO/javax/servlet/servlet-api/2.3/servlet-api-2.3.jar" sourcepath="M2_REPO/javax/servlet/servlet-api/2.3/servlet-api-2.3-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/ant/ant/1.5/ant-1.5.jar"/> - <classpathentry kind="var" path="M2_REPO/ant-contrib/ant-contrib/1.0b2/ant-contrib-1.0b2.jar" sourcepath="M2_REPO/ant-contrib/ant-contrib/1.0b2/ant-contrib-1.0b2-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/httpunit/httpunit/1.7/httpunit-1.7.jar" sourcepath="M2_REPO/httpunit/httpunit/1.7/httpunit-1.7-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/rhino/js/1.6R7/js-1.6R7.jar"/> - <classpathentry kind="var" path="M2_REPO/jtidy/jtidy/4aug2000r7-dev/jtidy-4aug2000r7-dev.jar" sourcepath="M2_REPO/jtidy/jtidy/4aug2000r7-dev/jtidy-4aug2000r7-dev-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/junit/junit/4.4/junit-4.4.jar" sourcepath="M2_REPO/junit/junit/4.4/junit-4.4-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/apache-log4j/log4j/1.2.14/log4j-1.2.14.jar" sourcepath="M2_REPO/apache-log4j/log4j/1.2.14/log4j-1.2.14-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/nekohtml/nekohtml/1.9.12/nekohtml-1.9.12.jar"/> - <classpathentry kind="var" path="M2_REPO/org/picketlink/picketlink-fed/2.0.0-SNAPSHOT/picketlink-fed-2.0.0-SNAPSHOT.jar" sourcepath="M2_REPO/org/picketlink/picketlink-fed/2.0.0-SNAPSHOT/picketlink-fed-2.0.0-SNAPSHOT-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/apache-xerces/xercesImpl/2.9.1/xercesImpl-2.9.1.jar"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> - <classpathentry kind="var" path="M2_REPO/org/jboss/jbossas/jboss-as-client/5.1.0.GA/jboss-as-client-5.1.0.GA.pom"/> - <classpathentry kind="lib" path="/opt/workspace-picketlink/integration-tests-trunk/picketlink-sts-tests/target/jboss-5.1.0.GA/client/jbossall-client.jar"/> - <classpathentry kind="output" path="target/classes"/> -</classpath> + <classpathentry kind="src" path="src/test/java" output="target/test-classes" including="**/*.java"/> + <classpathentry kind="src" path="src/test/resources" output="target/test-classes" excluding="**/*.java"/> + <classpathentry kind="output" path="target/classes"/> + <classpathentry kind="var" path="M2_REPO/javax/activation/activation/1.1/activation-1.1.jar" sourcepath="M2_REPO/javax/activation/activation/1.1/activation-1.1-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/javax/security/jaas/1.0.01/jaas-1.0.01.jar"/> + <classpathentry kind="var" path="M2_REPO/javax/transaction/jta/1.1/jta-1.1.jar" sourcepath="M2_REPO/javax/transaction/jta/1.1/jta-1.1-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/javax/servlet/servlet-api/2.3/servlet-api-2.3.jar" sourcepath="M2_REPO/javax/servlet/servlet-api/2.3/servlet-api-2.3-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/ant/ant/1.5/ant-1.5.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/ant/ant/1.7.0/ant-1.7.0.jar" sourcepath="M2_REPO/org/apache/ant/ant/1.7.0/ant-1.7.0-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/ant-contrib/ant-contrib/1.0b2/ant-contrib-1.0b2.jar" sourcepath="M2_REPO/ant-contrib/ant-contrib/1.0b2/ant-contrib-1.0b2-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/ant/ant-junit/1.7.0/ant-junit-1.7.0.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/ant/ant-launcher/1.7.0/ant-launcher-1.7.0.jar"/> + <classpathentry kind="var" path="M2_REPO/antlr/antlr/2.7.6/antlr-2.7.6.jar" sourcepath="M2_REPO/antlr/antlr/2.7.6/antlr-2.7.6-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/bcel/bcel/5.1/bcel-5.1.jar" sourcepath="M2_REPO/bcel/bcel/5.1/bcel-5.1-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/commons-collections/commons-collections/3.1/commons-collections-3.1.jar" sourcepath="M2_REPO/commons-collections/commons-collections/3.1/commons-collections-3.1-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/oswego-concurrent/concurrent/1.3.4-jboss-update1/concurrent-1.3.4-jboss-update1.jar" sourcepath="M2_REPO/oswego-concurrent/concurrent/1.3.4-jboss-update1/concurrent-1.3.4-jboss-update1-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar" sourcepath="M2_REPO/dom4j/dom4j/1.6.1/dom4j-1.6.1-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/wutka-dtdparser/dtdparser121/1.2.1/dtdparser121-1.2.1.jar"/> + <classpathentry kind="var" path="M2_REPO/org/hibernate/ejb3-persistence/1.0.2.GA/ejb3-persistence-1.0.2.GA.jar" sourcepath="M2_REPO/org/hibernate/ejb3-persistence/1.0.2.GA/ejb3-persistence-1.0.2.GA-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/gnu-getopt/getopt/1.0.12-brew/getopt-1.0.12-brew.jar"/> + <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-annotations/3.4.0.GA/hibernate-annotations-3.4.0.GA.jar" sourcepath="M2_REPO/org/hibernate/hibernate-annotations/3.4.0.GA/hibernate-annotations-3.4.0.GA-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-commons-annotations/3.1.0.GA/hibernate-commons-annotations-3.1.0.GA.jar" sourcepath="M2_REPO/org/hibernate/hibernate-commons-annotations/3.1.0.GA/hibernate-commons-annotations-3.1.0.GA-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-core/3.3.0.SP1/hibernate-core-3.3.0.SP1.jar" sourcepath="M2_REPO/org/hibernate/hibernate-core/3.3.0.SP1/hibernate-core-3.3.0.SP1-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-entitymanager/3.4.0.GA/hibernate-entitymanager-3.4.0.GA.jar" sourcepath="M2_REPO/org/hibernate/hibernate-entitymanager/3.4.0.GA/hibernate-entitymanager-3.4.0.GA-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/httpunit/httpunit/1.7/httpunit-1.7.jar" sourcepath="M2_REPO/httpunit/httpunit/1.7/httpunit-1.7-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/javassist/javassist/3.9.0.GA/javassist-3.9.0.GA.jar" sourcepath="M2_REPO/javassist/javassist/3.9.0.GA/javassist-3.9.0.GA-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/sun-jaxb/jaxb-api/2.1.9/jaxb-api-2.1.9.jar" sourcepath="M2_REPO/sun-jaxb/jaxb-api/2.1.9/jaxb-api-2.1.9-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/jboss/aop/jboss-aop/2.1.1.GA/jboss-aop-2.1.1.GA.jar" sourcepath="M2_REPO/org/jboss/aop/jboss-aop/2.1.1.GA/jboss-aop-2.1.1.GA-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/jboss/microcontainer/jboss-aop-mc-int/2.0.4.GA/jboss-aop-mc-int-2.0.4.GA.jar" sourcepath="M2_REPO/org/jboss/microcontainer/jboss-aop-mc-int/2.0.4.GA/jboss-aop-mc-int-2.0.4.GA-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/jboss/jbossas/jboss-as-deployment/5.1.0.GA/jboss-as-deployment-5.1.0.GA.jar" sourcepath="M2_REPO/org/jboss/jbossas/jboss-as-deployment/5.1.0.GA/jboss-as-deployment-5.1.0.GA-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/jboss/jbossas/jboss-as-j2se/5.1.0.GA/jboss-as-j2se-5.1.0.GA.jar" sourcepath="M2_REPO/org/jboss/jbossas/jboss-as-j2se/5.1.0.GA/jboss-as-j2se-5.1.0.GA-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/jboss/jbossas/jboss-as-j2se/5.1.0.GA/jboss-as-j2se-5.1.0.GA-tests.jar"/> + <classpathentry kind="var" path="M2_REPO/org/jboss/jbossas/jboss-as-jmx/5.1.0.GA/jboss-as-jmx-5.1.0.GA.jar" sourcepath="M2_REPO/org/jboss/jbossas/jboss-as-jmx/5.1.0.GA/jboss-as-jmx-5.1.0.GA-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/jboss/jbossas/jboss-as-mbeans/5.1.0.GA/jboss-as-mbeans-5.1.0.GA.jar" sourcepath="M2_REPO/org/jboss/jbossas/jboss-as-mbeans/5.1.0.GA/jboss-as-mbeans-5.1.0.GA-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/jboss/jbossas/jboss-as-security/5.1.0.GA/jboss-as-security-5.1.0.GA.jar" sourcepath="M2_REPO/org/jboss/jbossas/jboss-as-security/5.1.0.GA/jboss-as-security-5.1.0.GA-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/jboss/jbossas/jboss-as-server/5.1.0.GA/jboss-as-server-5.1.0.GA-client.jar"/> + <classpathentry kind="var" path="M2_REPO/org/jboss/jbossas/jboss-as-server/5.1.0.GA/jboss-as-server-5.1.0.GA-jmx-invoker-adaptor-client.jar"/> + <classpathentry kind="var" path="M2_REPO/org/jboss/jbossas/jboss-as-system/5.1.0.GA/jboss-as-system-5.1.0.GA.jar" sourcepath="M2_REPO/org/jboss/jbossas/jboss-as-system/5.1.0.GA/jboss-as-system-5.1.0.GA-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/jboss/jbossas/jboss-as-system-jmx/5.1.0.GA/jboss-as-system-jmx-5.1.0.GA.jar" sourcepath="M2_REPO/org/jboss/jbossas/jboss-as-system-jmx/5.1.0.GA/jboss-as-system-jmx-5.1.0.GA-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/jboss/bootstrap/jboss-bootstrap/1.0.0-Beta-3/jboss-bootstrap-1.0.0-Beta-3.jar" sourcepath="M2_REPO/org/jboss/bootstrap/jboss-bootstrap/1.0.0-Beta-3/jboss-bootstrap-1.0.0-Beta-3-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/jboss/cl/jboss-classloader/2.0.3.GA/jboss-classloader-2.0.3.GA.jar" sourcepath="M2_REPO/org/jboss/cl/jboss-classloader/2.0.3.GA/jboss-classloader-2.0.3.GA-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/jboss/cl/jboss-classloading/2.0.3.GA/jboss-classloading-2.0.3.GA.jar" sourcepath="M2_REPO/org/jboss/cl/jboss-classloading/2.0.3.GA/jboss-classloading-2.0.3.GA-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/jboss/integration/jboss-classloading-spi/5.1.0.GA/jboss-classloading-spi-5.1.0.GA.jar" sourcepath="M2_REPO/org/jboss/integration/jboss-classloading-spi/5.1.0.GA/jboss-classloading-spi-5.1.0.GA-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/jboss/cl/jboss-classloading-vfs/2.0.3.GA/jboss-classloading-vfs-2.0.3.GA.jar" sourcepath="M2_REPO/org/jboss/cl/jboss-classloading-vfs/2.0.3.GA/jboss-classloading-vfs-2.0.3.GA-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-common-core/2.2.14.GA/jboss-common-core-2.2.14.GA.jar" sourcepath="M2_REPO/org/jboss/jboss-common-core/2.2.14.GA/jboss-common-core-2.2.14.GA-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/jboss/microcontainer/jboss-dependency/2.0.6.GA/jboss-dependency-2.0.6.GA.jar" sourcepath="M2_REPO/org/jboss/microcontainer/jboss-dependency/2.0.6.GA/jboss-dependency-2.0.6.GA-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/jboss/deployers/jboss-deployers-client/2.0.5.GA/jboss-deployers-client-2.0.5.GA.jar" sourcepath="M2_REPO/org/jboss/deployers/jboss-deployers-client/2.0.5.GA/jboss-deployers-client-2.0.5.GA-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/jboss/deployers/jboss-deployers-client-spi/2.0.7.GA/jboss-deployers-client-spi-2.0.7.GA.jar" sourcepath="M2_REPO/org/jboss/deployers/jboss-deployers-client-spi/2.0.7.GA/jboss-deployers-client-spi-2.0.7.GA-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/jboss/deployers/jboss-deployers-core/2.0.5.GA/jboss-deployers-core-2.0.5.GA.jar" sourcepath="M2_REPO/org/jboss/deployers/jboss-deployers-core/2.0.5.GA/jboss-deployers-core-2.0.5.GA-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/jboss/deployers/jboss-deployers-core-spi/2.0.7.GA/jboss-deployers-core-spi-2.0.7.GA.jar" sourcepath="M2_REPO/org/jboss/deployers/jboss-deployers-core-spi/2.0.7.GA/jboss-deployers-core-spi-2.0.7.GA-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/jboss/deployers/jboss-deployers-impl/2.0.7.GA/jboss-deployers-impl-2.0.7.GA.jar" sourcepath="M2_REPO/org/jboss/deployers/jboss-deployers-impl/2.0.7.GA/jboss-deployers-impl-2.0.7.GA-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/jboss/deployers/jboss-deployers-spi/2.0.5.GA/jboss-deployers-spi-2.0.5.GA.jar" sourcepath="M2_REPO/org/jboss/deployers/jboss-deployers-spi/2.0.5.GA/jboss-deployers-spi-2.0.5.GA-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/jboss/deployers/jboss-deployers-structure-spi/2.0.7.GA/jboss-deployers-structure-spi-2.0.7.GA.jar" sourcepath="M2_REPO/org/jboss/deployers/jboss-deployers-structure-spi/2.0.7.GA/jboss-deployers-structure-spi-2.0.7.GA-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/jboss/deployers/jboss-deployers-vfs/2.0.5.GA/jboss-deployers-vfs-2.0.5.GA.jar" sourcepath="M2_REPO/org/jboss/deployers/jboss-deployers-vfs/2.0.5.GA/jboss-deployers-vfs-2.0.5.GA-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/jboss/deployers/jboss-deployers-vfs-spi/2.0.5.GA/jboss-deployers-vfs-spi-2.0.5.GA.jar" sourcepath="M2_REPO/org/jboss/deployers/jboss-deployers-vfs-spi/2.0.5.GA/jboss-deployers-vfs-spi-2.0.5.GA-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/jboss/integration/jboss-deployment-spi/5.1.0.GA/jboss-deployment-spi-5.1.0.GA.jar" sourcepath="M2_REPO/org/jboss/integration/jboss-deployment-spi/5.1.0.GA/jboss-deployment-spi-5.1.0.GA-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/jboss/javaee/jboss-ejb-api/3.0.0.GA/jboss-ejb-api-3.0.0.GA.jar" sourcepath="M2_REPO/org/jboss/javaee/jboss-ejb-api/3.0.0.GA/jboss-ejb-api-3.0.0.GA-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/jboss/ejb3/jboss-ejb3-ext-api/1.0.0/jboss-ejb3-ext-api-1.0.0.jar" sourcepath="M2_REPO/org/jboss/ejb3/jboss-ejb3-ext-api/1.0.0/jboss-ejb3-ext-api-1.0.0-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/jboss/javaee/jboss-jacc-api/1.1.0.GA_SP1/jboss-jacc-api-1.1.0.GA_SP1.jar" sourcepath="M2_REPO/org/jboss/javaee/jboss-jacc-api/1.1.0.GA_SP1/jboss-jacc-api-1.1.0.GA_SP1-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/jboss/javaee/jboss-jad-api/1.2.0.GA/jboss-jad-api-1.2.0.GA.jar" sourcepath="M2_REPO/org/jboss/javaee/jboss-jad-api/1.2.0.GA/jboss-jad-api-1.2.0.GA-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/jboss/javaee/jboss-jaspi-api/1.0.0.GA/jboss-jaspi-api-1.0.0.GA.jar" sourcepath="M2_REPO/org/jboss/javaee/jboss-jaspi-api/1.0.0.GA/jboss-jaspi-api-1.0.0.GA-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/jboss/jbossws/jboss-jaxws/3.0.1-native-2.0.4.GA/jboss-jaxws-3.0.1-native-2.0.4.GA.jar"/> + <classpathentry kind="var" path="M2_REPO/org/jboss/javaee/jboss-jca-api/1.5.0.GA/jboss-jca-api-1.5.0.GA.jar" sourcepath="M2_REPO/org/jboss/javaee/jboss-jca-api/1.5.0.GA/jboss-jca-api-1.5.0.GA-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/jboss/javaee/jboss-jms-api/1.1.0.GA/jboss-jms-api-1.1.0.GA.jar" sourcepath="M2_REPO/org/jboss/javaee/jboss-jms-api/1.1.0.GA/jboss-jms-api-1.1.0.GA-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/jboss/jpa/jboss-jpa-deployers/1.0.0/jboss-jpa-deployers-1.0.0.jar" sourcepath="M2_REPO/org/jboss/jpa/jboss-jpa-deployers/1.0.0/jboss-jpa-deployers-1.0.0-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/jboss/microcontainer/jboss-kernel/2.0.4.GA/jboss-kernel-2.0.4.GA.jar" sourcepath="M2_REPO/org/jboss/microcontainer/jboss-kernel/2.0.4.GA/jboss-kernel-2.0.4.GA-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/jboss/logging/jboss-logging-log4j/2.0.5.GA/jboss-logging-log4j-2.0.5.GA.jar" sourcepath="M2_REPO/org/jboss/logging/jboss-logging-log4j/2.0.5.GA/jboss-logging-log4j-2.0.5.GA-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/jboss/logging/jboss-logging-spi/2.0.5.GA/jboss-logging-spi-2.0.5.GA.jar" sourcepath="M2_REPO/org/jboss/logging/jboss-logging-spi/2.0.5.GA/jboss-logging-spi-2.0.5.GA-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/jboss/man/jboss-managed/2.0.0.GA/jboss-managed-2.0.0.GA.jar" sourcepath="M2_REPO/org/jboss/man/jboss-managed/2.0.0.GA/jboss-managed-2.0.0.GA-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-mdr/2.0.0.GA/jboss-mdr-2.0.0.GA.jar" sourcepath="M2_REPO/org/jboss/jboss-mdr/2.0.0.GA/jboss-mdr-2.0.0.GA-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/jboss/metadata/jboss-metadata/1.0.1.GA/jboss-metadata-1.0.1.GA.jar" sourcepath="M2_REPO/org/jboss/metadata/jboss-metadata/1.0.1.GA/jboss-metadata-1.0.1.GA-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/jboss/man/jboss-metatype/2.1.0.SP1/jboss-metatype-2.1.0.SP1.jar" sourcepath="M2_REPO/org/jboss/man/jboss-metatype/2.1.0.SP1/jboss-metatype-2.1.0.SP1-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/jboss/profiler/jvmti/jboss-profiler-jvmti/1.0.0.CR5/jboss-profiler-jvmti-1.0.0.CR5.jar"/> + <classpathentry kind="var" path="M2_REPO/org/jboss/integration/jboss-profileservice-spi/5.1.0.GA/jboss-profileservice-spi-5.1.0.GA.jar" sourcepath="M2_REPO/org/jboss/integration/jboss-profileservice-spi/5.1.0.GA/jboss-profileservice-spi-5.1.0.GA-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-reflect/2.0.2.GA/jboss-reflect-2.0.2.GA.jar" sourcepath="M2_REPO/org/jboss/jboss-reflect/2.0.2.GA/jboss-reflect-2.0.2.GA-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/jboss/remoting/jboss-remoting/2.5.1/jboss-remoting-2.5.1.jar" sourcepath="M2_REPO/org/jboss/remoting/jboss-remoting/2.5.1/jboss-remoting-2.5.1-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/jboss/security/jboss-security-spi/2.0.3.SP1/jboss-security-spi-2.0.3.SP1.jar" sourcepath="M2_REPO/org/jboss/security/jboss-security-spi/2.0.3.SP1/jboss-security-spi-2.0.3.SP1-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/jboss/jboss-serialization/1.0.3.GA/jboss-serialization-1.0.3.GA.jar"/> + <classpathentry kind="var" path="M2_REPO/org/jboss/jbossas/jboss-server-manager/1.0.2.GA/jboss-server-manager-1.0.2.GA.jar" sourcepath="M2_REPO/org/jboss/jbossas/jboss-server-manager/1.0.2.GA/jboss-server-manager-1.0.2.GA-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/jboss/test/jboss-test/1.1.4.GA/jboss-test-1.1.4.GA.jar" sourcepath="M2_REPO/org/jboss/test/jboss-test/1.1.4.GA/jboss-test-1.1.4.GA-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/jboss/javaee/jboss-transaction-api/1.0.1.GA/jboss-transaction-api-1.0.1.GA.jar" sourcepath="M2_REPO/org/jboss/javaee/jboss-transaction-api/1.0.1.GA/jboss-transaction-api-1.0.1.GA-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/jboss/integration/jboss-transaction-spi/5.1.0.GA/jboss-transaction-spi-5.1.0.GA.jar" sourcepath="M2_REPO/org/jboss/integration/jboss-transaction-spi/5.1.0.GA/jboss-transaction-spi-5.1.0.GA-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-vfs/2.0.0.CR1/jboss-vfs-2.0.0.CR1.jar" sourcepath="M2_REPO/org/jboss/jboss-vfs/2.0.0.CR1/jboss-vfs-2.0.0.CR1-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/jboss/security/jbosssx/2.0.3.SP1/jbosssx-2.0.3.SP1.jar" sourcepath="M2_REPO/org/jboss/security/jbosssx/2.0.3.SP1/jbosssx-2.0.3.SP1-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/jboss/security/jbosssx-client/2.0.4.SP6/jbosssx-client-2.0.4.SP6.jar"/> + <classpathentry kind="var" path="M2_REPO/org/jboss/ws/native/jbossws-native-jaxrpc/3.0.4.GA/jbossws-native-jaxrpc-3.0.4.GA.jar" sourcepath="M2_REPO/org/jboss/ws/native/jbossws-native-jaxrpc/3.0.4.GA/jbossws-native-jaxrpc-3.0.4.GA-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/jboss/ws/native/jbossws-native-jaxws/3.1.2.GA/jbossws-native-jaxws-3.1.2.GA.jar" sourcepath="M2_REPO/org/jboss/ws/native/jbossws-native-jaxws/3.1.2.GA/jbossws-native-jaxws-3.1.2.GA-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/jboss/ws/native/jbossws-native-saaj/3.1.2.GA/jbossws-native-saaj-3.1.2.GA.jar" sourcepath="M2_REPO/org/jboss/ws/native/jbossws-native-saaj/3.1.2.GA/jbossws-native-saaj-3.1.2.GA-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/jboss/ws/jbossws-spi/1.0.6.GA/jbossws-spi-1.0.6.GA.jar" sourcepath="M2_REPO/org/jboss/ws/jbossws-spi/1.0.6.GA/jbossws-spi-1.0.6.GA-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/jboss/security/jbossxacml/2.0.4/jbossxacml-2.0.4.jar" sourcepath="M2_REPO/org/jboss/security/jbossxacml/2.0.4/jbossxacml-2.0.4-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/jboss/jbossxb/2.0.1.GA/jbossxb-2.0.1.GA.jar" sourcepath="M2_REPO/org/jboss/jbossxb/2.0.1.GA/jbossxb-2.0.1.GA-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/jboss/naming/jnp-client/5.0.3.GA/jnp-client-5.0.3.GA.jar" sourcepath="M2_REPO/org/jboss/naming/jnp-client/5.0.3.GA/jnp-client-5.0.3.GA-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/jboss/naming/jnpserver/5.0.3.GA/jnpserver-5.0.3.GA.jar" sourcepath="M2_REPO/org/jboss/naming/jnpserver/5.0.3.GA/jnpserver-5.0.3.GA-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/jpl-pattern/jpl-pattern/1.0/jpl-pattern-1.0.jar"/> + <classpathentry kind="var" path="M2_REPO/jpl-util/jpl-util/1.0/jpl-util-1.0.jar"/> + <classpathentry kind="var" path="M2_REPO/rhino/js/1.6R7/js-1.6R7.jar"/> + <classpathentry kind="var" path="M2_REPO/jtidy/jtidy/4aug2000r7-dev/jtidy-4aug2000r7-dev.jar" sourcepath="M2_REPO/jtidy/jtidy/4aug2000r7-dev/jtidy-4aug2000r7-dev-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/junit/junit/4.4/junit-4.4.jar" sourcepath="M2_REPO/junit/junit/4.4/junit-4.4-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/apache-log4j/log4j/1.2.14/log4j-1.2.14.jar" sourcepath="M2_REPO/apache-log4j/log4j/1.2.14/log4j-1.2.14-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14.jar" sourcepath="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/nekohtml/nekohtml/1.9.12/nekohtml-1.9.12.jar"/> + <classpathentry kind="var" path="M2_REPO/org/picketlink/picketlink-fed/2.0.0-SNAPSHOT/picketlink-fed-2.0.0-SNAPSHOT.jar"/> + <classpathentry kind="var" path="M2_REPO/qdox/qdox/1.6.1/qdox-1.6.1.jar" sourcepath="M2_REPO/qdox/qdox/1.6.1/qdox-1.6.1-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/jboss/web/servlet-api/2.1.1.GA/servlet-api-2.1.1.GA.jar"/> + <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-api/1.4.2/slf4j-api-1.4.2.jar" sourcepath="M2_REPO/org/slf4j/slf4j-api/1.4.2/slf4j-api-1.4.2-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/stax/stax-api/1.0/stax-api-1.0.jar"/> + <classpathentry kind="var" path="M2_REPO/trove/trove/2.1.1/trove-2.1.1.jar"/> + <classpathentry kind="var" path="M2_REPO/apache-xerces/xercesImpl/2.9.1/xercesImpl-2.9.1.jar"/> + <classpathentry kind="var" path="M2_REPO/apache-xerces/xml-apis/2.9.1/xml-apis-2.9.1.jar"/> + <classpathentry kind="var" path="M2_REPO/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.jar" sourcepath="M2_REPO/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/xmlsec/1.4.3/xmlsec-1.4.3.jar"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> +</classpath> \ No newline at end of file Modified: integration-tests/trunk/pom.xml =================================================================== --- integration-tests/trunk/pom.xml 2011-03-22 18:52:29 UTC (rev 828) +++ integration-tests/trunk/pom.xml 2011-03-22 21:11:39 UTC (rev 829) @@ -16,7 +16,11 @@ <modules> <module>parent</module> <module>picketlink-saml-tests</module> + <module>picketlink-saml-jbas51</module> + <module>picketlink-saml-jbas6</module> + <module>picketlink-saml-tomcat6</module> <module>picketlink-sts-tests</module> <module>picketlink-openid-tests</module> + <module>picketlink-pdp-tests</module> </modules> </project>

13 years, 9 months

1
0
0 / 0

Picketlink SVN: r828 - integration-tests/trunk/parent.

by picketlink-commits＠lists.jboss.org

Author: anil.saldhana(a)jboss.com Date: 2011-03-22 14:52:29 -0400 (Tue, 22 Mar 2011) New Revision: 828 Modified: integration-tests/trunk/parent/pom.xml Log: remove test fail ignore Modified: integration-tests/trunk/parent/pom.xml =================================================================== --- integration-tests/trunk/parent/pom.xml 2011-03-22 18:24:27 UTC (rev 827) +++ integration-tests/trunk/parent/pom.xml 2011-03-22 18:52:29 UTC (rev 828) @@ -43,7 +43,6 @@ <configuration> <printSummary>true</printSummary> <disableXmlReport>false</disableXmlReport> - <testFailureIgnore>true</testFailureIgnore> <includes> <include>**/**TestCase.java</include> </includes>

13 years, 9 months

1
0
0 / 0

Picketlink SVN: r827 - federation/trunk/picketlink-bindings-jboss/src/main/java/org/picketlink/identity/federation/bindings/jboss/auth.

by picketlink-commits＠lists.jboss.org

Author: anil.saldhana(a)jboss.com Date: 2011-03-22 14:24:27 -0400 (Tue, 22 Mar 2011) New Revision: 827 Modified: federation/trunk/picketlink-bindings-jboss/src/main/java/org/picketlink/identity/federation/bindings/jboss/auth/SAML2STSLoginModule.java Log: add to local options Modified: federation/trunk/picketlink-bindings-jboss/src/main/java/org/picketlink/identity/federation/bindings/jboss/auth/SAML2STSLoginModule.java =================================================================== --- federation/trunk/picketlink-bindings-jboss/src/main/java/org/picketlink/identity/federation/bindings/jboss/auth/SAML2STSLoginModule.java 2011-03-22 18:23:55 UTC (rev 826) +++ federation/trunk/picketlink-bindings-jboss/src/main/java/org/picketlink/identity/federation/bindings/jboss/auth/SAML2STSLoginModule.java 2011-03-22 18:24:27 UTC (rev 827) @@ -23,6 +23,7 @@ import java.security.Principal; import java.security.acl.Group; +import java.util.HashMap; import java.util.HashSet; import java.util.List; import java.util.Map; @@ -124,7 +125,7 @@ protected String groupName = "Roles"; - protected Map<String, ?> options = null; + protected Map<String, Object> options = new HashMap<String, Object>(); /* * (non-Javadoc) @@ -135,7 +136,7 @@ Map<String, ?> options) { super.initialize(subject, callbackHandler, sharedState, options); - this.options = options; + this.options.putAll(options); // save the config file and cache validation options, removing them from the map - all remaining properties will // be set in the request context of the Dispatch instance used to send requests to the STS. this.stsConfigurationFile = (String) this.options.remove("configFile");

13 years, 9 months

1
0
0 / 0

Picketlink SVN: r826 - federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/sts.

by picketlink-commits＠lists.jboss.org

Author: anil.saldhana(a)jboss.com Date: 2011-03-22 14:23:55 -0400 (Tue, 22 Mar 2011) New Revision: 826 Modified: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/sts/PicketLinkCoreSTS.java Log: format the exception msg Modified: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/sts/PicketLinkCoreSTS.java =================================================================== --- federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/sts/PicketLinkCoreSTS.java 2011-03-22 17:28:53 UTC (rev 825) +++ federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/sts/PicketLinkCoreSTS.java 2011-03-22 18:23:55 UTC (rev 826) @@ -53,97 +53,99 @@ */ public class PicketLinkCoreSTS { - private static final Logger logger = Logger.getLogger( PicketLinkCoreSTS.class ); - public static final RuntimePermission rte = new RuntimePermission( "org.picketlink.sts" ); - + private static final Logger logger = Logger.getLogger(PicketLinkCoreSTS.class); + + public static final RuntimePermission rte = new RuntimePermission("org.picketlink.sts"); + protected STSCoreConfig configuration; - + private static PicketLinkCoreSTS _instance = null; - - private static final String SEPARATOR = AccessController.doPrivileged( new PrivilegedAction<String>() - { + + private static final String SEPARATOR = AccessController.doPrivileged(new PrivilegedAction<String>() + { public String run() - { + { return System.getProperty("file.separator"); } - } ); + }); private static final String STS_CONFIG_DIR = "picketlink-store" + SEPARATOR + "sts" + SEPARATOR; - + protected PicketLinkCoreSTS() - { + { } - + public static PicketLinkCoreSTS instance() { - if( _instance == null ) + if (_instance == null) _instance = new PicketLinkCoreSTS(); - + return _instance; } - - public void initialize( STSCoreConfig config ) + + public void initialize(STSCoreConfig config) { - if( this.configuration != null ) + if (this.configuration != null) { - this.configuration.copy(config); - } + this.configuration.copy(config); + } else this.configuration = config; } - - public void installDefaultConfiguration( String... configFileName ) + + public void installDefaultConfiguration(String... configFileName) { String fileName = "core-sts.xml"; - - if( configFileName != null && configFileName.length > 0 ) - fileName = configFileName[ 0 ]; - - if( configuration == null ) + + if (configFileName != null && configFileName.length > 0) + fileName = configFileName[0]; + + if (configuration == null) { - if(logger.isDebugEnabled() ) - logger.debug( "[InstallDefaultConfiguration] Configuration is null. Creating a new configuration" ); - configuration = new PicketLinkSTSConfiguration(); + if (logger.isDebugEnabled()) + logger.debug("[InstallDefaultConfiguration] Configuration is null. Creating a new configuration"); + configuration = new PicketLinkSTSConfiguration(); } - + try { - if(logger.isDebugEnabled() ) - logger.debug( "[InstallDefaultConfiguration] Configuration file name=" + fileName ); - - STSConfiguration config = getConfiguration( fileName ); + if (logger.isDebugEnabled()) + logger.debug("[InstallDefaultConfiguration] Configuration file name=" + fileName); + + STSConfiguration config = getConfiguration(fileName); configuration.copy(config); } catch (ConfigurationException e) { - throw new RuntimeException( e ); - } + throw new RuntimeException(e); + } } - + /** * Issue a security token * @param protocolContext * @throws ProcessingException * @throws {@link SecurityException} if the caller does not have a runtime permission for "org.picketlink.sts" */ - public void issueToken( ProtocolContext protocolContext) throws ProcessingException - { + public void issueToken(ProtocolContext protocolContext) throws ProcessingException + { SecurityManager sm = System.getSecurityManager(); - if( sm != null ) - sm.checkPermission( rte ); - - SecurityTokenProvider provider = getProvider(protocolContext); - - if( provider == null ) - throw new ProcessingException( "No Security Token Provider found in configuration:" + configuration + "[ProtoCtx=]" + protocolContext ); - - if( logger.isDebugEnabled() ) + if (sm != null) + sm.checkPermission(rte); + + SecurityTokenProvider provider = getProvider(protocolContext); + + if (provider == null) + throw new ProcessingException("No Security Token Provider found in configuration:[" + configuration + + "][ProtoCtx=" + protocolContext + "]"); + + if (logger.isDebugEnabled()) { - logger.debug( "issueToken::provider=" + provider ); + logger.debug("issueToken::provider=" + provider); } - - provider.issueToken( protocolContext ); + + provider.issueToken(protocolContext); } /** @@ -156,25 +158,26 @@ * @throws ProcessingException if an error occurs while renewing the security token. * @throws {@link SecurityException} if the caller does not have a runtime permission for "org.picketlink.sts" */ - public void renewToken( ProtocolContext protocolContext) throws ProcessingException - { + public void renewToken(ProtocolContext protocolContext) throws ProcessingException + { SecurityManager sm = System.getSecurityManager(); - if( sm != null ) - sm.checkPermission( rte ); - + if (sm != null) + sm.checkPermission(rte); + SecurityTokenProvider provider = null; - - if( provider == null ) + + if (provider == null) provider = getProviderBasedOnQName(protocolContext); - if( provider == null ) - throw new ProcessingException( "No Security Token Provider found in configuration:" + configuration + "[ProtoCtx=]" + protocolContext ); - - if( logger.isDebugEnabled() ) + if (provider == null) + throw new ProcessingException("No Security Token Provider found in configuration:" + configuration + + "[ProtoCtx=]" + protocolContext); + + if (logger.isDebugEnabled()) { - logger.debug( "renewToken::provider=" + provider ); + logger.debug("renewToken::provider=" + provider); } - provider.renewToken( protocolContext ); + provider.renewToken(protocolContext); } /** @@ -187,26 +190,26 @@ * @throws ProcessingException if an error occurs while canceling the security token. * @throws {@link SecurityException} if the caller does not have a runtime permission for "org.picketlink.sts" */ - public void cancelToken( ProtocolContext protocolContext) throws ProcessingException + public void cancelToken(ProtocolContext protocolContext) throws ProcessingException { SecurityManager sm = System.getSecurityManager(); - if( sm != null ) - sm.checkPermission( rte ); - + if (sm != null) + sm.checkPermission(rte); + SecurityTokenProvider provider = null; - - if( provider == null ) + + if (provider == null) provider = getProviderBasedOnQName(protocolContext); - if( provider == null ) - throw new ProcessingException( "No Security Token Provider found in configuration:" + protocolContext ); - - if( logger.isDebugEnabled() ) + if (provider == null) + throw new ProcessingException("No Security Token Provider found in configuration:" + protocolContext); + + if (logger.isDebugEnabled()) { - logger.debug( "cancelToken::provider=" + provider ); + logger.debug("cancelToken::provider=" + provider); } - - provider.cancelToken( protocolContext ); + + provider.cancelToken(protocolContext); } /** @@ -219,72 +222,73 @@ * @throws ProcessingException if an error occurs while validating the security token. * @throws {@link SecurityException} if the caller does not have a runtime permission for "org.picketlink.sts" */ - public void validateToken( ProtocolContext protocolContext) throws ProcessingException + public void validateToken(ProtocolContext protocolContext) throws ProcessingException { SecurityManager sm = System.getSecurityManager(); - if( sm != null ) - sm.checkPermission( rte ); - + if (sm != null) + sm.checkPermission(rte); + SecurityTokenProvider provider = null; - - if( provider == null ) + + if (provider == null) provider = getProviderBasedOnQName(protocolContext); - if( provider == null ) - throw new ProcessingException( "No Security Token Provider found in configuration:" + configuration + "[ProtoCtx=]" + protocolContext ); - - if( logger.isDebugEnabled() ) + if (provider == null) + throw new ProcessingException("No Security Token Provider found in configuration:" + configuration + + "[ProtoCtx=]" + protocolContext); + + if (logger.isDebugEnabled()) { - logger.debug( "validateToken::provider=" + provider ); + logger.debug("validateToken::provider=" + provider); } - - provider.validateToken( protocolContext ); + + provider.validateToken(protocolContext); } - - private SecurityTokenProvider getProvider( ProtocolContext protocolContext ) + + private SecurityTokenProvider getProvider(ProtocolContext protocolContext) { - if( configuration == null ) - throw new RuntimeException( "Configuration is not set" ); - + if (configuration == null) + throw new RuntimeException("Configuration is not set"); + SecurityTokenProvider provider = null; - + //Special Case: WST Applies To String serviceName = protocolContext.serviceName(); if (serviceName != null) { - provider = this.configuration.getProviderForService( serviceName ); + provider = this.configuration.getProviderForService(serviceName); } - - if( provider == null ) + + if (provider == null) { //lets get the provider based on token type String tokenType = protocolContext.tokenType(); - if( tokenType != null ) - provider = this.configuration.getProviderForTokenType( protocolContext.tokenType() ); + if (tokenType != null) + provider = this.configuration.getProviderForTokenType(protocolContext.tokenType()); } return provider; } - - private SecurityTokenProvider getProviderBasedOnQName( ProtocolContext protocolContext ) throws ProcessingException + + private SecurityTokenProvider getProviderBasedOnQName(ProtocolContext protocolContext) throws ProcessingException { SecurityTokenProvider provider = null; - + QName qname = null; - if( provider == null ) + if (provider == null) { qname = protocolContext.getQName(); - if( qname == null ) - throw new ProcessingException( "QName of the token type is null " ); - provider = this.configuration.getProviderForTokenElementNS( protocolContext.family(), qname ); - } - + if (qname == null) + throw new ProcessingException("QName of the token type is null "); + provider = this.configuration.getProviderForTokenElementNS(protocolContext.family(), qname); + } + if (provider == null) throw new ProcessingException("No SecurityTokenProvider configured for " + qname.getNamespaceURI() + ":" - + qname.getLocalPart() ); - + + qname.getLocalPart()); + return provider; } - + /** * * Obtains the STS configuration options. @@ -292,7 +296,7 @@ * * @return an instance of {@code STSConfiguration} containing the STS configuration properties. */ - protected STSConfiguration getConfiguration( String fileName ) throws ConfigurationException + protected STSConfiguration getConfiguration(String fileName) throws ConfigurationException { URL configurationFileURL = null; @@ -305,12 +309,12 @@ configurationFileURL = configurationFile.toURI().toURL(); else // if not configuration file was found in the user home, check the context classloader. - configurationFileURL = SecurityActions.getContextClassLoader().getResource( fileName ); + configurationFileURL = SecurityActions.getContextClassLoader().getResource(fileName); // if no configuration file was found, log a warn message and use default configuration values. if (configurationFileURL == null) { - logger.warn( fileName + " configuration file not found. Using default configuration values"); + logger.warn(fileName + " configuration file not found. Using default configuration values"); return new PicketLinkSTSConfiguration(); } @@ -318,7 +322,7 @@ STSType stsConfig = (STSType) new STSConfigParser().parse(stream); STSConfiguration configuration = new PicketLinkSTSConfiguration(stsConfig); if (logger.isInfoEnabled()) - logger.info( fileName + " configuration file loaded"); + logger.info(fileName + " configuration file loaded"); return configuration; } catch (Exception e)

13 years, 9 months

1
0
0 / 0

Picketlink SVN: r825 - federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust.

by picketlink-commits＠lists.jboss.org

Author: anil.saldhana(a)jboss.com Date: 2011-03-22 13:28:53 -0400 (Tue, 22 Mar 2011) New Revision: 825 Modified: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/PicketLinkSTS.java Log: provide info on the config file that is busted Modified: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/PicketLinkSTS.java =================================================================== --- federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/PicketLinkSTS.java 2011-03-21 22:14:37 UTC (rev 824) +++ federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/PicketLinkSTS.java 2011-03-22 17:28:53 UTC (rev 825) @@ -61,13 +61,13 @@ { private static Logger logger = Logger.getLogger(PicketLinkSTS.class); - private static final String SEPARATOR = AccessController.doPrivileged( new PrivilegedAction<String>() - { + private static final String SEPARATOR = AccessController.doPrivileged(new PrivilegedAction<String>() + { public String run() - { + { return System.getProperty("file.separator"); } - } ); + }); private static final String STS_CONFIG_FILE = "picketlink-sts.xml"; @@ -247,7 +247,7 @@ } catch (Exception e) { - throw new ConfigurationException("Error parsing the configuration file:", e); + throw new ConfigurationException("Error parsing the configuration file:[" + configurationFileURL + "]", e); } } } \ No newline at end of file

13 years, 9 months

1
0
0 / 0

Picketlink SVN: r824 - trust/trunk/jbossws/src/main/java/org/picketlink/trust/jbossws/handler.

by picketlink-commits＠lists.jboss.org

Author: anil.saldhana(a)jboss.com Date: 2011-03-21 18:14:37 -0400 (Mon, 21 Mar 2011) New Revision: 824 Modified: trust/trunk/jbossws/src/main/java/org/picketlink/trust/jbossws/handler/SAML2Handler.java Log: use PL constants Modified: trust/trunk/jbossws/src/main/java/org/picketlink/trust/jbossws/handler/SAML2Handler.java =================================================================== --- trust/trunk/jbossws/src/main/java/org/picketlink/trust/jbossws/handler/SAML2Handler.java 2011-03-16 20:06:26 UTC (rev 823) +++ trust/trunk/jbossws/src/main/java/org/picketlink/trust/jbossws/handler/SAML2Handler.java 2011-03-21 22:14:37 UTC (rev 824) @@ -35,6 +35,7 @@ import org.jboss.security.SecurityContext; import org.jboss.wsf.common.handler.GenericSOAPHandler; import org.picketlink.identity.federation.bindings.jboss.subject.PicketLinkPrincipal; +import org.picketlink.identity.federation.core.saml.v2.constants.JBossSAMLURIConstants; import org.picketlink.identity.federation.core.wstrust.SamlCredential; import org.picketlink.trust.jbossws.Constants; import org.picketlink.trust.jbossws.SAML2Constants; @@ -49,8 +50,10 @@ * * @author <a href="mmoyses(a)redhat.com">Marcus Moyses</a> * @author <a href="alessio.soldano(a)jboss.com">Alessio Soldano</a> + * @author Anil Saldhana * @version $Revision: 1 $ */ +@SuppressWarnings({"rawtypes", "restriction"}) public class SAML2Handler extends GenericSOAPHandler { @@ -76,13 +79,14 @@ */ protected boolean handleInbound(MessageContext msgContext) { + String assertionNS = JBossSAMLURIConstants.ASSERTION_NSURI.get(); SOAPMessageContext ctx = (SOAPMessageContext) msgContext; SOAPMessage soapMessage = ctx.getMessage(); // retrieve the assertion Document document = soapMessage.getSOAPPart(); Element soapHeader = Util.findOrCreateSoapHeader(document.getDocumentElement()); - Element assertion = Util.findElement(soapHeader, new QName(SAML2Constants.SAML2_ASSERTION_URI, "Assertion")); + Element assertion = Util.findElement(soapHeader, new QName(assertionNS, "Assertion")); if (assertion != null) { SamlCredential credential = new SamlCredential(assertion); @@ -91,8 +95,8 @@ log.trace("Assertion included in SOAP payload:"); log.trace(credential.getAssertionAsString()); } - Element subject = Util.findElement(assertion, new QName(SAML2Constants.SAML2_ASSERTION_URI, "Subject")); - Element nameID = Util.findElement(subject, new QName(SAML2Constants.SAML2_ASSERTION_URI, "NameID")); + Element subject = Util.findElement(assertion, new QName(assertionNS, "Subject")); + Element nameID = Util.findElement(subject, new QName(assertionNS, "NameID")); String username = getUsername(nameID); // set SecurityContext Subject s = new Subject();

13 years, 9 months

1
0
0 / 0

Picketlink SVN: r823 - in federation/trunk: picketlink-bindings/src/test/resources/saml2/post/ping/WEB-INF and 3 other directories.

by picketlink-commits＠lists.jboss.org

Author: anil.saldhana(a)jboss.com Date: 2011-03-16 16:06:26 -0400 (Wed, 16 Mar 2011) New Revision: 823 Modified: federation/trunk/picketlink-bindings/src/test/java/org/picketlink/test/identity/federation/bindings/workflow/PingFederateResponseTestCase.java federation/trunk/picketlink-bindings/src/test/resources/saml2/post/ping/WEB-INF/picketlink-handlers.xml federation/trunk/picketlink-web/src/main/java/org/picketlink/identity/federation/web/constants/GeneralConstants.java federation/trunk/picketlink-web/src/main/java/org/picketlink/identity/federation/web/handlers/saml2/SAML2AttributeHandler.java federation/trunk/picketlink-web/src/main/java/org/picketlink/identity/federation/web/process/SAMLHandlerChainProcessor.java Log: PLFED-159: the SAML2AttribHandler should key in by default name. We can configure if the attrib on the sp side needs to be keyed by friendly name Modified: federation/trunk/picketlink-bindings/src/test/java/org/picketlink/test/identity/federation/bindings/workflow/PingFederateResponseTestCase.java =================================================================== --- federation/trunk/picketlink-bindings/src/test/java/org/picketlink/test/identity/federation/bindings/workflow/PingFederateResponseTestCase.java 2011-03-16 04:25:50 UTC (rev 822) +++ federation/trunk/picketlink-bindings/src/test/java/org/picketlink/test/identity/federation/bindings/workflow/PingFederateResponseTestCase.java 2011-03-16 20:06:26 UTC (rev 823) @@ -21,6 +21,7 @@ */ package org.picketlink.test.identity.federation.bindings.workflow; +import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; @@ -31,6 +32,8 @@ import java.io.InputStream; import java.io.PrintWriter; import java.net.URL; +import java.util.List; +import java.util.Map; import org.apache.catalina.deploy.LoginConfig; import org.junit.Test; @@ -52,72 +55,81 @@ */ public class PingFederateResponseTestCase { - private String profile = "saml2/post"; - private ClassLoader tcl = Thread.currentThread().getContextClassLoader(); - + private final String profile = "saml2/post"; + + private final ClassLoader tcl = Thread.currentThread().getContextClassLoader(); + + @SuppressWarnings("unchecked") @Test public void testSP() throws Exception - { + { MockCatalinaSession session = new MockCatalinaSession(); //First we go to the employee application MockCatalinaContextClassLoader mclSPEmp = setupTCL(profile + "/ping"); Thread.currentThread().setContextClassLoader(mclSPEmp); SPPostFormAuthenticator spEmpl = new SPPostFormAuthenticator(); - + MockCatalinaContext context = new MockCatalinaContext(); spEmpl.setContainer(context); - spEmpl.testStart(); - + spEmpl.testStart(); MockCatalinaRequest catalinaRequest = new MockCatalinaRequest(); catalinaRequest.setSession(session); catalinaRequest.setContext(context); - - String idpResponse = PostBindingUtil.base64Encode( new String( readIDPResponse()) ); - - catalinaRequest.setParameter( GeneralConstants.SAML_RESPONSE_KEY, idpResponse ); - + + String idpResponse = PostBindingUtil.base64Encode(new String(readIDPResponse())); + + catalinaRequest.setParameter(GeneralConstants.SAML_RESPONSE_KEY, idpResponse); + MockCatalinaResponse catalinaResponse = new MockCatalinaResponse(); ByteArrayOutputStream baos = new ByteArrayOutputStream(); catalinaResponse.setWriter(new PrintWriter(baos)); - + LoginConfig loginConfig = new LoginConfig(); - assertTrue( spEmpl.authenticate(catalinaRequest, catalinaResponse, loginConfig) ); + assertTrue(spEmpl.authenticate(catalinaRequest, catalinaResponse, loginConfig)); + + Map<String, List<Object>> sessionMap = (Map<String, List<Object>>) session + .getAttribute(GeneralConstants.SESSION_ATTRIBUTE_MAP); + assertNotNull(sessionMap); + assertEquals("asptest_email", sessionMap.get("email").get(0)); + assertEquals("asptest_zipcode", sessionMap.get("zipcode").get(0)); } - + private byte[] readIDPResponse() throws IOException { - File file = new File( tcl.getResource("responseIDP/pingidp.xml").getPath() ); - InputStream is = new FileInputStream( file ); - assertNotNull( is ); - + File file = new File(tcl.getResource("responseIDP/pingidp.xml").getPath()); + InputStream is = new FileInputStream(file); + assertNotNull(is); + long length = file.length(); // Create the byte array to hold the data - byte[] bytes = new byte[(int)length]; + byte[] bytes = new byte[(int) length]; // Read in the bytes int offset = 0; int numRead = 0; - while (offset < bytes.length - && (numRead=is.read(bytes, offset, bytes.length-offset)) >= 0) { - offset += numRead; + while (offset < bytes.length && (numRead = is.read(bytes, offset, bytes.length - offset)) >= 0) + { + offset += numRead; } // Ensure all the bytes have been read in - if (offset < bytes.length) { - throw new IOException("Could not completely read file "+file.getName()); + if (offset < bytes.length) + { + throw new IOException("Could not completely read file " + file.getName()); } // Close the input stream and return bytes is.close(); - return bytes; + return bytes; } - + private MockCatalinaContextClassLoader setupTCL(String resource) { - URL[] urls = new URL[] {tcl.getResource(resource)}; - + URL[] urls = new URL[] + {tcl.getResource(resource)}; + MockCatalinaContextClassLoader mcl = new MockCatalinaContextClassLoader(urls); mcl.setDelegate(tcl); mcl.setProfile(resource); Modified: federation/trunk/picketlink-bindings/src/test/resources/saml2/post/ping/WEB-INF/picketlink-handlers.xml =================================================================== --- federation/trunk/picketlink-bindings/src/test/resources/saml2/post/ping/WEB-INF/picketlink-handlers.xml 2011-03-16 04:25:50 UTC (rev 822) +++ federation/trunk/picketlink-bindings/src/test/resources/saml2/post/ping/WEB-INF/picketlink-handlers.xml 2011-03-16 20:06:26 UTC (rev 823) @@ -1,5 +1,6 @@ <Handlers xmlns="urn:picketlink:identity-federation:handler:config:1.0"> <Handler class="org.picketlink.identity.federation.web.handlers.saml2.SAML2IssuerTrustHandler"/> <Handler class="org.picketlink.identity.federation.web.handlers.saml2.SAML2LogOutHandler"/> - <Handler class="org.picketlink.identity.federation.web.handlers.saml2.SAML2AuthenticationHandler"/> + <Handler class="org.picketlink.identity.federation.web.handlers.saml2.SAML2AuthenticationHandler"/> + <Handler class="org.picketlink.identity.federation.web.handlers.saml2.SAML2AttributeHandler"/> </Handlers> \ No newline at end of file Modified: federation/trunk/picketlink-web/src/main/java/org/picketlink/identity/federation/web/constants/GeneralConstants.java =================================================================== --- federation/trunk/picketlink-web/src/main/java/org/picketlink/identity/federation/web/constants/GeneralConstants.java 2011-03-16 04:25:50 UTC (rev 822) +++ federation/trunk/picketlink-web/src/main/java/org/picketlink/identity/federation/web/constants/GeneralConstants.java 2011-03-16 20:06:26 UTC (rev 823) @@ -38,6 +38,8 @@ String ATTRIBUTE_KEYS = "ATTRIBUTE_KEYS"; + String ATTRIBUTE_CHOOSE_FRIENDLY_NAME = "ATTRIBUTE_CHOOSE_FRIENDLY_NAME"; + String ATTIBUTE_MANAGER = "ATTRIBUTE_MANAGER"; String CANONICALIZATION_METHOD = "CANONICALIZATION_METHOD"; Modified: federation/trunk/picketlink-web/src/main/java/org/picketlink/identity/federation/web/handlers/saml2/SAML2AttributeHandler.java =================================================================== --- federation/trunk/picketlink-web/src/main/java/org/picketlink/identity/federation/web/handlers/saml2/SAML2AttributeHandler.java 2011-03-16 04:25:50 UTC (rev 822) +++ federation/trunk/picketlink-web/src/main/java/org/picketlink/identity/federation/web/handlers/saml2/SAML2AttributeHandler.java 2011-03-16 20:06:26 UTC (rev 823) @@ -40,6 +40,7 @@ import org.picketlink.identity.federation.core.saml.v2.interfaces.SAML2HandlerConfig; import org.picketlink.identity.federation.core.saml.v2.interfaces.SAML2HandlerRequest; import org.picketlink.identity.federation.core.saml.v2.interfaces.SAML2HandlerResponse; +import org.picketlink.identity.federation.core.util.StringUtil; import org.picketlink.identity.federation.newmodel.saml.v2.assertion.AssertionType; import org.picketlink.identity.federation.newmodel.saml.v2.assertion.AttributeStatementType; import org.picketlink.identity.federation.newmodel.saml.v2.assertion.AttributeStatementType.ASTChoiceType; @@ -50,7 +51,17 @@ import org.picketlink.identity.federation.web.core.HTTPContext; /** - * Handler dealing with attributes for SAML2 + * Handler dealing with attributes for SAML2 + * + * Configuration for handler: + * + * + * <ul> + * <li>ATTRIBUTE_MANAGER: a fqn of the attribute manager class. This is an IDP setting.</li> + * <li>ATTRIBUTE_KEYS: a comma separated list of string values representing attributes to be sent. IDP setting.</li> + * <li>ATTRIBUTE_CHOOSE_FRIENDLY_NAME : set to true if you require attributes to be keyed by friendly name rather than default name. SP Setting.</li> + * </ul> + * * @author Anil.Saldhana(a)redhat.com * @since Oct 12, 2009 */ @@ -64,6 +75,8 @@ protected List<String> attributeKeys = new ArrayList<String>(); + protected boolean chooseFriendlyName = false; + @Override public void initChainConfig(SAML2HandlerChainConfig handlerChainConfig) throws ConfigurationException { @@ -88,6 +101,13 @@ List<String> ak = (List<String>) this.handlerConfig.getParameter(GeneralConstants.ATTRIBUTE_KEYS); if (ak != null) this.attributeKeys.addAll(ak); + + String chooseFriendlyNameStr = (String) handlerConfig + .getParameter(GeneralConstants.ATTRIBUTE_CHOOSE_FRIENDLY_NAME); + if (StringUtil.isNotNull(chooseFriendlyNameStr)) + { + chooseFriendlyName = Boolean.parseBoolean(chooseFriendlyNameStr); + } } @SuppressWarnings("unchecked") @@ -150,7 +170,7 @@ AssertionType assertion = (AssertionType) request.getOptions().get(GeneralConstants.ASSERTION); if (assertion == null) - throw new RuntimeException("Assertion not found in the handler request"); + throw new RuntimeException("Assertion not found in the handler request:" + request.getOptions()); Set<StatementAbstractType> statements = assertion.getStatements(); for (StatementAbstractType statement : statements) { @@ -168,7 +188,14 @@ attrMap = new HashMap<String, List<Object>>(); session.setAttribute(GeneralConstants.SESSION_ATTRIBUTE_MAP, attrMap); } - attrMap.put(attr.getFriendlyName(), attr.getAttributeValue()); + if (chooseFriendlyName) + { + attrMap.put(attr.getFriendlyName(), attr.getAttributeValue()); + } + else + { + attrMap.put(attr.getName(), attr.getAttributeValue()); + } } } } Modified: federation/trunk/picketlink-web/src/main/java/org/picketlink/identity/federation/web/process/SAMLHandlerChainProcessor.java =================================================================== --- federation/trunk/picketlink-web/src/main/java/org/picketlink/identity/federation/web/process/SAMLHandlerChainProcessor.java 2011-03-16 04:25:50 UTC (rev 822) +++ federation/trunk/picketlink-web/src/main/java/org/picketlink/identity/federation/web/process/SAMLHandlerChainProcessor.java 2011-03-16 20:06:26 UTC (rev 823) @@ -22,7 +22,7 @@ package org.picketlink.identity.federation.web.process; import java.io.IOException; -import java.util.HashSet; +import java.util.LinkedHashSet; import java.util.Set; import java.util.concurrent.locks.Lock; @@ -31,7 +31,7 @@ import org.picketlink.identity.federation.core.saml.v2.interfaces.SAML2HandlerRequest; import org.picketlink.identity.federation.core.saml.v2.interfaces.SAML2HandlerResponse; import org.picketlink.identity.federation.newmodel.saml.v2.protocol.RequestAbstractType; -import org.picketlink.identity.federation.saml.v2.SAML2Object; +import org.picketlink.identity.federation.saml.v2.SAML2Object; import org.picketlink.identity.federation.web.core.HTTPContext; /** @@ -41,20 +41,17 @@ */ public class SAMLHandlerChainProcessor { - private Set<SAML2Handler> handlers = new HashSet<SAML2Handler>(); - + private final Set<SAML2Handler> handlers = new LinkedHashSet<SAML2Handler>(); + public SAMLHandlerChainProcessor(Set<SAML2Handler> handlers) { - this.handlers.addAll(handlers); + this.handlers.addAll(handlers); } - - public void callHandlerChain(SAML2Object samlObject, - SAML2HandlerRequest saml2HandlerRequest, - SAML2HandlerResponse saml2HandlerResponse, - HTTPContext httpContext, - Lock chainLock) - throws ProcessingException, IOException - { + + public void callHandlerChain(SAML2Object samlObject, SAML2HandlerRequest saml2HandlerRequest, + SAML2HandlerResponse saml2HandlerResponse, HTTPContext httpContext, Lock chainLock) + throws ProcessingException, IOException + { try { chainLock.lock(); @@ -79,6 +76,6 @@ finally { chainLock.unlock(); - } - } + } + } } \ No newline at end of file

13 years, 9 months

1
0
0 / 0

Picketlink SVN: r822 - federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/util.

by picketlink-commits＠lists.jboss.org

Author: matthew.hayes Date: 2011-03-16 00:25:50 -0400 (Wed, 16 Mar 2011) New Revision: 822 Modified: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/util/AssertionUtil.java Log: INFO log line in hasExpired was showing up in non-expired assertions. Handling was correct, logging was the only issue. Modified: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/util/AssertionUtil.java =================================================================== --- federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/util/AssertionUtil.java 2011-03-15 22:40:28 UTC (rev 821) +++ federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/util/AssertionUtil.java 2011-03-16 04:25:50 UTC (rev 822) @@ -159,7 +159,7 @@ if(trace) log.trace("Now="+now.toXMLFormat() + " ::notBefore="+notBefore.toXMLFormat() + "::notOnOrAfter="+notOnOrAfter); expiry = !XMLTimeUtil.isValid(now, notBefore, notOnOrAfter); - if( !expiry ) + if( expiry ) { log.info( "Assertion has expired with id=" + assertion.getID() ); }

13 years, 9 months

1
0
0 / 0

Picketlink SVN: r821 - federation/trunk/picketlink-bindings-jboss/src/main/java/org/picketlink/identity/federation/bindings/jboss/auth.

by picketlink-commits＠lists.jboss.org

Author: anil.saldhana(a)jboss.com Date: 2011-03-15 18:40:28 -0400 (Tue, 15 Mar 2011) New Revision: 821 Modified: federation/trunk/picketlink-bindings-jboss/src/main/java/org/picketlink/identity/federation/bindings/jboss/auth/SAML2STSLoginModule.java Log: bring back lost stefan's Revision: 799 changes Modified: federation/trunk/picketlink-bindings-jboss/src/main/java/org/picketlink/identity/federation/bindings/jboss/auth/SAML2STSLoginModule.java =================================================================== --- federation/trunk/picketlink-bindings-jboss/src/main/java/org/picketlink/identity/federation/bindings/jboss/auth/SAML2STSLoginModule.java 2011-03-15 22:31:14 UTC (rev 820) +++ federation/trunk/picketlink-bindings-jboss/src/main/java/org/picketlink/identity/federation/bindings/jboss/auth/SAML2STSLoginModule.java 2011-03-15 22:40:28 UTC (rev 821) @@ -125,7 +125,7 @@ protected String groupName = "Roles"; protected Map<String, ?> options = null; - + /* * (non-Javadoc) * @see org.jboss.security.auth.spi.AbstractServerLoginModule#initialize(javax.security.auth.Subject, javax.security.auth.callback.CallbackHandler, java.util.Map, java.util.Map) @@ -135,24 +135,25 @@ Map<String, ?> options) { super.initialize(subject, callbackHandler, sharedState, options); - // check if the options contain the name of the STS configuration file. - this.stsConfigurationFile = (String) options.get("configFile"); + this.options = options; + // save the config file and cache validation options, removing them from the map - all remaining properties will + // be set in the request context of the Dispatch instance used to send requests to the STS. + this.stsConfigurationFile = (String) this.options.remove("configFile"); + String cacheInvalidation = (String) this.options.remove("cache.invalidation"); + if (cacheInvalidation != null && !cacheInvalidation.isEmpty()) + { + this.enableCacheInvalidation = Boolean.parseBoolean(cacheInvalidation); + this.securityDomain = (String) this.options.remove(SecurityConstants.SECURITY_DOMAIN_OPTION); + if (this.securityDomain == null || this.securityDomain.isEmpty()) + throw new RuntimeException("Please configure option:" + SecurityConstants.SECURITY_DOMAIN_OPTION); + } + String groupNameStr = (String) options.get("groupPrincipalName"); if (StringUtil.isNotNull(groupNameStr)) { groupName = groupNameStr.trim(); } - - String cacheInvalidation = (String) options.get("cache.invalidation"); - if (cacheInvalidation != null && !cacheInvalidation.isEmpty()) - { - enableCacheInvalidation = Boolean.parseBoolean(cacheInvalidation); - securityDomain = (String) options.get(SecurityConstants.SECURITY_DOMAIN_OPTION); - if (securityDomain == null || securityDomain.isEmpty()) - throw new RuntimeException("Please configure option:" + SecurityConstants.SECURITY_DOMAIN_OPTION); - } - } /*

13 years, 9 months

1
0
0 / 0

Picketlink SVN: r820 - federation/trunk/picketlink-bindings-jboss/src/main/java/org/picketlink/identity/federation/bindings/jboss/auth.

by picketlink-commits＠lists.jboss.org

Author: anil.saldhana(a)jboss.com Date: 2011-03-15 18:31:14 -0400 (Tue, 15 Mar 2011) New Revision: 820 Modified: federation/trunk/picketlink-bindings-jboss/src/main/java/org/picketlink/identity/federation/bindings/jboss/auth/SAML2LoginModule.java federation/trunk/picketlink-bindings-jboss/src/main/java/org/picketlink/identity/federation/bindings/jboss/auth/SAML2STSLoginModule.java Log: PLFED-163: customize group principal name Modified: federation/trunk/picketlink-bindings-jboss/src/main/java/org/picketlink/identity/federation/bindings/jboss/auth/SAML2LoginModule.java =================================================================== --- federation/trunk/picketlink-bindings-jboss/src/main/java/org/picketlink/identity/federation/bindings/jboss/auth/SAML2LoginModule.java 2011-03-15 22:29:20 UTC (rev 819) +++ federation/trunk/picketlink-bindings-jboss/src/main/java/org/picketlink/identity/federation/bindings/jboss/auth/SAML2LoginModule.java 2011-03-15 22:31:14 UTC (rev 820) @@ -24,13 +24,17 @@ import java.security.Principal; import java.security.acl.Group; import java.util.List; +import java.util.Map; +import javax.security.auth.Subject; +import javax.security.auth.callback.CallbackHandler; import javax.security.auth.login.LoginException; -import org.picketlink.identity.federation.bindings.tomcat.sp.holder.ServiceProviderSAMLContext; import org.jboss.security.SimpleGroup; import org.jboss.security.SimplePrincipal; import org.jboss.security.auth.spi.UsernamePasswordLoginModule; +import org.picketlink.identity.federation.bindings.tomcat.sp.holder.ServiceProviderSAMLContext; +import org.picketlink.identity.federation.core.util.StringUtil; /** * Login Module that is capable of dealing with SAML2 cases @@ -48,27 +52,47 @@ * @since Feb 13, 2009 */ public class SAML2LoginModule extends UsernamePasswordLoginModule -{ +{ + + protected String groupName = "Roles"; + + /* + * (non-Javadoc) + * @see org.jboss.security.auth.spi.AbstractServerLoginModule#initialize(javax.security.auth.Subject, javax.security.auth.callback.CallbackHandler, java.util.Map, java.util.Map) + */ @Override + public void initialize(Subject subject, CallbackHandler callbackHandler, Map<String, ?> sharedState, + Map<String, ?> options) + { + super.initialize(subject, callbackHandler, sharedState, options); + String groupNameStr = (String) options.get("groupPrincipalName"); + if (StringUtil.isNotNull(groupNameStr)) + { + groupName = groupNameStr.trim(); + } + } + + @Override protected Principal getIdentity() - { + { return new SimplePrincipal(ServiceProviderSAMLContext.getUserName()); } @Override protected Group[] getRoleSets() throws LoginException { - Group group = new SimpleGroup("Roles"); - + Group group = new SimpleGroup(groupName); + List<String> roles = ServiceProviderSAMLContext.getRoles(); - if(roles != null) + if (roles != null) { - for(String role: roles) + for (String role : roles) { group.addMember(new SimplePrincipal(role)); } } - return new Group[] {group}; + return new Group[] + {group}; } @Override Modified: federation/trunk/picketlink-bindings-jboss/src/main/java/org/picketlink/identity/federation/bindings/jboss/auth/SAML2STSLoginModule.java =================================================================== --- federation/trunk/picketlink-bindings-jboss/src/main/java/org/picketlink/identity/federation/bindings/jboss/auth/SAML2STSLoginModule.java 2011-03-15 22:29:20 UTC (rev 819) +++ federation/trunk/picketlink-bindings-jboss/src/main/java/org/picketlink/identity/federation/bindings/jboss/auth/SAML2STSLoginModule.java 2011-03-15 22:31:14 UTC (rev 820) @@ -44,19 +44,20 @@ import org.picketlink.identity.federation.core.factories.JBossAuthCacheInvalidationFactory; import org.picketlink.identity.federation.core.factories.JBossAuthCacheInvalidationFactory.TimeCacheExpiry; import org.picketlink.identity.federation.core.saml.v2.util.AssertionUtil; +import org.picketlink.identity.federation.core.util.StringUtil; import org.picketlink.identity.federation.core.wstrust.STSClient; +import org.picketlink.identity.federation.core.wstrust.STSClientConfig.Builder; import org.picketlink.identity.federation.core.wstrust.SamlCredential; import org.picketlink.identity.federation.core.wstrust.WSTrustException; -import org.picketlink.identity.federation.core.wstrust.STSClientConfig.Builder; import org.picketlink.identity.federation.core.wstrust.plugins.saml.SAMLUtil; import org.picketlink.identity.federation.newmodel.saml.v2.assertion.AssertionType; import org.picketlink.identity.federation.newmodel.saml.v2.assertion.AttributeStatementType; +import org.picketlink.identity.federation.newmodel.saml.v2.assertion.AttributeStatementType.ASTChoiceType; import org.picketlink.identity.federation.newmodel.saml.v2.assertion.AttributeType; import org.picketlink.identity.federation.newmodel.saml.v2.assertion.BaseIDAbstractType; import org.picketlink.identity.federation.newmodel.saml.v2.assertion.NameIDType; import org.picketlink.identity.federation.newmodel.saml.v2.assertion.StatementAbstractType; import org.picketlink.identity.federation.newmodel.saml.v2.assertion.SubjectType; -import org.picketlink.identity.federation.newmodel.saml.v2.assertion.AttributeStatementType.ASTChoiceType; import org.w3c.dom.Element; /** @@ -76,6 +77,7 @@ * <ul>jboss.security.security_domain: name of the security domain where this login module is configured. This is only required * if the cache.invalidation option is configured. * </ul> + * <ul>groupPrincipalName: if you do not want the Roles in the subject to be "Roles", then set it to a different value</ul> * </li> * * @@ -117,9 +119,11 @@ protected AssertionType assertion; protected boolean enableCacheInvalidation = false; - + protected String securityDomain = null; - + + protected String groupName = "Roles"; + protected Map<String, ?> options = null; /* @@ -131,19 +135,24 @@ Map<String, ?> options) { super.initialize(subject, callbackHandler, sharedState, options); - this.options = options; + // check if the options contain the name of the STS configuration file. + this.stsConfigurationFile = (String) options.get("configFile"); - // save the config file and cache validation options, removing them from the map - all remainig properties will - // be set in the request context of the Dispatch instance used to send requests to the STS. - this.stsConfigurationFile = (String) this.options.remove("configFile"); - String cacheInvalidation = (String) this.options.remove( "cache.invalidation" ); - if( cacheInvalidation != null && !cacheInvalidation.isEmpty() ) + String groupNameStr = (String) options.get("groupPrincipalName"); + if (StringUtil.isNotNull(groupNameStr)) { - this.enableCacheInvalidation = Boolean.parseBoolean( cacheInvalidation ); - this.securityDomain = (String) this.options.remove( SecurityConstants.SECURITY_DOMAIN_OPTION ); - if( this.securityDomain == null || this.securityDomain.isEmpty() ) - throw new RuntimeException( "Please configure option:" + SecurityConstants.SECURITY_DOMAIN_OPTION ); + groupName = groupNameStr.trim(); } + + String cacheInvalidation = (String) options.get("cache.invalidation"); + if (cacheInvalidation != null && !cacheInvalidation.isEmpty()) + { + enableCacheInvalidation = Boolean.parseBoolean(cacheInvalidation); + securityDomain = (String) options.get(SecurityConstants.SECURITY_DOMAIN_OPTION); + if (securityDomain == null || securityDomain.isEmpty()) + throw new RuntimeException("Please configure option:" + SecurityConstants.SECURITY_DOMAIN_OPTION); + } + } /* @@ -188,7 +197,8 @@ Element assertionElement = null; try { - super.callbackHandler.handle(new Callback[]{callback}); + super.callbackHandler.handle(new Callback[] + {callback}); if (callback.getCredential() instanceof SamlCredential == false) throw new IllegalArgumentException("Supplied credential is not a SAML credential"); this.credential = (SamlCredential) callback.getCredential(); @@ -202,7 +212,7 @@ } // send the assertion to the STS for validation. - STSClient client = this.getSTSClient() ; + STSClient client = this.getSTSClient(); try { boolean isValid = client.validateToken(assertionElement); @@ -225,23 +235,23 @@ if (subject != null) { BaseIDAbstractType baseID = subject.getSubType().getBaseID(); - if( baseID instanceof NameIDType ) + if (baseID instanceof NameIDType) { NameIDType nameID = (NameIDType) baseID; - this.principal = new PicketLinkPrincipal(nameID.getValue()); - + this.principal = new PicketLinkPrincipal(nameID.getValue()); + //If the user has configured cache invalidation of subject based on saml token expiry - if( enableCacheInvalidation ) + if (enableCacheInvalidation) { TimeCacheExpiry cacheExpiry = JBossAuthCacheInvalidationFactory.getCacheExpiry(); - XMLGregorianCalendar expiry = AssertionUtil.getExpiration( assertion ); - if( expiry != null ) + XMLGregorianCalendar expiry = AssertionUtil.getExpiration(assertion); + if (expiry != null) { - cacheExpiry.register( securityDomain, expiry.toGregorianCalendar().getTime() , principal ); - } + cacheExpiry.register(securityDomain, expiry.toGregorianCalendar().getTime(), principal); + } else { - log.warn( "SAML Assertion has been found to have no expiration: ID = " + assertion.getID() ); + log.warn("SAML Assertion has been found to have no expiration: ID = " + assertion.getID()); } } } @@ -300,10 +310,10 @@ { Set<Principal> roles = new HashSet<Principal>(); List<ASTChoiceType> attributeList = attributeStatement.getAttributes(); - for ( ASTChoiceType obj : attributeList ) + for (ASTChoiceType obj : attributeList) { AttributeType attribute = obj.getAttribute(); - if( attribute != null ) + if (attribute != null) { // if this is a role attribute, get its values and add them to the role set. if (attribute.getName().equals("role")) @@ -313,14 +323,15 @@ } } } - Group rolesGroup = new PicketLinkGroup("Roles"); + Group rolesGroup = new PicketLinkGroup(groupName); for (Principal role : roles) rolesGroup.addMember(role); - return new Group[]{rolesGroup}; + return new Group[] + {rolesGroup}; } return new Group[0]; } - + /** * * Checks if the specified SAML assertion contains a {@code AttributeStatementType} and returns this type when it @@ -344,7 +355,7 @@ } return null; } - + /** * Get the {@link STSClient} object with which we can make calls to the STS * @return

13 years, 9 months

1
0
0 / 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

picketlink-commits March 2011