Picketlink SVN: r1194 - in integration-tests/branches/product: ant-scripts and 13 other directories.
by picketlink-commits＠lists.jboss.org
Author: pskopek(a)redhat.com
Date: 2011-08-26 03:52:04 -0400 (Fri, 26 Aug 2011)
New Revision: 1194
Modified:
integration-tests/branches/product/ant-scripts/ant-build.xml
integration-tests/branches/product/parent/pom.xml
integration-tests/branches/product/picketlink-int-webapps/claims/pom.xml
integration-tests/branches/product/picketlink-pdp-tests/.classpath
integration-tests/branches/product/picketlink-pdp-tests/.project
integration-tests/branches/product/picketlink-pdp-tests/pom.xml
integration-tests/branches/product/picketlink-saml-jbas51/pom.xml
integration-tests/branches/product/picketlink-saml-jbas6/pom.xml
integration-tests/branches/product/picketlink-saml-standalone/pom.xml
integration-tests/branches/product/picketlink-saml-tomcat6/pom.xml
integration-tests/branches/product/picketlink-sts-jbas51-cxf/pom.xml
integration-tests/branches/product/picketlink-sts-jbas51-native/pom.xml
integration-tests/branches/product/picketlink-sts-jbas6-cxf/pom.xml
integration-tests/branches/product/picketlink-sts-tests/.classpath
integration-tests/branches/product/picketlink-sts-tests/.project
integration-tests/branches/product/picketlink-sts-tests/pom.xml
integration-tests/branches/product/picketlink-trust-jbas51-native/pom.xml
integration-tests/branches/product/picketlink-trust-tests/pom.xml
integration-tests/branches/product/pom.xml
Log:
Fixing poms to have them work in eclipse and ability to run tests against certain version of PL by specifying pl-version property.
Modified: integration-tests/branches/product/ant-scripts/ant-build.xml
===================================================================
--- integration-tests/branches/product/ant-scripts/ant-build.xml 2011-08-25 11:47:25 UTC (rev 1193)
+++ integration-tests/branches/product/ant-scripts/ant-build.xml 2011-08-26 07:52:04 UTC (rev 1194)
@@ -1,4 +1,4 @@
-<project default="init" name="PicketLink Federation Integration Test Suite">
+<project name="PicketLink Federation Integration Test Suite">
<taskdef resource="net/sf/antcontrib/antlib.xml">
<classpath path="${depclasspath}"/>
</taskdef>
Modified: integration-tests/branches/product/parent/pom.xml
===================================================================
--- integration-tests/branches/product/parent/pom.xml 2011-08-25 11:47:25 UTC (rev 1193)
+++ integration-tests/branches/product/parent/pom.xml 2011-08-26 07:52:04 UTC (rev 1194)
@@ -26,6 +26,11 @@
<connection>scm:svn:http://anonsvn.jboss.org/repos/picketlink/federation/tags/1.0.0.a...</connection>
<developerConnection>scm:svn:https://svn.jboss.org/repos/picketlink/federation/tags/1.0.0.alpha1</developerConnection>
</scm>
+
+ <properties>
+ <pl-version>2.0.0.final</pl-version>
+ </properties>
+
<build>
<plugins>
@@ -58,6 +63,35 @@
<artifactId>maven-antrun-plugin</artifactId>
<version>1.4</version>
</plugin>
+ <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
+ <plugin>
+ <groupId>org.eclipse.m2e</groupId>
+ <artifactId>lifecycle-mapping</artifactId>
+ <version>1.0.0</version>
+ <configuration>
+ <lifecycleMappingMetadata>
+ <pluginExecutions>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>
+ org.apache.maven.plugins
+ </groupId>
+ <artifactId>
+ maven-antrun-plugin
+ </artifactId>
+ <versionRange>[1.4,)</versionRange>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <ignore></ignore>
+ </action>
+ </pluginExecution>
+ </pluginExecutions>
+ </lifecycleMappingMetadata>
+ </configuration>
+ </plugin>
</plugins>
</pluginManagement>
</build>
Modified: integration-tests/branches/product/picketlink-int-webapps/claims/pom.xml
===================================================================
--- integration-tests/branches/product/picketlink-int-webapps/claims/pom.xml 2011-08-25 11:47:25 UTC (rev 1193)
+++ integration-tests/branches/product/picketlink-int-webapps/claims/pom.xml 2011-08-26 07:52:04 UTC (rev 1194)
@@ -3,7 +3,7 @@
<groupId>org.picketlink</groupId>
<artifactId>picketlink-integration-tests-parent</artifactId>
<version>2.0.0-SNAPSHOT</version>
- <relativePath>../</relativePath>
+ <relativePath>../../parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: integration-tests/branches/product/picketlink-pdp-tests/.classpath
===================================================================
--- integration-tests/branches/product/picketlink-pdp-tests/.classpath 2011-08-25 11:47:25 UTC (rev 1193)
+++ integration-tests/branches/product/picketlink-pdp-tests/.classpath 2011-08-26 07:52:04 UTC (rev 1194)
@@ -1,18 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
<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/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/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/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"/>
-</classpath>
\ No newline at end of file
+ <classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
+ <classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"/>
+ <classpathentry kind="output" path="target/classes"/>
+</classpath>
Modified: integration-tests/branches/product/picketlink-pdp-tests/.project
===================================================================
--- integration-tests/branches/product/picketlink-pdp-tests/.project 2011-08-25 11:47:25 UTC (rev 1193)
+++ integration-tests/branches/product/picketlink-pdp-tests/.project 2011-08-26 07:52:04 UTC (rev 1194)
@@ -1,13 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>picketlink-integration-pdp-tests</name>
- <comment>PicketLink Federation Tests to be run in a continous integration environment such as Hudson</comment>
- <projects/>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
\ No newline at end of file
+ <name>picketlink-integration-pdp-tests</name>
+ <comment>PicketLink Federation Tests to be run in a continous integration environment such as Hudson</comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.m2e.core.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
Modified: integration-tests/branches/product/picketlink-pdp-tests/pom.xml
===================================================================
--- integration-tests/branches/product/picketlink-pdp-tests/pom.xml 2011-08-25 11:47:25 UTC (rev 1193)
+++ integration-tests/branches/product/picketlink-pdp-tests/pom.xml 2011-08-26 07:52:04 UTC (rev 1194)
@@ -44,7 +44,7 @@
<phase>compile</phase>
<configuration>
<tasks>
- <property name="version" value="${project.version}"/>
+ <property name="version" value="${pl-version}"/>
<property name="depclasspath" refid="maven.dependency.classpath"/>
<property name="localRepository" value="${user.home}/.m2/repository"/>
<ant antfile="${basedir}/ant-build.xml" target="install-jboss" />
@@ -82,7 +82,7 @@
<dependency>
<groupId>org.picketlink</groupId>
<artifactId>picketlink-fed</artifactId>
- <version>${version}</version>
+ <version>${pl-version}</version>
<scope>test</scope>
</dependency>
<dependency>
Modified: integration-tests/branches/product/picketlink-saml-jbas51/pom.xml
===================================================================
--- integration-tests/branches/product/picketlink-saml-jbas51/pom.xml 2011-08-25 11:47:25 UTC (rev 1193)
+++ integration-tests/branches/product/picketlink-saml-jbas51/pom.xml 2011-08-26 07:52:04 UTC (rev 1194)
@@ -60,7 +60,7 @@
<configuration>
<tasks>
<property name="depclasspath" refid="maven.dependency.classpath"/>
- <property name="version" value="${project.version}"/>
+ <property name="version" value="${pl-version}"/>
<property name="localRepository" value="${user.home}/.m2/repository"/>
<ant antfile="${basedir}/../ant-scripts/ant-build.xml" target="init-jboss5" />
<ant antfile="${basedir}/../ant-scripts/ant-build.xml" target="start-jboss5" />
@@ -76,7 +76,7 @@
<configuration>
<tasks>
<property name="depclasspath" refid="maven.dependency.classpath"/>
- <property name="version" value="${version}"/>
+ <property name="version" value="${pl-version}"/>
<property name="localRepository" value="${user.home}/.m2/repository"/>
<ant antfile="${basedir}/../ant-scripts/ant-build.xml" target="stop-jboss5" />
</tasks>
@@ -125,7 +125,27 @@
<artifactId>ant-contrib</artifactId>
<version>1.0b2</version>
</dependency>
-
+ <dependency>
+ <groupId>org.picketlink</groupId>
+ <artifactId>picketlink-bindings</artifactId>
+ <version>${pl-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.picketlink</groupId>
+ <artifactId>picketlink-bindings-jboss</artifactId>
+ <version>${pl-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.picketlink</groupId>
+ <artifactId>picketlink-fed</artifactId>
+ <version>${pl-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.picketlink</groupId>
+ <artifactId>picketlink-fed-webapps-assembly</artifactId>
+ <version>${pl-version}</version>
+ <type>zip</type>
+ </dependency>
</dependencies>
<reporting>
Modified: integration-tests/branches/product/picketlink-saml-jbas6/pom.xml
===================================================================
--- integration-tests/branches/product/picketlink-saml-jbas6/pom.xml 2011-08-25 11:47:25 UTC (rev 1193)
+++ integration-tests/branches/product/picketlink-saml-jbas6/pom.xml 2011-08-26 07:52:04 UTC (rev 1194)
@@ -60,7 +60,7 @@
<configuration>
<tasks>
<property name="depclasspath" refid="maven.dependency.classpath"/>
- <property name="version" value="${project.version}"/>
+ <property name="version" value="${pl-version}"/>
<property name="localRepository" value="${user.home}/.m2/repository"/>
<ant antfile="${basedir}/../ant-scripts/ant-build.xml" target="init-jboss6" />
<ant antfile="${basedir}/../ant-scripts/ant-build.xml" target="start-jboss6" />
@@ -76,7 +76,7 @@
<configuration>
<tasks>
<property name="depclasspath" refid="maven.dependency.classpath"/>
- <property name="version" value="${version}"/>
+ <property name="version" value="${pl-version}"/>
<property name="localRepository" value="${user.home}/.m2/repository"/>
<ant antfile="${basedir}/../ant-scripts/ant-build.xml" target="stop-jboss6" />
</tasks>
Modified: integration-tests/branches/product/picketlink-saml-standalone/pom.xml
===================================================================
--- integration-tests/branches/product/picketlink-saml-standalone/pom.xml 2011-08-25 11:47:25 UTC (rev 1193)
+++ integration-tests/branches/product/picketlink-saml-standalone/pom.xml 2011-08-26 07:52:04 UTC (rev 1194)
@@ -56,7 +56,7 @@
<configuration>
<tasks>
<property name="depclasspath" refid="maven.dependency.classpath"/>
- <property name="version" value="${project.version}"/>
+ <property name="version" value="${pl-version}"/>
<property name="localRepository" value="${user.home}/.m2/repository"/>
<ant antfile="${basedir}/../ant-scripts/ant-build.xml" target="start-tomcat6-standalone" />
</tasks>
@@ -71,7 +71,7 @@
<configuration>
<tasks>
<property name="depclasspath" refid="maven.dependency.classpath"/>
- <property name="version" value="${version}"/>
+ <property name="version" value="${pl-version}"/>
<property name="localRepository" value="${user.home}/.m2/repository"/>
<ant antfile="${basedir}/../ant-scripts/ant-build.xml" target="stop-tomcat6" />
</tasks>
@@ -120,7 +120,13 @@
<artifactId>ant-contrib</artifactId>
<version>1.0b2</version>
</dependency>
-
+ <dependency>
+ <groupId>org.picketlink</groupId>
+ <artifactId>idp-standalone</artifactId>
+ <type>war</type>
+ <version>${pl-version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<reporting>
Modified: integration-tests/branches/product/picketlink-saml-tomcat6/pom.xml
===================================================================
--- integration-tests/branches/product/picketlink-saml-tomcat6/pom.xml 2011-08-25 11:47:25 UTC (rev 1193)
+++ integration-tests/branches/product/picketlink-saml-tomcat6/pom.xml 2011-08-26 07:52:04 UTC (rev 1194)
@@ -60,7 +60,7 @@
<configuration>
<tasks>
<property name="depclasspath" refid="maven.dependency.classpath"/>
- <property name="version" value="${project.version}"/>
+ <property name="version" value="${pl-version}"/>
<property name="localRepository" value="${user.home}/.m2/repository"/>
<ant antfile="${basedir}/../ant-scripts/ant-build.xml" target="start-tomcat6" />
</tasks>
@@ -75,7 +75,7 @@
<configuration>
<tasks>
<property name="depclasspath" refid="maven.dependency.classpath"/>
- <property name="version" value="${version}"/>
+ <property name="version" value="${pl-version}"/>
<property name="localRepository" value="${user.home}/.m2/repository"/>
<ant antfile="${basedir}/../ant-scripts/ant-build.xml" target="stop-tomcat6" />
</tasks>
Modified: integration-tests/branches/product/picketlink-sts-jbas51-cxf/pom.xml
===================================================================
--- integration-tests/branches/product/picketlink-sts-jbas51-cxf/pom.xml 2011-08-25 11:47:25 UTC (rev 1193)
+++ integration-tests/branches/product/picketlink-sts-jbas51-cxf/pom.xml 2011-08-26 07:52:04 UTC (rev 1194)
@@ -66,7 +66,7 @@
<phase>compile</phase>
<configuration>
<tasks>
- <property name="version" value="${project.version}"/>
+ <property name="version" value="${pl-version}"/>
<property name="depclasspath" refid="maven.dependency.classpath"/>
<property name="localRepository" value="${user.home}/.m2/repository"/>
<ant antfile="${basedir}/../ant-scripts/ant-build.xml" target="init-jboss5" />
@@ -100,7 +100,7 @@
<dependency>
<groupId>org.picketlink</groupId>
<artifactId>picketlink-fed</artifactId>
- <version>${version}</version>
+ <version>${pl-version}</version>
<scope>test</scope>
</dependency>
<dependency>
Modified: integration-tests/branches/product/picketlink-sts-jbas51-native/pom.xml
===================================================================
--- integration-tests/branches/product/picketlink-sts-jbas51-native/pom.xml 2011-08-25 11:47:25 UTC (rev 1193)
+++ integration-tests/branches/product/picketlink-sts-jbas51-native/pom.xml 2011-08-26 07:52:04 UTC (rev 1194)
@@ -67,7 +67,7 @@
<phase>compile</phase>
<configuration>
<tasks>
- <property name="version" value="${project.version}"/>
+ <property name="version" value="${pl-version}"/>
<property name="depclasspath" refid="maven.dependency.classpath"/>
<property name="localRepository" value="${user.home}/.m2/repository"/>
<ant antfile="${basedir}/../ant-scripts/ant-build.xml" target="init-jboss5" />
@@ -100,7 +100,7 @@
<dependency>
<groupId>org.picketlink</groupId>
<artifactId>picketlink-fed</artifactId>
- <version>${version}</version>
+ <version>${pl-version}</version>
<scope>test</scope>
</dependency>
<dependency>
Modified: integration-tests/branches/product/picketlink-sts-jbas6-cxf/pom.xml
===================================================================
--- integration-tests/branches/product/picketlink-sts-jbas6-cxf/pom.xml 2011-08-25 11:47:25 UTC (rev 1193)
+++ integration-tests/branches/product/picketlink-sts-jbas6-cxf/pom.xml 2011-08-26 07:52:04 UTC (rev 1194)
@@ -51,7 +51,7 @@
<phase>compile</phase>
<configuration>
<tasks>
- <property name="version" value="${project.version}"/>
+ <property name="version" value="${pl-version}"/>
<property name="depclasspath" refid="maven.dependency.classpath"/>
<property name="localRepository" value="${user.home}/.m2/repository"/>
<ant antfile="${basedir}/../ant-scripts/ant-build.xml" target="init-jboss6" />
@@ -85,7 +85,7 @@
<dependency>
<groupId>org.picketlink</groupId>
<artifactId>picketlink-fed</artifactId>
- <version>${version}</version>
+ <version>${pl-version}</version>
<scope>test</scope>
</dependency>
<dependency>
Modified: integration-tests/branches/product/picketlink-sts-tests/.classpath
===================================================================
--- integration-tests/branches/product/picketlink-sts-tests/.classpath 2011-08-25 11:47:25 UTC (rev 1193)
+++ integration-tests/branches/product/picketlink-sts-tests/.classpath 2011-08-26 07:52:04 UTC (rev 1194)
@@ -1,115 +1,8 @@
<?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/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"/>
+ <classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
+ <classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
+ <classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
Modified: integration-tests/branches/product/picketlink-sts-tests/.project
===================================================================
--- integration-tests/branches/product/picketlink-sts-tests/.project 2011-08-25 11:47:25 UTC (rev 1193)
+++ integration-tests/branches/product/picketlink-sts-tests/.project 2011-08-26 07:52:04 UTC (rev 1194)
@@ -1,17 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>picketlink-integration-sts-tests</name>
- <comment>PicketLink Federation Tests to be run in a continous integration environment such as Hudson</comment>
- <projects/>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- </buildCommand>
- <buildCommand>
- <name>org.maven.ide.eclipse.maven2Builder</name>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.maven.ide.eclipse.maven2Nature</nature>
- </natures>
-</projectDescription>
\ No newline at end of file
+ <name>picketlink-integration-sts-tests</name>
+ <comment>PicketLink Federation Tests to be run in a continous integration environment such as Hudson</comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.maven.ide.eclipse.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.m2e.core.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.maven.ide.eclipse.maven2Nature</nature>
+ </natures>
+</projectDescription>
Modified: integration-tests/branches/product/picketlink-sts-tests/pom.xml
===================================================================
--- integration-tests/branches/product/picketlink-sts-tests/pom.xml 2011-08-25 11:47:25 UTC (rev 1193)
+++ integration-tests/branches/product/picketlink-sts-tests/pom.xml 2011-08-26 07:52:04 UTC (rev 1194)
@@ -49,7 +49,7 @@
<dependency>
<groupId>org.picketlink</groupId>
<artifactId>picketlink-fed</artifactId>
- <version>${version}</version>
+ <version>${pl-version}</version>
<scope>test</scope>
</dependency>
<dependency>
Modified: integration-tests/branches/product/picketlink-trust-jbas51-native/pom.xml
===================================================================
--- integration-tests/branches/product/picketlink-trust-jbas51-native/pom.xml 2011-08-25 11:47:25 UTC (rev 1193)
+++ integration-tests/branches/product/picketlink-trust-jbas51-native/pom.xml 2011-08-26 07:52:04 UTC (rev 1194)
@@ -64,7 +64,7 @@
<phase>compile</phase>
<configuration>
<tasks>
- <property name="version" value="${project.version}"/>
+ <property name="version" value="${pl-version}"/>
<property name="depclasspath" refid="maven.dependency.classpath"/>
<property name="localRepository" value="${user.home}/.m2/repository"/>
<ant antfile="${basedir}/../ant-scripts/ant-build.xml" target="init-jboss5" />
@@ -98,13 +98,13 @@
<dependency>
<groupId>org.picketlink</groupId>
<artifactId>picketlink-fed</artifactId>
- <version>${project.version}</version>
+ <version>${pl-version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.picketlink</groupId>
<artifactId>picketlink-trust-jbossws</artifactId>
- <version>${project.version}</version>
+ <version>${pl-version}</version>
<scope>test</scope>
</dependency>
<dependency>
Modified: integration-tests/branches/product/picketlink-trust-tests/pom.xml
===================================================================
--- integration-tests/branches/product/picketlink-trust-tests/pom.xml 2011-08-25 11:47:25 UTC (rev 1193)
+++ integration-tests/branches/product/picketlink-trust-tests/pom.xml 2011-08-26 07:52:04 UTC (rev 1194)
@@ -147,13 +147,13 @@
<dependency>
<groupId>org.picketlink</groupId>
<artifactId>picketlink-fed</artifactId>
- <version>${version}</version>
+ <version>${pl-version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.picketlink</groupId>
<artifactId>picketlink-trust-jbossws</artifactId>
- <version>${version}</version>
+ <version>${pl-version}</version>
<scope>test</scope>
<exclusions>
<exclusion>
Modified: integration-tests/branches/product/pom.xml
===================================================================
--- integration-tests/branches/product/pom.xml 2011-08-25 11:47:25 UTC (rev 1193)
+++ integration-tests/branches/product/pom.xml 2011-08-26 07:52:04 UTC (rev 1194)
@@ -24,9 +24,11 @@
<module>picketlink-sts-tests</module>
<module>picketlink-sts-jbas51-native</module>
<module>picketlink-sts-jbas51-cxf</module>
- <module>picketlink-sts-jbas6-cxf</module>
+ <module>picketlink-sts-jbas6-cxf</module>
+ <module>picketlink-pdp-tests</module>
+ <module>picketlink-trust-tests</module>
+ <module>picketlink-trust-jbas51-native</module>
<!-- <module>picketlink-openid-tests</module> -->
- <module>picketlink-pdp-tests</module>
</modules>
</project>
13 years, 4 months
- 1
- 0
Picketlink SVN: r1193 - in integration-tests/branches/product/common-dist: jbossws and 1 other directory.
by picketlink-commits＠lists.jboss.org
Author: pskopek(a)redhat.com
Date: 2011-08-25 07:47:25 -0400 (Thu, 25 Aug 2011)
New Revision: 1193
Removed:
integration-tests/branches/product/common-dist/jbossas/
integration-tests/branches/product/common-dist/jbossws/3.3.1.GA/
integration-tests/branches/product/common-dist/jbossws/3.4.1.GA/
integration-tests/branches/product/common-dist/tomcat/
Log:
deleted distributions which are not relevant to product
13 years, 4 months
- 1
- 0
Picketlink SVN: r1192 - integration-tests/branches.
by picketlink-commits＠lists.jboss.org
Author: pskopek(a)redhat.com
Date: 2011-08-25 05:34:38 -0400 (Thu, 25 Aug 2011)
New Revision: 1192
Added:
integration-tests/branches/product/
Log:
PicketLink product integration tests branch.
Created as part of JBQA-5129.
13 years, 4 months
- 1
- 0
Picketlink SVN: r1191 - in product/trunk: parent and 5 other directories.
by picketlink-commits＠lists.jboss.org
Author: anil.saldhana(a)jboss.com
Date: 2011-08-11 18:58:50 -0400 (Thu, 11 Aug 2011)
New Revision: 1191
Modified:
product/trunk/parent/pom.xml
product/trunk/picketlink-core/pom.xml
product/trunk/picketlink-webapps/idp/pom.xml
product/trunk/picketlink-webapps/pdp/pom.xml
product/trunk/picketlink-webapps/picketlink-sts/pom.xml
product/trunk/picketlink-webapps/pom.xml
product/trunk/pom.xml
Log:
PLFED-226: next 2.0.1
Modified: product/trunk/parent/pom.xml
===================================================================
--- product/trunk/parent/pom.xml 2011-08-11 22:54:16 UTC (rev 1190)
+++ product/trunk/parent/pom.xml 2011-08-11 22:58:50 UTC (rev 1191)
@@ -8,7 +8,7 @@
<groupId>org.picketlink.product</groupId>
<artifactId>picketlink-fed-parent</artifactId>
<packaging>pom</packaging>
- <version>2.0.0</version>
+ <version>2.0.1-SNAPSHOT</version>
<name>PicketLink Federation- Parent</name>
<url>http://labs.jboss.org/portal/picketlink/</url>
<description>PicketLink is a cross-cutting project that handles identity needs for the JEMS projects</description>
@@ -23,8 +23,8 @@
<url>http://www.jboss.org</url>
</organization>
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/picketlink/product/tags/2.0.0.alpha1</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/picketlink/product/tags/2.0.0.alpha1</developerConnection>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/picketlink/product/tags/2.0.1-SNAP...</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/picketlink/product/tags/2.0.1-SNAPSHO...</developerConnection>
</scm>
<build>
Modified: product/trunk/picketlink-core/pom.xml
===================================================================
--- product/trunk/picketlink-core/pom.xml 2011-08-11 22:54:16 UTC (rev 1190)
+++ product/trunk/picketlink-core/pom.xml 2011-08-11 22:58:50 UTC (rev 1191)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.picketlink.product</groupId>
<artifactId>picketlink-fed-parent</artifactId>
- <version>2.0.0</version>
+ <version>2.0.1-SNAPSHOT</version>
<relativePath>../parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: product/trunk/picketlink-webapps/idp/pom.xml
===================================================================
--- product/trunk/picketlink-webapps/idp/pom.xml 2011-08-11 22:54:16 UTC (rev 1190)
+++ product/trunk/picketlink-webapps/idp/pom.xml 2011-08-11 22:58:50 UTC (rev 1191)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.picketlink.product</groupId>
<artifactId>picketlink-federation-webapps</artifactId>
- <version>2.0.0</version>
+ <version>2.0.1-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
Modified: product/trunk/picketlink-webapps/pdp/pom.xml
===================================================================
--- product/trunk/picketlink-webapps/pdp/pom.xml 2011-08-11 22:54:16 UTC (rev 1190)
+++ product/trunk/picketlink-webapps/pdp/pom.xml 2011-08-11 22:58:50 UTC (rev 1191)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.picketlink.product</groupId>
<artifactId>picketlink-federation-webapps</artifactId>
- <version>2.0.0</version>
+ <version>2.0.1-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
Modified: product/trunk/picketlink-webapps/picketlink-sts/pom.xml
===================================================================
--- product/trunk/picketlink-webapps/picketlink-sts/pom.xml 2011-08-11 22:54:16 UTC (rev 1190)
+++ product/trunk/picketlink-webapps/picketlink-sts/pom.xml 2011-08-11 22:58:50 UTC (rev 1191)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.picketlink.product</groupId>
<artifactId>picketlink-federation-webapps</artifactId>
- <version>2.0.0</version>
+ <version>2.0.1-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
Modified: product/trunk/picketlink-webapps/pom.xml
===================================================================
--- product/trunk/picketlink-webapps/pom.xml 2011-08-11 22:54:16 UTC (rev 1190)
+++ product/trunk/picketlink-webapps/pom.xml 2011-08-11 22:58:50 UTC (rev 1191)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.picketlink.product</groupId>
<artifactId>picketlink-fed-parent</artifactId>
- <version>2.0.0</version>
+ <version>2.0.1-SNAPSHOT</version>
<relativePath>../parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: product/trunk/pom.xml
===================================================================
--- product/trunk/pom.xml 2011-08-11 22:54:16 UTC (rev 1190)
+++ product/trunk/pom.xml 2011-08-11 22:58:50 UTC (rev 1191)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.picketlink.product</groupId>
<artifactId>picketlink-fed-parent</artifactId>
- <version>2.0.0</version>
+ <version>2.0.1-SNAPSHOT</version>
<relativePath>parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
13 years, 4 months
- 1
- 0
Picketlink SVN: r1190 - in product/trunk: parent and 25 other directories.
by picketlink-commits＠lists.jboss.org
Author: anil.saldhana(a)jboss.com
Date: 2011-08-11 18:54:16 -0400 (Thu, 11 Aug 2011)
New Revision: 1190
Modified:
product/trunk/parent/pom.xml
product/trunk/picketlink-core/pom.xml
product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/constants/X500SAMLProfileConstants.java
product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/core/util/IDFedLSInputResolver.java
product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/core/util/SchemaManagerUtil.java
product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/core/wsse/WSSecurityConstants.java
product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/core/wstrust/WSTrustConstants.java
product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/ws/policy/Policy.java
product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/ws/trust/LifetimeType.java
product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/ws/trust/RequestedReferenceType.java
product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/ws/wss/secext/AttributedString.java
product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/ws/wss/secext/BinarySecurityTokenType.java
product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/ws/wss/secext/EncodedString.java
product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/ws/wss/secext/KeyIdentifierType.java
product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/ws/wss/secext/PasswordString.java
product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/ws/wss/secext/SecurityTokenReferenceType.java
product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/ws/wss/secext/UsernameTokenType.java
product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/ws/wss/utility/AttributedDateTime.java
product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/ws/wss/utility/AttributedURI.java
product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/ws/wss/utility/TimestampType.java
product/trunk/picketlink-core/src/main/java/org/picketlink/trust/jbossws/Constants.java
product/trunk/picketlink-core/src/main/java/org/picketlink/trust/jbossws/handler/BinaryTokenHandler.java
product/trunk/picketlink-core/src/test/java/org/picketlink/test/identity/federation/api/util/KeyUtilUnitTestCase.java
product/trunk/picketlink-core/src/test/java/org/picketlink/test/identity/federation/bindings/config/MetadataConfigUnitTestCase.java
product/trunk/picketlink-core/src/test/java/org/picketlink/test/identity/federation/core/config/ConfigUnitTestCase.java
product/trunk/picketlink-core/src/test/java/org/picketlink/test/identity/federation/core/util/KeystoreUtilUnitTestCase.java
product/trunk/picketlink-core/src/test/resources/config/test-config-2.xml
product/trunk/picketlink-core/src/test/resources/config/test-metadata-config-1.xml
product/trunk/picketlink-core/src/test/resources/jbossws/xml/wsse-saml.xml
product/trunk/picketlink-core/src/test/resources/parser/saml2/saml2-authnrequest.xml
product/trunk/picketlink-core/src/test/resources/parser/wst/wst-issue-onbehalfof.xml
product/trunk/picketlink-core/src/test/resources/parser/wst/wst-response-assertion-hok-certificate.xml
product/trunk/picketlink-core/src/test/resources/parser/wst/wst-response-assertion-hok-combined.xml
product/trunk/picketlink-core/src/test/resources/parser/wst/wst-response-assertion-hok-pubkey.xml
product/trunk/picketlink-core/src/test/resources/parser/wst/wst-response-assertion-hok-simmetric.xml
product/trunk/picketlink-core/src/test/resources/parser/wst/wst-response-assertion.xml
product/trunk/picketlink-core/src/test/resources/saml/v2/authnrequest/samlAuthnRequestExample.xml
product/trunk/picketlink-core/src/test/resources/saml/v2/authnrequest/samlAuthnRequestWithSignature.xml
product/trunk/picketlink-core/src/test/resources/saml2/metadata/sp-entitydescriptor.xml
product/trunk/picketlink-core/src/test/resources/saml2/metadata/testshib-two-metadata.xml
product/trunk/picketlink-webapps/idp/pom.xml
product/trunk/picketlink-webapps/pdp/pom.xml
product/trunk/picketlink-webapps/picketlink-sts/pom.xml
product/trunk/picketlink-webapps/pom.xml
product/trunk/pom.xml
Log:
revert to r1188
Modified: product/trunk/parent/pom.xml
===================================================================
--- product/trunk/parent/pom.xml 2011-08-11 22:40:00 UTC (rev 1189)
+++ product/trunk/parent/pom.xml 2011-08-11 22:54:16 UTC (rev 1190)
@@ -8,7 +8,7 @@
<groupId>org.picketlink.product</groupId>
<artifactId>picketlink-fed-parent</artifactId>
<packaging>pom</packaging>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.0.0</version>
<name>PicketLink Federation- Parent</name>
<url>http://labs.jboss.org/portal/picketlink/</url>
<description>PicketLink is a cross-cutting project that handles identity needs for the JEMS projects</description>
@@ -23,8 +23,8 @@
<url>http://www.jboss.org</url>
</organization>
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/picketlink/product/tags/2.0.1-SNAP...</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/picketlink/product/tags/2.0.1-SNAPSHO...</developerConnection>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/picketlink/product/tags/2.0.0.alpha1</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/picketlink/product/tags/2.0.0.alpha1</developerConnection>
</scm>
<build>
Modified: product/trunk/picketlink-core/pom.xml
===================================================================
--- product/trunk/picketlink-core/pom.xml 2011-08-11 22:40:00 UTC (rev 1189)
+++ product/trunk/picketlink-core/pom.xml 2011-08-11 22:54:16 UTC (rev 1190)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.picketlink.product</groupId>
<artifactId>picketlink-fed-parent</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.0.0</version>
<relativePath>../parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/constants/X500SAMLProfileConstants.java
===================================================================
--- product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/constants/X500SAMLProfileConstants.java 2011-08-11 22:40:00 UTC (rev 1189)
+++ product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/constants/X500SAMLProfileConstants.java 2011-08-11 22:54:16 UTC (rev 1190)
@@ -33,28 +33,28 @@
*/
public enum X500SAMLProfileConstants
{
- A_RECORD( "aRecord" , "urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.26" ),
+ A_RECORD( "aRecord" , "urn:oid:0.9.2342.19200300.100.1.26" ),
ALIASED_ENTRY_NAME( "aliasedEntryName" , "urn:oid:2.5.4.1"),
ALIASED_OBJECT_NAME("aliasedObjectName" , "urn:oid:2.5.4.1"),
- ASSOCIATED_DOMAIN("associatedDomain" , "urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.37"),
- ASSOCIATED_NAME("associatedName" , "urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.38"),
- AUDIO("audio" , "urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.55"),
+ ASSOCIATED_DOMAIN("associatedDomain" , "urn:oid:0.9.2342.19200300.100.1.37"),
+ ASSOCIATED_NAME("associatedName" , "urn:oid:0.9.2342.19200300.100.1.38"),
+ AUDIO("audio" , "urn:oid:0.9.2342.19200300.100.1.55"),
AUTHORITY_REVOCATION_LIST("authorityRevocationList" , "urn:oid:2.5.4.38"),
- BINDING_NAME("buildingName" , "urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.48"),
+ BINDING_NAME("buildingName" , "urn:oid:0.9.2342.19200300.100.1.48"),
BUSINESS_CATEGORY("businessCategory" , "urn:oid:2.5.4.15"),
C("c" , "urn:oid:2.5.4.6"),
CA_CERTIFICATE("cACertificate" , "urn:oid:2.5.4.37"),
- CNAME_RECORD("cNAMERecord" , "urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.31"),
+ CNAME_RECORD("cNAMERecord" , "urn:oid:0.9.2342.19200300.100.1.31"),
CAR_LICENSE("carLicense" , "urn:oid:2.16.840.1.113730.3.1.1"),
CRL("certificateRevocationList" , "urn:oid:2.5.4.39"),
CN("cn" , "urn:oid:2.5.4.3"),
- CO("co" , "urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.43"),
+ CO("co" , "urn:oid:0.9.2342.19200300.100.1.43"),
COMMON_NAME("commonName" , "urn:oid:2.5.4.3"),
COUNTRY_NAME("countryName" , "urn:oid:2.5.4.6"),
CROSS_CERTIFICATE_PAIR("crossCertificatePair" , "urn:oid:2.5.4.40"),
- D_IT_REDIRECT("dITRedirect" , "urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.54"),
- D_SA_QUALITY("dSAQuality" , "urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.49"),
- DC("dc" , "urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.25"),
+ D_IT_REDIRECT("dITRedirect" , "urn:oid:0.9.2342.19200300.100.1.54"),
+ D_SA_QUALITY("dSAQuality" , "urn:oid:0.9.2342.19200300.100.1.49"),
+ DC("dc" , "urn:oid:0.9.2342.19200300.100.1.25"),
DELTA_REVOCATION_LIST("deltaRevocationList" , "urn:oid:2.5.4.53"),
DEPARTMENT_NUMBER("departmentNumber" , "urn:oid:2.16.840.1.113730.3.1.2"),
DESCRIPTION("description" , "urn:oid:2.5.4.13"),
@@ -63,14 +63,14 @@
DISTINGUISHED_NAME("distinguishedName" , "urn:oid:2.5.4.49"),
DMD_NAME("dmdName" , "urn:oid:2.5.4.54"),
DN_QUALIFIER("dnQualifier" , "urn:oid:2.5.4.46"),
- DOCUMENT_AUTHOR("documentAuthor" , "urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.14"),
- DOCUMENT_IDENTIFIER("documentIdentifier" , "urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.11"),
- DOCUMENT_LOCATION("documentLocation" , "urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.15"),
- DOCUMENT_PUBLISHER("documentPublisher" , "urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.56"),
- DOCUMENT_TITLE("documentTitle" , "urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.12"),
- DOCUMENT_VERSION("documentVersion" , "urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.13"),
- DOMAIN_COMPONENT("domainComponent" , "urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.25"),
- DRINK("drink" , "urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.5"),
+ DOCUMENT_AUTHOR("documentAuthor" , "urn:oid:0.9.2342.19200300.100.1.14"),
+ DOCUMENT_IDENTIFIER("documentIdentifier" , "urn:oid:0.9.2342.19200300.100.1.11"),
+ DOCUMENT_LOCATION("documentLocation" , "urn:oid:0.9.2342.19200300.100.1.15"),
+ DOCUMENT_PUBLISHER("documentPublisher" , "urn:oid:0.9.2342.19200300.100.1.56"),
+ DOCUMENT_TITLE("documentTitle" , "urn:oid:0.9.2342.19200300.100.1.12"),
+ DOCUMENT_VERSION("documentVersion" , "urn:oid:0.9.2342.19200300.100.1.13"),
+ DOMAIN_COMPONENT("domainComponent" , "urn:oid:0.9.2342.19200300.100.1.25"),
+ DRINK("drink" , "urn:oid:0.9.2342.19200300.100.1.5"),
EDU_ORG_HOMEPAGEURI("eduOrgHomePageURI" , "urn:oid:1.3.6.1.4.1.5923.1.2.1.2"),
EDU_ORG_IDENTITY_AUTHN_POLICYURI("eduOrgIdentityAuthNPolicyURI" , "urn:oid:1.3.6.1.4.1.5923.1.2.1.3"),
EDU_ORG_LEGALNAME("eduOrgLegalName" , "urn:oid:1.3.6.1.4.1.5923.1.2.1.4"),
@@ -92,37 +92,37 @@
EMPLOYEE_TYPE("employeeType" , "urn:oid:2.16.840.1.113730.3.1.4"),
ENHANCED_SEARCH_GUIDE("enhancedSearchGuide" , "urn:oid:2.5.4.47"),
FAX_TELEPHONE_NUMBER("facsimileTelephoneNumber" , "urn:oid:2.5.4.23"),
- FAVORITE_DRINK("favouriteDrink" , "urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.5"),
+ FAVORITE_DRINK("favouriteDrink" , "urn:oid:0.9.2342.19200300.100.1.5"),
FAX("fax" , "urn:oid:2.5.4.23"),
FEDERATION_FEIDE_SCHEMA_VERSION("federationFeideSchemaVersion" , "urn:oid:1.3.6.1.4.1.2428.90.1.9"),
- FRIENDLY_COUNTRY_NAME("friendlyCountryName" , "urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.43"),
+ FRIENDLY_COUNTRY_NAME("friendlyCountryName" , "urn:oid:0.9.2342.19200300.100.1.43"),
GENERATION_QUALIFIER("generationQualifier" , "urn:oid:2.5.4.44"),
GIVEN_NAME("givenName" , "urn:oid:2.5.4.42"),
GN("gn" , "urn:oid:2.5.4.42"),
- HOME_PHONE("homePhone" , "urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.20"),
- HOME_POSTAL_ADDRESS("homePostalAddress" , "urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.39"),
- HOME_TELEPHONE_NUMBER("homeTelephoneNumber" , "urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.20"),
- HOST("host" , "urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.9"),
+ HOME_PHONE("homePhone" , "urn:oid:0.9.2342.19200300.100.1.20"),
+ HOME_POSTAL_ADDRESS("homePostalAddress" , "urn:oid:0.9.2342.19200300.100.1.39"),
+ HOME_TELEPHONE_NUMBER("homeTelephoneNumber" , "urn:oid:0.9.2342.19200300.100.1.20"),
+ HOST("host" , "urn:oid:0.9.2342.19200300.100.1.9"),
HOUSE_IDENTIFIER("houseIdentifier" , "urn:oid:2.5.4.51"),
- INFO("info" , "urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.4"),
+ INFO("info" , "urn:oid:0.9.2342.19200300.100.1.4"),
INITIALS("initials" , "urn:oid:2.5.4.43"),
INTERNATIONAL_ISDN_NUMBER("internationaliSDNNumber" , "urn:oid:2.5.4.25"),
IS_MEMBEROF("isMemberOf" , "urn:oid:1.3.6.1.4.1.5923.1.5.1.1"),
- JANET_MAILBOX("janetMailbox" , "urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.46"),
- JPEG_PHOTO("jpegPhoto" , "urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.60"),
+ JANET_MAILBOX("janetMailbox" , "urn:oid:0.9.2342.19200300.100.1.46"),
+ JPEG_PHOTO("jpegPhoto" , "urn:oid:0.9.2342.19200300.100.1.60"),
KNOWLEDGE_INFORMATION("knowledgeInformation" , "urn:oid:2.5.4.2"),
L("l" , "urn:oid:2.5.4.7"),
LABELED_URI("labeledURI" , "urn:oid:1.3.6.1.4.1.250.1.57"),
LOCALITY_NAME("localityName" , "urn:oid:2.5.4.7"),
- M_DRECORD("mDRecord" , "urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.27"),
- M_XRECORD("mXRecord" , "urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.28"),
- MAIL("mail" , "urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.3"),
- MAIL_PREFERENCEOPTION("mailPreferenceOption" , "urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.47"),
- MANAGER("manager" , "urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.10"),
+ M_DRECORD("mDRecord" , "urn:oid:0.9.2342.19200300.100.1.27"),
+ M_XRECORD("mXRecord" , "urn:oid:0.9.2342.19200300.100.1.28"),
+ MAIL("mail" , "urn:oid:0.9.2342.19200300.100.1.3"),
+ MAIL_PREFERENCEOPTION("mailPreferenceOption" , "urn:oid:0.9.2342.19200300.100.1.47"),
+ MANAGER("manager" , "urn:oid:0.9.2342.19200300.100.1.10"),
MEMBER("member" , "urn:oid:2.5.4.31"),
- MOBILE("mobile" , "urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.41"),
- MOBILE_TELEPHONE_NUMBER("mobileTelephoneNumber" , "urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.41"),
- N_SRECORD("nSRecord" , "urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.29"),
+ MOBILE("mobile" , "urn:oid:0.9.2342.19200300.100.1.41"),
+ MOBILE_TELEPHONE_NUMBER("mobileTelephoneNumber" , "urn:oid:0.9.2342.19200300.100.1.41"),
+ N_SRECORD("nSRecord" , "urn:oid:0.9.2342.19200300.100.1.29"),
NAME("name" , "urn:oid:2.5.4.41"),
NOR_EDU_ORG_ACRONYM("norEduOrgAcronym" , "urn:oid:1.3.6.1.4.1.2428.90.1.6"),
NOR_EDU_ORG_NIN("norEduOrgNIN" , "urn:oid:1.3.6.1.4.1.2428.90.1.12"),
@@ -137,16 +137,16 @@
O("o" , "urn:oid:2.5.4.10"),
OBJECT_CLASS("objectClass" , "urn:oid:2.5.4.0"),
ORGANIZATION_NAME("organizationName" , "urn:oid:2.5.4.10"),
- ORGANIZATIONAL_STATUS("organizationalStatus" , "urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.45"),
+ ORGANIZATIONAL_STATUS("organizationalStatus" , "urn:oid:0.9.2342.19200300.100.1.45"),
ORGANIZATIONAL_UNIT_NAME("organizationalUnitName" , "urn:oid:2.5.4.11"),
- OTHER_MAIL_BOX("otherMailbox" , "urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.22"),
+ OTHER_MAIL_BOX("otherMailbox" , "urn:oid:0.9.2342.19200300.100.1.22"),
OU("ou" , "urn:oid:2.5.4.11"),
OWNER("owner" , "urn:oid:2.5.4.32"),
- PAGER("pager" , "urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.42"),
- PAGER_TELEPHONE_NUMBER("pagerTelephoneNumber" , "urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.42"),
- PERSONAL_SIGNATURE("personalSignature" , "urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.53"),
- PERSONAL_TITLE("personalTitle" , "urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.40"),
- PHOTO("photo" , "urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.7"),
+ PAGER("pager" , "urn:oid:0.9.2342.19200300.100.1.42"),
+ PAGER_TELEPHONE_NUMBER("pagerTelephoneNumber" , "urn:oid:0.9.2342.19200300.100.1.42"),
+ PERSONAL_SIGNATURE("personalSignature" , "urn:oid:0.9.2342.19200300.100.1.53"),
+ PERSONAL_TITLE("personalTitle" , "urn:oid:0.9.2342.19200300.100.1.40"),
+ PHOTO("photo" , "urn:oid:0.9.2342.19200300.100.1.7"),
PHYSICAL_DELIVERY_OFFICE_NAME("physicalDeliveryOfficeName" , "urn:oid:2.5.4.19"),
PKCS_9_EMAIL("pkcs9email" , "urn:oid:1.2.840.113549.1.9.1"),
POST_OFFICE_BOX("postOfficeBox" , "urn:oid:2.5.4.18"),
@@ -158,39 +158,39 @@
PROTOCOL_INFORMATION("protocolInformation" , "urn:oid:2.5.4.48"),
PSEUDONYM("pseudonym" , "urn:oid:2.5.4.65"),
REGISTERED_ADDRESS("registeredAddress" , "urn:oid:2.5.4.26"),
- RFC_822_MAILBOX("rfc822Mailbox" , "urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.3"),
+ RFC_822_MAILBOX("rfc822Mailbox" , "urn:oid:0.9.2342.19200300.100.1.3"),
ROLE_OCCUPANT("roleOccupant" , "urn:oid:2.5.4.33"),
- ROOM_NUMBER("roomNumber" , "urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.6"),
- S_OAR_RECORD("sOARecord" , "urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.30"),
+ ROOM_NUMBER("roomNumber" , "urn:oid:0.9.2342.19200300.100.1.6"),
+ S_OAR_RECORD("sOARecord" , "urn:oid:0.9.2342.19200300.100.1.30"),
SEARCH_GUIDE("searchGuide" , "urn:oid:2.5.4.14"),
- SECRETARY("secretary" , "urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.21"),
+ SECRETARY("secretary" , "urn:oid:0.9.2342.19200300.100.1.21"),
SEE_ALSO("seeAlso" , "urn:oid:2.5.4.34"),
SERIAL_NUMBER("serialNumber" , "urn:oid:2.5.4.5"),
- SINGLE_LEVEL_QUALITY("singleLevelQuality" , "urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.50"),
+ SINGLE_LEVEL_QUALITY("singleLevelQuality" , "urn:oid:0.9.2342.19200300.100.1.50"),
SN("sn" , "urn:oid:2.5.4.4"),
ST("st" , "urn:oid:2.5.4.8"),
STATE_OR_PROVINCE_NAME("stateOrProvinceName" , "urn:oid:2.5.4.8"),
STREET("street" , "urn:oid:2.5.4.9"),
STREET_ADDRESS("streetAddress" , "urn:oid:2.5.4.9"),
- SUBTREE_MAXIMUM_QUALITY("subtreeMaximumQuality" , "urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.52"),
- SUBTREE_MINIMUM_QUALITY("subtreeMinimumQuality" , "urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.51"),
+ SUBTREE_MAXIMUM_QUALITY("subtreeMaximumQuality" , "urn:oid:0.9.2342.19200300.100.1.52"),
+ SUBTREE_MINIMUM_QUALITY("subtreeMinimumQuality" , "urn:oid:0.9.2342.19200300.100.1.51"),
SUPPORTED_ALGORITHMS("supportedAlgorithms" , "urn:oid:2.5.4.52"),
SUPPORTED_APPLICATION_CONTEXT("supportedApplicationContext" , "urn:oid:2.5.4.30"),
SURNAME("surname" , "urn:oid:2.5.4.4"),
TELEPHONE_NUMBER("telephoneNumber" , "urn:oid:2.5.4.20"),
TELETEX_TERMINAL_IDENTIFIER("teletexTerminalIdentifier" , "urn:oid:2.5.4.22"),
TELEX_NUMBER("telexNumber" , "urn:oid:2.5.4.21"),
- TEXT_ENCODED_OR_ADDRESS("textEncodedORAddress" , "urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.2"),
+ TEXT_ENCODED_OR_ADDRESS("textEncodedORAddress" , "urn:oid:0.9.2342.19200300.100.1.2"),
TITLE("title" , "urn:oid:2.5.4.12"),
- UID("uid" , "urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.1"),
- UNIQUE_IDENTIFIER("uniqueIdentifier" , "urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.44"),
+ UID("uid" , "urn:oid:0.9.2342.19200300.100.1.1"),
+ UNIQUE_IDENTIFIER("uniqueIdentifier" , "urn:oid:0.9.2342.19200300.100.1.44"),
UNIQUE_MEMBER("uniqueMember" , "urn:oid:2.5.4.50"),
USER_CERTIFICATE("userCertificate" , "urn:oid:2.5.4.36"),
- USER_CLASS("userClass" , "urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.8"),
+ USER_CLASS("userClass" , "urn:oid:0.9.2342.19200300.100.1.8"),
USER_PKCS12("userPKCS12" , "urn:oid:2.16.840.1.113730.3.1.216"),
USER_PASSWORD("userPassword" , "urn:oid:2.5.4.35"),
USER_SMIME_CERTIFICATE("userSMIMECertificate" , "urn:oid:2.16.840.1.113730.3.1.40"),
- USERID("userid" , "urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.1"),
+ USERID("userid" , "urn:oid:0.9.2342.19200300.100.1.1"),
X121_ADDRESS("x121Address" , "urn:oid:2.5.4.24"),
X500_UNIQUE_IDENTIFIER("x500UniqueIdentifier" , "urn:oid:2.5.4.45");
Modified: product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/core/util/IDFedLSInputResolver.java
===================================================================
--- product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/core/util/IDFedLSInputResolver.java 2011-08-11 22:40:00 UTC (rev 1189)
+++ product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/core/util/IDFedLSInputResolver.java 2011-08-11 22:54:16 UTC (rev 1190)
@@ -59,7 +59,7 @@
//XML DSIG
schemaLocationMap.put("http://www.w3.org/2000/09/xmldsig#", "schema/w3c/xmldsig/xmldsig-core-schema.xsd");
- schemaLocationMap.put("http://www.w3.org/TR/2002/REC-xmldsig-core-2.0.1-SNAPSHOT212/xmldsig-core...",
+ schemaLocationMap.put("http://www.w3.org/TR/2002/REC-xmldsig-core-20020212/xmldsig-core-schema.xsd",
"schema/w3c/xmldsig/xmldsig-core-schema.xsd");
//XML Enc
@@ -98,10 +98,10 @@
//WS-T
schemaLocationMap.put("http://docs.oasis-open.org/ws-sx/ws-trust/200512", "schema/wstrust/v1_3/ws-trust-1.3.xsd");
- schemaLocationMap.put("http://docs.oasis-open.org/wss/2004/01/oasis-2.0.1-SNAPSHOT1-wss-wssecuri...",
- "schema/wstrust/v1_3/oasis-2.0.1-SNAPSHOT1-wss-wssecurity-secext-1.0.xsd");
- schemaLocationMap.put("http://docs.oasis-open.org/wss/2004/01/oasis-2.0.1-SNAPSHOT1-wss-wssecuri...",
- "schema/wstrust/v1_3/oasis-2.0.1-SNAPSHOT1-wss-wssecurity-utility-1.0.xsd");
+ schemaLocationMap.put("http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext...",
+ "schema/wstrust/v1_3/oasis-200401-wss-wssecurity-secext-1.0.xsd");
+ schemaLocationMap.put("http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit...",
+ "schema/wstrust/v1_3/oasis-200401-wss-wssecurity-utility-1.0.xsd");
schemaLocationMap.put("http://schemas.xmlsoap.org/ws/2004/09/policy", "schema/wstrust/v1_3/ws-policy.xsd");
schemaLocationMap.put("http://www.w3.org/2005/08/addressing", "schema/wstrust/v1_3/ws-addr.xsd");
}
Modified: product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/core/util/SchemaManagerUtil.java
===================================================================
--- product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/core/util/SchemaManagerUtil.java 2011-08-11 22:40:00 UTC (rev 1189)
+++ product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/core/util/SchemaManagerUtil.java 2011-08-11 22:54:16 UTC (rev 1190)
@@ -95,8 +95,8 @@
List<String> list = new ArrayList<String>();
list.add("schema/wstrust/v1_3/ws-trust-1.3.xsd");
- list.add("schema/wstrust/v1_3/oasis-2.0.1-SNAPSHOT1-wss-wssecurity-secext-1.0.xsd");
- list.add("schema/wstrust/v1_3/oasis-2.0.1-SNAPSHOT1-wss-wssecurity-utility-1.0.xsd");
+ list.add("schema/wstrust/v1_3/oasis-200401-wss-wssecurity-secext-1.0.xsd");
+ list.add("schema/wstrust/v1_3/oasis-200401-wss-wssecurity-utility-1.0.xsd");
list.add("schema/wstrust/v1_3/ws-policy.xsd");
list.add("schema/wstrust/v1_3/ws-addr.xsd");
return list;
Modified: product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/core/wsse/WSSecurityConstants.java
===================================================================
--- product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/core/wsse/WSSecurityConstants.java 2011-08-11 22:40:00 UTC (rev 1189)
+++ product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/core/wsse/WSSecurityConstants.java 2011-08-11 22:54:16 UTC (rev 1190)
@@ -33,7 +33,7 @@
String USERNAME_TOKEN = "UsernameToken";
String WSSE_PREFIX = "wsse";
String WSU_PREFIX = "wsu";
- String WSSE_NS = "http://docs.oasis-open.org/wss/2004/01/oasis-2.0.1-SNAPSHOT1-wss-wssecuri...";
+ String WSSE_NS = "http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext...";
String WSSE11_NS = "http://docs.oasis-open.org/wss/oasis-wss-wssecurity-secext-1.1.xsd";
- String WSU_NS = "http://docs.oasis-open.org/wss/2004/01/oasis-2.0.1-SNAPSHOT1-wss-wssecuri...";
+ String WSU_NS = "http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit...";
}
Modified: product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/core/wstrust/WSTrustConstants.java
===================================================================
--- product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/core/wstrust/WSTrustConstants.java 2011-08-11 22:40:00 UTC (rev 1189)
+++ product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/core/wstrust/WSTrustConstants.java 2011-08-11 22:54:16 UTC (rev 1190)
@@ -79,9 +79,9 @@
String WSP_NS = "http://schemas.xmlsoap.org/ws/2004/09/policy";
- String WSU_NS = "http://docs.oasis-open.org/wss/2004/01/oasis-2.0.1-SNAPSHOT1-wss-wssecuri...";
+ String WSU_NS = "http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit...";
- String WSSE_NS = "http://docs.oasis-open.org/wss/2004/01/oasis-2.0.1-SNAPSHOT1-wss-wssecuri...";
+ String WSSE_NS = "http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext...";
String WSSE11_NS = "http://docs.oasis-open.org/wss/oasis-wss-wssecurity-secext-1.1.xsd";
Modified: product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/ws/policy/Policy.java
===================================================================
--- product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/ws/policy/Policy.java 2011-08-11 22:40:00 UTC (rev 1189)
+++ product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/ws/policy/Policy.java 2011-08-11 22:54:16 UTC (rev 1190)
@@ -37,7 +37,7 @@
* <complexContent>
* <extension base="{http://schemas.xmlsoap.org/ws/2004/09/policy}OperatorContentType">
* <attribute name="Name" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- * <attribute ref="{http://docs.oasis-open.org/wss/2004/01/oasis-2.0.1-SNAPSHOT1-wss-wssecurity-utility-1.0.xsd}Id"/>
+ * <attribute ref="{http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd}Id"/>
* </extension>
* </complexContent>
* </complexType>
Modified: product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/ws/trust/LifetimeType.java
===================================================================
--- product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/ws/trust/LifetimeType.java 2011-08-11 22:40:00 UTC (rev 1189)
+++ product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/ws/trust/LifetimeType.java 2011-08-11 22:54:16 UTC (rev 1190)
@@ -33,8 +33,8 @@
* <complexContent>
* <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
* <sequence>
- * <element ref="{http://docs.oasis-open.org/wss/2004/01/oasis-2.0.1-SNAPSHOT1-wss-wssecurity-utility-1.0.xsd}Created" minOccurs="0"/>
- * <element ref="{http://docs.oasis-open.org/wss/2004/01/oasis-2.0.1-SNAPSHOT1-wss-wssecurity-utility-1.0.xsd}Expires" minOccurs="0"/>
+ * <element ref="{http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd}Created" minOccurs="0"/>
+ * <element ref="{http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd}Expires" minOccurs="0"/>
* </sequence>
* </restriction>
* </complexContent>
Modified: product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/ws/trust/RequestedReferenceType.java
===================================================================
--- product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/ws/trust/RequestedReferenceType.java 2011-08-11 22:40:00 UTC (rev 1189)
+++ product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/ws/trust/RequestedReferenceType.java 2011-08-11 22:54:16 UTC (rev 1190)
@@ -33,7 +33,7 @@
* <complexContent>
* <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
* <sequence>
- * <element ref="{http://docs.oasis-open.org/wss/2004/01/oasis-2.0.1-SNAPSHOT1-wss-wssecurity-secext-1.0.xsd}SecurityTokenReference"/>
+ * <element ref="{http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd}SecurityTokenReference"/>
* </sequence>
* </restriction>
* </complexContent>
Modified: product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/ws/wss/secext/AttributedString.java
===================================================================
--- product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/ws/wss/secext/AttributedString.java 2011-08-11 22:40:00 UTC (rev 1189)
+++ product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/ws/wss/secext/AttributedString.java 2011-08-11 22:54:16 UTC (rev 1190)
@@ -34,7 +34,7 @@
* <complexType name="AttributedString">
* <simpleContent>
* <extension base="<http://www.w3.org/2001/XMLSchema>string">
- * <attribute ref="{http://docs.oasis-open.org/wss/2004/01/oasis-2.0.1-SNAPSHOT1-wss-wssecurity-utility-1.0.xsd}Id"/>
+ * <attribute ref="{http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd}Id"/>
* </extension>
* </simpleContent>
* </complexType>
Modified: product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/ws/wss/secext/BinarySecurityTokenType.java
===================================================================
--- product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/ws/wss/secext/BinarySecurityTokenType.java 2011-08-11 22:40:00 UTC (rev 1189)
+++ product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/ws/wss/secext/BinarySecurityTokenType.java 2011-08-11 22:54:16 UTC (rev 1190)
@@ -31,7 +31,7 @@
* <pre>
* <complexType name="BinarySecurityTokenType">
* <simpleContent>
- * <extension base="<http://docs.oasis-open.org/wss/2004/01/oasis-2.0.1-SNAPSHOT1-wss-wssecuri...>EncodedString">
+ * <extension base="<http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext...>EncodedString">
* <attribute name="ValueType" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
* </extension>
* </simpleContent>
Modified: product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/ws/wss/secext/EncodedString.java
===================================================================
--- product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/ws/wss/secext/EncodedString.java 2011-08-11 22:40:00 UTC (rev 1189)
+++ product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/ws/wss/secext/EncodedString.java 2011-08-11 22:54:16 UTC (rev 1190)
@@ -31,7 +31,7 @@
* <pre>
* <complexType name="EncodedString">
* <simpleContent>
- * <extension base="<http://docs.oasis-open.org/wss/2004/01/oasis-2.0.1-SNAPSHOT1-wss-wssecuri...>AttributedString">
+ * <extension base="<http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext...>AttributedString">
* <attribute name="EncodingType" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
* </extension>
* </simpleContent>
Modified: product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/ws/wss/secext/KeyIdentifierType.java
===================================================================
--- product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/ws/wss/secext/KeyIdentifierType.java 2011-08-11 22:40:00 UTC (rev 1189)
+++ product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/ws/wss/secext/KeyIdentifierType.java 2011-08-11 22:54:16 UTC (rev 1190)
@@ -31,7 +31,7 @@
* <pre>
* <complexType name="KeyIdentifierType">
* <simpleContent>
- * <extension base="<http://docs.oasis-open.org/wss/2004/01/oasis-2.0.1-SNAPSHOT1-wss-wssecuri...>EncodedString">
+ * <extension base="<http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext...>EncodedString">
* <attribute name="ValueType" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
* </extension>
* </simpleContent>
Modified: product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/ws/wss/secext/PasswordString.java
===================================================================
--- product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/ws/wss/secext/PasswordString.java 2011-08-11 22:40:00 UTC (rev 1189)
+++ product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/ws/wss/secext/PasswordString.java 2011-08-11 22:54:16 UTC (rev 1190)
@@ -31,7 +31,7 @@
* <pre>
* <complexType name="PasswordString">
* <simpleContent>
- * <extension base="<http://docs.oasis-open.org/wss/2004/01/oasis-2.0.1-SNAPSHOT1-wss-wssecuri...>AttributedString">
+ * <extension base="<http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext...>AttributedString">
* <attribute name="Type" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
* </extension>
* </simpleContent>
Modified: product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/ws/wss/secext/SecurityTokenReferenceType.java
===================================================================
--- product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/ws/wss/secext/SecurityTokenReferenceType.java 2011-08-11 22:40:00 UTC (rev 1189)
+++ product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/ws/wss/secext/SecurityTokenReferenceType.java 2011-08-11 22:54:16 UTC (rev 1190)
@@ -41,8 +41,8 @@
* <choice maxOccurs="unbounded" minOccurs="0">
* <any/>
* </choice>
- * <attribute ref="{http://docs.oasis-open.org/wss/2004/01/oasis-2.0.1-SNAPSHOT1-wss-wssecurity-utility-1.0.xsd}Id"/>
- * <attribute ref="{http://docs.oasis-open.org/wss/2004/01/oasis-2.0.1-SNAPSHOT1-wss-wssecurity-secext-1.0.xsd}Usage"/>
+ * <attribute ref="{http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd}Id"/>
+ * <attribute ref="{http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd}Usage"/>
* </restriction>
* </complexContent>
* </complexType>
Modified: product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/ws/wss/secext/UsernameTokenType.java
===================================================================
--- product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/ws/wss/secext/UsernameTokenType.java 2011-08-11 22:40:00 UTC (rev 1189)
+++ product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/ws/wss/secext/UsernameTokenType.java 2011-08-11 22:54:16 UTC (rev 1190)
@@ -35,10 +35,10 @@
* <complexContent>
* <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
* <sequence>
- * <element name="Username" type="{http://docs.oasis-open.org/wss/2004/01/oasis-2.0.1-SNAPSHOT1-wss-wssecurity-secext-1.0.xsd}AttributedString"/>
+ * <element name="Username" type="{http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd}AttributedString"/>
* <any/>
* </sequence>
- * <attribute ref="{http://docs.oasis-open.org/wss/2004/01/oasis-2.0.1-SNAPSHOT1-wss-wssecurity-utility-1.0.xsd}Id"/>
+ * <attribute ref="{http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd}Id"/>
* </restriction>
* </complexContent>
* </complexType>
Modified: product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/ws/wss/utility/AttributedDateTime.java
===================================================================
--- product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/ws/wss/utility/AttributedDateTime.java 2011-08-11 22:40:00 UTC (rev 1189)
+++ product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/ws/wss/utility/AttributedDateTime.java 2011-08-11 22:54:16 UTC (rev 1190)
@@ -36,7 +36,7 @@
* <complexType name="AttributedDateTime">
* <simpleContent>
* <extension base="<http://www.w3.org/2001/XMLSchema>string">
- * <attGroup ref="{http://docs.oasis-open.org/wss/2004/01/oasis-2.0.1-SNAPSHOT1-wss-wssecurity-utility-1.0.xsd}commonAtts"/>
+ * <attGroup ref="{http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd}commonAtts"/>
* </extension>
* </simpleContent>
* </complexType>
Modified: product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/ws/wss/utility/AttributedURI.java
===================================================================
--- product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/ws/wss/utility/AttributedURI.java 2011-08-11 22:40:00 UTC (rev 1189)
+++ product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/ws/wss/utility/AttributedURI.java 2011-08-11 22:54:16 UTC (rev 1190)
@@ -36,7 +36,7 @@
* <complexType name="AttributedURI">
* <simpleContent>
* <extension base="<http://www.w3.org/2001/XMLSchema>anyURI">
- * <attGroup ref="{http://docs.oasis-open.org/wss/2004/01/oasis-2.0.1-SNAPSHOT1-wss-wssecurity-utility-1.0.xsd}commonAtts"/>
+ * <attGroup ref="{http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd}commonAtts"/>
* </extension>
* </simpleContent>
* </complexType>
Modified: product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/ws/wss/utility/TimestampType.java
===================================================================
--- product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/ws/wss/utility/TimestampType.java 2011-08-11 22:40:00 UTC (rev 1189)
+++ product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/ws/wss/utility/TimestampType.java 2011-08-11 22:54:16 UTC (rev 1190)
@@ -37,13 +37,13 @@
* <complexContent>
* <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
* <sequence>
- * <element ref="{http://docs.oasis-open.org/wss/2004/01/oasis-2.0.1-SNAPSHOT1-wss-wssecurity-utility-1.0.xsd}Created" minOccurs="0"/>
- * <element ref="{http://docs.oasis-open.org/wss/2004/01/oasis-2.0.1-SNAPSHOT1-wss-wssecurity-utility-1.0.xsd}Expires" minOccurs="0"/>
+ * <element ref="{http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd}Created" minOccurs="0"/>
+ * <element ref="{http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd}Expires" minOccurs="0"/>
* <choice maxOccurs="unbounded" minOccurs="0">
* <any/>
* </choice>
* </sequence>
- * <attGroup ref="{http://docs.oasis-open.org/wss/2004/01/oasis-2.0.1-SNAPSHOT1-wss-wssecurity-utility-1.0.xsd}commonAtts"/>
+ * <attGroup ref="{http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd}commonAtts"/>
* </restriction>
* </complexContent>
* </complexType>
Modified: product/trunk/picketlink-core/src/main/java/org/picketlink/trust/jbossws/Constants.java
===================================================================
--- product/trunk/picketlink-core/src/main/java/org/picketlink/trust/jbossws/Constants.java 2011-08-11 22:40:00 UTC (rev 1189)
+++ product/trunk/picketlink-core/src/main/java/org/picketlink/trust/jbossws/Constants.java 2011-08-11 22:54:16 UTC (rev 1190)
@@ -31,20 +31,20 @@
*/
public class Constants
{
- public static final String WSS_SOAP_NS = "http://docs.oasis-open.org/wss/2004/01/oasis-2.0.1-SNAPSHOT1-wss-soap-mes...";
+ public static final String WSS_SOAP_NS = "http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-soap-message-secu...";
public static final String WSSE_LOCAL = "Security";
public static final String WSSE_PREFIX = "wsse";
- public static final String WSSE_NS = "http://docs.oasis-open.org/wss/2004/01/oasis-2.0.1-SNAPSHOT1-wss-wssecuri...";
+ public static final String WSSE_NS = "http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext...";
public static final String WSSE_BINARY_SECURITY_TOKEN = "BinarySecurityToken";
public static final String WSSE_USERNAME_TOKEN = "UsernameToken";
public static final String WSSE_USERNAME = "Username";
public static final String WSSE_PASSWORD = "Password";
- public static final String WSSE_PASSWORD_TEXT_NS = "http://docs.oasis-open.org/wss/2004/01/oasis-2.0.1-SNAPSHOT1-wss-wssecuri...";
+ public static final String WSSE_PASSWORD_TEXT_NS = "http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext...";
public static final String WSSE_ENCODING_TYPE = "EncodingType";
@@ -52,7 +52,7 @@
public static final String WSU_PREFIX = "wsu";
- public static final String WSU_NS = "http://docs.oasis-open.org/wss/2004/01/oasis-2.0.1-SNAPSHOT1-wss-wssecuri...";
+ public static final String WSU_NS = "http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit...";
public static final String XML_SIGNATURE_NS = org.apache.xml.security.utils.Constants.SignatureSpecNS;
@@ -66,9 +66,9 @@
public static final String BASE64_ENCODING_TYPE = WSS_SOAP_NS + "#Base64Binary";
- public static final String PASSWORD_TEXT_TYPE = "http://docs.oasis-open.org/wss/2004/01/oasis-2.0.1-SNAPSHOT1-wss-username...";
+ public static final String PASSWORD_TEXT_TYPE = "http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-username-token-pr...";
- public static final String PASSWORD_DIGEST_TYPE = "http://docs.oasis-open.org/wss/2004/01/oasis-2.0.1-SNAPSHOT1-wss-username...";
+ public static final String PASSWORD_DIGEST_TYPE = "http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-username-token-pr...";
public static final String WSSE_HEADER = WSSE_PREFIX + ":Security";
Modified: product/trunk/picketlink-core/src/main/java/org/picketlink/trust/jbossws/handler/BinaryTokenHandler.java
===================================================================
--- product/trunk/picketlink-core/src/main/java/org/picketlink/trust/jbossws/handler/BinaryTokenHandler.java 2011-08-11 22:40:00 UTC (rev 1189)
+++ product/trunk/picketlink-core/src/main/java/org/picketlink/trust/jbossws/handler/BinaryTokenHandler.java 2011-08-11 22:54:16 UTC (rev 1190)
@@ -93,7 +93,7 @@
* Attribute value for the EncodingType attribute
*/
private String encodingType = SecurityActions.getSystemProperty("binary.http.encodingType",
- "http://docs.oasis-open.org/wss/2004/01/ oasis-2.0.1-SNAPSHOT1-wss-soap-message-security-1.0#Base64Binary");
+ "http://docs.oasis-open.org/wss/2004/01/ oasis-200401-wss-soap-message-security-1.0#Base64Binary");
/**
* Attribute value for the ValueType attribute
Modified: product/trunk/picketlink-core/src/test/java/org/picketlink/test/identity/federation/api/util/KeyUtilUnitTestCase.java
===================================================================
--- product/trunk/picketlink-core/src/test/java/org/picketlink/test/identity/federation/api/util/KeyUtilUnitTestCase.java 2011-08-11 22:40:00 UTC (rev 1189)
+++ product/trunk/picketlink-core/src/test/java/org/picketlink/test/identity/federation/api/util/KeyUtilUnitTestCase.java 2011-08-11 22:54:16 UTC (rev 1190)
@@ -47,7 +47,7 @@
-keypass test123
-keystore jbid_test_keystore.jks
-storepass store123
- -validity 2.0.1-SNAPSHOT0
+ -validity 200000
*/
private String keystoreLocation = "keystore/jbid_test_keystore.jks";
private String keystorePass = "store123";
Modified: product/trunk/picketlink-core/src/test/java/org/picketlink/test/identity/federation/bindings/config/MetadataConfigUnitTestCase.java
===================================================================
--- product/trunk/picketlink-core/src/test/java/org/picketlink/test/identity/federation/bindings/config/MetadataConfigUnitTestCase.java 2011-08-11 22:40:00 UTC (rev 1189)
+++ product/trunk/picketlink-core/src/test/java/org/picketlink/test/identity/federation/bindings/config/MetadataConfigUnitTestCase.java 2011-08-11 22:54:16 UTC (rev 1190)
@@ -47,7 +47,7 @@
Object object = this.unmarshall(config + "1.xml");
assertNotNull("IDP is not null", object);
IDPType idp = (IDPType) object;
- assertEquals("2.0.1-SNAPSHOT", 2.0.1-SNAPSHOTL, idp.getAssertionValidity());
+ assertEquals("20000", 20000L, idp.getAssertionValidity());
assertEquals("somefqn", idp.getRoleGenerator());
TrustType trust = idp.getTrust();
Modified: product/trunk/picketlink-core/src/test/java/org/picketlink/test/identity/federation/core/config/ConfigUnitTestCase.java
===================================================================
--- product/trunk/picketlink-core/src/test/java/org/picketlink/test/identity/federation/core/config/ConfigUnitTestCase.java 2011-08-11 22:40:00 UTC (rev 1189)
+++ product/trunk/picketlink-core/src/test/java/org/picketlink/test/identity/federation/core/config/ConfigUnitTestCase.java 2011-08-11 22:54:16 UTC (rev 1190)
@@ -83,7 +83,7 @@
assertNotNull("IDP is not null", object);
IDPType idp = (IDPType) object;
- assertEquals("2.0.1-SNAPSHOT", 2.0.1-SNAPSHOTL, idp.getAssertionValidity());
+ assertEquals("20000", 20000L, idp.getAssertionValidity());
assertEquals("somefqn", idp.getRoleGenerator());
assertTrue(idp.isEncrypt());
assertEquals( CanonicalizationMethod.EXCLUSIVE , idp.getCanonicalizationMethod() );
Modified: product/trunk/picketlink-core/src/test/java/org/picketlink/test/identity/federation/core/util/KeystoreUtilUnitTestCase.java
===================================================================
--- product/trunk/picketlink-core/src/test/java/org/picketlink/test/identity/federation/core/util/KeystoreUtilUnitTestCase.java 2011-08-11 22:40:00 UTC (rev 1189)
+++ product/trunk/picketlink-core/src/test/java/org/picketlink/test/identity/federation/core/util/KeystoreUtilUnitTestCase.java 2011-08-11 22:54:16 UTC (rev 1190)
@@ -50,7 +50,7 @@
-keypass test123
-keystore jbid_test_keystore.jks
-storepass store123
- -validity 2.0.1-SNAPSHOT0
+ -validity 200000
*/
private String keystoreLocation = "keystore/jbid_test_keystore.jks";
private String keystorePass = "store123";
Modified: product/trunk/picketlink-core/src/test/resources/config/test-config-2.xml
===================================================================
--- product/trunk/picketlink-core/src/test/resources/config/test-config-2.xml 2011-08-11 22:40:00 UTC (rev 1189)
+++ product/trunk/picketlink-core/src/test/resources/config/test-config-2.xml 2011-08-11 22:54:16 UTC (rev 1190)
@@ -1,5 +1,5 @@
<PicketLinkIDP xmlns="urn:picketlink:identity-federation:config:1.0"
- AssertionValidity="2.0.1-SNAPSHOT"
+ AssertionValidity="20000"
RoleGenerator="somefqn"
Encrypt="true"
CanonicalizationMethod="http://www.w3.org/2001/10/xml-exc-c14n#">
Modified: product/trunk/picketlink-core/src/test/resources/config/test-metadata-config-1.xml
===================================================================
--- product/trunk/picketlink-core/src/test/resources/config/test-metadata-config-1.xml 2011-08-11 22:40:00 UTC (rev 1189)
+++ product/trunk/picketlink-core/src/test/resources/config/test-metadata-config-1.xml 2011-08-11 22:54:16 UTC (rev 1190)
@@ -1,5 +1,5 @@
<PicketLinkIDP xmlns="urn:picketlink:identity-federation:config:1.0"
- AssertionValidity="2.0.1-SNAPSHOT"
+ AssertionValidity="20000"
RoleGenerator="somefqn"
Encrypt="true">
<IdentityURL>http://localhost:8080/idp</IdentityURL>
Modified: product/trunk/picketlink-core/src/test/resources/jbossws/xml/wsse-saml.xml
===================================================================
--- product/trunk/picketlink-core/src/test/resources/jbossws/xml/wsse-saml.xml 2011-08-11 22:40:00 UTC (rev 1189)
+++ product/trunk/picketlink-core/src/test/resources/jbossws/xml/wsse-saml.xml 2011-08-11 22:54:16 UTC (rev 1190)
@@ -2,7 +2,7 @@
" +
<env:Header>
<wsse:Security
- xmlns:wsse='http://docs.oasis-open.org/wss/2004/01/oasis-2.0.1-SNAPSHOT1-wss-wssecuri...'>
+ xmlns:wsse='http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext...'>
<saml:Assertion xmlns:saml='urn:oasis:names:tc:SAML:2.0:assertion'
xmlns='urn:oasis:names:tc:SAML:2.0:assertion' ID='ID_7069926b-792e-4f90-8727-0e16ec9c3073'
IssueInstant='2011-07-13T00:16:13.990Z' Version='2.0'>
Modified: product/trunk/picketlink-core/src/test/resources/parser/saml2/saml2-authnrequest.xml
===================================================================
--- product/trunk/picketlink-core/src/test/resources/parser/saml2/saml2-authnrequest.xml 2011-08-11 22:40:00 UTC (rev 1189)
+++ product/trunk/picketlink-core/src/test/resources/parser/saml2/saml2-authnrequest.xml 2011-08-11 22:54:16 UTC (rev 1190)
@@ -17,7 +17,7 @@
<Signature xmlns="http://www.w3.org/2000/09/xmldsig#">
<SignedInfo>
<CanonicalizationMethod
- Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-2.0.1-SNAPSHOT315#WithComments" />
+ Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithComments" />
<SignatureMethod
Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1" />
<Reference URI="#ccocfkmlnocbajegpiheahonbcambbapiibggije">
Modified: product/trunk/picketlink-core/src/test/resources/parser/wst/wst-issue-onbehalfof.xml
===================================================================
--- product/trunk/picketlink-core/src/test/resources/parser/wst/wst-issue-onbehalfof.xml 2011-08-11 22:40:00 UTC (rev 1189)
+++ product/trunk/picketlink-core/src/test/resources/parser/wst/wst-issue-onbehalfof.xml 2011-08-11 22:54:16 UTC (rev 1190)
@@ -2,8 +2,8 @@
<wst:RequestType>http://docs.oasis-open.org/ws-sx/ws-trust/200512/Issue</wst:RequestType>
<wst:TokenType>http://docs.oasis-open.org/wss/oasis-wss-saml-token-profile-1.1#SAMLV2.0</wst:TokenType>
<wst:OnBehalfOf>
- <wsse:UsernameToken wsu:Id="id" xmlns:wsse="http://docs.oasis-open.org/wss/2004/01/oasis-2.0.1-SNAPSHOT1-wss-wssecuri..."
- xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-2.0.1-SNAPSHOT1-wss-wssecuri...">
+ <wsse:UsernameToken wsu:Id="id" xmlns:wsse="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext..."
+ xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit...">
<wsse:Username>anotherduke</wsse:Username>
</wsse:UsernameToken>
</wst:OnBehalfOf>
Modified: product/trunk/picketlink-core/src/test/resources/parser/wst/wst-response-assertion-hok-certificate.xml
===================================================================
--- product/trunk/picketlink-core/src/test/resources/parser/wst/wst-response-assertion-hok-certificate.xml 2011-08-11 22:40:00 UTC (rev 1189)
+++ product/trunk/picketlink-core/src/test/resources/parser/wst/wst-response-assertion-hok-certificate.xml 2011-08-11 22:54:16 UTC (rev 1190)
@@ -1,4 +1,4 @@
-<wst:RequestSecurityTokenResponseCollection xmlns:wst="http://docs.oasis-open.org/ws-sx/ws-trust/200512" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-2.0.1-SNAPSHOT1-wss-wssecuri...">
+<wst:RequestSecurityTokenResponseCollection xmlns:wst="http://docs.oasis-open.org/ws-sx/ws-trust/200512" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit...">
<wst:RequestSecurityTokenResponse Context="testcontext">
<wst:TokenType>http://docs.oasis-open.org/wss/oasis-wss-saml-token-profile-1.1#SAMLV2.0</wst:TokenType>
<wst:Lifetime>
@@ -68,7 +68,7 @@
</saml2:Assertion>
</wst:RequestedSecurityToken>
<wst:RequestedAttachedReference>
- <wsse:SecurityTokenReference xmlns:wsse11="http://docs.oasis-open.org/wss/oasis-wss-wssecurity-secext-1.1.xsd" wsse11:TokenType="http://docs.oasis-open.org/wss/oasis-wss-saml-token-profile-1.1#SAMLV2.0" xmlns:wsse="http://docs.oasis-open.org/wss/2004/01/oasis-2.0.1-SNAPSHOT1-wss-wssecuri...">
+ <wsse:SecurityTokenReference xmlns:wsse11="http://docs.oasis-open.org/wss/oasis-wss-wssecurity-secext-1.1.xsd" wsse11:TokenType="http://docs.oasis-open.org/wss/oasis-wss-saml-token-profile-1.1#SAMLV2.0" xmlns:wsse="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext...">
<wsse:KeyIdentifier ValueType="http://docs.oasis-open.org/wss/oasis-wss-saml-token-profile-1.1#SAMLID">
#ID_5a15fc70-daa1-4808-b70e-9cbf6b8e4d4f
</wsse:KeyIdentifier>
Modified: product/trunk/picketlink-core/src/test/resources/parser/wst/wst-response-assertion-hok-combined.xml
===================================================================
--- product/trunk/picketlink-core/src/test/resources/parser/wst/wst-response-assertion-hok-combined.xml 2011-08-11 22:40:00 UTC (rev 1189)
+++ product/trunk/picketlink-core/src/test/resources/parser/wst/wst-response-assertion-hok-combined.xml 2011-08-11 22:54:16 UTC (rev 1190)
@@ -1,4 +1,4 @@
-<wst:RequestSecurityTokenResponseCollection xmlns:wst="http://docs.oasis-open.org/ws-sx/ws-trust/200512" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-2.0.1-SNAPSHOT1-wss-wssecuri...">
+<wst:RequestSecurityTokenResponseCollection xmlns:wst="http://docs.oasis-open.org/ws-sx/ws-trust/200512" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit...">
<wst:RequestSecurityTokenResponse Context="testcontext">
<wst:TokenType>http://docs.oasis-open.org/wss/oasis-wss-saml-token-profile-1.1#SAMLV2.0</wst:TokenType>
<wst:Lifetime>
@@ -76,7 +76,7 @@
<wst:BinarySecret Type="http://docs.oasis-open.org/ws-sx/ws-trust/200512/Nonce">dSRCR4Abu6c=</wst:BinarySecret>
</wst:Entropy>
<wst:RequestedAttachedReference>
- <wsse:SecurityTokenReference xmlns:wsse11="http://docs.oasis-open.org/wss/oasis-wss-wssecurity-secext-1.1.xsd" wsse11:TokenType="http://docs.oasis-open.org/wss/oasis-wss-saml-token-profile-1.1#SAMLV2.0" xmlns:wsse="http://docs.oasis-open.org/wss/2004/01/oasis-2.0.1-SNAPSHOT1-wss-wssecuri...">
+ <wsse:SecurityTokenReference xmlns:wsse11="http://docs.oasis-open.org/wss/oasis-wss-wssecurity-secext-1.1.xsd" wsse11:TokenType="http://docs.oasis-open.org/wss/oasis-wss-saml-token-profile-1.1#SAMLV2.0" xmlns:wsse="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext...">
<wsse:KeyIdentifier ValueType="http://docs.oasis-open.org/wss/oasis-wss-saml-token-profile-1.1#SAMLID">
#ID_17a5f8b6-0c74-4df8-993d-ff51f00c57c7
</wsse:KeyIdentifier>
Modified: product/trunk/picketlink-core/src/test/resources/parser/wst/wst-response-assertion-hok-pubkey.xml
===================================================================
--- product/trunk/picketlink-core/src/test/resources/parser/wst/wst-response-assertion-hok-pubkey.xml 2011-08-11 22:40:00 UTC (rev 1189)
+++ product/trunk/picketlink-core/src/test/resources/parser/wst/wst-response-assertion-hok-pubkey.xml 2011-08-11 22:54:16 UTC (rev 1190)
@@ -1,4 +1,4 @@
-<wst:RequestSecurityTokenResponseCollection xmlns:wst="http://docs.oasis-open.org/ws-sx/ws-trust/200512" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-2.0.1-SNAPSHOT1-wss-wssecuri...">
+<wst:RequestSecurityTokenResponseCollection xmlns:wst="http://docs.oasis-open.org/ws-sx/ws-trust/200512" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit...">
<wst:RequestSecurityTokenResponse Context="testcontext">
<wst:TokenType>http://docs.oasis-open.org/wss/oasis-wss-saml-token-profile-1.1#SAMLV2.0</wst:TokenType>
<wst:Lifetime>
@@ -71,7 +71,7 @@
</saml2:Assertion>
</wst:RequestedSecurityToken>
<wst:RequestedAttachedReference>
- <wsse:SecurityTokenReference xmlns:wsse11="http://docs.oasis-open.org/wss/oasis-wss-wssecurity-secext-1.1.xsd" wsse11:TokenType="http://docs.oasis-open.org/wss/oasis-wss-saml-token-profile-1.1#SAMLV2.0" xmlns:wsse="http://docs.oasis-open.org/wss/2004/01/oasis-2.0.1-SNAPSHOT1-wss-wssecuri...">
+ <wsse:SecurityTokenReference xmlns:wsse11="http://docs.oasis-open.org/wss/oasis-wss-wssecurity-secext-1.1.xsd" wsse11:TokenType="http://docs.oasis-open.org/wss/oasis-wss-saml-token-profile-1.1#SAMLV2.0" xmlns:wsse="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext...">
<wsse:KeyIdentifier ValueType="http://docs.oasis-open.org/wss/oasis-wss-saml-token-profile-1.1#SAMLID">
#ID_22727062-ce90-44d3-a870-823ec0d69809
</wsse:KeyIdentifier>
Modified: product/trunk/picketlink-core/src/test/resources/parser/wst/wst-response-assertion-hok-simmetric.xml
===================================================================
--- product/trunk/picketlink-core/src/test/resources/parser/wst/wst-response-assertion-hok-simmetric.xml 2011-08-11 22:40:00 UTC (rev 1189)
+++ product/trunk/picketlink-core/src/test/resources/parser/wst/wst-response-assertion-hok-simmetric.xml 2011-08-11 22:54:16 UTC (rev 1190)
@@ -1,4 +1,4 @@
-<wst:RequestSecurityTokenResponseCollection xmlns:wst="http://docs.oasis-open.org/ws-sx/ws-trust/200512" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-2.0.1-SNAPSHOT1-wss-wssecuri...">
+<wst:RequestSecurityTokenResponseCollection xmlns:wst="http://docs.oasis-open.org/ws-sx/ws-trust/200512" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit...">
<wst:RequestSecurityTokenResponse Context="testcontext">
<wst:TokenType>http://docs.oasis-open.org/wss/oasis-wss-saml-token-profile-1.1#SAMLV2.0</wst:TokenType>
<wst:Lifetime>
@@ -76,7 +76,7 @@
<wst:BinarySecret Type="http://docs.oasis-open.org/ws-sx/ws-trust/200512/Nonce">vEkFafTxSjucwlle7aObtg==</wst:BinarySecret>
</wst:Entropy>
<wst:RequestedAttachedReference>
- <wsse:SecurityTokenReference xmlns:wsse11="http://docs.oasis-open.org/wss/oasis-wss-wssecurity-secext-1.1.xsd" wsse11:TokenType="http://docs.oasis-open.org/wss/oasis-wss-saml-token-profile-1.1#SAMLV2.0" xmlns:wsse="http://docs.oasis-open.org/wss/2004/01/oasis-2.0.1-SNAPSHOT1-wss-wssecuri...">
+ <wsse:SecurityTokenReference xmlns:wsse11="http://docs.oasis-open.org/wss/oasis-wss-wssecurity-secext-1.1.xsd" wsse11:TokenType="http://docs.oasis-open.org/wss/oasis-wss-saml-token-profile-1.1#SAMLV2.0" xmlns:wsse="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext...">
<wsse:KeyIdentifier ValueType="http://docs.oasis-open.org/wss/oasis-wss-saml-token-profile-1.1#SAMLID">
#ID_5cc7fe71-7d76-4615-93d7-6ecfb1e63aae
</wsse:KeyIdentifier>
Modified: product/trunk/picketlink-core/src/test/resources/parser/wst/wst-response-assertion.xml
===================================================================
--- product/trunk/picketlink-core/src/test/resources/parser/wst/wst-response-assertion.xml 2011-08-11 22:40:00 UTC (rev 1189)
+++ product/trunk/picketlink-core/src/test/resources/parser/wst/wst-response-assertion.xml 2011-08-11 22:54:16 UTC (rev 1190)
@@ -1,4 +1,4 @@
-<wst:RequestSecurityTokenResponseCollection xmlns:wst="http://docs.oasis-open.org/ws-sx/ws-trust/200512" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-2.0.1-SNAPSHOT1-wss-wssecuri...">
+<wst:RequestSecurityTokenResponseCollection xmlns:wst="http://docs.oasis-open.org/ws-sx/ws-trust/200512" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit...">
<wst:RequestSecurityTokenResponse Context="testcontext">
<wst:TokenType>http://docs.oasis-open.org/wss/oasis-wss-saml-token-profile-1.1#SAMLV2.0</wst:TokenType>
<wst:Lifetime>
Modified: product/trunk/picketlink-core/src/test/resources/saml/v2/authnrequest/samlAuthnRequestExample.xml
===================================================================
(Binary files differ)
Modified: product/trunk/picketlink-core/src/test/resources/saml/v2/authnrequest/samlAuthnRequestWithSignature.xml
===================================================================
--- product/trunk/picketlink-core/src/test/resources/saml/v2/authnrequest/samlAuthnRequestWithSignature.xml 2011-08-11 22:40:00 UTC (rev 1189)
+++ product/trunk/picketlink-core/src/test/resources/saml/v2/authnrequest/samlAuthnRequestWithSignature.xml 2011-08-11 22:54:16 UTC (rev 1190)
@@ -15,7 +15,7 @@
<Signature xmlns="http://www.w3.org/2000/09/xmldsig#">
<SignedInfo>
<CanonicalizationMethod
- Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-2.0.1-SNAPSHOT315#WithComments" />
+ Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithComments" />
<SignatureMethod
Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1" />
<Reference URI="#ccocfkmlnocbajegpiheahonbcambbapiibggije">
Modified: product/trunk/picketlink-core/src/test/resources/saml2/metadata/sp-entitydescriptor.xml
===================================================================
--- product/trunk/picketlink-core/src/test/resources/saml2/metadata/sp-entitydescriptor.xml 2011-08-11 22:40:00 UTC (rev 1189)
+++ product/trunk/picketlink-core/src/test/resources/saml2/metadata/sp-entitydescriptor.xml 2011-08-11 22:54:16 UTC (rev 1190)
@@ -50,7 +50,7 @@
<md:ServiceName xml:lang="en">Sample Service</md:ServiceName>
<md:ServiceDescription xml:lang="en">An example service that requires a human-readable identifier and optional name and e-mail address.</md:ServiceDescription>
<md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
- <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
<md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
</md:AttributeConsumingService>
Modified: product/trunk/picketlink-core/src/test/resources/saml2/metadata/testshib-two-metadata.xml
===================================================================
--- product/trunk/picketlink-core/src/test/resources/saml2/metadata/testshib-two-metadata.xml 2011-08-11 22:40:00 UTC (rev 1189)
+++ product/trunk/picketlink-core/src/test/resources/saml2/metadata/testshib-two-metadata.xml 2011-08-11 22:54:16 UTC (rev 1190)
@@ -53714,7 +53714,7 @@
BgEFBQcDATAdBgNVHQ4EFgQUboCxFapQWR+9Kpjxit7D6Oaz9igwgcYGA1UdIwSBvjCBu4AUGgIJ
hfBzUtNt18QAT2T448a5OBihgZukgZgwgZUxCzAJBgNVBAYTAkdSMUQwQgYDVQQKEztIZWxsZW5p
YyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25zIENlcnQuIEF1dGhvcml0eTFAMD4G
-A1UEAxM3SGVsbGVuaWMgQWNhZGVtaWMgYW5kIFJlc2VhcmNoIEluc3RpdHV0aW9ucyBSb2.0.1-SNAPSHOTEg
+A1UEAxM3SGVsbGVuaWMgQWNhZGVtaWMgYW5kIFJlc2VhcmNoIEluc3RpdHV0aW9ucyBSb290Q0Eg
MjAwNoIFAQAAAA4wFwYDVR0RBBAwDoEMYWRtaW5AZWt0LmdyMBcGA1UdEgQQMA6BDGNhQGhhcmlj
YS5ncjAyBggrBgEFBQcBAQQmMCQwIgYIKwYBBQUHMAGGFmh0dHA6Ly9vY3NwLmhhcmljYS5nci8w
RQYDVR0fBD4wPDA6oDigNoY0aHR0cDovL2NybHYxLmhhcmljYS5nci9IYXJpY2FFS1RDQTIwMDgv
@@ -53772,7 +53772,7 @@
BgEFBQcDATAdBgNVHQ4EFgQUboCxFapQWR+9Kpjxit7D6Oaz9igwgcYGA1UdIwSBvjCBu4AUGgIJ
hfBzUtNt18QAT2T448a5OBihgZukgZgwgZUxCzAJBgNVBAYTAkdSMUQwQgYDVQQKEztIZWxsZW5p
YyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25zIENlcnQuIEF1dGhvcml0eTFAMD4G
-A1UEAxM3SGVsbGVuaWMgQWNhZGVtaWMgYW5kIFJlc2VhcmNoIEluc3RpdHV0aW9ucyBSb2.0.1-SNAPSHOTEg
+A1UEAxM3SGVsbGVuaWMgQWNhZGVtaWMgYW5kIFJlc2VhcmNoIEluc3RpdHV0aW9ucyBSb290Q0Eg
MjAwNoIFAQAAAA4wFwYDVR0RBBAwDoEMYWRtaW5AZWt0LmdyMBcGA1UdEgQQMA6BDGNhQGhhcmlj
YS5ncjAyBggrBgEFBQcBAQQmMCQwIgYIKwYBBQUHMAGGFmh0dHA6Ly9vY3NwLmhhcmljYS5nci8w
RQYDVR0fBD4wPDA6oDigNoY0aHR0cDovL2NybHYxLmhhcmljYS5nci9IYXJpY2FFS1RDQTIwMDgv
@@ -70554,7 +70554,7 @@
MRkwFwYDVQQDExBpZHAuYmFybmV0LmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
AQEA15UdvpIRLL49uj68oeUDwuyf7fjkXW8IrdkXaEtThHYzX9+Z+1JDIeDsSY2GwlXCBWtsCl8r
kXkgzqf1ZXxp1QrSi2VYllI/X4NfhIBJ0PhxPQl0dIhD4OJ8oFpciutGrKbEkdPe82Vnmpro6qDi
-F++FXFfPpUyaJy18e4C2.0.1-SNAPSHOTYtaVPGycljzTVYbUMCGuFjHeYhc8qUZKofEyGmWIrvHZbG0LVrTQ
+F++FXFfPpUyaJy18e4C2n0u0YtaVPGycljzTVYbUMCGuFjHeYhc8qUZKofEyGmWIrvHZbG0LVrTQ
0aggjskhzDV5hEyNLSoyeUj+a/bESgBhznBdYXYahS1WPaztrjKv9xd7+YhFPS4oxn/VgaGzNNoz
D373L1JHPxgTQ2lbnW977mAHEma1NIF4SbLWb0OLLQIDAQABo2cwZTBEBgNVHREEPTA7ghBpZHAu
YmFybmV0LmFjLnVrhidodHRwczovL2lkcC5iYXJuZXQuYWMudWsvaWRwL3NoaWJib2xldGgwHQYD
@@ -70597,7 +70597,7 @@
MRkwFwYDVQQDExBpZHAuYmFybmV0LmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
AQEA15UdvpIRLL49uj68oeUDwuyf7fjkXW8IrdkXaEtThHYzX9+Z+1JDIeDsSY2GwlXCBWtsCl8r
kXkgzqf1ZXxp1QrSi2VYllI/X4NfhIBJ0PhxPQl0dIhD4OJ8oFpciutGrKbEkdPe82Vnmpro6qDi
-F++FXFfPpUyaJy18e4C2.0.1-SNAPSHOTYtaVPGycljzTVYbUMCGuFjHeYhc8qUZKofEyGmWIrvHZbG0LVrTQ
+F++FXFfPpUyaJy18e4C2n0u0YtaVPGycljzTVYbUMCGuFjHeYhc8qUZKofEyGmWIrvHZbG0LVrTQ
0aggjskhzDV5hEyNLSoyeUj+a/bESgBhznBdYXYahS1WPaztrjKv9xd7+YhFPS4oxn/VgaGzNNoz
D373L1JHPxgTQ2lbnW977mAHEma1NIF4SbLWb0OLLQIDAQABo2cwZTBEBgNVHREEPTA7ghBpZHAu
YmFybmV0LmFjLnVrhidodHRwczovL2lkcC5iYXJuZXQuYWMudWsvaWRwL3NoaWJib2xldGgwHQYD
@@ -75214,7 +75214,7 @@
mflY4DVSQuOTr1zc97giEI7gic2k+EiqKKEXVMcIZpgD6Sxr0Hc/mhb9sZPE8OAR7/E6FFGW4TyP
iaPUe4disgyavlrDSsDx+zUg+Kb4dshYk0YB0B7rnAXqe4NZKEq/eWXtVhNRRQvvqZ+1B584a/MG
qg5/dZLlvCJ49AgU26r53ESfe4cXB2bzrC8MalO6o30ZMG3sPJs2taBMShbKU8WnvIHEZ90jnUcI
-r0IrkC2zT2AAqkwqbk9KvO42.0.1-SNAPSHOT1Mhxqq0SZjHjYvYFmN8ctwIDAQABo20wazBKBgNVHREEQzBB
+r0IrkC2zT2AAqkwqbk9KvO42f0f01Mhxqq0SZjHjYvYFmN8ctwIDAQABo20wazBKBgNVHREEQzBB
ghNub2RlMy5mdWxsZXJ0b24uZWR1hipodHRwczovL25vZGUzLmZ1bGxlcnRvbi5lZHUvaWRwL3No
aWJib2xldGgwHQYDVR0OBBYEFKU11sg+lw4YIBAp2VltcZrbxCSsMA0GCSqGSIb3DQEBBQUAA4IB
AQAWMfxPSNaEfYnYjbkQV3YOU9Lpp3wrHoe6p66rUWQrZlN1EAPqQ6q/0OawSB3+TscXvi18rp0W
@@ -75257,7 +75257,7 @@
mflY4DVSQuOTr1zc97giEI7gic2k+EiqKKEXVMcIZpgD6Sxr0Hc/mhb9sZPE8OAR7/E6FFGW4TyP
iaPUe4disgyavlrDSsDx+zUg+Kb4dshYk0YB0B7rnAXqe4NZKEq/eWXtVhNRRQvvqZ+1B584a/MG
qg5/dZLlvCJ49AgU26r53ESfe4cXB2bzrC8MalO6o30ZMG3sPJs2taBMShbKU8WnvIHEZ90jnUcI
-r0IrkC2zT2AAqkwqbk9KvO42.0.1-SNAPSHOT1Mhxqq0SZjHjYvYFmN8ctwIDAQABo20wazBKBgNVHREEQzBB
+r0IrkC2zT2AAqkwqbk9KvO42f0f01Mhxqq0SZjHjYvYFmN8ctwIDAQABo20wazBKBgNVHREEQzBB
ghNub2RlMy5mdWxsZXJ0b24uZWR1hipodHRwczovL25vZGUzLmZ1bGxlcnRvbi5lZHUvaWRwL3No
aWJib2xldGgwHQYDVR0OBBYEFKU11sg+lw4YIBAp2VltcZrbxCSsMA0GCSqGSIb3DQEBBQUAA4IB
AQAWMfxPSNaEfYnYjbkQV3YOU9Lpp3wrHoe6p66rUWQrZlN1EAPqQ6q/0OawSB3+TscXvi18rp0W
@@ -82834,7 +82834,7 @@
dGUuZXMubmV0MB4XDTA5MDYwOTIyMzk0NFoXDTE5MDYwNzIyMzk0NFowGTEXMBUGA1UEAxMOY2Fs
Y2l0ZS5lcy5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDCBQC1W5oWupg1MPHJ
oZm9n41mTu9l3bcRG7jL35m16QxvQXYhmXQrf6x0fQFFBTDFyMfGKyaY9pgP0rnHl8qddCnjoLdN
-twSvQQpCUQo26J4UeDFH6Xkm2PSHKQ0TVY5ZtknaC+htkSQ2LRSVCSPtRU6rsVFhF2.0.1-SNAPSHOTLc1U3m
+twSvQQpCUQo26J4UeDFH6Xkm2PSHKQ0TVY5ZtknaC+htkSQ2LRSVCSPtRU6rsVFhF2O0E0Lc1U3m
+yZyeRqROydJgtBhS1sawxKwVXKHH6MNJA10qCZUUbVV5DivKgX8OSNPUPPNqzc6r3MLvZwemQ5b
Uqv7jxQSx70r8GIcSXLWmm85KbYFVXw5HnwGZmzS620HjLjC920WdpBVd4hS1f2ACk0bWDI1F1Or
fTxKbXERQntMM6lBFIQfAgMBAAGjPDA6MBkGA1UdEQQSMBCCDmNhbGNpdGUuZXMubmV0MB0GA1Ud
@@ -95008,10 +95008,10 @@
<md:RequestedAttribute Name="urn:oid:2.5.4.3"
NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:basic" isRequired="true"/>
<md:RequestedAttribute
- Name="urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.1"
+ Name="urn:oid:0.9.2342.19200300.100.1.1"
NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:basic" isRequired="true"/>
<md:RequestedAttribute
- Name="urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.3"
+ Name="urn:oid:0.9.2342.19200300.100.1.3"
NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:basic" isRequired="true"/>
<md:RequestedAttribute
Name="dk:gov:saml:attribute:AssuranceLevel"
@@ -118757,10 +118757,10 @@
<md:RequestedAttribute Name="urn:oid:2.5.4.3"
NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:basic" isRequired="true"/>
<md:RequestedAttribute
- Name="urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.1"
+ Name="urn:oid:0.9.2342.19200300.100.1.1"
NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:basic" isRequired="true"/>
<md:RequestedAttribute
- Name="urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.3"
+ Name="urn:oid:0.9.2342.19200300.100.1.3"
NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:basic" isRequired="true"/>
<md:RequestedAttribute
Name="dk:gov:saml:attribute:AssuranceLevel"
@@ -119495,7 +119495,7 @@
DI1SWNrvvn7KV0YWg8SBq9wUmoibxvDc3MCGBlwBNYzprDxKpQIDAQABo0cwRTAkBgNVHREEHTAb
ghl3bWxpMDE2NjY5Lmdyb3VwaW5mcmEuY29tMB0GA1UdDgQWBBSTn8Vl1m7FcQodPsV48pFarOJi
rjANBgkqhkiG9w0BAQUFAAOCAQEAIyXJOAGmjgZUn81e7znwS14dPAGBQ8DXzcKNiZgDZqsfa+zF
-RYQHVvTxHApBKBLNhB2O0ynsZAl+vy2Ss2.0.1-SNAPSHOTatjfu3VBuIf/31s6WffSPVUAowFzyVjTgjaGgC
+RYQHVvTxHApBKBLNhB2O0ynsZAl+vy2Ss2E0b0atjfu3VBuIf/31s6WffSPVUAowFzyVjTgjaGgC
UxrEvJywXr6u5V00AbF6GbFgma3V6lFdpOytKuka0oy+3w1LeVi0sQgXT/2ncXJ3OTEZAcvYZK3D
k7E7juNXLLY+hGdLOY80sn1FwBXU5SRfnG67dQnTdFOwPd6k7X/AJ4I7XcCaHJ/9Kuz6f1d7sVD+
skNmcwhlijpHKiV+gNiUSYEFoKHWtm75MWOIjMFPo/gil9oePBd3AZgulzSZEmcY6g==
@@ -145297,10 +145297,10 @@
<md:RequestedAttribute Name="urn:oid:2.5.4.3"
NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:basic" isRequired="true"/>
<md:RequestedAttribute
- Name="urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.1"
+ Name="urn:oid:0.9.2342.19200300.100.1.1"
NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:basic" isRequired="true"/>
<md:RequestedAttribute
- Name="urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.3"
+ Name="urn:oid:0.9.2342.19200300.100.1.3"
NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:basic" isRequired="true"/>
<md:RequestedAttribute
Name="dk:gov:saml:attribute:AssuranceLevel"
@@ -151270,7 +151270,7 @@
AQUAA4IBDwAwggEKAoIBAQCXXyo9YN+9JiDyUzpAcXh2zxBxpEu6sj05TAUBTP1Irpm3PcqXwwUJ
0UEmuzMW4Bd/48vyMCcKUqe56J94B3LTquqK3D4y3gK0FblmpS+yJhcLZzWku0tRaVnWZh/NP9US
kQjFkeCGiBL3JeR+RoENHrQpTT/iI8XvWrrekYLYBC4NFVF81JPYc17ZxpMO3vgucIr+VRSAFUOY
-zTqD4IKSvqsNm2u1ueO4/UxNCY/Yj5ulG82.0.1-SNAPSHOT3jhbai0LqLETujPEQ2bemZqNUNHxdtgvU5yDA
+zTqD4IKSvqsNm2u1ueO4/UxNCY/Yj5ulG82W0T03jhbai0LqLETujPEQ2bemZqNUNHxdtgvU5yDA
H0AHv7RzW4Kx2v+qKpTDAvRd5JvERQa4P9DWjYRAzHjz0TK9pdE6nMz0hEXpAgMBAAGjdTBzMFIG
A1UdEQRLMEmCF3NoaWJib2xldGguY29jb25pbm8uZWR1hi5odHRwczovL3NoaWJib2xldGguY29j
b25pbm8uZWR1L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRf5ApSnXQFJpysLJcHKJAtjvCgLzAN
@@ -151313,7 +151313,7 @@
AQUAA4IBDwAwggEKAoIBAQCXXyo9YN+9JiDyUzpAcXh2zxBxpEu6sj05TAUBTP1Irpm3PcqXwwUJ
0UEmuzMW4Bd/48vyMCcKUqe56J94B3LTquqK3D4y3gK0FblmpS+yJhcLZzWku0tRaVnWZh/NP9US
kQjFkeCGiBL3JeR+RoENHrQpTT/iI8XvWrrekYLYBC4NFVF81JPYc17ZxpMO3vgucIr+VRSAFUOY
-zTqD4IKSvqsNm2u1ueO4/UxNCY/Yj5ulG82.0.1-SNAPSHOT3jhbai0LqLETujPEQ2bemZqNUNHxdtgvU5yDA
+zTqD4IKSvqsNm2u1ueO4/UxNCY/Yj5ulG82W0T03jhbai0LqLETujPEQ2bemZqNUNHxdtgvU5yDA
H0AHv7RzW4Kx2v+qKpTDAvRd5JvERQa4P9DWjYRAzHjz0TK9pdE6nMz0hEXpAgMBAAGjdTBzMFIG
A1UdEQRLMEmCF3NoaWJib2xldGguY29jb25pbm8uZWR1hi5odHRwczovL3NoaWJib2xldGguY29j
b25pbm8uZWR1L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRf5ApSnXQFJpysLJcHKJAtjvCgLzAN
@@ -169042,7 +169042,7 @@
</md:ContactPerson>
</md:EntityDescriptor>
<md:EntityDescriptor
- entityID="https://clc2.uniservity.com/SingleSignOn?groupid=2.0.1-SNAPSHOT589/shibbo..." xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata">
+ entityID="https://clc2.uniservity.com/SingleSignOn?groupid=20090589/shibboleth-sp" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata">
<md:SPSSODescriptor
protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata">
<md:KeyDescriptor>
@@ -169072,30 +169072,30 @@
<md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
<md:AssertionConsumerService
Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://clc2.uniservity.com/SingleSignOn?groupid=2.0.1-SNAPSHOT589/Shibbo..." index="1"/>
+ Location="https://clc2.uniservity.com/SingleSignOn?groupid=20090589/Shibboleth.sso/..." index="1"/>
<md:AssertionConsumerService
Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="http://clc2.uniservity.com/SingleSignOn?groupid=2.0.1-SNAPSHOT589/Shibbol..." index="2"/>
+ Location="http://clc2.uniservity.com/SingleSignOn?groupid=20090589/Shibboleth.sso/S..." index="2"/>
<md:AssertionConsumerService
Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://clc2.uniservity.com/SingleSignOn?groupid=2.0.1-SNAPSHOT589/Shibbo..." index="3"/>
+ Location="https://clc2.uniservity.com/SingleSignOn?groupid=20090589/Shibboleth.sso/..." index="3"/>
<md:AssertionConsumerService
Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact"
- Location="https://clc2.uniservity.com/SingleSignOn?groupid=2.0.1-SNAPSHOT589/Shibbo..." index="4"/>
+ Location="https://clc2.uniservity.com/SingleSignOn?groupid=20090589/Shibboleth.sso/..." index="4"/>
<md:AssertionConsumerService
Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01"
- Location="http://clc2.uniservity.com/SingleSignOn?groupid=2.0.1-SNAPSHOT589/Shibbol..." index="5"/>
+ Location="http://clc2.uniservity.com/SingleSignOn?groupid=20090589/Shibboleth.sso/S..." index="5"/>
<md:AssertionConsumerService
Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post"
- Location="https://clc2.uniservity.com/SingleSignOn?groupid=2.0.1-SNAPSHOT589/Shibbo..." index="6"/>
+ Location="https://clc2.uniservity.com/SingleSignOn?groupid=20090589/Shibboleth.sso/..." index="6"/>
<md:AssertionConsumerService
Binding="urn:oasis:names:tc:SAML:1.1:profiles:browser-post"
- Location="http://clc2.uniservity.com/SingleSignOn?groupid=2.0.1-SNAPSHOT589/Shibbol..." index="7"/>
+ Location="http://clc2.uniservity.com/SingleSignOn?groupid=20090589/Shibboleth.sso/S..." index="7"/>
</md:SPSSODescriptor>
<md:Organization xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata">
- <md:OrganizationName xml:lang="en">clc2.uniservity.com/SingleSignOn?groupid=2.0.1-SNAPSHOT589</md:OrganizationName>
+ <md:OrganizationName xml:lang="en">clc2.uniservity.com/SingleSignOn?groupid=20090589</md:OrganizationName>
<md:OrganizationDisplayName xml:lang="en">TestShib SP</md:OrganizationDisplayName>
- <md:OrganizationURL xml:lang="en">http://clc2.uniservity.com/SingleSignOn?groupid=2.0.1-SNAPSHOT589/</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="en">http://clc2.uniservity.com/SingleSignOn?groupid=20090589/</md:OrganizationURL>
</md:Organization>
<md:ContactPerson contactType="technical" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata">
<md:GivenName>Alex</md:GivenName>
@@ -203419,10 +203419,10 @@
<md:RequestedAttribute Name="urn:oid:2.5.4.3"
NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:basic" isRequired="true"/>
<md:RequestedAttribute
- Name="urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.1"
+ Name="urn:oid:0.9.2342.19200300.100.1.1"
NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:basic" isRequired="true"/>
<md:RequestedAttribute
- Name="urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.3"
+ Name="urn:oid:0.9.2342.19200300.100.1.3"
NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:basic" isRequired="true"/>
<md:RequestedAttribute
Name="dk:gov:saml:attribute:AssuranceLevel"
@@ -203931,10 +203931,10 @@
<md:RequestedAttribute Name="urn:oid:2.5.4.3"
NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:basic" isRequired="true"/>
<md:RequestedAttribute
- Name="urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.1"
+ Name="urn:oid:0.9.2342.19200300.100.1.1"
NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:basic" isRequired="true"/>
<md:RequestedAttribute
- Name="urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.3"
+ Name="urn:oid:0.9.2342.19200300.100.1.3"
NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:basic" isRequired="true"/>
<!--
<md:RequestedAttribute Name="dk:gov:saml:attribute:AssuranceLevel" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:basic" isRequired="true"/>
Modified: product/trunk/picketlink-webapps/idp/pom.xml
===================================================================
--- product/trunk/picketlink-webapps/idp/pom.xml 2011-08-11 22:40:00 UTC (rev 1189)
+++ product/trunk/picketlink-webapps/idp/pom.xml 2011-08-11 22:54:16 UTC (rev 1190)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.picketlink.product</groupId>
<artifactId>picketlink-federation-webapps</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.0.0</version>
<relativePath>../</relativePath>
</parent>
Modified: product/trunk/picketlink-webapps/pdp/pom.xml
===================================================================
--- product/trunk/picketlink-webapps/pdp/pom.xml 2011-08-11 22:40:00 UTC (rev 1189)
+++ product/trunk/picketlink-webapps/pdp/pom.xml 2011-08-11 22:54:16 UTC (rev 1190)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.picketlink.product</groupId>
<artifactId>picketlink-federation-webapps</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.0.0</version>
<relativePath>../</relativePath>
</parent>
Modified: product/trunk/picketlink-webapps/picketlink-sts/pom.xml
===================================================================
--- product/trunk/picketlink-webapps/picketlink-sts/pom.xml 2011-08-11 22:40:00 UTC (rev 1189)
+++ product/trunk/picketlink-webapps/picketlink-sts/pom.xml 2011-08-11 22:54:16 UTC (rev 1190)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.picketlink.product</groupId>
<artifactId>picketlink-federation-webapps</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.0.0</version>
<relativePath>../</relativePath>
</parent>
Modified: product/trunk/picketlink-webapps/pom.xml
===================================================================
--- product/trunk/picketlink-webapps/pom.xml 2011-08-11 22:40:00 UTC (rev 1189)
+++ product/trunk/picketlink-webapps/pom.xml 2011-08-11 22:54:16 UTC (rev 1190)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.picketlink.product</groupId>
<artifactId>picketlink-fed-parent</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.0.0</version>
<relativePath>../parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: product/trunk/pom.xml
===================================================================
--- product/trunk/pom.xml 2011-08-11 22:40:00 UTC (rev 1189)
+++ product/trunk/pom.xml 2011-08-11 22:54:16 UTC (rev 1190)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.picketlink.product</groupId>
<artifactId>picketlink-fed-parent</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.0.0</version>
<relativePath>parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
13 years, 4 months
- 1
- 0
Picketlink SVN: r1189 - in product/trunk: parent and 25 other directories.
by picketlink-commits＠lists.jboss.org
Author: anil.saldhana(a)jboss.com
Date: 2011-08-11 18:40:00 -0400 (Thu, 11 Aug 2011)
New Revision: 1189
Modified:
product/trunk/parent/pom.xml
product/trunk/picketlink-core/pom.xml
product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/constants/X500SAMLProfileConstants.java
product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/core/util/IDFedLSInputResolver.java
product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/core/util/SchemaManagerUtil.java
product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/core/wsse/WSSecurityConstants.java
product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/core/wstrust/WSTrustConstants.java
product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/ws/policy/Policy.java
product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/ws/trust/LifetimeType.java
product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/ws/trust/RequestedReferenceType.java
product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/ws/wss/secext/AttributedString.java
product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/ws/wss/secext/BinarySecurityTokenType.java
product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/ws/wss/secext/EncodedString.java
product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/ws/wss/secext/KeyIdentifierType.java
product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/ws/wss/secext/PasswordString.java
product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/ws/wss/secext/SecurityTokenReferenceType.java
product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/ws/wss/secext/UsernameTokenType.java
product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/ws/wss/utility/AttributedDateTime.java
product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/ws/wss/utility/AttributedURI.java
product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/ws/wss/utility/TimestampType.java
product/trunk/picketlink-core/src/main/java/org/picketlink/trust/jbossws/Constants.java
product/trunk/picketlink-core/src/main/java/org/picketlink/trust/jbossws/handler/BinaryTokenHandler.java
product/trunk/picketlink-core/src/test/java/org/picketlink/test/identity/federation/api/util/KeyUtilUnitTestCase.java
product/trunk/picketlink-core/src/test/java/org/picketlink/test/identity/federation/bindings/config/MetadataConfigUnitTestCase.java
product/trunk/picketlink-core/src/test/java/org/picketlink/test/identity/federation/core/config/ConfigUnitTestCase.java
product/trunk/picketlink-core/src/test/java/org/picketlink/test/identity/federation/core/util/KeystoreUtilUnitTestCase.java
product/trunk/picketlink-core/src/test/resources/config/test-config-2.xml
product/trunk/picketlink-core/src/test/resources/config/test-metadata-config-1.xml
product/trunk/picketlink-core/src/test/resources/jbossws/xml/wsse-saml.xml
product/trunk/picketlink-core/src/test/resources/parser/saml2/saml2-authnrequest.xml
product/trunk/picketlink-core/src/test/resources/parser/wst/wst-issue-onbehalfof.xml
product/trunk/picketlink-core/src/test/resources/parser/wst/wst-response-assertion-hok-certificate.xml
product/trunk/picketlink-core/src/test/resources/parser/wst/wst-response-assertion-hok-combined.xml
product/trunk/picketlink-core/src/test/resources/parser/wst/wst-response-assertion-hok-pubkey.xml
product/trunk/picketlink-core/src/test/resources/parser/wst/wst-response-assertion-hok-simmetric.xml
product/trunk/picketlink-core/src/test/resources/parser/wst/wst-response-assertion.xml
product/trunk/picketlink-core/src/test/resources/saml/v2/authnrequest/samlAuthnRequestExample.xml
product/trunk/picketlink-core/src/test/resources/saml/v2/authnrequest/samlAuthnRequestWithSignature.xml
product/trunk/picketlink-core/src/test/resources/saml2/metadata/sp-entitydescriptor.xml
product/trunk/picketlink-core/src/test/resources/saml2/metadata/testshib-two-metadata.xml
product/trunk/picketlink-webapps/idp/pom.xml
product/trunk/picketlink-webapps/pdp/pom.xml
product/trunk/picketlink-webapps/picketlink-sts/pom.xml
product/trunk/picketlink-webapps/pom.xml
product/trunk/pom.xml
Log:
PLFED-226: next 2.0.1
Modified: product/trunk/parent/pom.xml
===================================================================
--- product/trunk/parent/pom.xml 2011-08-11 22:38:40 UTC (rev 1188)
+++ product/trunk/parent/pom.xml 2011-08-11 22:40:00 UTC (rev 1189)
@@ -8,7 +8,7 @@
<groupId>org.picketlink.product</groupId>
<artifactId>picketlink-fed-parent</artifactId>
<packaging>pom</packaging>
- <version>2.0.0</version>
+ <version>2.0.1-SNAPSHOT</version>
<name>PicketLink Federation- Parent</name>
<url>http://labs.jboss.org/portal/picketlink/</url>
<description>PicketLink is a cross-cutting project that handles identity needs for the JEMS projects</description>
@@ -23,8 +23,8 @@
<url>http://www.jboss.org</url>
</organization>
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/picketlink/product/tags/2.0.0.alpha1</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/picketlink/product/tags/2.0.0.alpha1</developerConnection>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/picketlink/product/tags/2.0.1-SNAP...</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/picketlink/product/tags/2.0.1-SNAPSHO...</developerConnection>
</scm>
<build>
Modified: product/trunk/picketlink-core/pom.xml
===================================================================
--- product/trunk/picketlink-core/pom.xml 2011-08-11 22:38:40 UTC (rev 1188)
+++ product/trunk/picketlink-core/pom.xml 2011-08-11 22:40:00 UTC (rev 1189)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.picketlink.product</groupId>
<artifactId>picketlink-fed-parent</artifactId>
- <version>2.0.0</version>
+ <version>2.0.1-SNAPSHOT</version>
<relativePath>../parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/constants/X500SAMLProfileConstants.java
===================================================================
--- product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/constants/X500SAMLProfileConstants.java 2011-08-11 22:38:40 UTC (rev 1188)
+++ product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/constants/X500SAMLProfileConstants.java 2011-08-11 22:40:00 UTC (rev 1189)
@@ -33,28 +33,28 @@
*/
public enum X500SAMLProfileConstants
{
- A_RECORD( "aRecord" , "urn:oid:0.9.2342.19200300.100.1.26" ),
+ A_RECORD( "aRecord" , "urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.26" ),
ALIASED_ENTRY_NAME( "aliasedEntryName" , "urn:oid:2.5.4.1"),
ALIASED_OBJECT_NAME("aliasedObjectName" , "urn:oid:2.5.4.1"),
- ASSOCIATED_DOMAIN("associatedDomain" , "urn:oid:0.9.2342.19200300.100.1.37"),
- ASSOCIATED_NAME("associatedName" , "urn:oid:0.9.2342.19200300.100.1.38"),
- AUDIO("audio" , "urn:oid:0.9.2342.19200300.100.1.55"),
+ ASSOCIATED_DOMAIN("associatedDomain" , "urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.37"),
+ ASSOCIATED_NAME("associatedName" , "urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.38"),
+ AUDIO("audio" , "urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.55"),
AUTHORITY_REVOCATION_LIST("authorityRevocationList" , "urn:oid:2.5.4.38"),
- BINDING_NAME("buildingName" , "urn:oid:0.9.2342.19200300.100.1.48"),
+ BINDING_NAME("buildingName" , "urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.48"),
BUSINESS_CATEGORY("businessCategory" , "urn:oid:2.5.4.15"),
C("c" , "urn:oid:2.5.4.6"),
CA_CERTIFICATE("cACertificate" , "urn:oid:2.5.4.37"),
- CNAME_RECORD("cNAMERecord" , "urn:oid:0.9.2342.19200300.100.1.31"),
+ CNAME_RECORD("cNAMERecord" , "urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.31"),
CAR_LICENSE("carLicense" , "urn:oid:2.16.840.1.113730.3.1.1"),
CRL("certificateRevocationList" , "urn:oid:2.5.4.39"),
CN("cn" , "urn:oid:2.5.4.3"),
- CO("co" , "urn:oid:0.9.2342.19200300.100.1.43"),
+ CO("co" , "urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.43"),
COMMON_NAME("commonName" , "urn:oid:2.5.4.3"),
COUNTRY_NAME("countryName" , "urn:oid:2.5.4.6"),
CROSS_CERTIFICATE_PAIR("crossCertificatePair" , "urn:oid:2.5.4.40"),
- D_IT_REDIRECT("dITRedirect" , "urn:oid:0.9.2342.19200300.100.1.54"),
- D_SA_QUALITY("dSAQuality" , "urn:oid:0.9.2342.19200300.100.1.49"),
- DC("dc" , "urn:oid:0.9.2342.19200300.100.1.25"),
+ D_IT_REDIRECT("dITRedirect" , "urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.54"),
+ D_SA_QUALITY("dSAQuality" , "urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.49"),
+ DC("dc" , "urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.25"),
DELTA_REVOCATION_LIST("deltaRevocationList" , "urn:oid:2.5.4.53"),
DEPARTMENT_NUMBER("departmentNumber" , "urn:oid:2.16.840.1.113730.3.1.2"),
DESCRIPTION("description" , "urn:oid:2.5.4.13"),
@@ -63,14 +63,14 @@
DISTINGUISHED_NAME("distinguishedName" , "urn:oid:2.5.4.49"),
DMD_NAME("dmdName" , "urn:oid:2.5.4.54"),
DN_QUALIFIER("dnQualifier" , "urn:oid:2.5.4.46"),
- DOCUMENT_AUTHOR("documentAuthor" , "urn:oid:0.9.2342.19200300.100.1.14"),
- DOCUMENT_IDENTIFIER("documentIdentifier" , "urn:oid:0.9.2342.19200300.100.1.11"),
- DOCUMENT_LOCATION("documentLocation" , "urn:oid:0.9.2342.19200300.100.1.15"),
- DOCUMENT_PUBLISHER("documentPublisher" , "urn:oid:0.9.2342.19200300.100.1.56"),
- DOCUMENT_TITLE("documentTitle" , "urn:oid:0.9.2342.19200300.100.1.12"),
- DOCUMENT_VERSION("documentVersion" , "urn:oid:0.9.2342.19200300.100.1.13"),
- DOMAIN_COMPONENT("domainComponent" , "urn:oid:0.9.2342.19200300.100.1.25"),
- DRINK("drink" , "urn:oid:0.9.2342.19200300.100.1.5"),
+ DOCUMENT_AUTHOR("documentAuthor" , "urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.14"),
+ DOCUMENT_IDENTIFIER("documentIdentifier" , "urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.11"),
+ DOCUMENT_LOCATION("documentLocation" , "urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.15"),
+ DOCUMENT_PUBLISHER("documentPublisher" , "urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.56"),
+ DOCUMENT_TITLE("documentTitle" , "urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.12"),
+ DOCUMENT_VERSION("documentVersion" , "urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.13"),
+ DOMAIN_COMPONENT("domainComponent" , "urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.25"),
+ DRINK("drink" , "urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.5"),
EDU_ORG_HOMEPAGEURI("eduOrgHomePageURI" , "urn:oid:1.3.6.1.4.1.5923.1.2.1.2"),
EDU_ORG_IDENTITY_AUTHN_POLICYURI("eduOrgIdentityAuthNPolicyURI" , "urn:oid:1.3.6.1.4.1.5923.1.2.1.3"),
EDU_ORG_LEGALNAME("eduOrgLegalName" , "urn:oid:1.3.6.1.4.1.5923.1.2.1.4"),
@@ -92,37 +92,37 @@
EMPLOYEE_TYPE("employeeType" , "urn:oid:2.16.840.1.113730.3.1.4"),
ENHANCED_SEARCH_GUIDE("enhancedSearchGuide" , "urn:oid:2.5.4.47"),
FAX_TELEPHONE_NUMBER("facsimileTelephoneNumber" , "urn:oid:2.5.4.23"),
- FAVORITE_DRINK("favouriteDrink" , "urn:oid:0.9.2342.19200300.100.1.5"),
+ FAVORITE_DRINK("favouriteDrink" , "urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.5"),
FAX("fax" , "urn:oid:2.5.4.23"),
FEDERATION_FEIDE_SCHEMA_VERSION("federationFeideSchemaVersion" , "urn:oid:1.3.6.1.4.1.2428.90.1.9"),
- FRIENDLY_COUNTRY_NAME("friendlyCountryName" , "urn:oid:0.9.2342.19200300.100.1.43"),
+ FRIENDLY_COUNTRY_NAME("friendlyCountryName" , "urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.43"),
GENERATION_QUALIFIER("generationQualifier" , "urn:oid:2.5.4.44"),
GIVEN_NAME("givenName" , "urn:oid:2.5.4.42"),
GN("gn" , "urn:oid:2.5.4.42"),
- HOME_PHONE("homePhone" , "urn:oid:0.9.2342.19200300.100.1.20"),
- HOME_POSTAL_ADDRESS("homePostalAddress" , "urn:oid:0.9.2342.19200300.100.1.39"),
- HOME_TELEPHONE_NUMBER("homeTelephoneNumber" , "urn:oid:0.9.2342.19200300.100.1.20"),
- HOST("host" , "urn:oid:0.9.2342.19200300.100.1.9"),
+ HOME_PHONE("homePhone" , "urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.20"),
+ HOME_POSTAL_ADDRESS("homePostalAddress" , "urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.39"),
+ HOME_TELEPHONE_NUMBER("homeTelephoneNumber" , "urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.20"),
+ HOST("host" , "urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.9"),
HOUSE_IDENTIFIER("houseIdentifier" , "urn:oid:2.5.4.51"),
- INFO("info" , "urn:oid:0.9.2342.19200300.100.1.4"),
+ INFO("info" , "urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.4"),
INITIALS("initials" , "urn:oid:2.5.4.43"),
INTERNATIONAL_ISDN_NUMBER("internationaliSDNNumber" , "urn:oid:2.5.4.25"),
IS_MEMBEROF("isMemberOf" , "urn:oid:1.3.6.1.4.1.5923.1.5.1.1"),
- JANET_MAILBOX("janetMailbox" , "urn:oid:0.9.2342.19200300.100.1.46"),
- JPEG_PHOTO("jpegPhoto" , "urn:oid:0.9.2342.19200300.100.1.60"),
+ JANET_MAILBOX("janetMailbox" , "urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.46"),
+ JPEG_PHOTO("jpegPhoto" , "urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.60"),
KNOWLEDGE_INFORMATION("knowledgeInformation" , "urn:oid:2.5.4.2"),
L("l" , "urn:oid:2.5.4.7"),
LABELED_URI("labeledURI" , "urn:oid:1.3.6.1.4.1.250.1.57"),
LOCALITY_NAME("localityName" , "urn:oid:2.5.4.7"),
- M_DRECORD("mDRecord" , "urn:oid:0.9.2342.19200300.100.1.27"),
- M_XRECORD("mXRecord" , "urn:oid:0.9.2342.19200300.100.1.28"),
- MAIL("mail" , "urn:oid:0.9.2342.19200300.100.1.3"),
- MAIL_PREFERENCEOPTION("mailPreferenceOption" , "urn:oid:0.9.2342.19200300.100.1.47"),
- MANAGER("manager" , "urn:oid:0.9.2342.19200300.100.1.10"),
+ M_DRECORD("mDRecord" , "urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.27"),
+ M_XRECORD("mXRecord" , "urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.28"),
+ MAIL("mail" , "urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.3"),
+ MAIL_PREFERENCEOPTION("mailPreferenceOption" , "urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.47"),
+ MANAGER("manager" , "urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.10"),
MEMBER("member" , "urn:oid:2.5.4.31"),
- MOBILE("mobile" , "urn:oid:0.9.2342.19200300.100.1.41"),
- MOBILE_TELEPHONE_NUMBER("mobileTelephoneNumber" , "urn:oid:0.9.2342.19200300.100.1.41"),
- N_SRECORD("nSRecord" , "urn:oid:0.9.2342.19200300.100.1.29"),
+ MOBILE("mobile" , "urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.41"),
+ MOBILE_TELEPHONE_NUMBER("mobileTelephoneNumber" , "urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.41"),
+ N_SRECORD("nSRecord" , "urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.29"),
NAME("name" , "urn:oid:2.5.4.41"),
NOR_EDU_ORG_ACRONYM("norEduOrgAcronym" , "urn:oid:1.3.6.1.4.1.2428.90.1.6"),
NOR_EDU_ORG_NIN("norEduOrgNIN" , "urn:oid:1.3.6.1.4.1.2428.90.1.12"),
@@ -137,16 +137,16 @@
O("o" , "urn:oid:2.5.4.10"),
OBJECT_CLASS("objectClass" , "urn:oid:2.5.4.0"),
ORGANIZATION_NAME("organizationName" , "urn:oid:2.5.4.10"),
- ORGANIZATIONAL_STATUS("organizationalStatus" , "urn:oid:0.9.2342.19200300.100.1.45"),
+ ORGANIZATIONAL_STATUS("organizationalStatus" , "urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.45"),
ORGANIZATIONAL_UNIT_NAME("organizationalUnitName" , "urn:oid:2.5.4.11"),
- OTHER_MAIL_BOX("otherMailbox" , "urn:oid:0.9.2342.19200300.100.1.22"),
+ OTHER_MAIL_BOX("otherMailbox" , "urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.22"),
OU("ou" , "urn:oid:2.5.4.11"),
OWNER("owner" , "urn:oid:2.5.4.32"),
- PAGER("pager" , "urn:oid:0.9.2342.19200300.100.1.42"),
- PAGER_TELEPHONE_NUMBER("pagerTelephoneNumber" , "urn:oid:0.9.2342.19200300.100.1.42"),
- PERSONAL_SIGNATURE("personalSignature" , "urn:oid:0.9.2342.19200300.100.1.53"),
- PERSONAL_TITLE("personalTitle" , "urn:oid:0.9.2342.19200300.100.1.40"),
- PHOTO("photo" , "urn:oid:0.9.2342.19200300.100.1.7"),
+ PAGER("pager" , "urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.42"),
+ PAGER_TELEPHONE_NUMBER("pagerTelephoneNumber" , "urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.42"),
+ PERSONAL_SIGNATURE("personalSignature" , "urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.53"),
+ PERSONAL_TITLE("personalTitle" , "urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.40"),
+ PHOTO("photo" , "urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.7"),
PHYSICAL_DELIVERY_OFFICE_NAME("physicalDeliveryOfficeName" , "urn:oid:2.5.4.19"),
PKCS_9_EMAIL("pkcs9email" , "urn:oid:1.2.840.113549.1.9.1"),
POST_OFFICE_BOX("postOfficeBox" , "urn:oid:2.5.4.18"),
@@ -158,39 +158,39 @@
PROTOCOL_INFORMATION("protocolInformation" , "urn:oid:2.5.4.48"),
PSEUDONYM("pseudonym" , "urn:oid:2.5.4.65"),
REGISTERED_ADDRESS("registeredAddress" , "urn:oid:2.5.4.26"),
- RFC_822_MAILBOX("rfc822Mailbox" , "urn:oid:0.9.2342.19200300.100.1.3"),
+ RFC_822_MAILBOX("rfc822Mailbox" , "urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.3"),
ROLE_OCCUPANT("roleOccupant" , "urn:oid:2.5.4.33"),
- ROOM_NUMBER("roomNumber" , "urn:oid:0.9.2342.19200300.100.1.6"),
- S_OAR_RECORD("sOARecord" , "urn:oid:0.9.2342.19200300.100.1.30"),
+ ROOM_NUMBER("roomNumber" , "urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.6"),
+ S_OAR_RECORD("sOARecord" , "urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.30"),
SEARCH_GUIDE("searchGuide" , "urn:oid:2.5.4.14"),
- SECRETARY("secretary" , "urn:oid:0.9.2342.19200300.100.1.21"),
+ SECRETARY("secretary" , "urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.21"),
SEE_ALSO("seeAlso" , "urn:oid:2.5.4.34"),
SERIAL_NUMBER("serialNumber" , "urn:oid:2.5.4.5"),
- SINGLE_LEVEL_QUALITY("singleLevelQuality" , "urn:oid:0.9.2342.19200300.100.1.50"),
+ SINGLE_LEVEL_QUALITY("singleLevelQuality" , "urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.50"),
SN("sn" , "urn:oid:2.5.4.4"),
ST("st" , "urn:oid:2.5.4.8"),
STATE_OR_PROVINCE_NAME("stateOrProvinceName" , "urn:oid:2.5.4.8"),
STREET("street" , "urn:oid:2.5.4.9"),
STREET_ADDRESS("streetAddress" , "urn:oid:2.5.4.9"),
- SUBTREE_MAXIMUM_QUALITY("subtreeMaximumQuality" , "urn:oid:0.9.2342.19200300.100.1.52"),
- SUBTREE_MINIMUM_QUALITY("subtreeMinimumQuality" , "urn:oid:0.9.2342.19200300.100.1.51"),
+ SUBTREE_MAXIMUM_QUALITY("subtreeMaximumQuality" , "urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.52"),
+ SUBTREE_MINIMUM_QUALITY("subtreeMinimumQuality" , "urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.51"),
SUPPORTED_ALGORITHMS("supportedAlgorithms" , "urn:oid:2.5.4.52"),
SUPPORTED_APPLICATION_CONTEXT("supportedApplicationContext" , "urn:oid:2.5.4.30"),
SURNAME("surname" , "urn:oid:2.5.4.4"),
TELEPHONE_NUMBER("telephoneNumber" , "urn:oid:2.5.4.20"),
TELETEX_TERMINAL_IDENTIFIER("teletexTerminalIdentifier" , "urn:oid:2.5.4.22"),
TELEX_NUMBER("telexNumber" , "urn:oid:2.5.4.21"),
- TEXT_ENCODED_OR_ADDRESS("textEncodedORAddress" , "urn:oid:0.9.2342.19200300.100.1.2"),
+ TEXT_ENCODED_OR_ADDRESS("textEncodedORAddress" , "urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.2"),
TITLE("title" , "urn:oid:2.5.4.12"),
- UID("uid" , "urn:oid:0.9.2342.19200300.100.1.1"),
- UNIQUE_IDENTIFIER("uniqueIdentifier" , "urn:oid:0.9.2342.19200300.100.1.44"),
+ UID("uid" , "urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.1"),
+ UNIQUE_IDENTIFIER("uniqueIdentifier" , "urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.44"),
UNIQUE_MEMBER("uniqueMember" , "urn:oid:2.5.4.50"),
USER_CERTIFICATE("userCertificate" , "urn:oid:2.5.4.36"),
- USER_CLASS("userClass" , "urn:oid:0.9.2342.19200300.100.1.8"),
+ USER_CLASS("userClass" , "urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.8"),
USER_PKCS12("userPKCS12" , "urn:oid:2.16.840.1.113730.3.1.216"),
USER_PASSWORD("userPassword" , "urn:oid:2.5.4.35"),
USER_SMIME_CERTIFICATE("userSMIMECertificate" , "urn:oid:2.16.840.1.113730.3.1.40"),
- USERID("userid" , "urn:oid:0.9.2342.19200300.100.1.1"),
+ USERID("userid" , "urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.1"),
X121_ADDRESS("x121Address" , "urn:oid:2.5.4.24"),
X500_UNIQUE_IDENTIFIER("x500UniqueIdentifier" , "urn:oid:2.5.4.45");
Modified: product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/core/util/IDFedLSInputResolver.java
===================================================================
--- product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/core/util/IDFedLSInputResolver.java 2011-08-11 22:38:40 UTC (rev 1188)
+++ product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/core/util/IDFedLSInputResolver.java 2011-08-11 22:40:00 UTC (rev 1189)
@@ -59,7 +59,7 @@
//XML DSIG
schemaLocationMap.put("http://www.w3.org/2000/09/xmldsig#", "schema/w3c/xmldsig/xmldsig-core-schema.xsd");
- schemaLocationMap.put("http://www.w3.org/TR/2002/REC-xmldsig-core-20020212/xmldsig-core-schema.xsd",
+ schemaLocationMap.put("http://www.w3.org/TR/2002/REC-xmldsig-core-2.0.1-SNAPSHOT212/xmldsig-core...",
"schema/w3c/xmldsig/xmldsig-core-schema.xsd");
//XML Enc
@@ -98,10 +98,10 @@
//WS-T
schemaLocationMap.put("http://docs.oasis-open.org/ws-sx/ws-trust/200512", "schema/wstrust/v1_3/ws-trust-1.3.xsd");
- schemaLocationMap.put("http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext...",
- "schema/wstrust/v1_3/oasis-200401-wss-wssecurity-secext-1.0.xsd");
- schemaLocationMap.put("http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit...",
- "schema/wstrust/v1_3/oasis-200401-wss-wssecurity-utility-1.0.xsd");
+ schemaLocationMap.put("http://docs.oasis-open.org/wss/2004/01/oasis-2.0.1-SNAPSHOT1-wss-wssecuri...",
+ "schema/wstrust/v1_3/oasis-2.0.1-SNAPSHOT1-wss-wssecurity-secext-1.0.xsd");
+ schemaLocationMap.put("http://docs.oasis-open.org/wss/2004/01/oasis-2.0.1-SNAPSHOT1-wss-wssecuri...",
+ "schema/wstrust/v1_3/oasis-2.0.1-SNAPSHOT1-wss-wssecurity-utility-1.0.xsd");
schemaLocationMap.put("http://schemas.xmlsoap.org/ws/2004/09/policy", "schema/wstrust/v1_3/ws-policy.xsd");
schemaLocationMap.put("http://www.w3.org/2005/08/addressing", "schema/wstrust/v1_3/ws-addr.xsd");
}
Modified: product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/core/util/SchemaManagerUtil.java
===================================================================
--- product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/core/util/SchemaManagerUtil.java 2011-08-11 22:38:40 UTC (rev 1188)
+++ product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/core/util/SchemaManagerUtil.java 2011-08-11 22:40:00 UTC (rev 1189)
@@ -95,8 +95,8 @@
List<String> list = new ArrayList<String>();
list.add("schema/wstrust/v1_3/ws-trust-1.3.xsd");
- list.add("schema/wstrust/v1_3/oasis-200401-wss-wssecurity-secext-1.0.xsd");
- list.add("schema/wstrust/v1_3/oasis-200401-wss-wssecurity-utility-1.0.xsd");
+ list.add("schema/wstrust/v1_3/oasis-2.0.1-SNAPSHOT1-wss-wssecurity-secext-1.0.xsd");
+ list.add("schema/wstrust/v1_3/oasis-2.0.1-SNAPSHOT1-wss-wssecurity-utility-1.0.xsd");
list.add("schema/wstrust/v1_3/ws-policy.xsd");
list.add("schema/wstrust/v1_3/ws-addr.xsd");
return list;
Modified: product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/core/wsse/WSSecurityConstants.java
===================================================================
--- product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/core/wsse/WSSecurityConstants.java 2011-08-11 22:38:40 UTC (rev 1188)
+++ product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/core/wsse/WSSecurityConstants.java 2011-08-11 22:40:00 UTC (rev 1189)
@@ -33,7 +33,7 @@
String USERNAME_TOKEN = "UsernameToken";
String WSSE_PREFIX = "wsse";
String WSU_PREFIX = "wsu";
- String WSSE_NS = "http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext...";
+ String WSSE_NS = "http://docs.oasis-open.org/wss/2004/01/oasis-2.0.1-SNAPSHOT1-wss-wssecuri...";
String WSSE11_NS = "http://docs.oasis-open.org/wss/oasis-wss-wssecurity-secext-1.1.xsd";
- String WSU_NS = "http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit...";
+ String WSU_NS = "http://docs.oasis-open.org/wss/2004/01/oasis-2.0.1-SNAPSHOT1-wss-wssecuri...";
}
Modified: product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/core/wstrust/WSTrustConstants.java
===================================================================
--- product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/core/wstrust/WSTrustConstants.java 2011-08-11 22:38:40 UTC (rev 1188)
+++ product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/core/wstrust/WSTrustConstants.java 2011-08-11 22:40:00 UTC (rev 1189)
@@ -79,9 +79,9 @@
String WSP_NS = "http://schemas.xmlsoap.org/ws/2004/09/policy";
- String WSU_NS = "http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit...";
+ String WSU_NS = "http://docs.oasis-open.org/wss/2004/01/oasis-2.0.1-SNAPSHOT1-wss-wssecuri...";
- String WSSE_NS = "http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext...";
+ String WSSE_NS = "http://docs.oasis-open.org/wss/2004/01/oasis-2.0.1-SNAPSHOT1-wss-wssecuri...";
String WSSE11_NS = "http://docs.oasis-open.org/wss/oasis-wss-wssecurity-secext-1.1.xsd";
Modified: product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/ws/policy/Policy.java
===================================================================
--- product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/ws/policy/Policy.java 2011-08-11 22:38:40 UTC (rev 1188)
+++ product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/ws/policy/Policy.java 2011-08-11 22:40:00 UTC (rev 1189)
@@ -37,7 +37,7 @@
* <complexContent>
* <extension base="{http://schemas.xmlsoap.org/ws/2004/09/policy}OperatorContentType">
* <attribute name="Name" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- * <attribute ref="{http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd}Id"/>
+ * <attribute ref="{http://docs.oasis-open.org/wss/2004/01/oasis-2.0.1-SNAPSHOT1-wss-wssecurity-utility-1.0.xsd}Id"/>
* </extension>
* </complexContent>
* </complexType>
Modified: product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/ws/trust/LifetimeType.java
===================================================================
--- product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/ws/trust/LifetimeType.java 2011-08-11 22:38:40 UTC (rev 1188)
+++ product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/ws/trust/LifetimeType.java 2011-08-11 22:40:00 UTC (rev 1189)
@@ -33,8 +33,8 @@
* <complexContent>
* <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
* <sequence>
- * <element ref="{http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd}Created" minOccurs="0"/>
- * <element ref="{http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd}Expires" minOccurs="0"/>
+ * <element ref="{http://docs.oasis-open.org/wss/2004/01/oasis-2.0.1-SNAPSHOT1-wss-wssecurity-utility-1.0.xsd}Created" minOccurs="0"/>
+ * <element ref="{http://docs.oasis-open.org/wss/2004/01/oasis-2.0.1-SNAPSHOT1-wss-wssecurity-utility-1.0.xsd}Expires" minOccurs="0"/>
* </sequence>
* </restriction>
* </complexContent>
Modified: product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/ws/trust/RequestedReferenceType.java
===================================================================
--- product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/ws/trust/RequestedReferenceType.java 2011-08-11 22:38:40 UTC (rev 1188)
+++ product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/ws/trust/RequestedReferenceType.java 2011-08-11 22:40:00 UTC (rev 1189)
@@ -33,7 +33,7 @@
* <complexContent>
* <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
* <sequence>
- * <element ref="{http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd}SecurityTokenReference"/>
+ * <element ref="{http://docs.oasis-open.org/wss/2004/01/oasis-2.0.1-SNAPSHOT1-wss-wssecurity-secext-1.0.xsd}SecurityTokenReference"/>
* </sequence>
* </restriction>
* </complexContent>
Modified: product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/ws/wss/secext/AttributedString.java
===================================================================
--- product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/ws/wss/secext/AttributedString.java 2011-08-11 22:38:40 UTC (rev 1188)
+++ product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/ws/wss/secext/AttributedString.java 2011-08-11 22:40:00 UTC (rev 1189)
@@ -34,7 +34,7 @@
* <complexType name="AttributedString">
* <simpleContent>
* <extension base="<http://www.w3.org/2001/XMLSchema>string">
- * <attribute ref="{http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd}Id"/>
+ * <attribute ref="{http://docs.oasis-open.org/wss/2004/01/oasis-2.0.1-SNAPSHOT1-wss-wssecurity-utility-1.0.xsd}Id"/>
* </extension>
* </simpleContent>
* </complexType>
Modified: product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/ws/wss/secext/BinarySecurityTokenType.java
===================================================================
--- product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/ws/wss/secext/BinarySecurityTokenType.java 2011-08-11 22:38:40 UTC (rev 1188)
+++ product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/ws/wss/secext/BinarySecurityTokenType.java 2011-08-11 22:40:00 UTC (rev 1189)
@@ -31,7 +31,7 @@
* <pre>
* <complexType name="BinarySecurityTokenType">
* <simpleContent>
- * <extension base="<http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext...>EncodedString">
+ * <extension base="<http://docs.oasis-open.org/wss/2004/01/oasis-2.0.1-SNAPSHOT1-wss-wssecuri...>EncodedString">
* <attribute name="ValueType" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
* </extension>
* </simpleContent>
Modified: product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/ws/wss/secext/EncodedString.java
===================================================================
--- product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/ws/wss/secext/EncodedString.java 2011-08-11 22:38:40 UTC (rev 1188)
+++ product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/ws/wss/secext/EncodedString.java 2011-08-11 22:40:00 UTC (rev 1189)
@@ -31,7 +31,7 @@
* <pre>
* <complexType name="EncodedString">
* <simpleContent>
- * <extension base="<http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext...>AttributedString">
+ * <extension base="<http://docs.oasis-open.org/wss/2004/01/oasis-2.0.1-SNAPSHOT1-wss-wssecuri...>AttributedString">
* <attribute name="EncodingType" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
* </extension>
* </simpleContent>
Modified: product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/ws/wss/secext/KeyIdentifierType.java
===================================================================
--- product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/ws/wss/secext/KeyIdentifierType.java 2011-08-11 22:38:40 UTC (rev 1188)
+++ product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/ws/wss/secext/KeyIdentifierType.java 2011-08-11 22:40:00 UTC (rev 1189)
@@ -31,7 +31,7 @@
* <pre>
* <complexType name="KeyIdentifierType">
* <simpleContent>
- * <extension base="<http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext...>EncodedString">
+ * <extension base="<http://docs.oasis-open.org/wss/2004/01/oasis-2.0.1-SNAPSHOT1-wss-wssecuri...>EncodedString">
* <attribute name="ValueType" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
* </extension>
* </simpleContent>
Modified: product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/ws/wss/secext/PasswordString.java
===================================================================
--- product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/ws/wss/secext/PasswordString.java 2011-08-11 22:38:40 UTC (rev 1188)
+++ product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/ws/wss/secext/PasswordString.java 2011-08-11 22:40:00 UTC (rev 1189)
@@ -31,7 +31,7 @@
* <pre>
* <complexType name="PasswordString">
* <simpleContent>
- * <extension base="<http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext...>AttributedString">
+ * <extension base="<http://docs.oasis-open.org/wss/2004/01/oasis-2.0.1-SNAPSHOT1-wss-wssecuri...>AttributedString">
* <attribute name="Type" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
* </extension>
* </simpleContent>
Modified: product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/ws/wss/secext/SecurityTokenReferenceType.java
===================================================================
--- product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/ws/wss/secext/SecurityTokenReferenceType.java 2011-08-11 22:38:40 UTC (rev 1188)
+++ product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/ws/wss/secext/SecurityTokenReferenceType.java 2011-08-11 22:40:00 UTC (rev 1189)
@@ -41,8 +41,8 @@
* <choice maxOccurs="unbounded" minOccurs="0">
* <any/>
* </choice>
- * <attribute ref="{http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd}Id"/>
- * <attribute ref="{http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd}Usage"/>
+ * <attribute ref="{http://docs.oasis-open.org/wss/2004/01/oasis-2.0.1-SNAPSHOT1-wss-wssecurity-utility-1.0.xsd}Id"/>
+ * <attribute ref="{http://docs.oasis-open.org/wss/2004/01/oasis-2.0.1-SNAPSHOT1-wss-wssecurity-secext-1.0.xsd}Usage"/>
* </restriction>
* </complexContent>
* </complexType>
Modified: product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/ws/wss/secext/UsernameTokenType.java
===================================================================
--- product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/ws/wss/secext/UsernameTokenType.java 2011-08-11 22:38:40 UTC (rev 1188)
+++ product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/ws/wss/secext/UsernameTokenType.java 2011-08-11 22:40:00 UTC (rev 1189)
@@ -35,10 +35,10 @@
* <complexContent>
* <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
* <sequence>
- * <element name="Username" type="{http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd}AttributedString"/>
+ * <element name="Username" type="{http://docs.oasis-open.org/wss/2004/01/oasis-2.0.1-SNAPSHOT1-wss-wssecurity-secext-1.0.xsd}AttributedString"/>
* <any/>
* </sequence>
- * <attribute ref="{http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd}Id"/>
+ * <attribute ref="{http://docs.oasis-open.org/wss/2004/01/oasis-2.0.1-SNAPSHOT1-wss-wssecurity-utility-1.0.xsd}Id"/>
* </restriction>
* </complexContent>
* </complexType>
Modified: product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/ws/wss/utility/AttributedDateTime.java
===================================================================
--- product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/ws/wss/utility/AttributedDateTime.java 2011-08-11 22:38:40 UTC (rev 1188)
+++ product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/ws/wss/utility/AttributedDateTime.java 2011-08-11 22:40:00 UTC (rev 1189)
@@ -36,7 +36,7 @@
* <complexType name="AttributedDateTime">
* <simpleContent>
* <extension base="<http://www.w3.org/2001/XMLSchema>string">
- * <attGroup ref="{http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd}commonAtts"/>
+ * <attGroup ref="{http://docs.oasis-open.org/wss/2004/01/oasis-2.0.1-SNAPSHOT1-wss-wssecurity-utility-1.0.xsd}commonAtts"/>
* </extension>
* </simpleContent>
* </complexType>
Modified: product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/ws/wss/utility/AttributedURI.java
===================================================================
--- product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/ws/wss/utility/AttributedURI.java 2011-08-11 22:38:40 UTC (rev 1188)
+++ product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/ws/wss/utility/AttributedURI.java 2011-08-11 22:40:00 UTC (rev 1189)
@@ -36,7 +36,7 @@
* <complexType name="AttributedURI">
* <simpleContent>
* <extension base="<http://www.w3.org/2001/XMLSchema>anyURI">
- * <attGroup ref="{http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd}commonAtts"/>
+ * <attGroup ref="{http://docs.oasis-open.org/wss/2004/01/oasis-2.0.1-SNAPSHOT1-wss-wssecurity-utility-1.0.xsd}commonAtts"/>
* </extension>
* </simpleContent>
* </complexType>
Modified: product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/ws/wss/utility/TimestampType.java
===================================================================
--- product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/ws/wss/utility/TimestampType.java 2011-08-11 22:38:40 UTC (rev 1188)
+++ product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/ws/wss/utility/TimestampType.java 2011-08-11 22:40:00 UTC (rev 1189)
@@ -37,13 +37,13 @@
* <complexContent>
* <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
* <sequence>
- * <element ref="{http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd}Created" minOccurs="0"/>
- * <element ref="{http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd}Expires" minOccurs="0"/>
+ * <element ref="{http://docs.oasis-open.org/wss/2004/01/oasis-2.0.1-SNAPSHOT1-wss-wssecurity-utility-1.0.xsd}Created" minOccurs="0"/>
+ * <element ref="{http://docs.oasis-open.org/wss/2004/01/oasis-2.0.1-SNAPSHOT1-wss-wssecurity-utility-1.0.xsd}Expires" minOccurs="0"/>
* <choice maxOccurs="unbounded" minOccurs="0">
* <any/>
* </choice>
* </sequence>
- * <attGroup ref="{http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd}commonAtts"/>
+ * <attGroup ref="{http://docs.oasis-open.org/wss/2004/01/oasis-2.0.1-SNAPSHOT1-wss-wssecurity-utility-1.0.xsd}commonAtts"/>
* </restriction>
* </complexContent>
* </complexType>
Modified: product/trunk/picketlink-core/src/main/java/org/picketlink/trust/jbossws/Constants.java
===================================================================
--- product/trunk/picketlink-core/src/main/java/org/picketlink/trust/jbossws/Constants.java 2011-08-11 22:38:40 UTC (rev 1188)
+++ product/trunk/picketlink-core/src/main/java/org/picketlink/trust/jbossws/Constants.java 2011-08-11 22:40:00 UTC (rev 1189)
@@ -31,20 +31,20 @@
*/
public class Constants
{
- public static final String WSS_SOAP_NS = "http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-soap-message-secu...";
+ public static final String WSS_SOAP_NS = "http://docs.oasis-open.org/wss/2004/01/oasis-2.0.1-SNAPSHOT1-wss-soap-mes...";
public static final String WSSE_LOCAL = "Security";
public static final String WSSE_PREFIX = "wsse";
- public static final String WSSE_NS = "http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext...";
+ public static final String WSSE_NS = "http://docs.oasis-open.org/wss/2004/01/oasis-2.0.1-SNAPSHOT1-wss-wssecuri...";
public static final String WSSE_BINARY_SECURITY_TOKEN = "BinarySecurityToken";
public static final String WSSE_USERNAME_TOKEN = "UsernameToken";
public static final String WSSE_USERNAME = "Username";
public static final String WSSE_PASSWORD = "Password";
- public static final String WSSE_PASSWORD_TEXT_NS = "http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext...";
+ public static final String WSSE_PASSWORD_TEXT_NS = "http://docs.oasis-open.org/wss/2004/01/oasis-2.0.1-SNAPSHOT1-wss-wssecuri...";
public static final String WSSE_ENCODING_TYPE = "EncodingType";
@@ -52,7 +52,7 @@
public static final String WSU_PREFIX = "wsu";
- public static final String WSU_NS = "http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit...";
+ public static final String WSU_NS = "http://docs.oasis-open.org/wss/2004/01/oasis-2.0.1-SNAPSHOT1-wss-wssecuri...";
public static final String XML_SIGNATURE_NS = org.apache.xml.security.utils.Constants.SignatureSpecNS;
@@ -66,9 +66,9 @@
public static final String BASE64_ENCODING_TYPE = WSS_SOAP_NS + "#Base64Binary";
- public static final String PASSWORD_TEXT_TYPE = "http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-username-token-pr...";
+ public static final String PASSWORD_TEXT_TYPE = "http://docs.oasis-open.org/wss/2004/01/oasis-2.0.1-SNAPSHOT1-wss-username...";
- public static final String PASSWORD_DIGEST_TYPE = "http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-username-token-pr...";
+ public static final String PASSWORD_DIGEST_TYPE = "http://docs.oasis-open.org/wss/2004/01/oasis-2.0.1-SNAPSHOT1-wss-username...";
public static final String WSSE_HEADER = WSSE_PREFIX + ":Security";
Modified: product/trunk/picketlink-core/src/main/java/org/picketlink/trust/jbossws/handler/BinaryTokenHandler.java
===================================================================
--- product/trunk/picketlink-core/src/main/java/org/picketlink/trust/jbossws/handler/BinaryTokenHandler.java 2011-08-11 22:38:40 UTC (rev 1188)
+++ product/trunk/picketlink-core/src/main/java/org/picketlink/trust/jbossws/handler/BinaryTokenHandler.java 2011-08-11 22:40:00 UTC (rev 1189)
@@ -93,7 +93,7 @@
* Attribute value for the EncodingType attribute
*/
private String encodingType = SecurityActions.getSystemProperty("binary.http.encodingType",
- "http://docs.oasis-open.org/wss/2004/01/ oasis-200401-wss-soap-message-security-1.0#Base64Binary");
+ "http://docs.oasis-open.org/wss/2004/01/ oasis-2.0.1-SNAPSHOT1-wss-soap-message-security-1.0#Base64Binary");
/**
* Attribute value for the ValueType attribute
Modified: product/trunk/picketlink-core/src/test/java/org/picketlink/test/identity/federation/api/util/KeyUtilUnitTestCase.java
===================================================================
--- product/trunk/picketlink-core/src/test/java/org/picketlink/test/identity/federation/api/util/KeyUtilUnitTestCase.java 2011-08-11 22:38:40 UTC (rev 1188)
+++ product/trunk/picketlink-core/src/test/java/org/picketlink/test/identity/federation/api/util/KeyUtilUnitTestCase.java 2011-08-11 22:40:00 UTC (rev 1189)
@@ -47,7 +47,7 @@
-keypass test123
-keystore jbid_test_keystore.jks
-storepass store123
- -validity 200000
+ -validity 2.0.1-SNAPSHOT0
*/
private String keystoreLocation = "keystore/jbid_test_keystore.jks";
private String keystorePass = "store123";
Modified: product/trunk/picketlink-core/src/test/java/org/picketlink/test/identity/federation/bindings/config/MetadataConfigUnitTestCase.java
===================================================================
--- product/trunk/picketlink-core/src/test/java/org/picketlink/test/identity/federation/bindings/config/MetadataConfigUnitTestCase.java 2011-08-11 22:38:40 UTC (rev 1188)
+++ product/trunk/picketlink-core/src/test/java/org/picketlink/test/identity/federation/bindings/config/MetadataConfigUnitTestCase.java 2011-08-11 22:40:00 UTC (rev 1189)
@@ -47,7 +47,7 @@
Object object = this.unmarshall(config + "1.xml");
assertNotNull("IDP is not null", object);
IDPType idp = (IDPType) object;
- assertEquals("20000", 20000L, idp.getAssertionValidity());
+ assertEquals("2.0.1-SNAPSHOT", 2.0.1-SNAPSHOTL, idp.getAssertionValidity());
assertEquals("somefqn", idp.getRoleGenerator());
TrustType trust = idp.getTrust();
Modified: product/trunk/picketlink-core/src/test/java/org/picketlink/test/identity/federation/core/config/ConfigUnitTestCase.java
===================================================================
--- product/trunk/picketlink-core/src/test/java/org/picketlink/test/identity/federation/core/config/ConfigUnitTestCase.java 2011-08-11 22:38:40 UTC (rev 1188)
+++ product/trunk/picketlink-core/src/test/java/org/picketlink/test/identity/federation/core/config/ConfigUnitTestCase.java 2011-08-11 22:40:00 UTC (rev 1189)
@@ -83,7 +83,7 @@
assertNotNull("IDP is not null", object);
IDPType idp = (IDPType) object;
- assertEquals("20000", 20000L, idp.getAssertionValidity());
+ assertEquals("2.0.1-SNAPSHOT", 2.0.1-SNAPSHOTL, idp.getAssertionValidity());
assertEquals("somefqn", idp.getRoleGenerator());
assertTrue(idp.isEncrypt());
assertEquals( CanonicalizationMethod.EXCLUSIVE , idp.getCanonicalizationMethod() );
Modified: product/trunk/picketlink-core/src/test/java/org/picketlink/test/identity/federation/core/util/KeystoreUtilUnitTestCase.java
===================================================================
--- product/trunk/picketlink-core/src/test/java/org/picketlink/test/identity/federation/core/util/KeystoreUtilUnitTestCase.java 2011-08-11 22:38:40 UTC (rev 1188)
+++ product/trunk/picketlink-core/src/test/java/org/picketlink/test/identity/federation/core/util/KeystoreUtilUnitTestCase.java 2011-08-11 22:40:00 UTC (rev 1189)
@@ -50,7 +50,7 @@
-keypass test123
-keystore jbid_test_keystore.jks
-storepass store123
- -validity 200000
+ -validity 2.0.1-SNAPSHOT0
*/
private String keystoreLocation = "keystore/jbid_test_keystore.jks";
private String keystorePass = "store123";
Modified: product/trunk/picketlink-core/src/test/resources/config/test-config-2.xml
===================================================================
--- product/trunk/picketlink-core/src/test/resources/config/test-config-2.xml 2011-08-11 22:38:40 UTC (rev 1188)
+++ product/trunk/picketlink-core/src/test/resources/config/test-config-2.xml 2011-08-11 22:40:00 UTC (rev 1189)
@@ -1,5 +1,5 @@
<PicketLinkIDP xmlns="urn:picketlink:identity-federation:config:1.0"
- AssertionValidity="20000"
+ AssertionValidity="2.0.1-SNAPSHOT"
RoleGenerator="somefqn"
Encrypt="true"
CanonicalizationMethod="http://www.w3.org/2001/10/xml-exc-c14n#">
Modified: product/trunk/picketlink-core/src/test/resources/config/test-metadata-config-1.xml
===================================================================
--- product/trunk/picketlink-core/src/test/resources/config/test-metadata-config-1.xml 2011-08-11 22:38:40 UTC (rev 1188)
+++ product/trunk/picketlink-core/src/test/resources/config/test-metadata-config-1.xml 2011-08-11 22:40:00 UTC (rev 1189)
@@ -1,5 +1,5 @@
<PicketLinkIDP xmlns="urn:picketlink:identity-federation:config:1.0"
- AssertionValidity="20000"
+ AssertionValidity="2.0.1-SNAPSHOT"
RoleGenerator="somefqn"
Encrypt="true">
<IdentityURL>http://localhost:8080/idp</IdentityURL>
Modified: product/trunk/picketlink-core/src/test/resources/jbossws/xml/wsse-saml.xml
===================================================================
--- product/trunk/picketlink-core/src/test/resources/jbossws/xml/wsse-saml.xml 2011-08-11 22:38:40 UTC (rev 1188)
+++ product/trunk/picketlink-core/src/test/resources/jbossws/xml/wsse-saml.xml 2011-08-11 22:40:00 UTC (rev 1189)
@@ -2,7 +2,7 @@
" +
<env:Header>
<wsse:Security
- xmlns:wsse='http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext...'>
+ xmlns:wsse='http://docs.oasis-open.org/wss/2004/01/oasis-2.0.1-SNAPSHOT1-wss-wssecuri...'>
<saml:Assertion xmlns:saml='urn:oasis:names:tc:SAML:2.0:assertion'
xmlns='urn:oasis:names:tc:SAML:2.0:assertion' ID='ID_7069926b-792e-4f90-8727-0e16ec9c3073'
IssueInstant='2011-07-13T00:16:13.990Z' Version='2.0'>
Modified: product/trunk/picketlink-core/src/test/resources/parser/saml2/saml2-authnrequest.xml
===================================================================
--- product/trunk/picketlink-core/src/test/resources/parser/saml2/saml2-authnrequest.xml 2011-08-11 22:38:40 UTC (rev 1188)
+++ product/trunk/picketlink-core/src/test/resources/parser/saml2/saml2-authnrequest.xml 2011-08-11 22:40:00 UTC (rev 1189)
@@ -17,7 +17,7 @@
<Signature xmlns="http://www.w3.org/2000/09/xmldsig#">
<SignedInfo>
<CanonicalizationMethod
- Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithComments" />
+ Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-2.0.1-SNAPSHOT315#WithComments" />
<SignatureMethod
Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1" />
<Reference URI="#ccocfkmlnocbajegpiheahonbcambbapiibggije">
Modified: product/trunk/picketlink-core/src/test/resources/parser/wst/wst-issue-onbehalfof.xml
===================================================================
--- product/trunk/picketlink-core/src/test/resources/parser/wst/wst-issue-onbehalfof.xml 2011-08-11 22:38:40 UTC (rev 1188)
+++ product/trunk/picketlink-core/src/test/resources/parser/wst/wst-issue-onbehalfof.xml 2011-08-11 22:40:00 UTC (rev 1189)
@@ -2,8 +2,8 @@
<wst:RequestType>http://docs.oasis-open.org/ws-sx/ws-trust/200512/Issue</wst:RequestType>
<wst:TokenType>http://docs.oasis-open.org/wss/oasis-wss-saml-token-profile-1.1#SAMLV2.0</wst:TokenType>
<wst:OnBehalfOf>
- <wsse:UsernameToken wsu:Id="id" xmlns:wsse="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext..."
- xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit...">
+ <wsse:UsernameToken wsu:Id="id" xmlns:wsse="http://docs.oasis-open.org/wss/2004/01/oasis-2.0.1-SNAPSHOT1-wss-wssecuri..."
+ xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-2.0.1-SNAPSHOT1-wss-wssecuri...">
<wsse:Username>anotherduke</wsse:Username>
</wsse:UsernameToken>
</wst:OnBehalfOf>
Modified: product/trunk/picketlink-core/src/test/resources/parser/wst/wst-response-assertion-hok-certificate.xml
===================================================================
--- product/trunk/picketlink-core/src/test/resources/parser/wst/wst-response-assertion-hok-certificate.xml 2011-08-11 22:38:40 UTC (rev 1188)
+++ product/trunk/picketlink-core/src/test/resources/parser/wst/wst-response-assertion-hok-certificate.xml 2011-08-11 22:40:00 UTC (rev 1189)
@@ -1,4 +1,4 @@
-<wst:RequestSecurityTokenResponseCollection xmlns:wst="http://docs.oasis-open.org/ws-sx/ws-trust/200512" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit...">
+<wst:RequestSecurityTokenResponseCollection xmlns:wst="http://docs.oasis-open.org/ws-sx/ws-trust/200512" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-2.0.1-SNAPSHOT1-wss-wssecuri...">
<wst:RequestSecurityTokenResponse Context="testcontext">
<wst:TokenType>http://docs.oasis-open.org/wss/oasis-wss-saml-token-profile-1.1#SAMLV2.0</wst:TokenType>
<wst:Lifetime>
@@ -68,7 +68,7 @@
</saml2:Assertion>
</wst:RequestedSecurityToken>
<wst:RequestedAttachedReference>
- <wsse:SecurityTokenReference xmlns:wsse11="http://docs.oasis-open.org/wss/oasis-wss-wssecurity-secext-1.1.xsd" wsse11:TokenType="http://docs.oasis-open.org/wss/oasis-wss-saml-token-profile-1.1#SAMLV2.0" xmlns:wsse="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext...">
+ <wsse:SecurityTokenReference xmlns:wsse11="http://docs.oasis-open.org/wss/oasis-wss-wssecurity-secext-1.1.xsd" wsse11:TokenType="http://docs.oasis-open.org/wss/oasis-wss-saml-token-profile-1.1#SAMLV2.0" xmlns:wsse="http://docs.oasis-open.org/wss/2004/01/oasis-2.0.1-SNAPSHOT1-wss-wssecuri...">
<wsse:KeyIdentifier ValueType="http://docs.oasis-open.org/wss/oasis-wss-saml-token-profile-1.1#SAMLID">
#ID_5a15fc70-daa1-4808-b70e-9cbf6b8e4d4f
</wsse:KeyIdentifier>
Modified: product/trunk/picketlink-core/src/test/resources/parser/wst/wst-response-assertion-hok-combined.xml
===================================================================
--- product/trunk/picketlink-core/src/test/resources/parser/wst/wst-response-assertion-hok-combined.xml 2011-08-11 22:38:40 UTC (rev 1188)
+++ product/trunk/picketlink-core/src/test/resources/parser/wst/wst-response-assertion-hok-combined.xml 2011-08-11 22:40:00 UTC (rev 1189)
@@ -1,4 +1,4 @@
-<wst:RequestSecurityTokenResponseCollection xmlns:wst="http://docs.oasis-open.org/ws-sx/ws-trust/200512" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit...">
+<wst:RequestSecurityTokenResponseCollection xmlns:wst="http://docs.oasis-open.org/ws-sx/ws-trust/200512" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-2.0.1-SNAPSHOT1-wss-wssecuri...">
<wst:RequestSecurityTokenResponse Context="testcontext">
<wst:TokenType>http://docs.oasis-open.org/wss/oasis-wss-saml-token-profile-1.1#SAMLV2.0</wst:TokenType>
<wst:Lifetime>
@@ -76,7 +76,7 @@
<wst:BinarySecret Type="http://docs.oasis-open.org/ws-sx/ws-trust/200512/Nonce">dSRCR4Abu6c=</wst:BinarySecret>
</wst:Entropy>
<wst:RequestedAttachedReference>
- <wsse:SecurityTokenReference xmlns:wsse11="http://docs.oasis-open.org/wss/oasis-wss-wssecurity-secext-1.1.xsd" wsse11:TokenType="http://docs.oasis-open.org/wss/oasis-wss-saml-token-profile-1.1#SAMLV2.0" xmlns:wsse="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext...">
+ <wsse:SecurityTokenReference xmlns:wsse11="http://docs.oasis-open.org/wss/oasis-wss-wssecurity-secext-1.1.xsd" wsse11:TokenType="http://docs.oasis-open.org/wss/oasis-wss-saml-token-profile-1.1#SAMLV2.0" xmlns:wsse="http://docs.oasis-open.org/wss/2004/01/oasis-2.0.1-SNAPSHOT1-wss-wssecuri...">
<wsse:KeyIdentifier ValueType="http://docs.oasis-open.org/wss/oasis-wss-saml-token-profile-1.1#SAMLID">
#ID_17a5f8b6-0c74-4df8-993d-ff51f00c57c7
</wsse:KeyIdentifier>
Modified: product/trunk/picketlink-core/src/test/resources/parser/wst/wst-response-assertion-hok-pubkey.xml
===================================================================
--- product/trunk/picketlink-core/src/test/resources/parser/wst/wst-response-assertion-hok-pubkey.xml 2011-08-11 22:38:40 UTC (rev 1188)
+++ product/trunk/picketlink-core/src/test/resources/parser/wst/wst-response-assertion-hok-pubkey.xml 2011-08-11 22:40:00 UTC (rev 1189)
@@ -1,4 +1,4 @@
-<wst:RequestSecurityTokenResponseCollection xmlns:wst="http://docs.oasis-open.org/ws-sx/ws-trust/200512" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit...">
+<wst:RequestSecurityTokenResponseCollection xmlns:wst="http://docs.oasis-open.org/ws-sx/ws-trust/200512" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-2.0.1-SNAPSHOT1-wss-wssecuri...">
<wst:RequestSecurityTokenResponse Context="testcontext">
<wst:TokenType>http://docs.oasis-open.org/wss/oasis-wss-saml-token-profile-1.1#SAMLV2.0</wst:TokenType>
<wst:Lifetime>
@@ -71,7 +71,7 @@
</saml2:Assertion>
</wst:RequestedSecurityToken>
<wst:RequestedAttachedReference>
- <wsse:SecurityTokenReference xmlns:wsse11="http://docs.oasis-open.org/wss/oasis-wss-wssecurity-secext-1.1.xsd" wsse11:TokenType="http://docs.oasis-open.org/wss/oasis-wss-saml-token-profile-1.1#SAMLV2.0" xmlns:wsse="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext...">
+ <wsse:SecurityTokenReference xmlns:wsse11="http://docs.oasis-open.org/wss/oasis-wss-wssecurity-secext-1.1.xsd" wsse11:TokenType="http://docs.oasis-open.org/wss/oasis-wss-saml-token-profile-1.1#SAMLV2.0" xmlns:wsse="http://docs.oasis-open.org/wss/2004/01/oasis-2.0.1-SNAPSHOT1-wss-wssecuri...">
<wsse:KeyIdentifier ValueType="http://docs.oasis-open.org/wss/oasis-wss-saml-token-profile-1.1#SAMLID">
#ID_22727062-ce90-44d3-a870-823ec0d69809
</wsse:KeyIdentifier>
Modified: product/trunk/picketlink-core/src/test/resources/parser/wst/wst-response-assertion-hok-simmetric.xml
===================================================================
--- product/trunk/picketlink-core/src/test/resources/parser/wst/wst-response-assertion-hok-simmetric.xml 2011-08-11 22:38:40 UTC (rev 1188)
+++ product/trunk/picketlink-core/src/test/resources/parser/wst/wst-response-assertion-hok-simmetric.xml 2011-08-11 22:40:00 UTC (rev 1189)
@@ -1,4 +1,4 @@
-<wst:RequestSecurityTokenResponseCollection xmlns:wst="http://docs.oasis-open.org/ws-sx/ws-trust/200512" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit...">
+<wst:RequestSecurityTokenResponseCollection xmlns:wst="http://docs.oasis-open.org/ws-sx/ws-trust/200512" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-2.0.1-SNAPSHOT1-wss-wssecuri...">
<wst:RequestSecurityTokenResponse Context="testcontext">
<wst:TokenType>http://docs.oasis-open.org/wss/oasis-wss-saml-token-profile-1.1#SAMLV2.0</wst:TokenType>
<wst:Lifetime>
@@ -76,7 +76,7 @@
<wst:BinarySecret Type="http://docs.oasis-open.org/ws-sx/ws-trust/200512/Nonce">vEkFafTxSjucwlle7aObtg==</wst:BinarySecret>
</wst:Entropy>
<wst:RequestedAttachedReference>
- <wsse:SecurityTokenReference xmlns:wsse11="http://docs.oasis-open.org/wss/oasis-wss-wssecurity-secext-1.1.xsd" wsse11:TokenType="http://docs.oasis-open.org/wss/oasis-wss-saml-token-profile-1.1#SAMLV2.0" xmlns:wsse="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext...">
+ <wsse:SecurityTokenReference xmlns:wsse11="http://docs.oasis-open.org/wss/oasis-wss-wssecurity-secext-1.1.xsd" wsse11:TokenType="http://docs.oasis-open.org/wss/oasis-wss-saml-token-profile-1.1#SAMLV2.0" xmlns:wsse="http://docs.oasis-open.org/wss/2004/01/oasis-2.0.1-SNAPSHOT1-wss-wssecuri...">
<wsse:KeyIdentifier ValueType="http://docs.oasis-open.org/wss/oasis-wss-saml-token-profile-1.1#SAMLID">
#ID_5cc7fe71-7d76-4615-93d7-6ecfb1e63aae
</wsse:KeyIdentifier>
Modified: product/trunk/picketlink-core/src/test/resources/parser/wst/wst-response-assertion.xml
===================================================================
--- product/trunk/picketlink-core/src/test/resources/parser/wst/wst-response-assertion.xml 2011-08-11 22:38:40 UTC (rev 1188)
+++ product/trunk/picketlink-core/src/test/resources/parser/wst/wst-response-assertion.xml 2011-08-11 22:40:00 UTC (rev 1189)
@@ -1,4 +1,4 @@
-<wst:RequestSecurityTokenResponseCollection xmlns:wst="http://docs.oasis-open.org/ws-sx/ws-trust/200512" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit...">
+<wst:RequestSecurityTokenResponseCollection xmlns:wst="http://docs.oasis-open.org/ws-sx/ws-trust/200512" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-2.0.1-SNAPSHOT1-wss-wssecuri...">
<wst:RequestSecurityTokenResponse Context="testcontext">
<wst:TokenType>http://docs.oasis-open.org/wss/oasis-wss-saml-token-profile-1.1#SAMLV2.0</wst:TokenType>
<wst:Lifetime>
Modified: product/trunk/picketlink-core/src/test/resources/saml/v2/authnrequest/samlAuthnRequestExample.xml
===================================================================
(Binary files differ)
Modified: product/trunk/picketlink-core/src/test/resources/saml/v2/authnrequest/samlAuthnRequestWithSignature.xml
===================================================================
--- product/trunk/picketlink-core/src/test/resources/saml/v2/authnrequest/samlAuthnRequestWithSignature.xml 2011-08-11 22:38:40 UTC (rev 1188)
+++ product/trunk/picketlink-core/src/test/resources/saml/v2/authnrequest/samlAuthnRequestWithSignature.xml 2011-08-11 22:40:00 UTC (rev 1189)
@@ -15,7 +15,7 @@
<Signature xmlns="http://www.w3.org/2000/09/xmldsig#">
<SignedInfo>
<CanonicalizationMethod
- Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithComments" />
+ Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-2.0.1-SNAPSHOT315#WithComments" />
<SignatureMethod
Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1" />
<Reference URI="#ccocfkmlnocbajegpiheahonbcambbapiibggije">
Modified: product/trunk/picketlink-core/src/test/resources/saml2/metadata/sp-entitydescriptor.xml
===================================================================
--- product/trunk/picketlink-core/src/test/resources/saml2/metadata/sp-entitydescriptor.xml 2011-08-11 22:38:40 UTC (rev 1188)
+++ product/trunk/picketlink-core/src/test/resources/saml2/metadata/sp-entitydescriptor.xml 2011-08-11 22:40:00 UTC (rev 1189)
@@ -50,7 +50,7 @@
<md:ServiceName xml:lang="en">Sample Service</md:ServiceName>
<md:ServiceDescription xml:lang="en">An example service that requires a human-readable identifier and optional name and e-mail address.</md:ServiceDescription>
<md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
- <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+ <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
<md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
</md:AttributeConsumingService>
Modified: product/trunk/picketlink-core/src/test/resources/saml2/metadata/testshib-two-metadata.xml
===================================================================
--- product/trunk/picketlink-core/src/test/resources/saml2/metadata/testshib-two-metadata.xml 2011-08-11 22:38:40 UTC (rev 1188)
+++ product/trunk/picketlink-core/src/test/resources/saml2/metadata/testshib-two-metadata.xml 2011-08-11 22:40:00 UTC (rev 1189)
@@ -53714,7 +53714,7 @@
BgEFBQcDATAdBgNVHQ4EFgQUboCxFapQWR+9Kpjxit7D6Oaz9igwgcYGA1UdIwSBvjCBu4AUGgIJ
hfBzUtNt18QAT2T448a5OBihgZukgZgwgZUxCzAJBgNVBAYTAkdSMUQwQgYDVQQKEztIZWxsZW5p
YyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25zIENlcnQuIEF1dGhvcml0eTFAMD4G
-A1UEAxM3SGVsbGVuaWMgQWNhZGVtaWMgYW5kIFJlc2VhcmNoIEluc3RpdHV0aW9ucyBSb290Q0Eg
+A1UEAxM3SGVsbGVuaWMgQWNhZGVtaWMgYW5kIFJlc2VhcmNoIEluc3RpdHV0aW9ucyBSb2.0.1-SNAPSHOTEg
MjAwNoIFAQAAAA4wFwYDVR0RBBAwDoEMYWRtaW5AZWt0LmdyMBcGA1UdEgQQMA6BDGNhQGhhcmlj
YS5ncjAyBggrBgEFBQcBAQQmMCQwIgYIKwYBBQUHMAGGFmh0dHA6Ly9vY3NwLmhhcmljYS5nci8w
RQYDVR0fBD4wPDA6oDigNoY0aHR0cDovL2NybHYxLmhhcmljYS5nci9IYXJpY2FFS1RDQTIwMDgv
@@ -53772,7 +53772,7 @@
BgEFBQcDATAdBgNVHQ4EFgQUboCxFapQWR+9Kpjxit7D6Oaz9igwgcYGA1UdIwSBvjCBu4AUGgIJ
hfBzUtNt18QAT2T448a5OBihgZukgZgwgZUxCzAJBgNVBAYTAkdSMUQwQgYDVQQKEztIZWxsZW5p
YyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25zIENlcnQuIEF1dGhvcml0eTFAMD4G
-A1UEAxM3SGVsbGVuaWMgQWNhZGVtaWMgYW5kIFJlc2VhcmNoIEluc3RpdHV0aW9ucyBSb290Q0Eg
+A1UEAxM3SGVsbGVuaWMgQWNhZGVtaWMgYW5kIFJlc2VhcmNoIEluc3RpdHV0aW9ucyBSb2.0.1-SNAPSHOTEg
MjAwNoIFAQAAAA4wFwYDVR0RBBAwDoEMYWRtaW5AZWt0LmdyMBcGA1UdEgQQMA6BDGNhQGhhcmlj
YS5ncjAyBggrBgEFBQcBAQQmMCQwIgYIKwYBBQUHMAGGFmh0dHA6Ly9vY3NwLmhhcmljYS5nci8w
RQYDVR0fBD4wPDA6oDigNoY0aHR0cDovL2NybHYxLmhhcmljYS5nci9IYXJpY2FFS1RDQTIwMDgv
@@ -70554,7 +70554,7 @@
MRkwFwYDVQQDExBpZHAuYmFybmV0LmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
AQEA15UdvpIRLL49uj68oeUDwuyf7fjkXW8IrdkXaEtThHYzX9+Z+1JDIeDsSY2GwlXCBWtsCl8r
kXkgzqf1ZXxp1QrSi2VYllI/X4NfhIBJ0PhxPQl0dIhD4OJ8oFpciutGrKbEkdPe82Vnmpro6qDi
-F++FXFfPpUyaJy18e4C2n0u0YtaVPGycljzTVYbUMCGuFjHeYhc8qUZKofEyGmWIrvHZbG0LVrTQ
+F++FXFfPpUyaJy18e4C2.0.1-SNAPSHOTYtaVPGycljzTVYbUMCGuFjHeYhc8qUZKofEyGmWIrvHZbG0LVrTQ
0aggjskhzDV5hEyNLSoyeUj+a/bESgBhznBdYXYahS1WPaztrjKv9xd7+YhFPS4oxn/VgaGzNNoz
D373L1JHPxgTQ2lbnW977mAHEma1NIF4SbLWb0OLLQIDAQABo2cwZTBEBgNVHREEPTA7ghBpZHAu
YmFybmV0LmFjLnVrhidodHRwczovL2lkcC5iYXJuZXQuYWMudWsvaWRwL3NoaWJib2xldGgwHQYD
@@ -70597,7 +70597,7 @@
MRkwFwYDVQQDExBpZHAuYmFybmV0LmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
AQEA15UdvpIRLL49uj68oeUDwuyf7fjkXW8IrdkXaEtThHYzX9+Z+1JDIeDsSY2GwlXCBWtsCl8r
kXkgzqf1ZXxp1QrSi2VYllI/X4NfhIBJ0PhxPQl0dIhD4OJ8oFpciutGrKbEkdPe82Vnmpro6qDi
-F++FXFfPpUyaJy18e4C2n0u0YtaVPGycljzTVYbUMCGuFjHeYhc8qUZKofEyGmWIrvHZbG0LVrTQ
+F++FXFfPpUyaJy18e4C2.0.1-SNAPSHOTYtaVPGycljzTVYbUMCGuFjHeYhc8qUZKofEyGmWIrvHZbG0LVrTQ
0aggjskhzDV5hEyNLSoyeUj+a/bESgBhznBdYXYahS1WPaztrjKv9xd7+YhFPS4oxn/VgaGzNNoz
D373L1JHPxgTQ2lbnW977mAHEma1NIF4SbLWb0OLLQIDAQABo2cwZTBEBgNVHREEPTA7ghBpZHAu
YmFybmV0LmFjLnVrhidodHRwczovL2lkcC5iYXJuZXQuYWMudWsvaWRwL3NoaWJib2xldGgwHQYD
@@ -75214,7 +75214,7 @@
mflY4DVSQuOTr1zc97giEI7gic2k+EiqKKEXVMcIZpgD6Sxr0Hc/mhb9sZPE8OAR7/E6FFGW4TyP
iaPUe4disgyavlrDSsDx+zUg+Kb4dshYk0YB0B7rnAXqe4NZKEq/eWXtVhNRRQvvqZ+1B584a/MG
qg5/dZLlvCJ49AgU26r53ESfe4cXB2bzrC8MalO6o30ZMG3sPJs2taBMShbKU8WnvIHEZ90jnUcI
-r0IrkC2zT2AAqkwqbk9KvO42f0f01Mhxqq0SZjHjYvYFmN8ctwIDAQABo20wazBKBgNVHREEQzBB
+r0IrkC2zT2AAqkwqbk9KvO42.0.1-SNAPSHOT1Mhxqq0SZjHjYvYFmN8ctwIDAQABo20wazBKBgNVHREEQzBB
ghNub2RlMy5mdWxsZXJ0b24uZWR1hipodHRwczovL25vZGUzLmZ1bGxlcnRvbi5lZHUvaWRwL3No
aWJib2xldGgwHQYDVR0OBBYEFKU11sg+lw4YIBAp2VltcZrbxCSsMA0GCSqGSIb3DQEBBQUAA4IB
AQAWMfxPSNaEfYnYjbkQV3YOU9Lpp3wrHoe6p66rUWQrZlN1EAPqQ6q/0OawSB3+TscXvi18rp0W
@@ -75257,7 +75257,7 @@
mflY4DVSQuOTr1zc97giEI7gic2k+EiqKKEXVMcIZpgD6Sxr0Hc/mhb9sZPE8OAR7/E6FFGW4TyP
iaPUe4disgyavlrDSsDx+zUg+Kb4dshYk0YB0B7rnAXqe4NZKEq/eWXtVhNRRQvvqZ+1B584a/MG
qg5/dZLlvCJ49AgU26r53ESfe4cXB2bzrC8MalO6o30ZMG3sPJs2taBMShbKU8WnvIHEZ90jnUcI
-r0IrkC2zT2AAqkwqbk9KvO42f0f01Mhxqq0SZjHjYvYFmN8ctwIDAQABo20wazBKBgNVHREEQzBB
+r0IrkC2zT2AAqkwqbk9KvO42.0.1-SNAPSHOT1Mhxqq0SZjHjYvYFmN8ctwIDAQABo20wazBKBgNVHREEQzBB
ghNub2RlMy5mdWxsZXJ0b24uZWR1hipodHRwczovL25vZGUzLmZ1bGxlcnRvbi5lZHUvaWRwL3No
aWJib2xldGgwHQYDVR0OBBYEFKU11sg+lw4YIBAp2VltcZrbxCSsMA0GCSqGSIb3DQEBBQUAA4IB
AQAWMfxPSNaEfYnYjbkQV3YOU9Lpp3wrHoe6p66rUWQrZlN1EAPqQ6q/0OawSB3+TscXvi18rp0W
@@ -82834,7 +82834,7 @@
dGUuZXMubmV0MB4XDTA5MDYwOTIyMzk0NFoXDTE5MDYwNzIyMzk0NFowGTEXMBUGA1UEAxMOY2Fs
Y2l0ZS5lcy5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDCBQC1W5oWupg1MPHJ
oZm9n41mTu9l3bcRG7jL35m16QxvQXYhmXQrf6x0fQFFBTDFyMfGKyaY9pgP0rnHl8qddCnjoLdN
-twSvQQpCUQo26J4UeDFH6Xkm2PSHKQ0TVY5ZtknaC+htkSQ2LRSVCSPtRU6rsVFhF2O0E0Lc1U3m
+twSvQQpCUQo26J4UeDFH6Xkm2PSHKQ0TVY5ZtknaC+htkSQ2LRSVCSPtRU6rsVFhF2.0.1-SNAPSHOTLc1U3m
+yZyeRqROydJgtBhS1sawxKwVXKHH6MNJA10qCZUUbVV5DivKgX8OSNPUPPNqzc6r3MLvZwemQ5b
Uqv7jxQSx70r8GIcSXLWmm85KbYFVXw5HnwGZmzS620HjLjC920WdpBVd4hS1f2ACk0bWDI1F1Or
fTxKbXERQntMM6lBFIQfAgMBAAGjPDA6MBkGA1UdEQQSMBCCDmNhbGNpdGUuZXMubmV0MB0GA1Ud
@@ -95008,10 +95008,10 @@
<md:RequestedAttribute Name="urn:oid:2.5.4.3"
NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:basic" isRequired="true"/>
<md:RequestedAttribute
- Name="urn:oid:0.9.2342.19200300.100.1.1"
+ Name="urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.1"
NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:basic" isRequired="true"/>
<md:RequestedAttribute
- Name="urn:oid:0.9.2342.19200300.100.1.3"
+ Name="urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.3"
NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:basic" isRequired="true"/>
<md:RequestedAttribute
Name="dk:gov:saml:attribute:AssuranceLevel"
@@ -118757,10 +118757,10 @@
<md:RequestedAttribute Name="urn:oid:2.5.4.3"
NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:basic" isRequired="true"/>
<md:RequestedAttribute
- Name="urn:oid:0.9.2342.19200300.100.1.1"
+ Name="urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.1"
NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:basic" isRequired="true"/>
<md:RequestedAttribute
- Name="urn:oid:0.9.2342.19200300.100.1.3"
+ Name="urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.3"
NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:basic" isRequired="true"/>
<md:RequestedAttribute
Name="dk:gov:saml:attribute:AssuranceLevel"
@@ -119495,7 +119495,7 @@
DI1SWNrvvn7KV0YWg8SBq9wUmoibxvDc3MCGBlwBNYzprDxKpQIDAQABo0cwRTAkBgNVHREEHTAb
ghl3bWxpMDE2NjY5Lmdyb3VwaW5mcmEuY29tMB0GA1UdDgQWBBSTn8Vl1m7FcQodPsV48pFarOJi
rjANBgkqhkiG9w0BAQUFAAOCAQEAIyXJOAGmjgZUn81e7znwS14dPAGBQ8DXzcKNiZgDZqsfa+zF
-RYQHVvTxHApBKBLNhB2O0ynsZAl+vy2Ss2E0b0atjfu3VBuIf/31s6WffSPVUAowFzyVjTgjaGgC
+RYQHVvTxHApBKBLNhB2O0ynsZAl+vy2Ss2.0.1-SNAPSHOTatjfu3VBuIf/31s6WffSPVUAowFzyVjTgjaGgC
UxrEvJywXr6u5V00AbF6GbFgma3V6lFdpOytKuka0oy+3w1LeVi0sQgXT/2ncXJ3OTEZAcvYZK3D
k7E7juNXLLY+hGdLOY80sn1FwBXU5SRfnG67dQnTdFOwPd6k7X/AJ4I7XcCaHJ/9Kuz6f1d7sVD+
skNmcwhlijpHKiV+gNiUSYEFoKHWtm75MWOIjMFPo/gil9oePBd3AZgulzSZEmcY6g==
@@ -145297,10 +145297,10 @@
<md:RequestedAttribute Name="urn:oid:2.5.4.3"
NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:basic" isRequired="true"/>
<md:RequestedAttribute
- Name="urn:oid:0.9.2342.19200300.100.1.1"
+ Name="urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.1"
NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:basic" isRequired="true"/>
<md:RequestedAttribute
- Name="urn:oid:0.9.2342.19200300.100.1.3"
+ Name="urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.3"
NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:basic" isRequired="true"/>
<md:RequestedAttribute
Name="dk:gov:saml:attribute:AssuranceLevel"
@@ -151270,7 +151270,7 @@
AQUAA4IBDwAwggEKAoIBAQCXXyo9YN+9JiDyUzpAcXh2zxBxpEu6sj05TAUBTP1Irpm3PcqXwwUJ
0UEmuzMW4Bd/48vyMCcKUqe56J94B3LTquqK3D4y3gK0FblmpS+yJhcLZzWku0tRaVnWZh/NP9US
kQjFkeCGiBL3JeR+RoENHrQpTT/iI8XvWrrekYLYBC4NFVF81JPYc17ZxpMO3vgucIr+VRSAFUOY
-zTqD4IKSvqsNm2u1ueO4/UxNCY/Yj5ulG82W0T03jhbai0LqLETujPEQ2bemZqNUNHxdtgvU5yDA
+zTqD4IKSvqsNm2u1ueO4/UxNCY/Yj5ulG82.0.1-SNAPSHOT3jhbai0LqLETujPEQ2bemZqNUNHxdtgvU5yDA
H0AHv7RzW4Kx2v+qKpTDAvRd5JvERQa4P9DWjYRAzHjz0TK9pdE6nMz0hEXpAgMBAAGjdTBzMFIG
A1UdEQRLMEmCF3NoaWJib2xldGguY29jb25pbm8uZWR1hi5odHRwczovL3NoaWJib2xldGguY29j
b25pbm8uZWR1L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRf5ApSnXQFJpysLJcHKJAtjvCgLzAN
@@ -151313,7 +151313,7 @@
AQUAA4IBDwAwggEKAoIBAQCXXyo9YN+9JiDyUzpAcXh2zxBxpEu6sj05TAUBTP1Irpm3PcqXwwUJ
0UEmuzMW4Bd/48vyMCcKUqe56J94B3LTquqK3D4y3gK0FblmpS+yJhcLZzWku0tRaVnWZh/NP9US
kQjFkeCGiBL3JeR+RoENHrQpTT/iI8XvWrrekYLYBC4NFVF81JPYc17ZxpMO3vgucIr+VRSAFUOY
-zTqD4IKSvqsNm2u1ueO4/UxNCY/Yj5ulG82W0T03jhbai0LqLETujPEQ2bemZqNUNHxdtgvU5yDA
+zTqD4IKSvqsNm2u1ueO4/UxNCY/Yj5ulG82.0.1-SNAPSHOT3jhbai0LqLETujPEQ2bemZqNUNHxdtgvU5yDA
H0AHv7RzW4Kx2v+qKpTDAvRd5JvERQa4P9DWjYRAzHjz0TK9pdE6nMz0hEXpAgMBAAGjdTBzMFIG
A1UdEQRLMEmCF3NoaWJib2xldGguY29jb25pbm8uZWR1hi5odHRwczovL3NoaWJib2xldGguY29j
b25pbm8uZWR1L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRf5ApSnXQFJpysLJcHKJAtjvCgLzAN
@@ -169042,7 +169042,7 @@
</md:ContactPerson>
</md:EntityDescriptor>
<md:EntityDescriptor
- entityID="https://clc2.uniservity.com/SingleSignOn?groupid=20090589/shibboleth-sp" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata">
+ entityID="https://clc2.uniservity.com/SingleSignOn?groupid=2.0.1-SNAPSHOT589/shibbo..." xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata">
<md:SPSSODescriptor
protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata">
<md:KeyDescriptor>
@@ -169072,30 +169072,30 @@
<md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
<md:AssertionConsumerService
Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://clc2.uniservity.com/SingleSignOn?groupid=20090589/Shibboleth.sso/..." index="1"/>
+ Location="https://clc2.uniservity.com/SingleSignOn?groupid=2.0.1-SNAPSHOT589/Shibbo..." index="1"/>
<md:AssertionConsumerService
Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="http://clc2.uniservity.com/SingleSignOn?groupid=20090589/Shibboleth.sso/S..." index="2"/>
+ Location="http://clc2.uniservity.com/SingleSignOn?groupid=2.0.1-SNAPSHOT589/Shibbol..." index="2"/>
<md:AssertionConsumerService
Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://clc2.uniservity.com/SingleSignOn?groupid=20090589/Shibboleth.sso/..." index="3"/>
+ Location="https://clc2.uniservity.com/SingleSignOn?groupid=2.0.1-SNAPSHOT589/Shibbo..." index="3"/>
<md:AssertionConsumerService
Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact"
- Location="https://clc2.uniservity.com/SingleSignOn?groupid=20090589/Shibboleth.sso/..." index="4"/>
+ Location="https://clc2.uniservity.com/SingleSignOn?groupid=2.0.1-SNAPSHOT589/Shibbo..." index="4"/>
<md:AssertionConsumerService
Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01"
- Location="http://clc2.uniservity.com/SingleSignOn?groupid=20090589/Shibboleth.sso/S..." index="5"/>
+ Location="http://clc2.uniservity.com/SingleSignOn?groupid=2.0.1-SNAPSHOT589/Shibbol..." index="5"/>
<md:AssertionConsumerService
Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post"
- Location="https://clc2.uniservity.com/SingleSignOn?groupid=20090589/Shibboleth.sso/..." index="6"/>
+ Location="https://clc2.uniservity.com/SingleSignOn?groupid=2.0.1-SNAPSHOT589/Shibbo..." index="6"/>
<md:AssertionConsumerService
Binding="urn:oasis:names:tc:SAML:1.1:profiles:browser-post"
- Location="http://clc2.uniservity.com/SingleSignOn?groupid=20090589/Shibboleth.sso/S..." index="7"/>
+ Location="http://clc2.uniservity.com/SingleSignOn?groupid=2.0.1-SNAPSHOT589/Shibbol..." index="7"/>
</md:SPSSODescriptor>
<md:Organization xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata">
- <md:OrganizationName xml:lang="en">clc2.uniservity.com/SingleSignOn?groupid=20090589</md:OrganizationName>
+ <md:OrganizationName xml:lang="en">clc2.uniservity.com/SingleSignOn?groupid=2.0.1-SNAPSHOT589</md:OrganizationName>
<md:OrganizationDisplayName xml:lang="en">TestShib SP</md:OrganizationDisplayName>
- <md:OrganizationURL xml:lang="en">http://clc2.uniservity.com/SingleSignOn?groupid=20090589/</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="en">http://clc2.uniservity.com/SingleSignOn?groupid=2.0.1-SNAPSHOT589/</md:OrganizationURL>
</md:Organization>
<md:ContactPerson contactType="technical" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata">
<md:GivenName>Alex</md:GivenName>
@@ -203419,10 +203419,10 @@
<md:RequestedAttribute Name="urn:oid:2.5.4.3"
NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:basic" isRequired="true"/>
<md:RequestedAttribute
- Name="urn:oid:0.9.2342.19200300.100.1.1"
+ Name="urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.1"
NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:basic" isRequired="true"/>
<md:RequestedAttribute
- Name="urn:oid:0.9.2342.19200300.100.1.3"
+ Name="urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.3"
NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:basic" isRequired="true"/>
<md:RequestedAttribute
Name="dk:gov:saml:attribute:AssuranceLevel"
@@ -203931,10 +203931,10 @@
<md:RequestedAttribute Name="urn:oid:2.5.4.3"
NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:basic" isRequired="true"/>
<md:RequestedAttribute
- Name="urn:oid:0.9.2342.19200300.100.1.1"
+ Name="urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.1"
NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:basic" isRequired="true"/>
<md:RequestedAttribute
- Name="urn:oid:0.9.2342.19200300.100.1.3"
+ Name="urn:oid:0.9.2342.192.0.1-SNAPSHOT0.100.1.3"
NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:basic" isRequired="true"/>
<!--
<md:RequestedAttribute Name="dk:gov:saml:attribute:AssuranceLevel" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:basic" isRequired="true"/>
Modified: product/trunk/picketlink-webapps/idp/pom.xml
===================================================================
--- product/trunk/picketlink-webapps/idp/pom.xml 2011-08-11 22:38:40 UTC (rev 1188)
+++ product/trunk/picketlink-webapps/idp/pom.xml 2011-08-11 22:40:00 UTC (rev 1189)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.picketlink.product</groupId>
<artifactId>picketlink-federation-webapps</artifactId>
- <version>2.0.0</version>
+ <version>2.0.1-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
Modified: product/trunk/picketlink-webapps/pdp/pom.xml
===================================================================
--- product/trunk/picketlink-webapps/pdp/pom.xml 2011-08-11 22:38:40 UTC (rev 1188)
+++ product/trunk/picketlink-webapps/pdp/pom.xml 2011-08-11 22:40:00 UTC (rev 1189)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.picketlink.product</groupId>
<artifactId>picketlink-federation-webapps</artifactId>
- <version>2.0.0</version>
+ <version>2.0.1-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
Modified: product/trunk/picketlink-webapps/picketlink-sts/pom.xml
===================================================================
--- product/trunk/picketlink-webapps/picketlink-sts/pom.xml 2011-08-11 22:38:40 UTC (rev 1188)
+++ product/trunk/picketlink-webapps/picketlink-sts/pom.xml 2011-08-11 22:40:00 UTC (rev 1189)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.picketlink.product</groupId>
<artifactId>picketlink-federation-webapps</artifactId>
- <version>2.0.0</version>
+ <version>2.0.1-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
Modified: product/trunk/picketlink-webapps/pom.xml
===================================================================
--- product/trunk/picketlink-webapps/pom.xml 2011-08-11 22:38:40 UTC (rev 1188)
+++ product/trunk/picketlink-webapps/pom.xml 2011-08-11 22:40:00 UTC (rev 1189)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.picketlink.product</groupId>
<artifactId>picketlink-fed-parent</artifactId>
- <version>2.0.0</version>
+ <version>2.0.1-SNAPSHOT</version>
<relativePath>../parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: product/trunk/pom.xml
===================================================================
--- product/trunk/pom.xml 2011-08-11 22:38:40 UTC (rev 1188)
+++ product/trunk/pom.xml 2011-08-11 22:40:00 UTC (rev 1189)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.picketlink.product</groupId>
<artifactId>picketlink-fed-parent</artifactId>
- <version>2.0.0</version>
+ <version>2.0.1-SNAPSHOT</version>
<relativePath>parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
13 years, 4 months
- 1
- 0
Picketlink SVN: r1188 - product/tags.
by picketlink-commits＠lists.jboss.org
Author: anil.saldhana(a)jboss.com
Date: 2011-08-11 18:38:40 -0400 (Thu, 11 Aug 2011)
New Revision: 1188
Added:
product/tags/2.0.0/
Log:
PLFED-226: release 2.0.0 product version
13 years, 4 months
- 1
- 0
Picketlink SVN: r1187 - in product/trunk: parent and 5 other directories.
by picketlink-commits＠lists.jboss.org
Author: anil.saldhana(a)jboss.com
Date: 2011-08-11 18:36:18 -0400 (Thu, 11 Aug 2011)
New Revision: 1187
Modified:
product/trunk/parent/pom.xml
product/trunk/picketlink-core/pom.xml
product/trunk/picketlink-webapps/idp/pom.xml
product/trunk/picketlink-webapps/pdp/pom.xml
product/trunk/picketlink-webapps/picketlink-sts/pom.xml
product/trunk/picketlink-webapps/pom.xml
product/trunk/pom.xml
Log:
PLFED-226: prepare 2.0.0
Modified: product/trunk/parent/pom.xml
===================================================================
--- product/trunk/parent/pom.xml 2011-08-11 22:32:39 UTC (rev 1186)
+++ product/trunk/parent/pom.xml 2011-08-11 22:36:18 UTC (rev 1187)
@@ -8,7 +8,7 @@
<groupId>org.picketlink.product</groupId>
<artifactId>picketlink-fed-parent</artifactId>
<packaging>pom</packaging>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.0.0</version>
<name>PicketLink Federation- Parent</name>
<url>http://labs.jboss.org/portal/picketlink/</url>
<description>PicketLink is a cross-cutting project that handles identity needs for the JEMS projects</description>
Modified: product/trunk/picketlink-core/pom.xml
===================================================================
--- product/trunk/picketlink-core/pom.xml 2011-08-11 22:32:39 UTC (rev 1186)
+++ product/trunk/picketlink-core/pom.xml 2011-08-11 22:36:18 UTC (rev 1187)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.picketlink.product</groupId>
<artifactId>picketlink-fed-parent</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.0.0</version>
<relativePath>../parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: product/trunk/picketlink-webapps/idp/pom.xml
===================================================================
--- product/trunk/picketlink-webapps/idp/pom.xml 2011-08-11 22:32:39 UTC (rev 1186)
+++ product/trunk/picketlink-webapps/idp/pom.xml 2011-08-11 22:36:18 UTC (rev 1187)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.picketlink.product</groupId>
<artifactId>picketlink-federation-webapps</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.0.0</version>
<relativePath>../</relativePath>
</parent>
Modified: product/trunk/picketlink-webapps/pdp/pom.xml
===================================================================
--- product/trunk/picketlink-webapps/pdp/pom.xml 2011-08-11 22:32:39 UTC (rev 1186)
+++ product/trunk/picketlink-webapps/pdp/pom.xml 2011-08-11 22:36:18 UTC (rev 1187)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.picketlink.product</groupId>
<artifactId>picketlink-federation-webapps</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.0.0</version>
<relativePath>../</relativePath>
</parent>
Modified: product/trunk/picketlink-webapps/picketlink-sts/pom.xml
===================================================================
--- product/trunk/picketlink-webapps/picketlink-sts/pom.xml 2011-08-11 22:32:39 UTC (rev 1186)
+++ product/trunk/picketlink-webapps/picketlink-sts/pom.xml 2011-08-11 22:36:18 UTC (rev 1187)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.picketlink.product</groupId>
<artifactId>picketlink-federation-webapps</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.0.0</version>
<relativePath>../</relativePath>
</parent>
Modified: product/trunk/picketlink-webapps/pom.xml
===================================================================
--- product/trunk/picketlink-webapps/pom.xml 2011-08-11 22:32:39 UTC (rev 1186)
+++ product/trunk/picketlink-webapps/pom.xml 2011-08-11 22:36:18 UTC (rev 1187)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.picketlink.product</groupId>
<artifactId>picketlink-fed-parent</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.0.0</version>
<relativePath>../parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: product/trunk/pom.xml
===================================================================
--- product/trunk/pom.xml 2011-08-11 22:32:39 UTC (rev 1186)
+++ product/trunk/pom.xml 2011-08-11 22:36:18 UTC (rev 1187)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.picketlink.product</groupId>
<artifactId>picketlink-fed-parent</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.0.0</version>
<relativePath>parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
13 years, 4 months
- 1
- 0
Picketlink SVN: r1186 - product.
by picketlink-commits＠lists.jboss.org
Author: anil.saldhana(a)jboss.com
Date: 2011-08-11 18:32:39 -0400 (Thu, 11 Aug 2011)
New Revision: 1186
Added:
product/tags/
Log:
tags
13 years, 4 months
- 1
- 0
Picketlink SVN: r1185 - in product/trunk/picketlink-core/src/test/java/org/picketlink: test/identity/federation and 5 other directories.
by picketlink-commits＠lists.jboss.org
Author: anil.saldhana(a)jboss.com
Date: 2011-08-11 18:25:16 -0400 (Thu, 11 Aug 2011)
New Revision: 1185
Added:
product/trunk/picketlink-core/src/test/java/org/picketlink/test/identity/federation/bindings/authenticators/
product/trunk/picketlink-core/src/test/java/org/picketlink/test/identity/federation/bindings/authenticators/SPPostFormAuthenticatorUnitTestCase.java
product/trunk/picketlink-core/src/test/java/org/picketlink/test/identity/federation/bindings/config/
product/trunk/picketlink-core/src/test/java/org/picketlink/test/identity/federation/bindings/config/MetadataConfigUnitTestCase.java
product/trunk/picketlink-core/src/test/java/org/picketlink/test/identity/federation/bindings/mock/
product/trunk/picketlink-core/src/test/java/org/picketlink/test/identity/federation/bindings/mock/MockCatalinaContext.java
product/trunk/picketlink-core/src/test/java/org/picketlink/test/identity/federation/bindings/mock/MockCatalinaContextClassLoader.java
product/trunk/picketlink-core/src/test/java/org/picketlink/test/identity/federation/bindings/mock/MockCatalinaLoginConfig.java
product/trunk/picketlink-core/src/test/java/org/picketlink/test/identity/federation/bindings/mock/MockCatalinaRealm.java
product/trunk/picketlink-core/src/test/java/org/picketlink/test/identity/federation/bindings/mock/MockCatalinaRequest.java
product/trunk/picketlink-core/src/test/java/org/picketlink/test/identity/federation/bindings/mock/MockCatalinaResponse.java
product/trunk/picketlink-core/src/test/java/org/picketlink/test/identity/federation/bindings/mock/MockCatalinaSession.java
product/trunk/picketlink-core/src/test/java/org/picketlink/test/identity/federation/bindings/servlets/
product/trunk/picketlink-core/src/test/java/org/picketlink/test/identity/federation/bindings/servlets/SOAPSAMLXACMLServletUnitTestCase.java
product/trunk/picketlink-core/src/test/java/org/picketlink/test/identity/federation/bindings/servlets/TestServletConfig.java
product/trunk/picketlink-core/src/test/java/org/picketlink/test/identity/federation/bindings/servlets/TestServletContext.java
product/trunk/picketlink-core/src/test/java/org/picketlink/test/identity/federation/bindings/servlets/TestServletRequest.java
product/trunk/picketlink-core/src/test/java/org/picketlink/test/identity/federation/bindings/servlets/TestServletResponse.java
Removed:
product/trunk/picketlink-core/src/test/java/org/picketlink/test/identity/federation/authenticators/
product/trunk/picketlink-core/src/test/java/org/picketlink/test/identity/federation/config/
product/trunk/picketlink-core/src/test/java/org/picketlink/test/identity/federation/mock/
product/trunk/picketlink-core/src/test/java/org/picketlink/test/identity/federation/servlets/
Modified:
product/trunk/picketlink-core/src/test/java/org/picketlink/
Log:
merge the tests
Property changes on: product/trunk/picketlink-core/src/test/java/org/picketlink
___________________________________________________________________
Modified: svn:mergeinfo
- /federation/trunk/picketlink-fed-core/src/test/java/org/picketlink:1152-1154,1159-1173
+ /federation/trunk/picketlink-bindings/src/test/java/org/picketlink:1140-1173
/federation/trunk/picketlink-fed-core/src/test/java/org/picketlink:1152-1154,1159-1173
Added: product/trunk/picketlink-core/src/test/java/org/picketlink/test/identity/federation/bindings/authenticators/SPPostFormAuthenticatorUnitTestCase.java
===================================================================
--- product/trunk/picketlink-core/src/test/java/org/picketlink/test/identity/federation/bindings/authenticators/SPPostFormAuthenticatorUnitTestCase.java (rev 0)
+++ product/trunk/picketlink-core/src/test/java/org/picketlink/test/identity/federation/bindings/authenticators/SPPostFormAuthenticatorUnitTestCase.java 2011-08-11 22:25:16 UTC (rev 1185)
@@ -0,0 +1,70 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.picketlink.test.identity.federation.bindings.authenticators;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+import java.net.URL;
+import java.security.cert.X509Certificate;
+
+import org.junit.Test;
+import org.picketlink.identity.federation.bindings.tomcat.sp.SPPostFormAuthenticator;
+import org.picketlink.test.identity.federation.bindings.mock.MockCatalinaContext;
+import org.picketlink.test.identity.federation.bindings.mock.MockCatalinaContextClassLoader;
+
+/**
+ * Unit test the {@link SPPostFormAuthenticator}
+ * @author Anil.Saldhana(a)redhat.com
+ * @since Mar 1, 2011
+ */
+public class SPPostFormAuthenticatorUnitTestCase
+{
+ @Test
+ public void testIDPMetadataFile() throws Exception
+ {
+ MockCatalinaContext ctx = new MockCatalinaContext();
+ SPPostFormAuthenticator auth = new SPPostFormAuthenticator();
+ auth.setContainer(ctx);
+
+ ClassLoader tccl = Thread.currentThread().getContextClassLoader();
+ URL configURL = tccl.getResource("config/test-idp-metadata-file-config.xml");
+ URL[] urls = new URL[]
+ {configURL};
+ MockCatalinaContextClassLoader tcl = new MockCatalinaContextClassLoader(urls);
+ tcl.associate("/WEB-INF/picketlink-idfed.xml", configURL.openStream());
+ tcl.associate("/WEB-INF/picketlink-handlers.xml",
+ tccl.getResourceAsStream("saml2/post/sp/employee/WEB-INF/picketlink-handlers.xml"));
+ tcl.associate("/WEB-INF/testshib.org.idp-metadata.xml",
+ tccl.getResourceAsStream("metadata/testshib.org.idp-metadata.xml"));
+ tcl.setProfile("DUMMY");
+ tcl.setDelegate(tccl);
+
+ Thread.currentThread().setContextClassLoader(tcl);
+ auth.testStart();
+ assertEquals("https://idp.testshib.org/idp/profile/SAML2/POST/SSO", auth.getIdentityURL());
+ X509Certificate idpCert = auth.getIdpCertificate();
+ assertNotNull(idpCert);
+ assertEquals("CN=idp.testshib.org, O=TestShib, L=Pittsburgh, ST=Pennsylvania, C=US", idpCert.getIssuerDN()
+ .getName());
+ }
+}
\ No newline at end of file
Added: product/trunk/picketlink-core/src/test/java/org/picketlink/test/identity/federation/bindings/config/MetadataConfigUnitTestCase.java
===================================================================
--- product/trunk/picketlink-core/src/test/java/org/picketlink/test/identity/federation/bindings/config/MetadataConfigUnitTestCase.java (rev 0)
+++ product/trunk/picketlink-core/src/test/java/org/picketlink/test/identity/federation/bindings/config/MetadataConfigUnitTestCase.java 2011-08-11 22:25:16 UTC (rev 1185)
@@ -0,0 +1,80 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.picketlink.test.identity.federation.bindings.config;
+
+import java.io.InputStream;
+import java.util.List;
+
+import junit.framework.TestCase;
+
+import org.picketlink.identity.federation.core.config.IDPType;
+import org.picketlink.identity.federation.core.config.KeyValueType;
+import org.picketlink.identity.federation.core.config.MetadataProviderType;
+import org.picketlink.identity.federation.core.config.TrustType;
+import org.picketlink.identity.federation.core.parsers.config.SAMLConfigParser;
+
+
+/**
+ * Config for the SAMLv2 Metadata Profile
+ * @author Anil.Saldhana(a)redhat.com
+ * @since Apr 22, 2009
+ */
+public class MetadataConfigUnitTestCase extends TestCase
+{
+ String config = "config/test-metadata-config-";
+
+ public void testMetadata() throws Exception
+ {
+ Object object = this.unmarshall(config + "1.xml");
+ assertNotNull("IDP is not null", object);
+ IDPType idp = (IDPType) object;
+ assertEquals("20000", 20000L, idp.getAssertionValidity());
+ assertEquals("somefqn", idp.getRoleGenerator());
+
+ TrustType trust = idp.getTrust();
+ assertNotNull("Trust is not null", trust);
+ String domains = trust.getDomains();
+ assertTrue("localhost trusted", domains.indexOf("localhost") > -1);
+ assertTrue("jboss.com trusted", domains.indexOf("jboss.com") > -1);
+
+ MetadataProviderType metaDataProvider = idp.getMetaDataProvider();
+ assertNotNull("MetadataProvider is not null", metaDataProvider);
+ assertEquals("org.jboss.test.somefqn", metaDataProvider.getClassName());
+
+ List<KeyValueType> keyValues = metaDataProvider.getOption();
+ assertTrue(1 == keyValues.size());
+ KeyValueType kvt = keyValues.get(0);
+ assertEquals("FileName", kvt.getKey());
+ assertEquals("myfile", kvt.getValue());
+ }
+
+ private Object unmarshall(String configFile) throws Exception
+ {
+ //String schema = PicketLinkFederationConstants.SCHEMA_IDFED;
+
+ ClassLoader tcl = Thread.currentThread().getContextClassLoader();
+ InputStream is = tcl.getResourceAsStream(configFile);
+ assertNotNull("Inputstream not null", is);
+
+ return (new SAMLConfigParser()).parse( is );
+ }
+}
\ No newline at end of file
Added: product/trunk/picketlink-core/src/test/java/org/picketlink/test/identity/federation/bindings/mock/MockCatalinaContext.java
===================================================================
--- product/trunk/picketlink-core/src/test/java/org/picketlink/test/identity/federation/bindings/mock/MockCatalinaContext.java (rev 0)
+++ product/trunk/picketlink-core/src/test/java/org/picketlink/test/identity/federation/bindings/mock/MockCatalinaContext.java 2011-08-11 22:25:16 UTC (rev 1185)
@@ -0,0 +1,959 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.picketlink.test.identity.federation.bindings.mock;
+
+import java.beans.PropertyChangeListener;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+
+import javax.naming.directory.DirContext;
+import javax.servlet.RequestDispatcher;
+import javax.servlet.Servlet;
+import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+
+import org.apache.catalina.Cluster;
+import org.apache.catalina.Container;
+import org.apache.catalina.ContainerListener;
+import org.apache.catalina.Context;
+import org.apache.catalina.Loader;
+import org.apache.catalina.Manager;
+import org.apache.catalina.Pipeline;
+import org.apache.catalina.Realm;
+import org.apache.catalina.Wrapper;
+import org.apache.catalina.connector.Request;
+import org.apache.catalina.connector.Response;
+import org.apache.catalina.deploy.ApplicationParameter;
+import org.apache.catalina.deploy.ErrorPage;
+import org.apache.catalina.deploy.FilterDef;
+import org.apache.catalina.deploy.FilterMap;
+import org.apache.catalina.deploy.LoginConfig;
+import org.apache.catalina.deploy.NamingResources;
+import org.apache.catalina.deploy.SecurityConstraint;
+import org.apache.catalina.util.CharsetMapper;
+import org.apache.juli.logging.Log;
+import org.apache.tomcat.util.http.mapper.Mapper;
+
+/**
+ * Mock Catalina Context
+ * @author Anil.Saldhana(a)redhat.com
+ * @since Oct 20, 2009
+ */
+@SuppressWarnings(
+{"unchecked", "rawtypes"})
+public class MockCatalinaContext implements Context, Container, ServletContext
+{
+ private Realm realm;
+
+ public void addChild(Container arg0)
+ {
+ }
+
+ public void addContainerListener(ContainerListener arg0)
+ {
+ }
+
+ public void addPropertyChangeListener(PropertyChangeListener arg0)
+ {
+ }
+
+ public void backgroundProcess()
+ {
+ }
+
+ public Container findChild(String arg0)
+ {
+ throw new RuntimeException("NYI");
+ }
+
+ public Container[] findChildren()
+ {
+
+ throw new RuntimeException("NYI");
+ }
+
+ public ContainerListener[] findContainerListeners()
+ {
+
+ throw new RuntimeException("NYI");
+ }
+
+ public int getBackgroundProcessorDelay()
+ {
+
+ return 0;
+ }
+
+ public Cluster getCluster()
+ {
+
+ throw new RuntimeException("NYI");
+ }
+
+ public String getInfo()
+ {
+
+ throw new RuntimeException("NYI");
+ }
+
+ public Loader getLoader()
+ {
+
+ throw new RuntimeException("NYI");
+ }
+
+ public Log getLogger()
+ {
+
+ throw new RuntimeException("NYI");
+ }
+
+ public Manager getManager()
+ {
+
+ throw new RuntimeException("NYI");
+ }
+
+ public Object getMappingObject()
+ {
+
+ throw new RuntimeException("NYI");
+ }
+
+ public String getName()
+ {
+ throw new RuntimeException("NYI");
+ }
+
+ public String getObjectName()
+ {
+
+ throw new RuntimeException("NYI");
+ }
+
+ public Container getParent()
+ {
+ return this;
+ }
+
+ public ClassLoader getParentClassLoader()
+ {
+ throw new RuntimeException("NYI");
+ }
+
+ public Pipeline getPipeline()
+ {
+ throw new RuntimeException("NYI");
+ }
+
+ public DirContext getResources()
+ {
+ throw new RuntimeException("NYI");
+ }
+
+ public void invoke(Request arg0, Response arg1) throws IOException, ServletException
+ {
+ }
+
+ public void removeChild(Container arg0)
+ {
+ }
+
+ public void removeContainerListener(ContainerListener arg0)
+ {
+ }
+
+ public void removePropertyChangeListener(PropertyChangeListener arg0)
+ {
+ }
+
+ public void setBackgroundProcessorDelay(int arg0)
+ {
+ }
+
+ public void setCluster(Cluster arg0)
+ {
+ }
+
+ public void setLoader(Loader arg0)
+ {
+ }
+
+ public void setManager(Manager arg0)
+ {
+ }
+
+ public void setName(String arg0)
+ {
+ }
+
+ public void setParent(Container arg0)
+ {
+ }
+
+ public void setParentClassLoader(ClassLoader arg0)
+ {
+ }
+
+ public void setRealm(Realm arg0)
+ {
+ this.realm = arg0;
+ }
+
+ public void setResources(DirContext arg0)
+ {
+ }
+
+ public void addApplicationListener(String arg0)
+ {
+ }
+
+ public void addApplicationParameter(ApplicationParameter arg0)
+ {
+ }
+
+ public void addConstraint(SecurityConstraint arg0)
+ {
+ }
+
+ public void addErrorPage(ErrorPage arg0)
+ {
+ }
+
+ public void addFilterDef(FilterDef arg0)
+ {
+ }
+
+ public void addFilterMap(FilterMap arg0)
+ {
+ }
+
+ public void addInstanceListener(String arg0)
+ {
+ }
+
+ public void addJspMapping(String arg0)
+ {
+ }
+
+ public void addLocaleEncodingMappingParameter(String arg0, String arg1)
+ {
+ }
+
+ public void addMimeMapping(String arg0, String arg1)
+ {
+ }
+
+ public void addParameter(String arg0, String arg1)
+ {
+ }
+
+ public void addRoleMapping(String arg0, String arg1)
+ {
+ }
+
+ public void addSecurityRole(String arg0)
+ {
+ }
+
+ public void addServletMapping(String arg0, String arg1)
+ {
+ }
+
+ public void addTaglib(String arg0, String arg1)
+ {
+ }
+
+ public void addWatchedResource(String arg0)
+ {
+ }
+
+ public void addWelcomeFile(String arg0)
+ {
+ }
+
+ public void addWrapperLifecycle(String arg0)
+ {
+ }
+
+ public void addWrapperListener(String arg0)
+ {
+ }
+
+ public Wrapper createWrapper()
+ {
+ throw new RuntimeException("NYI");
+ }
+
+ public String[] findApplicationListeners()
+ {
+ throw new RuntimeException("NYI");
+ }
+
+ public ApplicationParameter[] findApplicationParameters()
+ {
+ throw new RuntimeException("NYI");
+ }
+
+ public SecurityConstraint[] findConstraints()
+ {
+ throw new RuntimeException("NYI");
+ }
+
+ public ErrorPage findErrorPage(int arg0)
+ {
+ throw new RuntimeException("NYI");
+ }
+
+ public ErrorPage findErrorPage(String arg0)
+ {
+ throw new RuntimeException("NYI");
+ }
+
+ public ErrorPage[] findErrorPages()
+ {
+ throw new RuntimeException("NYI");
+ }
+
+ public FilterDef findFilterDef(String arg0)
+ {
+ throw new RuntimeException("NYI");
+ }
+
+ public FilterDef[] findFilterDefs()
+ {
+ throw new RuntimeException("NYI");
+ }
+
+ public FilterMap[] findFilterMaps()
+ {
+ throw new RuntimeException("NYI");
+ }
+
+ public String[] findInstanceListeners()
+ {
+ throw new RuntimeException("NYI");
+ }
+
+ public String findMimeMapping(String arg0)
+ {
+ throw new RuntimeException("NYI");
+ }
+
+ public String[] findMimeMappings()
+ {
+ throw new RuntimeException("NYI");
+ }
+
+ public String findParameter(String arg0)
+ {
+ throw new RuntimeException("NYI");
+ }
+
+ public String[] findParameters()
+ {
+ throw new RuntimeException("NYI");
+ }
+
+ public String findRoleMapping(String arg0)
+ {
+ throw new RuntimeException("NYI");
+ }
+
+ public boolean findSecurityRole(String arg0)
+ {
+ return false;
+ }
+
+ public String[] findSecurityRoles()
+ {
+ throw new RuntimeException("NYI");
+ }
+
+ public String findServletMapping(String arg0)
+ {
+ throw new RuntimeException("NYI");
+ }
+
+ public String[] findServletMappings()
+ {
+ throw new RuntimeException("NYI");
+ }
+
+ public String findStatusPage(int arg0)
+ {
+ throw new RuntimeException("NYI");
+ }
+
+ public int[] findStatusPages()
+ {
+ throw new RuntimeException("NYI");
+ }
+
+ public String findTaglib(String arg0)
+ {
+ throw new RuntimeException("NYI");
+ }
+
+ public String[] findTaglibs()
+ {
+ throw new RuntimeException("NYI");
+ }
+
+ public String[] findWatchedResources()
+ {
+ throw new RuntimeException("NYI");
+ }
+
+ public boolean findWelcomeFile(String arg0)
+ {
+ return false;
+ }
+
+ public String[] findWelcomeFiles()
+ {
+ throw new RuntimeException("NYI");
+ }
+
+ public String[] findWrapperLifecycles()
+ {
+ throw new RuntimeException("NYI");
+ }
+
+ public String[] findWrapperListeners()
+ {
+ throw new RuntimeException("NYI");
+ }
+
+ public String getAltDDName()
+ {
+ throw new RuntimeException("NYI");
+ }
+
+ public Object[] getApplicationEventListeners()
+ {
+ throw new RuntimeException("NYI");
+ }
+
+ public Object[] getApplicationLifecycleListeners()
+ {
+ throw new RuntimeException("NYI");
+ }
+
+ public boolean getAvailable()
+ {
+ return false;
+ }
+
+ public CharsetMapper getCharsetMapper()
+ {
+ throw new RuntimeException("NYI");
+ }
+
+ public String getConfigFile()
+ {
+ throw new RuntimeException("NYI");
+ }
+
+ public boolean getConfigured()
+ {
+ return false;
+ }
+
+ public boolean getCookies()
+ {
+ return false;
+ }
+
+ public boolean getCrossContext()
+ {
+ return false;
+ }
+
+ public String getDisplayName()
+ {
+ throw new RuntimeException("NYI");
+ }
+
+ public boolean getDistributable()
+ {
+ return false;
+ }
+
+ public String getDocBase()
+ {
+ throw new RuntimeException("NYI");
+ }
+
+ public String getEncodedPath()
+ {
+ throw new RuntimeException("NYI");
+ }
+
+ public boolean getIgnoreAnnotations()
+ {
+ return false;
+ }
+
+ public LoginConfig getLoginConfig()
+ {
+ LoginConfig loginConfig = new LoginConfig();
+ loginConfig.setAuthMethod("BASIC");
+ return loginConfig;
+ }
+
+ public Mapper getMapper()
+ {
+ throw new RuntimeException("NYI");
+ }
+
+ public NamingResources getNamingResources()
+ {
+ throw new RuntimeException("NYI");
+ }
+
+ public boolean getOverride()
+ {
+ return false;
+ }
+
+ public String getPath()
+ {
+ throw new RuntimeException("NYI");
+ }
+
+ public boolean getPrivileged()
+ {
+ return false;
+ }
+
+ public String getPublicId()
+ {
+ throw new RuntimeException("NYI");
+ }
+
+ public boolean getReloadable()
+ {
+ return false;
+ }
+
+ public ServletContext getServletContext()
+ {
+ return this;
+ }
+
+ public int getSessionTimeout()
+ {
+ return 0;
+ }
+
+ public boolean getSwallowOutput()
+ {
+ return false;
+ }
+
+ public boolean getTldNamespaceAware()
+ {
+ return false;
+ }
+
+ public boolean getTldValidation()
+ {
+ return false;
+ }
+
+ public String getWrapperClass()
+ {
+ throw new RuntimeException("NYI");
+ }
+
+ public boolean getXmlNamespaceAware()
+ {
+ return false;
+ }
+
+ public boolean getXmlValidation()
+ {
+ return false;
+ }
+
+ public void reload()
+ {
+ }
+
+ public void removeApplicationListener(String arg0)
+ {
+ }
+
+ public void removeApplicationParameter(String arg0)
+ {
+ }
+
+ public void removeConstraint(SecurityConstraint arg0)
+ {
+ }
+
+ public void removeErrorPage(ErrorPage arg0)
+ {
+ }
+
+ public void removeFilterDef(FilterDef arg0)
+ {
+ }
+
+ public void removeFilterMap(FilterMap arg0)
+ {
+ }
+
+ public void removeInstanceListener(String arg0)
+ {
+ }
+
+ public void removeMimeMapping(String arg0)
+ {
+ }
+
+ public void removeParameter(String arg0)
+ {
+ }
+
+ public void removeRoleMapping(String arg0)
+ {
+ }
+
+ public void removeSecurityRole(String arg0)
+ {
+ }
+
+ public void removeServletMapping(String arg0)
+ {
+ }
+
+ public void removeTaglib(String arg0)
+ {
+ }
+
+ public void removeWatchedResource(String arg0)
+ {
+ }
+
+ public void removeWelcomeFile(String arg0)
+ {
+ }
+
+ public void removeWrapperLifecycle(String arg0)
+ {
+ }
+
+ public void removeWrapperListener(String arg0)
+ {
+ }
+
+ public void setAltDDName(String arg0)
+ {
+ }
+
+ public void setApplicationEventListeners(Object[] arg0)
+ {
+ }
+
+ public void setApplicationLifecycleListeners(Object[] arg0)
+ {
+ }
+
+ public void setAvailable(boolean arg0)
+ {
+ }
+
+ public void setCharsetMapper(CharsetMapper arg0)
+ {
+ }
+
+ public void setConfigFile(String arg0)
+ {
+ }
+
+ public void setConfigured(boolean arg0)
+ {
+ }
+
+ public void setCookies(boolean arg0)
+ {
+ }
+
+ public void setCrossContext(boolean arg0)
+ {
+ }
+
+ public void setDisplayName(String arg0)
+ {
+ }
+
+ public void setDistributable(boolean arg0)
+ {
+ }
+
+ public void setDocBase(String arg0)
+ {
+ }
+
+ public void setIgnoreAnnotations(boolean arg0)
+ {
+ }
+
+ public void setLoginConfig(LoginConfig arg0)
+ {
+ }
+
+ public void setNamingResources(NamingResources arg0)
+ {
+ }
+
+ public void setOverride(boolean arg0)
+ {
+ }
+
+ public void setPath(String arg0)
+ {
+ }
+
+ public void setPrivileged(boolean arg0)
+ {
+ }
+
+ public void setPublicId(String arg0)
+ {
+ }
+
+ public void setReloadable(boolean arg0)
+ {
+ }
+
+ public void setSessionTimeout(int arg0)
+ {
+ }
+
+ public void setSwallowOutput(boolean arg0)
+ {
+ }
+
+ public void setTldNamespaceAware(boolean arg0)
+ {
+ }
+
+ public void setTldValidation(boolean arg0)
+ {
+ }
+
+ public void setWrapperClass(String arg0)
+ {
+ }
+
+ public void setXmlNamespaceAware(boolean arg0)
+ {
+ }
+
+ public void setXmlValidation(boolean arg0)
+ {
+ }
+
+ public Realm getRealm()
+ {
+ return realm;
+ }
+
+ //Copied from MockServletContext
+ private final Map params = new HashMap();
+
+ private final Map attribs = new HashMap();
+
+ public Object getAttribute(String arg0)
+ {
+ return attribs.get(arg0);
+ }
+
+ public Enumeration getAttributeNames()
+ {
+ return new Enumeration()
+ {
+ private final Iterator iter = attribs.entrySet().iterator();
+
+ public boolean hasMoreElements()
+ {
+ return iter.hasNext();
+ }
+
+ public Object nextElement()
+ {
+ Entry<String, Object> entry = (Entry<String, Object>) iter.next();
+ return entry.getValue();
+ }
+ };
+ }
+
+ public ServletContext getContext(String arg0)
+ {
+ throw new RuntimeException("NYI");
+ }
+
+ public String getContextPath()
+ {
+ throw new RuntimeException("NYI");
+ }
+
+ public String getInitParameter(String arg0)
+ {
+ return (String) params.get(arg0);
+ }
+
+ public Enumeration getInitParameterNames()
+ {
+ return new Enumeration()
+ {
+ private final Iterator iter = params.entrySet().iterator();
+
+ public boolean hasMoreElements()
+ {
+ return iter.hasNext();
+ }
+
+ public Object nextElement()
+ {
+ Entry<String, Object> entry = (Entry<String, Object>) iter.next();
+ return entry.getKey();
+ }
+ };
+ }
+
+ public int getMajorVersion()
+ {
+ return 0;
+ }
+
+ public String getMimeType(String arg0)
+ {
+ throw new RuntimeException("NYI");
+ }
+
+ public int getMinorVersion()
+ {
+ return 0;
+ }
+
+ public RequestDispatcher getNamedDispatcher(String arg0)
+ {
+ throw new RuntimeException("NYI");
+ }
+
+ public String getRealPath(String arg0)
+ {
+ return null;
+ }
+
+ public RequestDispatcher getRequestDispatcher(String arg0)
+ {
+ return new RequestDispatcher()
+ {
+
+ public void include(ServletRequest arg0, ServletResponse arg1) throws ServletException, IOException
+ {
+ }
+
+ public void forward(ServletRequest arg0, ServletResponse arg1) throws ServletException, IOException
+ {
+ }
+ };
+ }
+
+ public URL getResource(String arg0) throws MalformedURLException
+ {
+ throw new RuntimeException("NYI");
+ }
+
+ public InputStream getResourceAsStream(String arg0)
+ {
+ ClassLoader tcl = Thread.currentThread().getContextClassLoader();
+ return tcl.getResourceAsStream(arg0);
+ }
+
+ public Set getResourcePaths(String arg0)
+ {
+ throw new RuntimeException("NYI");
+ }
+
+ public String getServerInfo()
+ {
+ throw new RuntimeException("NYI");
+ }
+
+ public Servlet getServlet(String arg0) throws ServletException
+ {
+ throw new RuntimeException("NYI");
+ }
+
+ public String getServletContextName()
+ {
+ throw new RuntimeException("NYI");
+ }
+
+ public Enumeration getServletNames()
+ {
+ throw new RuntimeException("NYI");
+ }
+
+ public Enumeration getServlets()
+ {
+ throw new RuntimeException("NYI");
+ }
+
+ public void log(String arg0)
+ {
+ }
+
+ public void log(Exception arg0, String arg1)
+ {
+ }
+
+ public void log(String arg0, Throwable arg1)
+ {
+ }
+
+ public void removeAttribute(String arg0)
+ {
+ this.attribs.remove(arg0);
+ }
+
+ public void setAttribute(String arg0, Object arg1)
+ {
+ this.attribs.put(arg0, arg1);
+ }
+}
\ No newline at end of file
Added: product/trunk/picketlink-core/src/test/java/org/picketlink/test/identity/federation/bindings/mock/MockCatalinaContextClassLoader.java
===================================================================
--- product/trunk/picketlink-core/src/test/java/org/picketlink/test/identity/federation/bindings/mock/MockCatalinaContextClassLoader.java (rev 0)
+++ product/trunk/picketlink-core/src/test/java/org/picketlink/test/identity/federation/bindings/mock/MockCatalinaContextClassLoader.java 2011-08-11 22:25:16 UTC (rev 1185)
@@ -0,0 +1,76 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.picketlink.test.identity.federation.bindings.mock;
+
+import java.io.InputStream;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Mock TCL
+ * @author Anil.Saldhana(a)redhat.com
+ * @since Oct 7, 2009
+ */
+public class MockCatalinaContextClassLoader extends URLClassLoader
+{
+ private String profile;
+
+ private ClassLoader delegate;
+
+ private final Map<String, InputStream> streams = new HashMap<String, InputStream>();
+
+ public MockCatalinaContextClassLoader(URL[] urls)
+ {
+ super(urls);
+ }
+
+ public void setDelegate(ClassLoader tcl)
+ {
+ this.delegate = tcl;
+ }
+
+ public void setProfile(String profile)
+ {
+ this.profile = profile;
+ }
+
+ public void associate(String name, InputStream is)
+ {
+ this.streams.put(name, is);
+ }
+
+ @Override
+ public InputStream getResourceAsStream(String name)
+ {
+ if (streams.containsKey(name))
+ return streams.get(name);
+
+ if (profile == null)
+ throw new RuntimeException("null profile when seeking resource:" + name);
+ InputStream is = delegate.getResourceAsStream(profile + "/" + name);
+ if (is == null)
+ is = super.getResourceAsStream(name);
+ return is;
+ }
+}
\ No newline at end of file
Added: product/trunk/picketlink-core/src/test/java/org/picketlink/test/identity/federation/bindings/mock/MockCatalinaLoginConfig.java
===================================================================
--- product/trunk/picketlink-core/src/test/java/org/picketlink/test/identity/federation/bindings/mock/MockCatalinaLoginConfig.java (rev 0)
+++ product/trunk/picketlink-core/src/test/java/org/picketlink/test/identity/federation/bindings/mock/MockCatalinaLoginConfig.java 2011-08-11 22:25:16 UTC (rev 1185)
@@ -0,0 +1,34 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.picketlink.test.identity.federation.bindings.mock;
+
+import org.apache.catalina.deploy.LoginConfig;
+
+/**
+ * Mock LoginConfig
+ * @author Anil.Saldhana(a)redhat.com
+ * @since Oct 20, 2009
+ */
+public class MockCatalinaLoginConfig extends LoginConfig
+{
+ private static final long serialVersionUID = 1L;
+}
Added: product/trunk/picketlink-core/src/test/java/org/picketlink/test/identity/federation/bindings/mock/MockCatalinaRealm.java
===================================================================
--- product/trunk/picketlink-core/src/test/java/org/picketlink/test/identity/federation/bindings/mock/MockCatalinaRealm.java (rev 0)
+++ product/trunk/picketlink-core/src/test/java/org/picketlink/test/identity/federation/bindings/mock/MockCatalinaRealm.java 2011-08-11 22:25:16 UTC (rev 1185)
@@ -0,0 +1,69 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.picketlink.test.identity.federation.bindings.mock;
+
+import java.security.Principal;
+
+import org.apache.catalina.realm.RealmBase;
+
+/**
+ * Mock Tomcat Realm
+ * @author Anil.Saldhana(a)redhat.com
+ * @since Oct 21, 2009
+ */
+public class MockCatalinaRealm extends RealmBase
+{
+ private String name;
+ private String pass;
+ private Principal principal;
+
+ public MockCatalinaRealm(String name, String pass, Principal p)
+ {
+ this.name = name;
+ this.pass = pass;
+ this.principal = p;
+ }
+
+ @Override
+ protected String getName()
+ {
+ return name;
+ }
+
+ @Override
+ protected String getPassword(String arg0)
+ {
+ return pass;
+ }
+
+ @Override
+ protected Principal getPrincipal(String arg0)
+ {
+ return principal;
+ }
+
+ @Override
+ public Principal authenticate(String arg0, String arg1)
+ {
+ return principal;
+ }
+}
\ No newline at end of file
Added: product/trunk/picketlink-core/src/test/java/org/picketlink/test/identity/federation/bindings/mock/MockCatalinaRequest.java
===================================================================
--- product/trunk/picketlink-core/src/test/java/org/picketlink/test/identity/federation/bindings/mock/MockCatalinaRequest.java (rev 0)
+++ product/trunk/picketlink-core/src/test/java/org/picketlink/test/identity/federation/bindings/mock/MockCatalinaRequest.java 2011-08-11 22:25:16 UTC (rev 1185)
@@ -0,0 +1,157 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.picketlink.test.identity.federation.bindings.mock;
+
+import java.security.Principal;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.servlet.http.HttpSession;
+
+import org.apache.catalina.Session;
+import org.apache.catalina.connector.Request;
+
+/**
+ * Request for catalina container
+ * @author Anil.Saldhana(a)redhat.com
+ * @since Oct 20, 2009
+ */
+public class MockCatalinaRequest extends Request
+{
+ private Map<String,String> params = new HashMap<String, String>();
+ private Map<String,String> headers = new HashMap<String, String>();
+ private Session session;
+ private Principal principal;
+ private String method;
+ private String remotee;
+ private String queryString;
+
+
+ @Override
+ public void addHeader(String name, String value)
+ {
+ this.headers.put(name, value);
+ }
+
+ @Override
+ public String getHeader(String name)
+ {
+ return headers.get(name);
+ }
+
+ @Override
+ public Principal getPrincipal()
+ {
+ return principal;
+ }
+
+ public Principal getUserPrincipal()
+ {
+ return principal;
+ }
+
+ @Override
+ public void setUserPrincipal(Principal arg0)
+ {
+ this.principal = arg0;
+ }
+
+ @Override
+ public String getParameter(String name)
+ {
+ return this.params.get(name);
+ }
+
+ public void setParameter(String key, String value)
+ {
+ params.put(key, value);
+ }
+
+ @Override
+ public String getQueryString()
+ {
+ return this.queryString;
+ }
+
+ @Override
+ public void setQueryString(String query)
+ {
+ this.queryString = query;
+ }
+
+ @Override
+ public String getRemoteAddr()
+ {
+ return this.remotee;
+ }
+
+ @Override
+ public void setRemoteAddr(String remoteAddr)
+ {
+ this.remotee = remoteAddr;
+ }
+
+ @Override
+ public String getMethod()
+ {
+ return this.method;
+ }
+
+ @Override
+ public void setMethod(String method)
+ {
+ this.method = method;
+ }
+
+ @Override
+ public Session getSessionInternal()
+ {
+ return session;
+ }
+
+ @Override
+ public Session getSessionInternal(boolean b)
+ {
+ return session;
+ }
+
+ public void setSession(Session s)
+ {
+ this.session = s;
+ }
+
+ public HttpSession getSession(boolean b)
+ {
+ return this.session.getSession();
+ }
+
+ public HttpSession getSession()
+ {
+ return this.session.getSession();
+ }
+
+ public void clear()
+ {
+ this.params.clear();
+ this.session = null;
+ }
+}
\ No newline at end of file
Added: product/trunk/picketlink-core/src/test/java/org/picketlink/test/identity/federation/bindings/mock/MockCatalinaResponse.java
===================================================================
--- product/trunk/picketlink-core/src/test/java/org/picketlink/test/identity/federation/bindings/mock/MockCatalinaResponse.java (rev 0)
+++ product/trunk/picketlink-core/src/test/java/org/picketlink/test/identity/federation/bindings/mock/MockCatalinaResponse.java 2011-08-11 22:25:16 UTC (rev 1185)
@@ -0,0 +1,105 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.picketlink.test.identity.federation.bindings.mock;
+
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.io.Writer;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.catalina.connector.Response;
+
+/**
+ * Mock catalina response
+ * @author Anil.Saldhana(a)redhat.com
+ * @since Oct 20, 2009
+ */
+public class MockCatalinaResponse extends Response
+{
+ private Map<String, String> headers = new HashMap<String, String>();
+ private int status;
+ public String redirectString;
+ private PrintWriter mywriter;
+
+ @Override
+ public void setCharacterEncoding(String charset)
+ {
+ }
+
+ @Override
+ public void setHeader(String name, String value)
+ {
+ this.headers.put(name, value);
+ }
+
+ @Override
+ public int getStatus()
+ {
+ return this.status;
+ }
+
+ @Override
+ public void setStatus(int status)
+ {
+ this.status = status;
+ }
+
+ @Override
+ public void sendRedirect(String arg0) throws IOException
+ {
+ this.redirectString = arg0;
+ }
+
+ @Override
+ public boolean isCommitted()
+ {
+ return false;
+ }
+
+ public void setWriter(Writer w)
+ {
+ this.mywriter = (PrintWriter) w;
+ }
+
+
+ @Override
+ public PrintWriter getWriter() throws IOException
+ {
+ return this.mywriter;
+ }
+
+ @Override
+ public void setContentLength(int length)
+ {
+ }
+
+ @Override
+ public void setContentType(String arg0)
+ {
+ }
+
+ @Override
+ public void recycle()
+ {
+ }
+}
\ No newline at end of file
Added: product/trunk/picketlink-core/src/test/java/org/picketlink/test/identity/federation/bindings/mock/MockCatalinaSession.java
===================================================================
--- product/trunk/picketlink-core/src/test/java/org/picketlink/test/identity/federation/bindings/mock/MockCatalinaSession.java (rev 0)
+++ product/trunk/picketlink-core/src/test/java/org/picketlink/test/identity/federation/bindings/mock/MockCatalinaSession.java 2011-08-11 22:25:16 UTC (rev 1185)
@@ -0,0 +1,294 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.picketlink.test.identity.federation.bindings.mock;
+
+import java.security.Principal;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.UUID;
+import java.util.Map.Entry;
+
+import javax.servlet.ServletContext;
+import javax.servlet.http.HttpSession;
+import javax.servlet.http.HttpSessionContext;
+
+import org.apache.catalina.Manager;
+import org.apache.catalina.Session;
+import org.apache.catalina.SessionListener;
+
+/**
+ * Mock session for the catalina infrastructure
+ * @author Anil.Saldhana(a)redhat.com
+ * @since Oct 20, 2009
+ */
+@SuppressWarnings({"deprecation", "unchecked", "rawtypes"})
+public class MockCatalinaSession implements Session, HttpSession
+{
+ private Map<String, Object> notes = new HashMap<String,Object>();
+
+ public void setMaxInactiveInterval(int arg0)
+ {
+ }
+
+ public void access()
+ {
+ }
+
+ public void addSessionListener(SessionListener arg0)
+ {
+ }
+
+ public void endAccess()
+ {
+ }
+
+ public void expire()
+ {
+ }
+
+ public String getAuthType()
+ {
+ throw new RuntimeException("NYI");
+ }
+
+ public String getIdInternal()
+ {
+ throw new RuntimeException("NYI");
+ }
+
+ public String getInfo()
+ {
+ throw new RuntimeException("NYI");
+ }
+
+ public long getLastAccessedTimeInternal()
+ {
+ return 0;
+ }
+
+ public Manager getManager()
+ {
+ throw new RuntimeException("NYI");
+ }
+
+ public Object getNote(String arg0)
+ {
+ return notes.get(arg0);
+ }
+
+ public Iterator getNoteNames()
+ {
+ return notes.keySet().iterator();
+ }
+
+ public Principal getPrincipal()
+ {
+ throw new RuntimeException("NYI");
+ }
+
+ public HttpSession getSession()
+ {
+ return this;
+ }
+
+ public boolean isValid()
+ {
+ return this.valid;
+ }
+
+ public void recycle()
+ {
+ }
+
+ public void removeNote(String arg0)
+ {
+ }
+
+ public void removeSessionListener(SessionListener arg0)
+ {
+ }
+
+ public void setAuthType(String arg0)
+ {
+ }
+
+ public void setCreationTime(long arg0)
+ {
+ }
+
+ public void setId(String arg0)
+ {
+ }
+
+ public void setManager(Manager arg0)
+ {
+ }
+
+ public void setNew(boolean arg0)
+ {
+ }
+
+ public void setNote(String arg0, Object arg1)
+ {
+ this.notes.put(arg0, arg1);
+ }
+
+ public void setPrincipal(Principal arg0)
+ {
+ }
+
+ public void setValid(boolean arg0)
+ {
+ }
+
+ //Copied from MockHttpSession
+ private boolean valid = true;
+
+ private Map<String,Object> attribs = new HashMap<String,Object>();
+
+ private String id = UUID.randomUUID().toString();
+
+ private ServletContext context;
+
+ public boolean isInvalidated()
+ {
+ return valid == false;
+ }
+
+ public Object getAttribute(String arg0)
+ {
+ return attribs.get(arg0);
+ }
+
+ public Enumeration getAttributeNames()
+ {
+ return new Enumeration()
+ {
+ private Iterator iter = attribs.entrySet().iterator();
+
+ public boolean hasMoreElements()
+ {
+ return iter.hasNext();
+ }
+
+ public Object nextElement()
+ {
+ Entry<String,Object> entry = (Entry<String, Object>) iter.next();
+ return entry.getValue();
+ }
+ };
+ }
+
+ public long getCreationTime()
+ {
+ return 0;
+ }
+
+ public String getId()
+ {
+ return id;
+ }
+
+ public long getLastAccessedTime()
+ {
+ return 0;
+ }
+
+ public int getMaxInactiveInterval()
+ {
+ return 0;
+ }
+
+ public void setServletContext(ServletContext servletContext)
+ {
+ this.context = servletContext;
+ }
+
+ public ServletContext getServletContext()
+ {
+ return this.context;
+ }
+
+ public HttpSessionContext getSessionContext()
+ {
+
+ throw new RuntimeException("NYI");
+ }
+
+ public Object getValue(String arg0)
+ {
+ throw new RuntimeException("NYI");
+ }
+
+ public String[] getValueNames()
+ {
+ throw new RuntimeException("NYI");
+ }
+
+ public void invalidate()
+ {
+ this.valid = false;
+ }
+
+ public boolean isNew()
+ {
+ if(this.valid == false)
+ throw new IllegalStateException("Session already invalidated");
+
+ return false;
+ }
+
+ public void putValue(String arg0, Object arg1)
+ {
+ if(this.valid == false)
+ throw new IllegalStateException("Session already invalidated");
+ }
+
+ public void removeAttribute(String arg0)
+ {
+ if(this.valid == false)
+ throw new IllegalStateException("Session already invalidated");
+
+ this.attribs.remove(arg0);
+ }
+
+ public void removeValue(String arg0)
+ {
+ if(this.valid == false)
+ throw new IllegalStateException("Session already invalidated");
+ }
+
+ public void setAttribute(String arg0, Object arg1)
+ {
+ if(this.valid == false)
+ throw new IllegalStateException("Session already invalidated");
+
+ this.attribs.put(arg0, arg1);
+ }
+
+ public void clear()
+ {
+ this.notes.clear();
+ }
+}
\ No newline at end of file
Added: product/trunk/picketlink-core/src/test/java/org/picketlink/test/identity/federation/bindings/servlets/SOAPSAMLXACMLServletUnitTestCase.java
===================================================================
--- product/trunk/picketlink-core/src/test/java/org/picketlink/test/identity/federation/bindings/servlets/SOAPSAMLXACMLServletUnitTestCase.java (rev 0)
+++ product/trunk/picketlink-core/src/test/java/org/picketlink/test/identity/federation/bindings/servlets/SOAPSAMLXACMLServletUnitTestCase.java 2011-08-11 22:25:16 UTC (rev 1185)
@@ -0,0 +1,185 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.picketlink.test.identity.federation.bindings.servlets;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.InputStream;
+import java.util.HashMap;
+
+import javax.servlet.ServletContext;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import javax.xml.soap.SOAPBody;
+import javax.xml.soap.SOAPEnvelope;
+import javax.xml.soap.SOAPMessage;
+import javax.xml.soap.SOAPPart;
+
+import org.jboss.security.xacml.core.model.context.DecisionType;
+import org.jboss.security.xacml.core.model.context.ResultType;
+import org.junit.Test;
+import org.picketlink.identity.federation.bindings.servlets.SOAPSAMLXACMLServlet;
+import org.picketlink.identity.federation.core.saml.v2.util.DocumentUtil;
+import org.picketlink.identity.federation.core.saml.v2.util.SOAPSAMLXACMLUtil;
+import org.picketlink.identity.federation.core.util.SOAPUtil;
+import org.picketlink.identity.federation.saml.v2.profiles.xacml.assertion.XACMLAuthzDecisionStatementType;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+
+/**
+ * Unit Test the SOAP SAML XACML Servlet
+ * @author Anil.Saldhana(a)redhat.com
+ * @since Jan 28, 2009
+ */
+public class SOAPSAMLXACMLServletUnitTestCase
+{
+ @Test
+ public void testPermit() throws Exception
+ {
+ validate("xacml/requests/XacmlRequest-01-01.xml", DecisionType.PERMIT.value(), true);
+
+ validate("xacml/requests/XacmlRequest-format2-01-01.xml", DecisionType.PERMIT.value(), true);
+ }
+
+ @Test
+ public void testDeny() throws Exception
+ {
+ validate("xacml/requests/XacmlRequest-01-02.xml", DecisionType.DENY.value(), true);
+ }
+
+ @Test
+ public void testIncorrectInput() throws Exception
+ {
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
+
+ String garbage = "<fdfdsfdfk/>";
+ ByteArrayInputStream bis = new ByteArrayInputStream(garbage.getBytes());
+
+ SOAPSAMLXACMLServlet servlet = new SOAPSAMLXACMLServlet();
+ servlet.init(new TestServletConfig(getServletContext()));
+ ServletRequest sreq = new TestServletRequest(getSOAPStream(bis));
+ ServletResponse sresp = new TestServletResponse(baos);
+ servlet.service(sreq, sresp);
+
+ sresp.flushBuffer(); //Flush the servlet response ServletOutputStream to our baos
+
+ bis = new ByteArrayInputStream(baos.toByteArray());
+
+ SOAPMessage soapMessage = SOAPUtil.getSOAPMessage(bis);
+ Node xacmlNode = soapMessage.getSOAPBody().getChildNodes().item(0);
+ assertTrue(xacmlNode instanceof Element);
+ Element xacmlElement = (Element) xacmlNode;
+ assertTrue(xacmlElement.getLocalName().equals("Fault"));
+ /*Unmarshaller un = JAXBUtil.getUnmarshaller(SOAPSAMLXACMLUtil.getPackage());
+ JAXBElement<Envelope> jax = (JAXBElement<Envelope>) un.unmarshal(bis);
+ Envelope envelope = jax.getValue();
+ assertNotNull("Envelope is not null", envelope);
+ JAXBElement<?> fault = (JAXBElement<?>) envelope.getBody().getAny().get(0);
+ assertTrue(fault.getValue() instanceof Fault);*/
+ }
+
+ @Test
+ public void testInteropSOAPRequest() throws Exception
+ {
+ validate("xacml/requests/interop-request.xml", DecisionType.PERMIT.value(), false);
+ }
+
+ private void validate(String requestFile, String value, boolean needSOAPWrapping) throws Exception
+ {
+ InputStream is = getInputStream(requestFile);
+ if (is == null)
+ throw new IllegalArgumentException("Input Stream to request file is null");
+
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
+
+ SOAPSAMLXACMLServlet servlet = new SOAPSAMLXACMLServlet();
+ servlet.init(new TestServletConfig(getServletContext()));
+
+ if (needSOAPWrapping)
+ is = getSOAPStream(is);
+
+ ServletRequest sreq = new TestServletRequest(is);
+ ServletResponse sresp = new TestServletResponse(baos);
+ servlet.service(sreq, sresp);
+
+ sresp.flushBuffer(); //Flush the servlet response ServletOutputStream to our baos
+
+ ByteArrayInputStream bis = new ByteArrayInputStream(baos.toByteArray());
+
+ SOAPMessage soapMessage = SOAPUtil.getSOAPMessage(bis);
+
+ Node xacmlNode = soapMessage.getSOAPBody().getChildNodes().item(0);
+ XACMLAuthzDecisionStatementType xacmlStatement = SOAPSAMLXACMLUtil.getDecisionStatement(xacmlNode);
+ /*Unmarshaller un = JAXBUtil.getUnmarshaller(SOAPSAMLXACMLUtil.getPackage());
+ JAXBElement<Envelope> jax = (JAXBElement<Envelope>) un.unmarshal(bis);
+ Envelope envelope = jax.getValue();
+ assertNotNull("Envelope is not null", envelope);
+
+ JAXBElement<ResponseType> jaxbResponseType = (JAXBElement<ResponseType>) envelope.getBody().getAny().get(0);
+ ResponseType responseType = jaxbResponseType.getValue();
+
+ assertNotNull("ResponseType is not null", responseType);
+ AssertionType assertion = (AssertionType) responseType.getAssertionOrEncryptedAssertion().get(0);
+ XACMLAuthzDecisionStatementType xacmlStatement = (XACMLAuthzDecisionStatementType) assertion.getStatementOrAuthnStatementOrAuthzDecisionStatement().get(0);
+ */
+
+ assertNotNull("XACML Authorization Statement is not null", xacmlStatement);
+ org.jboss.security.xacml.core.model.context.ResponseType xacmlResponse = xacmlStatement.getResponse();
+ ResultType resultType = xacmlResponse.getResult().get(0);
+ DecisionType decision = resultType.getDecision();
+ assertNotNull("Decision is not null", decision);
+ assertEquals(value, decision.value());
+ }
+
+ private ServletContext getServletContext()
+ {
+ HashMap<String, String> map = new HashMap<String, String>();
+ map.put("policyConfigFileName", "xacml/policies/config/rsaConfPolicyConfig.xml");
+ return new TestServletContext(map);
+ }
+
+ private InputStream getInputStream(String requestFileLoc)
+ {
+ ClassLoader tcl = Thread.currentThread().getContextClassLoader();
+ return tcl.getResourceAsStream(requestFileLoc);
+ }
+
+ private InputStream getSOAPStream(InputStream dataStream) throws Exception
+ {
+ SOAPMessage message = SOAPUtil.create();
+ SOAPPart soapPart = message.getSOAPPart();
+ SOAPEnvelope envelope = soapPart.getEnvelope();
+ SOAPBody body = envelope.getBody();
+
+ body.addDocument(DocumentUtil.getDocument(dataStream));
+ message.saveChanges();
+
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ message.writeTo(baos);
+
+ return new ByteArrayInputStream(baos.toByteArray());
+ }
+}
\ No newline at end of file
Added: product/trunk/picketlink-core/src/test/java/org/picketlink/test/identity/federation/bindings/servlets/TestServletConfig.java
===================================================================
--- product/trunk/picketlink-core/src/test/java/org/picketlink/test/identity/federation/bindings/servlets/TestServletConfig.java (rev 0)
+++ product/trunk/picketlink-core/src/test/java/org/picketlink/test/identity/federation/bindings/servlets/TestServletConfig.java 2011-08-11 22:25:16 UTC (rev 1185)
@@ -0,0 +1,63 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.picketlink.test.identity.federation.bindings.servlets;
+
+import java.util.Enumeration;
+
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletContext;
+
+
+/**
+ * @author Anil.Saldhana(a)redhat.com
+ * @since Jan 28, 2009
+ */
+@SuppressWarnings({"rawtypes"})
+public class TestServletConfig implements ServletConfig
+{
+ private ServletContext sc;
+
+ public TestServletConfig(ServletContext sc)
+ {
+ this.sc = sc;
+ }
+
+ public String getInitParameter(String name)
+ {
+ return sc.getInitParameter(name);
+ }
+
+ public Enumeration getInitParameterNames()
+ {
+ return null;
+ }
+
+ public ServletContext getServletContext()
+ {
+ return sc;
+ }
+
+ public String getServletName()
+ {
+ return null;
+ }
+}
Added: product/trunk/picketlink-core/src/test/java/org/picketlink/test/identity/federation/bindings/servlets/TestServletContext.java
===================================================================
--- product/trunk/picketlink-core/src/test/java/org/picketlink/test/identity/federation/bindings/servlets/TestServletContext.java (rev 0)
+++ product/trunk/picketlink-core/src/test/java/org/picketlink/test/identity/federation/bindings/servlets/TestServletContext.java 2011-08-11 22:25:16 UTC (rev 1185)
@@ -0,0 +1,170 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.picketlink.test.identity.federation.bindings.servlets;
+
+import java.io.InputStream;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.Set;
+
+import javax.servlet.RequestDispatcher;
+import javax.servlet.Servlet;
+import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
+
+
+/**
+ * @author Anil.Saldhana(a)redhat.com
+ * @since Jan 28, 2009
+ */
+@SuppressWarnings({ "rawtypes"})
+public class TestServletContext implements ServletContext
+{
+ private HashMap<String,String> params = new HashMap<String,String>();
+
+ public TestServletContext(HashMap<String,String> map)
+ {
+ this.params = map;
+ }
+
+ public Object getAttribute(String name)
+ {
+ return null;
+ }
+
+ public Enumeration getAttributeNames()
+ {
+ return null;
+ }
+
+ public ServletContext getContext(String uripath)
+ {
+ return null;
+ }
+
+ public String getContextPath()
+ {
+ return null;
+ }
+
+ public String getInitParameter(String name)
+ {
+ return this.params.get(name);
+ }
+
+ public Enumeration getInitParameterNames()
+ {
+ return null;
+ }
+
+ public int getMajorVersion()
+ {
+ return 0;
+ }
+
+ public String getMimeType(String file)
+ {
+ return null;
+ }
+
+ public int getMinorVersion()
+ {
+ return 0;
+ }
+
+ public RequestDispatcher getNamedDispatcher(String name)
+ {
+ return null;
+ }
+
+ public String getRealPath(String path)
+ {
+ return null;
+ }
+
+ public RequestDispatcher getRequestDispatcher(String path)
+ {
+ return null;
+ }
+
+ public URL getResource(String path) throws MalformedURLException
+ {
+ return null;
+ }
+
+ public InputStream getResourceAsStream(String path)
+ {
+ return null;
+ }
+
+ public Set getResourcePaths(String path)
+ {
+ return null;
+ }
+
+ public String getServerInfo()
+ {
+ return null;
+ }
+
+ public Servlet getServlet(String name) throws ServletException
+ {
+ return null;
+ }
+
+ public String getServletContextName()
+ {
+ return null;
+ }
+
+ public Enumeration getServletNames()
+ {
+ return null;
+ }
+
+ public Enumeration getServlets()
+ {
+ return null;
+ }
+
+ public void log(String msg)
+ {
+ }
+
+ public void log(Exception exception, String msg)
+ {
+ }
+
+ public void log(String message, Throwable throwable)
+ {
+ }
+
+ public void removeAttribute(String name)
+ {
+ }
+
+ public void setAttribute(String name, Object object)
+ {
+ }
+}
\ No newline at end of file
Added: product/trunk/picketlink-core/src/test/java/org/picketlink/test/identity/federation/bindings/servlets/TestServletRequest.java
===================================================================
--- product/trunk/picketlink-core/src/test/java/org/picketlink/test/identity/federation/bindings/servlets/TestServletRequest.java (rev 0)
+++ product/trunk/picketlink-core/src/test/java/org/picketlink/test/identity/federation/bindings/servlets/TestServletRequest.java 2011-08-11 22:25:16 UTC (rev 1185)
@@ -0,0 +1,329 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.picketlink.test.identity.federation.bindings.servlets;
+
+import java.io.BufferedInputStream;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.UnsupportedEncodingException;
+import java.security.Principal;
+import java.util.Enumeration;
+import java.util.Locale;
+import java.util.Map;
+
+import javax.servlet.RequestDispatcher;
+import javax.servlet.ServletInputStream;
+import javax.servlet.http.Cookie;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpSession;
+
+
+/**
+ * @author Anil.Saldhana(a)redhat.com
+ * @since Jan 28, 2009
+ */
+@SuppressWarnings({ "rawtypes"})
+public class TestServletRequest implements HttpServletRequest
+{
+ private BufferedInputStream is = null;
+
+ public TestServletRequest(InputStream is)
+ {
+ super();
+ this.is = new BufferedInputStream(is);
+ }
+
+ public String getAuthType()
+ {
+ return null;
+ }
+
+ public String getContextPath()
+ {
+ return null;
+ }
+
+ public Cookie[] getCookies()
+ {
+ return null;
+ }
+
+ public long getDateHeader(String name)
+ {
+ return 0;
+ }
+
+ public String getHeader(String name)
+ {
+ return null;
+ }
+
+ public Enumeration getHeaderNames()
+ {
+ return null;
+ }
+
+ public Enumeration getHeaders(String name)
+ {
+ return null;
+ }
+
+ public int getIntHeader(String name)
+ {
+ return 0;
+ }
+
+ public String getMethod()
+ {
+ return null;
+ }
+
+ public String getPathInfo()
+ {
+ return null;
+ }
+
+ public String getPathTranslated()
+ {
+ return null;
+ }
+
+ public String getQueryString()
+ {
+ return null;
+ }
+
+ public String getRemoteUser()
+ {
+ return null;
+ }
+
+ public String getRequestURI()
+ {
+ return null;
+ }
+
+ public StringBuffer getRequestURL()
+ {
+ return null;
+ }
+
+ public String getRequestedSessionId()
+ {
+ return null;
+ }
+
+ public String getServletPath()
+ {
+ return null;
+ }
+
+ public HttpSession getSession()
+ {
+ return null;
+ }
+
+ public HttpSession getSession(boolean create)
+ {
+ return null;
+ }
+
+ public Principal getUserPrincipal()
+ {
+ return null;
+ }
+
+ public boolean isRequestedSessionIdFromCookie()
+ {
+ return false;
+ }
+
+ public boolean isRequestedSessionIdFromURL()
+ {
+ return false;
+ }
+
+ public boolean isRequestedSessionIdFromUrl()
+ {
+ return false;
+ }
+
+ public boolean isRequestedSessionIdValid()
+ {
+ return false;
+ }
+
+ public boolean isUserInRole(String role)
+ {
+ return false;
+ }
+
+ public Object getAttribute(String name)
+ {
+ return null;
+ }
+
+ public Enumeration getAttributeNames()
+ {
+ return null;
+ }
+
+ public String getCharacterEncoding()
+ {
+ return null;
+ }
+
+ public int getContentLength()
+ {
+ return 0;
+ }
+
+ public String getContentType()
+ {
+ return null;
+ }
+
+ public ServletInputStream getInputStream() throws IOException
+ {
+ return new ServletInputStream()
+ {
+ @Override
+ public int read() throws IOException
+ {
+ return is.read();
+ }
+ };
+ }
+
+ public String getLocalAddr()
+ {
+ return null;
+ }
+
+ public String getLocalName()
+ {
+ return null;
+ }
+
+ public int getLocalPort()
+ {
+ return 0;
+ }
+
+ public Locale getLocale()
+ {
+ return null;
+ }
+
+ public Enumeration getLocales()
+ {
+ return null;
+ }
+
+ public String getParameter(String name)
+ {
+ return null;
+ }
+
+ public Map getParameterMap()
+ {
+ return null;
+ }
+
+ public Enumeration getParameterNames()
+ {
+ return null;
+ }
+
+ public String[] getParameterValues(String name)
+ {
+ return null;
+ }
+
+ public String getProtocol()
+ {
+ return null;
+ }
+
+ public BufferedReader getReader() throws IOException
+ {
+ return null;
+ }
+
+ public String getRealPath(String path)
+ {
+ return null;
+ }
+
+ public String getRemoteAddr()
+ {
+ return null;
+ }
+
+ public String getRemoteHost()
+ {
+ return null;
+ }
+
+ public int getRemotePort()
+ {
+ return 0;
+ }
+
+ public RequestDispatcher getRequestDispatcher(String path)
+ {
+ return null;
+ }
+
+ public String getScheme()
+ {
+ return null;
+ }
+
+ public String getServerName()
+ {
+ return null;
+ }
+
+ public int getServerPort()
+ {
+ return 0;
+ }
+
+ public boolean isSecure()
+ {
+ return false;
+ }
+
+ public void removeAttribute(String name)
+ {
+ }
+
+ public void setAttribute(String name, Object o)
+ {
+ }
+
+ public void setCharacterEncoding(String env) throws UnsupportedEncodingException
+ {
+ }
+}
\ No newline at end of file
Added: product/trunk/picketlink-core/src/test/java/org/picketlink/test/identity/federation/bindings/servlets/TestServletResponse.java
===================================================================
--- product/trunk/picketlink-core/src/test/java/org/picketlink/test/identity/federation/bindings/servlets/TestServletResponse.java (rev 0)
+++ product/trunk/picketlink-core/src/test/java/org/picketlink/test/identity/federation/bindings/servlets/TestServletResponse.java 2011-08-11 22:25:16 UTC (rev 1185)
@@ -0,0 +1,196 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.picketlink.test.identity.federation.bindings.servlets;
+
+import java.io.BufferedOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.PrintWriter;
+import java.util.Locale;
+
+import javax.servlet.ServletOutputStream;
+import javax.servlet.http.Cookie;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ * @author Anil.Saldhana(a)redhat.com
+ * @since Jan 28, 2009
+ */
+public class TestServletResponse implements HttpServletResponse
+{
+ private BufferedOutputStream bos = null;
+
+ public TestServletResponse(OutputStream os)
+ {
+ super();
+ bos = new BufferedOutputStream(os);
+ }
+
+ public void addCookie(Cookie cookie)
+ {
+ }
+
+ public void addDateHeader(String name, long date)
+ {
+ }
+
+ public void addHeader(String name, String value)
+ {
+ }
+
+ public void addIntHeader(String name, int value)
+ {
+ }
+
+ public boolean containsHeader(String name)
+ {
+ return false;
+ }
+
+ public String encodeRedirectURL(String url)
+ {
+ return null;
+ }
+
+ public String encodeRedirectUrl(String url)
+ {
+ return null;
+ }
+
+ public String encodeURL(String url)
+ {
+ return null;
+ }
+
+ public String encodeUrl(String url)
+ {
+ return null;
+ }
+
+ public void sendError(int sc) throws IOException
+ {
+ }
+
+ public void sendError(int sc, String msg) throws IOException
+ {
+ }
+
+ public void sendRedirect(String location) throws IOException
+ {
+ }
+
+ public void setDateHeader(String name, long date)
+ {
+ }
+
+ public void setHeader(String name, String value)
+ {
+ }
+
+ public void setIntHeader(String name, int value)
+ {
+ }
+
+ public void setStatus(int sc)
+ {
+ }
+
+ public void setStatus(int sc, String sm)
+ {
+ }
+
+ public void flushBuffer() throws IOException
+ {
+ this.bos.flush();
+ }
+
+ public int getBufferSize()
+ {
+ return 0;
+ }
+
+ public String getCharacterEncoding()
+ {
+ return null;
+ }
+
+ public String getContentType()
+ {
+ return null;
+ }
+
+ public Locale getLocale()
+ {
+ return null;
+ }
+
+ public ServletOutputStream getOutputStream() throws IOException
+ {
+ bos.flush();
+ return new ServletOutputStream()
+ {
+ @Override
+ public void write(int b) throws IOException
+ {
+ bos.write(b);
+ }
+ };
+ }
+
+ public PrintWriter getWriter() throws IOException
+ {
+ return null;
+ }
+
+ public boolean isCommitted()
+ {
+ return false;
+ }
+
+ public void reset()
+ {
+ }
+
+ public void resetBuffer()
+ {
+ }
+
+ public void setBufferSize(int size)
+ {
+ }
+
+ public void setCharacterEncoding(String charset)
+ {
+ }
+
+ public void setContentLength(int len)
+ {
+ }
+
+ public void setContentType(String type)
+ {
+ }
+
+ public void setLocale(Locale loc)
+ {
+ }
+}
13 years, 4 months
- 1
- 0