Picketlink SVN: r1232 - in trust/trunk: jbossws and 1 other directories.
by picketlink-commits＠lists.jboss.org
Author: anil.saldhana(a)jboss.com
Date: 2011-09-19 12:38:18 -0400 (Mon, 19 Sep 2011)
New Revision: 1232
Modified:
trust/trunk/jbossws/pom.xml
trust/trunk/parent/pom.xml
trust/trunk/pom.xml
Log:
PLFED-233: prepare 2.0.1.final
Modified: trust/trunk/jbossws/pom.xml
===================================================================
--- trust/trunk/jbossws/pom.xml 2011-09-19 16:36:58 UTC (rev 1231)
+++ trust/trunk/jbossws/pom.xml 2011-09-19 16:38:18 UTC (rev 1232)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.picketlink</groupId>
<artifactId>picketlink-trust-parent</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.0.1.final</version>
<relativePath>../parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -52,12 +52,12 @@
<dependency>
<groupId>org.picketlink</groupId>
<artifactId>picketlink-fed</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.0.1.final</version>
</dependency>
<dependency>
<groupId>org.picketlink</groupId>
<artifactId>picketlink-bindings-jboss</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.0.1.final</version>
<exclusions>
<exclusion>
<artifactId>jboss-security-spi</artifactId>
Modified: trust/trunk/parent/pom.xml
===================================================================
--- trust/trunk/parent/pom.xml 2011-09-19 16:36:58 UTC (rev 1231)
+++ trust/trunk/parent/pom.xml 2011-09-19 16:38:18 UTC (rev 1232)
@@ -8,7 +8,7 @@
<groupId>org.picketlink</groupId>
<artifactId>picketlink-trust-parent</artifactId>
<packaging>pom</packaging>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.0.1.final</version>
<name>PicketLink Trust - Parent</name>
<url>http://labs.jboss.org/portal/picketlink/</url>
<description>PicketLink Trust integrates PicketLink with external projects</description>
Modified: trust/trunk/pom.xml
===================================================================
--- trust/trunk/pom.xml 2011-09-19 16:36:58 UTC (rev 1231)
+++ trust/trunk/pom.xml 2011-09-19 16:38:18 UTC (rev 1232)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.picketlink</groupId>
<artifactId>picketlink-trust-parent</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.0.1.final</version>
<relativePath>parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
12 years, 7 months
- 1
- 0
Picketlink SVN: r1231 - in federation/trunk: assembly and 29 other directories.
by picketlink-commits＠lists.jboss.org
Author: anil.saldhana(a)jboss.com
Date: 2011-09-19 12:36:58 -0400 (Mon, 19 Sep 2011)
New Revision: 1231
Modified:
federation/trunk/assembly/pom.xml
federation/trunk/parent/pom.xml
federation/trunk/picketlink-bindings-jboss/pom.xml
federation/trunk/picketlink-bindings/pom.xml
federation/trunk/picketlink-fed-api/pom.xml
federation/trunk/picketlink-fed-core/pom.xml
federation/trunk/picketlink-fed-model/pom.xml
federation/trunk/picketlink-web/pom.xml
federation/trunk/picketlink-webapps/assembly/pom.xml
federation/trunk/picketlink-webapps/circleoftrust/pom.xml
federation/trunk/picketlink-webapps/employee-post-sig/pom.xml
federation/trunk/picketlink-webapps/employee-post/pom.xml
federation/trunk/picketlink-webapps/employee-sig/pom.xml
federation/trunk/picketlink-webapps/employee-standalone/pom.xml
federation/trunk/picketlink-webapps/employee/pom.xml
federation/trunk/picketlink-webapps/idp-sig-no-val/pom.xml
federation/trunk/picketlink-webapps/idp-sig/pom.xml
federation/trunk/picketlink-webapps/idp-standalone/pom.xml
federation/trunk/picketlink-webapps/idp/pom.xml
federation/trunk/picketlink-webapps/metadata/pom.xml
federation/trunk/picketlink-webapps/pdp/pom.xml
federation/trunk/picketlink-webapps/picketlink-sts/pom.xml
federation/trunk/picketlink-webapps/pom.xml
federation/trunk/picketlink-webapps/sales-post-sig/pom.xml
federation/trunk/picketlink-webapps/sales-post/pom.xml
federation/trunk/picketlink-webapps/sales-saml11/pom.xml
federation/trunk/picketlink-webapps/sales-sig/pom.xml
federation/trunk/picketlink-webapps/sales-standalone/pom.xml
federation/trunk/picketlink-webapps/sales/pom.xml
federation/trunk/picketlink-xmlsec-model/pom.xml
federation/trunk/pom.xml
Log:
PLFED-233: next 2.0.2
Modified: federation/trunk/assembly/pom.xml
===================================================================
--- federation/trunk/assembly/pom.xml 2011-09-19 16:28:35 UTC (rev 1230)
+++ federation/trunk/assembly/pom.xml 2011-09-19 16:36:58 UTC (rev 1231)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.picketlink</groupId>
<artifactId>picketlink-fed-parent</artifactId>
- <version>2.0.1.final</version>
+ <version>2.0.2-SNAPSHOT</version>
<relativePath>../parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: federation/trunk/parent/pom.xml
===================================================================
--- federation/trunk/parent/pom.xml 2011-09-19 16:28:35 UTC (rev 1230)
+++ federation/trunk/parent/pom.xml 2011-09-19 16:36:58 UTC (rev 1231)
@@ -8,7 +8,7 @@
<groupId>org.picketlink</groupId>
<artifactId>picketlink-fed-parent</artifactId>
<packaging>pom</packaging>
- <version>2.0.1.final</version>
+ <version>2.0.2-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>
Modified: federation/trunk/picketlink-bindings/pom.xml
===================================================================
--- federation/trunk/picketlink-bindings/pom.xml 2011-09-19 16:28:35 UTC (rev 1230)
+++ federation/trunk/picketlink-bindings/pom.xml 2011-09-19 16:36:58 UTC (rev 1231)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.picketlink</groupId>
<artifactId>picketlink-fed-parent</artifactId>
- <version>2.0.1.final</version>
+ <version>2.0.2-SNAPSHOT</version>
<relativePath>../parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: federation/trunk/picketlink-bindings-jboss/pom.xml
===================================================================
--- federation/trunk/picketlink-bindings-jboss/pom.xml 2011-09-19 16:28:35 UTC (rev 1230)
+++ federation/trunk/picketlink-bindings-jboss/pom.xml 2011-09-19 16:36:58 UTC (rev 1231)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.picketlink</groupId>
<artifactId>picketlink-fed-parent</artifactId>
- <version>2.0.1.final</version>
+ <version>2.0.2-SNAPSHOT</version>
<relativePath>../parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: federation/trunk/picketlink-fed-api/pom.xml
===================================================================
--- federation/trunk/picketlink-fed-api/pom.xml 2011-09-19 16:28:35 UTC (rev 1230)
+++ federation/trunk/picketlink-fed-api/pom.xml 2011-09-19 16:36:58 UTC (rev 1231)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.picketlink</groupId>
<artifactId>picketlink-fed-parent</artifactId>
- <version>2.0.1.final</version>
+ <version>2.0.2-SNAPSHOT</version>
<relativePath>../parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: federation/trunk/picketlink-fed-core/pom.xml
===================================================================
--- federation/trunk/picketlink-fed-core/pom.xml 2011-09-19 16:28:35 UTC (rev 1230)
+++ federation/trunk/picketlink-fed-core/pom.xml 2011-09-19 16:36:58 UTC (rev 1231)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.picketlink</groupId>
<artifactId>picketlink-fed-parent</artifactId>
- <version>2.0.1.final</version>
+ <version>2.0.2-SNAPSHOT</version>
<relativePath>../parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: federation/trunk/picketlink-fed-model/pom.xml
===================================================================
--- federation/trunk/picketlink-fed-model/pom.xml 2011-09-19 16:28:35 UTC (rev 1230)
+++ federation/trunk/picketlink-fed-model/pom.xml 2011-09-19 16:36:58 UTC (rev 1231)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.picketlink</groupId>
<artifactId>picketlink-fed-parent</artifactId>
- <version>2.0.1.final</version>
+ <version>2.0.2-SNAPSHOT</version>
<relativePath>../parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: federation/trunk/picketlink-web/pom.xml
===================================================================
--- federation/trunk/picketlink-web/pom.xml 2011-09-19 16:28:35 UTC (rev 1230)
+++ federation/trunk/picketlink-web/pom.xml 2011-09-19 16:36:58 UTC (rev 1231)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.picketlink</groupId>
<artifactId>picketlink-fed-parent</artifactId>
- <version>2.0.1.final</version>
+ <version>2.0.2-SNAPSHOT</version>
<relativePath>../parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: federation/trunk/picketlink-webapps/assembly/pom.xml
===================================================================
--- federation/trunk/picketlink-webapps/assembly/pom.xml 2011-09-19 16:28:35 UTC (rev 1230)
+++ federation/trunk/picketlink-webapps/assembly/pom.xml 2011-09-19 16:36:58 UTC (rev 1231)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.picketlink</groupId>
<artifactId>picketlink-fed-parent</artifactId>
- <version>2.0.1.final</version>
+ <version>2.0.2-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: federation/trunk/picketlink-webapps/circleoftrust/pom.xml
===================================================================
--- federation/trunk/picketlink-webapps/circleoftrust/pom.xml 2011-09-19 16:28:35 UTC (rev 1230)
+++ federation/trunk/picketlink-webapps/circleoftrust/pom.xml 2011-09-19 16:36:58 UTC (rev 1231)
@@ -2,13 +2,13 @@
<parent>
<groupId>org.picketlink</groupId>
<artifactId>picketlink-federation-webapps</artifactId>
- <version>2.0.1.final</version>
+ <version>2.0.2-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>circleoftrust</artifactId>
- <version>2.0.1.final</version>
+ <version>2.0.2-SNAPSHOT</version>
<packaging>war</packaging>
<name>PicketLink Federation Circle Of Trust</name>
<url>http://labs.jboss.org/portal/picketlink/</url>
Modified: federation/trunk/picketlink-webapps/employee/pom.xml
===================================================================
--- federation/trunk/picketlink-webapps/employee/pom.xml 2011-09-19 16:28:35 UTC (rev 1230)
+++ federation/trunk/picketlink-webapps/employee/pom.xml 2011-09-19 16:36:58 UTC (rev 1231)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.picketlink</groupId>
<artifactId>picketlink-federation-webapps</artifactId>
- <version>2.0.1.final</version>
+ <version>2.0.2-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
Modified: federation/trunk/picketlink-webapps/employee-post/pom.xml
===================================================================
--- federation/trunk/picketlink-webapps/employee-post/pom.xml 2011-09-19 16:28:35 UTC (rev 1230)
+++ federation/trunk/picketlink-webapps/employee-post/pom.xml 2011-09-19 16:36:58 UTC (rev 1231)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.picketlink</groupId>
<artifactId>picketlink-federation-webapps</artifactId>
- <version>2.0.1.final</version>
+ <version>2.0.2-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
Modified: federation/trunk/picketlink-webapps/employee-post-sig/pom.xml
===================================================================
--- federation/trunk/picketlink-webapps/employee-post-sig/pom.xml 2011-09-19 16:28:35 UTC (rev 1230)
+++ federation/trunk/picketlink-webapps/employee-post-sig/pom.xml 2011-09-19 16:36:58 UTC (rev 1231)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.picketlink</groupId>
<artifactId>picketlink-federation-webapps</artifactId>
- <version>2.0.1.final</version>
+ <version>2.0.2-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
Modified: federation/trunk/picketlink-webapps/employee-sig/pom.xml
===================================================================
--- federation/trunk/picketlink-webapps/employee-sig/pom.xml 2011-09-19 16:28:35 UTC (rev 1230)
+++ federation/trunk/picketlink-webapps/employee-sig/pom.xml 2011-09-19 16:36:58 UTC (rev 1231)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.picketlink</groupId>
<artifactId>picketlink-federation-webapps</artifactId>
- <version>2.0.1.final</version>
+ <version>2.0.2-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
Modified: federation/trunk/picketlink-webapps/employee-standalone/pom.xml
===================================================================
--- federation/trunk/picketlink-webapps/employee-standalone/pom.xml 2011-09-19 16:28:35 UTC (rev 1230)
+++ federation/trunk/picketlink-webapps/employee-standalone/pom.xml 2011-09-19 16:36:58 UTC (rev 1231)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.picketlink</groupId>
<artifactId>picketlink-federation-webapps</artifactId>
- <version>2.0.1.final</version>
+ <version>2.0.2-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
Modified: federation/trunk/picketlink-webapps/idp/pom.xml
===================================================================
--- federation/trunk/picketlink-webapps/idp/pom.xml 2011-09-19 16:28:35 UTC (rev 1230)
+++ federation/trunk/picketlink-webapps/idp/pom.xml 2011-09-19 16:36:58 UTC (rev 1231)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.picketlink</groupId>
<artifactId>picketlink-federation-webapps</artifactId>
- <version>2.0.1.final</version>
+ <version>2.0.2-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
Modified: federation/trunk/picketlink-webapps/idp-sig/pom.xml
===================================================================
--- federation/trunk/picketlink-webapps/idp-sig/pom.xml 2011-09-19 16:28:35 UTC (rev 1230)
+++ federation/trunk/picketlink-webapps/idp-sig/pom.xml 2011-09-19 16:36:58 UTC (rev 1231)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.picketlink</groupId>
<artifactId>picketlink-federation-webapps</artifactId>
- <version>2.0.1.final</version>
+ <version>2.0.2-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
Modified: federation/trunk/picketlink-webapps/idp-sig-no-val/pom.xml
===================================================================
--- federation/trunk/picketlink-webapps/idp-sig-no-val/pom.xml 2011-09-19 16:28:35 UTC (rev 1230)
+++ federation/trunk/picketlink-webapps/idp-sig-no-val/pom.xml 2011-09-19 16:36:58 UTC (rev 1231)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.picketlink</groupId>
<artifactId>picketlink-federation-webapps</artifactId>
- <version>2.0.1.final</version>
+ <version>2.0.2-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
Modified: federation/trunk/picketlink-webapps/idp-standalone/pom.xml
===================================================================
--- federation/trunk/picketlink-webapps/idp-standalone/pom.xml 2011-09-19 16:28:35 UTC (rev 1230)
+++ federation/trunk/picketlink-webapps/idp-standalone/pom.xml 2011-09-19 16:36:58 UTC (rev 1231)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.picketlink</groupId>
<artifactId>picketlink-federation-webapps</artifactId>
- <version>2.0.1.final</version>
+ <version>2.0.2-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
Modified: federation/trunk/picketlink-webapps/metadata/pom.xml
===================================================================
--- federation/trunk/picketlink-webapps/metadata/pom.xml 2011-09-19 16:28:35 UTC (rev 1230)
+++ federation/trunk/picketlink-webapps/metadata/pom.xml 2011-09-19 16:36:58 UTC (rev 1231)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.picketlink</groupId>
<artifactId>picketlink-federation-webapps</artifactId>
- <version>2.0.1.final</version>
+ <version>2.0.2-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
Modified: federation/trunk/picketlink-webapps/pdp/pom.xml
===================================================================
--- federation/trunk/picketlink-webapps/pdp/pom.xml 2011-09-19 16:28:35 UTC (rev 1230)
+++ federation/trunk/picketlink-webapps/pdp/pom.xml 2011-09-19 16:36:58 UTC (rev 1231)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.picketlink</groupId>
<artifactId>picketlink-federation-webapps</artifactId>
- <version>2.0.1.final</version>
+ <version>2.0.2-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
Modified: federation/trunk/picketlink-webapps/picketlink-sts/pom.xml
===================================================================
--- federation/trunk/picketlink-webapps/picketlink-sts/pom.xml 2011-09-19 16:28:35 UTC (rev 1230)
+++ federation/trunk/picketlink-webapps/picketlink-sts/pom.xml 2011-09-19 16:36:58 UTC (rev 1231)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.picketlink</groupId>
<artifactId>picketlink-federation-webapps</artifactId>
- <version>2.0.1.final</version>
+ <version>2.0.2-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
Modified: federation/trunk/picketlink-webapps/pom.xml
===================================================================
--- federation/trunk/picketlink-webapps/pom.xml 2011-09-19 16:28:35 UTC (rev 1230)
+++ federation/trunk/picketlink-webapps/pom.xml 2011-09-19 16:36:58 UTC (rev 1231)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.picketlink</groupId>
<artifactId>picketlink-fed-parent</artifactId>
- <version>2.0.1.final</version>
+ <version>2.0.2-SNAPSHOT</version>
<relativePath>../parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: federation/trunk/picketlink-webapps/sales/pom.xml
===================================================================
--- federation/trunk/picketlink-webapps/sales/pom.xml 2011-09-19 16:28:35 UTC (rev 1230)
+++ federation/trunk/picketlink-webapps/sales/pom.xml 2011-09-19 16:36:58 UTC (rev 1231)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.picketlink</groupId>
<artifactId>picketlink-federation-webapps</artifactId>
- <version>2.0.1.final</version>
+ <version>2.0.2-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
Modified: federation/trunk/picketlink-webapps/sales-post/pom.xml
===================================================================
--- federation/trunk/picketlink-webapps/sales-post/pom.xml 2011-09-19 16:28:35 UTC (rev 1230)
+++ federation/trunk/picketlink-webapps/sales-post/pom.xml 2011-09-19 16:36:58 UTC (rev 1231)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.picketlink</groupId>
<artifactId>picketlink-federation-webapps</artifactId>
- <version>2.0.1.final</version>
+ <version>2.0.2-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
Modified: federation/trunk/picketlink-webapps/sales-post-sig/pom.xml
===================================================================
--- federation/trunk/picketlink-webapps/sales-post-sig/pom.xml 2011-09-19 16:28:35 UTC (rev 1230)
+++ federation/trunk/picketlink-webapps/sales-post-sig/pom.xml 2011-09-19 16:36:58 UTC (rev 1231)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.picketlink</groupId>
<artifactId>picketlink-federation-webapps</artifactId>
- <version>2.0.1.final</version>
+ <version>2.0.2-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
Modified: federation/trunk/picketlink-webapps/sales-saml11/pom.xml
===================================================================
--- federation/trunk/picketlink-webapps/sales-saml11/pom.xml 2011-09-19 16:28:35 UTC (rev 1230)
+++ federation/trunk/picketlink-webapps/sales-saml11/pom.xml 2011-09-19 16:36:58 UTC (rev 1231)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.picketlink</groupId>
<artifactId>picketlink-federation-webapps</artifactId>
- <version>2.0.1.final</version>
+ <version>2.0.2-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
Modified: federation/trunk/picketlink-webapps/sales-sig/pom.xml
===================================================================
--- federation/trunk/picketlink-webapps/sales-sig/pom.xml 2011-09-19 16:28:35 UTC (rev 1230)
+++ federation/trunk/picketlink-webapps/sales-sig/pom.xml 2011-09-19 16:36:58 UTC (rev 1231)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.picketlink</groupId>
<artifactId>picketlink-federation-webapps</artifactId>
- <version>2.0.1.final</version>
+ <version>2.0.2-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
Modified: federation/trunk/picketlink-webapps/sales-standalone/pom.xml
===================================================================
--- federation/trunk/picketlink-webapps/sales-standalone/pom.xml 2011-09-19 16:28:35 UTC (rev 1230)
+++ federation/trunk/picketlink-webapps/sales-standalone/pom.xml 2011-09-19 16:36:58 UTC (rev 1231)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.picketlink</groupId>
<artifactId>picketlink-federation-webapps</artifactId>
- <version>2.0.1.final</version>
+ <version>2.0.2-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
Modified: federation/trunk/picketlink-xmlsec-model/pom.xml
===================================================================
--- federation/trunk/picketlink-xmlsec-model/pom.xml 2011-09-19 16:28:35 UTC (rev 1230)
+++ federation/trunk/picketlink-xmlsec-model/pom.xml 2011-09-19 16:36:58 UTC (rev 1231)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.picketlink</groupId>
<artifactId>picketlink-fed-parent</artifactId>
- <version>2.0.1.final</version>
+ <version>2.0.2-SNAPSHOT</version>
<relativePath>../parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: federation/trunk/pom.xml
===================================================================
--- federation/trunk/pom.xml 2011-09-19 16:28:35 UTC (rev 1230)
+++ federation/trunk/pom.xml 2011-09-19 16:36:58 UTC (rev 1231)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.picketlink</groupId>
<artifactId>picketlink-fed-parent</artifactId>
- <version>2.0.1.final</version>
+ <version>2.0.2-SNAPSHOT</version>
<relativePath>parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
12 years, 7 months
- 1
- 0
Picketlink SVN: r1230 - federation/tags.
by picketlink-commits＠lists.jboss.org
Author: anil.saldhana(a)jboss.com
Date: 2011-09-19 12:28:35 -0400 (Mon, 19 Sep 2011)
New Revision: 1230
Added:
federation/tags/2.0.1.final/
Log:
PLFED-233: tag 2.0.1.final
12 years, 7 months
- 1
- 0
Picketlink SVN: r1229 - in federation/trunk: assembly and 29 other directories.
by picketlink-commits＠lists.jboss.org
Author: anil.saldhana(a)jboss.com
Date: 2011-09-19 12:27:23 -0400 (Mon, 19 Sep 2011)
New Revision: 1229
Modified:
federation/trunk/assembly/pom.xml
federation/trunk/parent/pom.xml
federation/trunk/picketlink-bindings-jboss/pom.xml
federation/trunk/picketlink-bindings/pom.xml
federation/trunk/picketlink-fed-api/pom.xml
federation/trunk/picketlink-fed-core/pom.xml
federation/trunk/picketlink-fed-model/pom.xml
federation/trunk/picketlink-web/pom.xml
federation/trunk/picketlink-webapps/assembly/pom.xml
federation/trunk/picketlink-webapps/circleoftrust/pom.xml
federation/trunk/picketlink-webapps/employee-post-sig/pom.xml
federation/trunk/picketlink-webapps/employee-post/pom.xml
federation/trunk/picketlink-webapps/employee-sig/pom.xml
federation/trunk/picketlink-webapps/employee-standalone/pom.xml
federation/trunk/picketlink-webapps/employee/pom.xml
federation/trunk/picketlink-webapps/idp-sig-no-val/pom.xml
federation/trunk/picketlink-webapps/idp-sig/pom.xml
federation/trunk/picketlink-webapps/idp-standalone/pom.xml
federation/trunk/picketlink-webapps/idp/pom.xml
federation/trunk/picketlink-webapps/metadata/pom.xml
federation/trunk/picketlink-webapps/pdp/pom.xml
federation/trunk/picketlink-webapps/picketlink-sts/pom.xml
federation/trunk/picketlink-webapps/pom.xml
federation/trunk/picketlink-webapps/sales-post-sig/pom.xml
federation/trunk/picketlink-webapps/sales-post/pom.xml
federation/trunk/picketlink-webapps/sales-saml11/pom.xml
federation/trunk/picketlink-webapps/sales-sig/pom.xml
federation/trunk/picketlink-webapps/sales-standalone/pom.xml
federation/trunk/picketlink-webapps/sales/pom.xml
federation/trunk/picketlink-xmlsec-model/pom.xml
federation/trunk/pom.xml
Log:
PLFED-233: prepare 2.0.1.final
Modified: federation/trunk/assembly/pom.xml
===================================================================
--- federation/trunk/assembly/pom.xml 2011-09-19 16:19:19 UTC (rev 1228)
+++ federation/trunk/assembly/pom.xml 2011-09-19 16:27:23 UTC (rev 1229)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.picketlink</groupId>
<artifactId>picketlink-fed-parent</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.0.1.final</version>
<relativePath>../parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: federation/trunk/parent/pom.xml
===================================================================
--- federation/trunk/parent/pom.xml 2011-09-19 16:19:19 UTC (rev 1228)
+++ federation/trunk/parent/pom.xml 2011-09-19 16:27:23 UTC (rev 1229)
@@ -8,7 +8,7 @@
<groupId>org.picketlink</groupId>
<artifactId>picketlink-fed-parent</artifactId>
<packaging>pom</packaging>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.0.1.final</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: federation/trunk/picketlink-bindings/pom.xml
===================================================================
--- federation/trunk/picketlink-bindings/pom.xml 2011-09-19 16:19:19 UTC (rev 1228)
+++ federation/trunk/picketlink-bindings/pom.xml 2011-09-19 16:27:23 UTC (rev 1229)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.picketlink</groupId>
<artifactId>picketlink-fed-parent</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.0.1.final</version>
<relativePath>../parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: federation/trunk/picketlink-bindings-jboss/pom.xml
===================================================================
--- federation/trunk/picketlink-bindings-jboss/pom.xml 2011-09-19 16:19:19 UTC (rev 1228)
+++ federation/trunk/picketlink-bindings-jboss/pom.xml 2011-09-19 16:27:23 UTC (rev 1229)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.picketlink</groupId>
<artifactId>picketlink-fed-parent</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.0.1.final</version>
<relativePath>../parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: federation/trunk/picketlink-fed-api/pom.xml
===================================================================
--- federation/trunk/picketlink-fed-api/pom.xml 2011-09-19 16:19:19 UTC (rev 1228)
+++ federation/trunk/picketlink-fed-api/pom.xml 2011-09-19 16:27:23 UTC (rev 1229)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.picketlink</groupId>
<artifactId>picketlink-fed-parent</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.0.1.final</version>
<relativePath>../parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: federation/trunk/picketlink-fed-core/pom.xml
===================================================================
--- federation/trunk/picketlink-fed-core/pom.xml 2011-09-19 16:19:19 UTC (rev 1228)
+++ federation/trunk/picketlink-fed-core/pom.xml 2011-09-19 16:27:23 UTC (rev 1229)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.picketlink</groupId>
<artifactId>picketlink-fed-parent</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.0.1.final</version>
<relativePath>../parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: federation/trunk/picketlink-fed-model/pom.xml
===================================================================
--- federation/trunk/picketlink-fed-model/pom.xml 2011-09-19 16:19:19 UTC (rev 1228)
+++ federation/trunk/picketlink-fed-model/pom.xml 2011-09-19 16:27:23 UTC (rev 1229)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.picketlink</groupId>
<artifactId>picketlink-fed-parent</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.0.1.final</version>
<relativePath>../parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: federation/trunk/picketlink-web/pom.xml
===================================================================
--- federation/trunk/picketlink-web/pom.xml 2011-09-19 16:19:19 UTC (rev 1228)
+++ federation/trunk/picketlink-web/pom.xml 2011-09-19 16:27:23 UTC (rev 1229)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.picketlink</groupId>
<artifactId>picketlink-fed-parent</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.0.1.final</version>
<relativePath>../parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: federation/trunk/picketlink-webapps/assembly/pom.xml
===================================================================
--- federation/trunk/picketlink-webapps/assembly/pom.xml 2011-09-19 16:19:19 UTC (rev 1228)
+++ federation/trunk/picketlink-webapps/assembly/pom.xml 2011-09-19 16:27:23 UTC (rev 1229)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.picketlink</groupId>
<artifactId>picketlink-fed-parent</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.0.1.final</version>
<relativePath>../../parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: federation/trunk/picketlink-webapps/circleoftrust/pom.xml
===================================================================
--- federation/trunk/picketlink-webapps/circleoftrust/pom.xml 2011-09-19 16:19:19 UTC (rev 1228)
+++ federation/trunk/picketlink-webapps/circleoftrust/pom.xml 2011-09-19 16:27:23 UTC (rev 1229)
@@ -2,13 +2,13 @@
<parent>
<groupId>org.picketlink</groupId>
<artifactId>picketlink-federation-webapps</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.0.1.final</version>
<relativePath>../</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>circleoftrust</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.0.1.final</version>
<packaging>war</packaging>
<name>PicketLink Federation Circle Of Trust</name>
<url>http://labs.jboss.org/portal/picketlink/</url>
Modified: federation/trunk/picketlink-webapps/employee/pom.xml
===================================================================
--- federation/trunk/picketlink-webapps/employee/pom.xml 2011-09-19 16:19:19 UTC (rev 1228)
+++ federation/trunk/picketlink-webapps/employee/pom.xml 2011-09-19 16:27:23 UTC (rev 1229)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.picketlink</groupId>
<artifactId>picketlink-federation-webapps</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.0.1.final</version>
<relativePath>../</relativePath>
</parent>
Modified: federation/trunk/picketlink-webapps/employee-post/pom.xml
===================================================================
--- federation/trunk/picketlink-webapps/employee-post/pom.xml 2011-09-19 16:19:19 UTC (rev 1228)
+++ federation/trunk/picketlink-webapps/employee-post/pom.xml 2011-09-19 16:27:23 UTC (rev 1229)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.picketlink</groupId>
<artifactId>picketlink-federation-webapps</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.0.1.final</version>
<relativePath>../</relativePath>
</parent>
Modified: federation/trunk/picketlink-webapps/employee-post-sig/pom.xml
===================================================================
--- federation/trunk/picketlink-webapps/employee-post-sig/pom.xml 2011-09-19 16:19:19 UTC (rev 1228)
+++ federation/trunk/picketlink-webapps/employee-post-sig/pom.xml 2011-09-19 16:27:23 UTC (rev 1229)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.picketlink</groupId>
<artifactId>picketlink-federation-webapps</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.0.1.final</version>
<relativePath>../</relativePath>
</parent>
Modified: federation/trunk/picketlink-webapps/employee-sig/pom.xml
===================================================================
--- federation/trunk/picketlink-webapps/employee-sig/pom.xml 2011-09-19 16:19:19 UTC (rev 1228)
+++ federation/trunk/picketlink-webapps/employee-sig/pom.xml 2011-09-19 16:27:23 UTC (rev 1229)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.picketlink</groupId>
<artifactId>picketlink-federation-webapps</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.0.1.final</version>
<relativePath>../</relativePath>
</parent>
Modified: federation/trunk/picketlink-webapps/employee-standalone/pom.xml
===================================================================
--- federation/trunk/picketlink-webapps/employee-standalone/pom.xml 2011-09-19 16:19:19 UTC (rev 1228)
+++ federation/trunk/picketlink-webapps/employee-standalone/pom.xml 2011-09-19 16:27:23 UTC (rev 1229)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.picketlink</groupId>
<artifactId>picketlink-federation-webapps</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.0.1.final</version>
<relativePath>../</relativePath>
</parent>
Modified: federation/trunk/picketlink-webapps/idp/pom.xml
===================================================================
--- federation/trunk/picketlink-webapps/idp/pom.xml 2011-09-19 16:19:19 UTC (rev 1228)
+++ federation/trunk/picketlink-webapps/idp/pom.xml 2011-09-19 16:27:23 UTC (rev 1229)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.picketlink</groupId>
<artifactId>picketlink-federation-webapps</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.0.1.final</version>
<relativePath>../</relativePath>
</parent>
Modified: federation/trunk/picketlink-webapps/idp-sig/pom.xml
===================================================================
--- federation/trunk/picketlink-webapps/idp-sig/pom.xml 2011-09-19 16:19:19 UTC (rev 1228)
+++ federation/trunk/picketlink-webapps/idp-sig/pom.xml 2011-09-19 16:27:23 UTC (rev 1229)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.picketlink</groupId>
<artifactId>picketlink-federation-webapps</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.0.1.final</version>
<relativePath>../</relativePath>
</parent>
Modified: federation/trunk/picketlink-webapps/idp-sig-no-val/pom.xml
===================================================================
--- federation/trunk/picketlink-webapps/idp-sig-no-val/pom.xml 2011-09-19 16:19:19 UTC (rev 1228)
+++ federation/trunk/picketlink-webapps/idp-sig-no-val/pom.xml 2011-09-19 16:27:23 UTC (rev 1229)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.picketlink</groupId>
<artifactId>picketlink-federation-webapps</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.0.1.final</version>
<relativePath>../</relativePath>
</parent>
Modified: federation/trunk/picketlink-webapps/idp-standalone/pom.xml
===================================================================
--- federation/trunk/picketlink-webapps/idp-standalone/pom.xml 2011-09-19 16:19:19 UTC (rev 1228)
+++ federation/trunk/picketlink-webapps/idp-standalone/pom.xml 2011-09-19 16:27:23 UTC (rev 1229)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.picketlink</groupId>
<artifactId>picketlink-federation-webapps</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.0.1.final</version>
<relativePath>../</relativePath>
</parent>
Modified: federation/trunk/picketlink-webapps/metadata/pom.xml
===================================================================
--- federation/trunk/picketlink-webapps/metadata/pom.xml 2011-09-19 16:19:19 UTC (rev 1228)
+++ federation/trunk/picketlink-webapps/metadata/pom.xml 2011-09-19 16:27:23 UTC (rev 1229)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.picketlink</groupId>
<artifactId>picketlink-federation-webapps</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.0.1.final</version>
<relativePath>../</relativePath>
</parent>
Modified: federation/trunk/picketlink-webapps/pdp/pom.xml
===================================================================
--- federation/trunk/picketlink-webapps/pdp/pom.xml 2011-09-19 16:19:19 UTC (rev 1228)
+++ federation/trunk/picketlink-webapps/pdp/pom.xml 2011-09-19 16:27:23 UTC (rev 1229)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.picketlink</groupId>
<artifactId>picketlink-federation-webapps</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.0.1.final</version>
<relativePath>../</relativePath>
</parent>
Modified: federation/trunk/picketlink-webapps/picketlink-sts/pom.xml
===================================================================
--- federation/trunk/picketlink-webapps/picketlink-sts/pom.xml 2011-09-19 16:19:19 UTC (rev 1228)
+++ federation/trunk/picketlink-webapps/picketlink-sts/pom.xml 2011-09-19 16:27:23 UTC (rev 1229)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.picketlink</groupId>
<artifactId>picketlink-federation-webapps</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.0.1.final</version>
<relativePath>../</relativePath>
</parent>
Modified: federation/trunk/picketlink-webapps/pom.xml
===================================================================
--- federation/trunk/picketlink-webapps/pom.xml 2011-09-19 16:19:19 UTC (rev 1228)
+++ federation/trunk/picketlink-webapps/pom.xml 2011-09-19 16:27:23 UTC (rev 1229)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.picketlink</groupId>
<artifactId>picketlink-fed-parent</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.0.1.final</version>
<relativePath>../parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: federation/trunk/picketlink-webapps/sales/pom.xml
===================================================================
--- federation/trunk/picketlink-webapps/sales/pom.xml 2011-09-19 16:19:19 UTC (rev 1228)
+++ federation/trunk/picketlink-webapps/sales/pom.xml 2011-09-19 16:27:23 UTC (rev 1229)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.picketlink</groupId>
<artifactId>picketlink-federation-webapps</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.0.1.final</version>
<relativePath>../</relativePath>
</parent>
Modified: federation/trunk/picketlink-webapps/sales-post/pom.xml
===================================================================
--- federation/trunk/picketlink-webapps/sales-post/pom.xml 2011-09-19 16:19:19 UTC (rev 1228)
+++ federation/trunk/picketlink-webapps/sales-post/pom.xml 2011-09-19 16:27:23 UTC (rev 1229)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.picketlink</groupId>
<artifactId>picketlink-federation-webapps</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.0.1.final</version>
<relativePath>../</relativePath>
</parent>
Modified: federation/trunk/picketlink-webapps/sales-post-sig/pom.xml
===================================================================
--- federation/trunk/picketlink-webapps/sales-post-sig/pom.xml 2011-09-19 16:19:19 UTC (rev 1228)
+++ federation/trunk/picketlink-webapps/sales-post-sig/pom.xml 2011-09-19 16:27:23 UTC (rev 1229)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.picketlink</groupId>
<artifactId>picketlink-federation-webapps</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.0.1.final</version>
<relativePath>../</relativePath>
</parent>
Modified: federation/trunk/picketlink-webapps/sales-saml11/pom.xml
===================================================================
--- federation/trunk/picketlink-webapps/sales-saml11/pom.xml 2011-09-19 16:19:19 UTC (rev 1228)
+++ federation/trunk/picketlink-webapps/sales-saml11/pom.xml 2011-09-19 16:27:23 UTC (rev 1229)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.picketlink</groupId>
<artifactId>picketlink-federation-webapps</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.0.1.final</version>
<relativePath>../</relativePath>
</parent>
Modified: federation/trunk/picketlink-webapps/sales-sig/pom.xml
===================================================================
--- federation/trunk/picketlink-webapps/sales-sig/pom.xml 2011-09-19 16:19:19 UTC (rev 1228)
+++ federation/trunk/picketlink-webapps/sales-sig/pom.xml 2011-09-19 16:27:23 UTC (rev 1229)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.picketlink</groupId>
<artifactId>picketlink-federation-webapps</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.0.1.final</version>
<relativePath>../</relativePath>
</parent>
Modified: federation/trunk/picketlink-webapps/sales-standalone/pom.xml
===================================================================
--- federation/trunk/picketlink-webapps/sales-standalone/pom.xml 2011-09-19 16:19:19 UTC (rev 1228)
+++ federation/trunk/picketlink-webapps/sales-standalone/pom.xml 2011-09-19 16:27:23 UTC (rev 1229)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.picketlink</groupId>
<artifactId>picketlink-federation-webapps</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.0.1.final</version>
<relativePath>../</relativePath>
</parent>
Modified: federation/trunk/picketlink-xmlsec-model/pom.xml
===================================================================
--- federation/trunk/picketlink-xmlsec-model/pom.xml 2011-09-19 16:19:19 UTC (rev 1228)
+++ federation/trunk/picketlink-xmlsec-model/pom.xml 2011-09-19 16:27:23 UTC (rev 1229)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.picketlink</groupId>
<artifactId>picketlink-fed-parent</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.0.1.final</version>
<relativePath>../parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: federation/trunk/pom.xml
===================================================================
--- federation/trunk/pom.xml 2011-09-19 16:19:19 UTC (rev 1228)
+++ federation/trunk/pom.xml 2011-09-19 16:27:23 UTC (rev 1229)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.picketlink</groupId>
<artifactId>picketlink-fed-parent</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.0.1.final</version>
<relativePath>parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
12 years, 7 months
- 1
- 0
Picketlink SVN: r1228 - in federation/trunk: picketlink-fed-api/src/test/java/org/picketlink/test/identity/federation/api/saml/v2 and 1 other directories.
by picketlink-commits＠lists.jboss.org
Author: anil.saldhana(a)jboss.com
Date: 2011-09-19 12:19:19 -0400 (Mon, 19 Sep 2011)
New Revision: 1228
Modified:
federation/trunk/picketlink-fed-api/src/main/java/org/picketlink/identity/federation/api/saml/v2/sig/SAML2Signature.java
federation/trunk/picketlink-fed-api/src/test/java/org/picketlink/test/identity/federation/api/saml/v2/SignatureValidationUnitTestCase.java
federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/util/XMLSignatureUtil.java
Log:
PLFED-232: opportunities to not include keyinfo in signed document
Modified: federation/trunk/picketlink-fed-api/src/main/java/org/picketlink/identity/federation/api/saml/v2/sig/SAML2Signature.java
===================================================================
--- federation/trunk/picketlink-fed-api/src/main/java/org/picketlink/identity/federation/api/saml/v2/sig/SAML2Signature.java 2011-09-18 07:21:45 UTC (rev 1227)
+++ federation/trunk/picketlink-fed-api/src/main/java/org/picketlink/identity/federation/api/saml/v2/sig/SAML2Signature.java 2011-09-19 16:19:19 UTC (rev 1228)
@@ -25,7 +25,7 @@
import java.security.GeneralSecurityException;
import java.security.KeyPair;
import java.security.PublicKey;
-
+
import javax.xml.crypto.MarshalException;
import javax.xml.crypto.dsig.DigestMethod;
import javax.xml.crypto.dsig.SignatureMethod;
@@ -40,7 +40,7 @@
import org.picketlink.identity.federation.core.exceptions.ProcessingException;
import org.picketlink.identity.federation.core.saml.v2.constants.JBossSAMLURIConstants;
import org.picketlink.identity.federation.core.saml.v2.util.DocumentUtil;
-import org.picketlink.identity.federation.core.util.XMLSignatureUtil;
+import org.picketlink.identity.federation.core.util.XMLSignatureUtil;
import org.picketlink.identity.federation.saml.v2.protocol.RequestAbstractType;
import org.picketlink.identity.federation.saml.v2.protocol.ResponseType;
import org.w3c.dom.Document;
@@ -55,9 +55,9 @@
public class SAML2Signature
{
private String signatureMethod = SignatureMethod.RSA_SHA1;
- private String digestMethod = DigestMethod.SHA1;
-
+ private String digestMethod = DigestMethod.SHA1;
+
public String getSignatureMethod()
{
return signatureMethod;
@@ -77,8 +77,22 @@
{
this.digestMethod = digestMethod;
}
-
+
/**
+ * Set to false, if you do not want to include keyinfo
+ * in the signature
+ * @param val
+ * @since v2.0.1
+ */
+ public void setSignatureIncludeKeyInfo(boolean val)
+ {
+ if (!val)
+ {
+ XMLSignatureUtil.setIncludeKeyInfoInSignature(false);
+ }
+ }
+
+ /**
* Sign an RequestType at the root
* @param request
* @param keypair Key Pair
@@ -92,20 +106,18 @@
* @throws MarshalException
* @throws GeneralSecurityException
*/
- public Document sign(RequestAbstractType request, KeyPair keypair) throws SAXException, IOException, ParserConfigurationException, GeneralSecurityException, MarshalException, XMLSignatureException
+ public Document sign(RequestAbstractType request, KeyPair keypair) throws SAXException, IOException,
+ ParserConfigurationException, GeneralSecurityException, MarshalException, XMLSignatureException
{
SAML2Request saml2Request = new SAML2Request();
Document doc = saml2Request.convert(request);
doc.normalize();
-
+
String referenceURI = "#" + request.getID();
-
- return XMLSignatureUtil.sign(doc,
- keypair,
- digestMethod, signatureMethod,
- referenceURI);
+
+ return XMLSignatureUtil.sign(doc, keypair, digestMethod, signatureMethod, referenceURI);
}
-
+
/**
* Sign an ResponseType at the root
* @param response
@@ -118,15 +130,16 @@
* @throws MarshalException
* @throws GeneralSecurityException
*/
- public Document sign(ResponseType response,KeyPair keypair) throws ParserConfigurationException, GeneralSecurityException, MarshalException, XMLSignatureException
+ public Document sign(ResponseType response, KeyPair keypair) throws ParserConfigurationException,
+ GeneralSecurityException, MarshalException, XMLSignatureException
{
SAML2Response saml2Request = new SAML2Response();
Document doc = saml2Request.convert(response);
doc.normalize();
-
- return sign(doc, response.getID(), keypair);
+
+ return sign(doc, response.getID(), keypair);
}
-
+
/**
* Sign an Document at the root
* @param response
@@ -139,19 +152,14 @@
* @throws MarshalException
* @throws GeneralSecurityException
*/
- public Document sign(Document doc,
- String referenceID,
- KeyPair keypair) throws
- ParserConfigurationException, GeneralSecurityException, MarshalException, XMLSignatureException
- {
+ public Document sign(Document doc, String referenceID, KeyPair keypair) throws ParserConfigurationException,
+ GeneralSecurityException, MarshalException, XMLSignatureException
+ {
String referenceURI = "#" + referenceID;
-
- return XMLSignatureUtil.sign(doc,
- keypair,
- digestMethod, signatureMethod,
- referenceURI);
+
+ return XMLSignatureUtil.sign(doc, keypair, digestMethod, signatureMethod, referenceURI);
}
-
+
/**
* Sign an assertion whose id value is provided in the response type
* @param response
@@ -167,17 +175,16 @@
* @throws MarshalException
* @throws GeneralSecurityException
*/
- public Document sign(ResponseType response,
- String idValueOfAssertion,
- KeyPair keypair,
- String referenceURI) throws ParserConfigurationException, XPathException, TransformerFactoryConfigurationError, TransformerException, GeneralSecurityException, MarshalException, XMLSignatureException
+ public Document sign(ResponseType response, String idValueOfAssertion, KeyPair keypair, String referenceURI)
+ throws ParserConfigurationException, XPathException, TransformerFactoryConfigurationError,
+ TransformerException, GeneralSecurityException, MarshalException, XMLSignatureException
{
SAML2Response saml2Response = new SAML2Response();
Document doc = saml2Response.convert(response);
-
- return sign(doc,idValueOfAssertion, keypair, referenceURI);
+
+ return sign(doc, idValueOfAssertion, keypair, referenceURI);
}
-
+
/**
* Sign a document
* @param doc
@@ -193,24 +200,17 @@
* @throws MarshalException
* @throws XMLSignatureException
*/
- public Document sign(Document doc,
- String idValueOfAssertion,
- KeyPair keypair,
- String referenceURI) throws ParserConfigurationException, XPathException, TransformerFactoryConfigurationError, TransformerException, GeneralSecurityException, MarshalException, XMLSignatureException
+ public Document sign(Document doc, String idValueOfAssertion, KeyPair keypair, String referenceURI)
+ throws ParserConfigurationException, XPathException, TransformerFactoryConfigurationError,
+ TransformerException, GeneralSecurityException, MarshalException, XMLSignatureException
{
- Node assertionNode = DocumentUtil.getNodeWithAttribute(doc,
- JBossSAMLURIConstants.ASSERTION_NSURI.get(),
- "Assertion",
- "ID",
- idValueOfAssertion);
-
- return XMLSignatureUtil.sign(doc, assertionNode,
- keypair,
- digestMethod, signatureMethod,
- referenceURI);
+ Node assertionNode = DocumentUtil.getNodeWithAttribute(doc, JBossSAMLURIConstants.ASSERTION_NSURI.get(),
+ "Assertion", "ID", idValueOfAssertion);
+
+ return XMLSignatureUtil.sign(doc, assertionNode, keypair, digestMethod, signatureMethod, referenceURI);
}
-
+
/**
* Sign a SAML Document
* @param samlDocument
@@ -228,9 +228,9 @@
catch (Exception e)
{
throw new ProcessingException(e);
- }
+ }
}
-
+
/**
* Validate the SAML2 Document
* @param signedDocument
@@ -242,13 +242,13 @@
{
try
{
- return XMLSignatureUtil.validate(signedDocument, publicKey);
+ return XMLSignatureUtil.validate(signedDocument, publicKey);
}
- catch(MarshalException me)
+ catch (MarshalException me)
{
throw new ProcessingException(me.getLocalizedMessage());
}
- catch(XMLSignatureException xse)
+ catch (XMLSignatureException xse)
{
throw new ProcessingException(xse.getLocalizedMessage());
}
Modified: federation/trunk/picketlink-fed-api/src/test/java/org/picketlink/test/identity/federation/api/saml/v2/SignatureValidationUnitTestCase.java
===================================================================
--- federation/trunk/picketlink-fed-api/src/test/java/org/picketlink/test/identity/federation/api/saml/v2/SignatureValidationUnitTestCase.java 2011-09-18 07:21:45 UTC (rev 1227)
+++ federation/trunk/picketlink-fed-api/src/test/java/org/picketlink/test/identity/federation/api/saml/v2/SignatureValidationUnitTestCase.java 2011-09-19 16:19:19 UTC (rev 1228)
@@ -80,12 +80,48 @@
ss.setSignatureMethod(SignatureMethod.DSA_SHA1);
Document signedDoc = ss.sign(authnRequest, kp);
+ System.out.println("Signed Doc:" + DocumentUtil.asString(signedDoc));
+
// Validate the signature
boolean isValid = XMLSignatureUtil.validate(signedDoc, kp.getPublic());
assertTrue(isValid);
}
/**
+ * Test the creation of AuthnRequestType with signature creation with a private key and then validate the signature
+ * with a public key. We test that the signature does not contain the keyinfo
+ *
+ * @throws Exception
+ */
+ @Test
+ public void testNoKeyInfo() throws Exception
+ {
+ SAML2Request saml2Request = new SAML2Request();
+ String id = IDGenerator.create("ID_");
+ String assertionConsumerURL = "http://sp";
+ String destination = "http://idp";
+ String issuerValue = "http://sp";
+ AuthnRequestType authnRequest = saml2Request.createAuthnRequestType(id, assertionConsumerURL, destination,
+ issuerValue);
+
+ KeyPairGenerator kpg = KeyPairGenerator.getInstance("DSA");
+ KeyPair kp = kpg.genKeyPair();
+
+ SAML2Signature ss = new SAML2Signature();
+ ss.setSignatureIncludeKeyInfo(false);
+
+ ss.setSignatureMethod(SignatureMethod.DSA_SHA1);
+ Document signedDoc = ss.sign(authnRequest, kp);
+
+ System.out.println("Signed Doc:" + DocumentUtil.asString(signedDoc));
+
+ // Validate the signature
+ boolean isValid = XMLSignatureUtil.validate(signedDoc, kp.getPublic());
+ assertTrue(isValid);
+ XMLSignatureUtil.setIncludeKeyInfoInSignature(true);
+ }
+
+ /**
* Test the signature for ResponseType
*
* @throws Exception
Modified: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/util/XMLSignatureUtil.java
===================================================================
--- federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/util/XMLSignatureUtil.java 2011-09-18 07:21:45 UTC (rev 1227)
+++ federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/util/XMLSignatureUtil.java 2011-09-19 16:19:19 UTC (rev 1228)
@@ -84,6 +84,11 @@
private static XMLSignatureFactory fac = getXMLSignatureFactory();
+ /**
+ * By default, we include the keyinfo in the signature
+ */
+ private static boolean includeKeyInfoInSignature = true;
+
private static XMLSignatureFactory getXMLSignatureFactory()
{
XMLSignatureFactory xsf = null;
@@ -104,6 +109,11 @@
static
{
SystemPropertiesUtil.ensure();
+ String keyInfoProp = SecurityActions.getSystemProperty("picketlink.xmlsig.includeKeyInfo", null);
+ if (StringUtil.isNotNull(keyInfoProp))
+ {
+ includeKeyInfoInSignature = Boolean.parseBoolean(keyInfoProp);
+ }
};
/**
@@ -118,6 +128,16 @@
}
/**
+ * Use this method to not include the KeyInfo in the signature
+ * @param includeKeyInfoInSignature
+ * @since v2.0.1
+ */
+ public static void setIncludeKeyInfoInSignature(boolean includeKeyInfoInSignature)
+ {
+ XMLSignatureUtil.includeKeyInfoInSignature = includeKeyInfoInSignature;
+ }
+
+ /**
* Precheck whether the document that will be validated has the right signedinfo
*
* @param doc
@@ -267,6 +287,10 @@
KeyValue kv = kif.newKeyValue(publicKey);
KeyInfo ki = kif.newKeyInfo(Collections.singletonList(kv));
+ if (!includeKeyInfoInSignature)
+ {
+ ki = null;
+ }
XMLSignature signature = fac.newXMLSignature(si, ki);
signature.sign(dsc);
@@ -378,5 +402,4 @@
}
return cert;
}
-
}
\ No newline at end of file
12 years, 7 months
- 1
- 0
Picketlink SVN: r1227 - social/trunk/openid/src/main/java/org/picketlink/social/openid/auth.
by picketlink-commits＠lists.jboss.org
Author: anil.saldhana(a)jboss.com
Date: 2011-09-18 03:21:45 -0400 (Sun, 18 Sep 2011)
New Revision: 1227
Modified:
social/trunk/openid/src/main/java/org/picketlink/social/openid/auth/OpenIDConsumerAuthenticator.java
Log:
redundant
Modified: social/trunk/openid/src/main/java/org/picketlink/social/openid/auth/OpenIDConsumerAuthenticator.java
===================================================================
--- social/trunk/openid/src/main/java/org/picketlink/social/openid/auth/OpenIDConsumerAuthenticator.java 2011-09-18 07:20:17 UTC (rev 1226)
+++ social/trunk/openid/src/main/java/org/picketlink/social/openid/auth/OpenIDConsumerAuthenticator.java 2011-09-18 07:21:45 UTC (rev 1227)
@@ -66,11 +66,6 @@
{
protected static Logger log = Logger.getLogger(OpenIDConsumerAuthenticator.class);
protected boolean trace = log.isTraceEnabled();
- public static final String RETURN_URL_PARAMETER = "returnUrl";
-
- public static final String OPEN_ID_PARAMETER = "openId";
-
- public static final String AUTHENTICATION_PROTOCOL_PARAMETER = "authProtocol";
private enum Providers
{
12 years, 7 months
- 1
- 0
Picketlink SVN: r1226 - social/trunk/facebook/src/main/java/org/picketlink/social/facebook.
by picketlink-commits＠lists.jboss.org
Author: anil.saldhana(a)jboss.com
Date: 2011-09-18 03:20:17 -0400 (Sun, 18 Sep 2011)
New Revision: 1226
Modified:
social/trunk/facebook/src/main/java/org/picketlink/social/facebook/FacebookAuthenticator.java
social/trunk/facebook/src/main/java/org/picketlink/social/facebook/FacebookLoginModule.java
Log:
save the original request
Modified: social/trunk/facebook/src/main/java/org/picketlink/social/facebook/FacebookAuthenticator.java
===================================================================
--- social/trunk/facebook/src/main/java/org/picketlink/social/facebook/FacebookAuthenticator.java 2011-09-18 07:19:35 UTC (rev 1225)
+++ social/trunk/facebook/src/main/java/org/picketlink/social/facebook/FacebookAuthenticator.java 2011-09-18 07:20:17 UTC (rev 1226)
@@ -79,11 +79,9 @@
protected boolean saveRestoreRequest = true;
public static String EMPTY_PASSWORD = "EMPTY";
-
- public enum STATES { AUTH, AUTHZ, FINISH};
-
-
+ private enum STATES { AUTH, AUTHZ, FINISH};
+
public void setReturnURL(String returnURL)
{
this.returnURL = returnURL;
@@ -157,7 +155,11 @@
return true;
if( state == null || state.isEmpty())
- {
+ {
+ if (saveRestoreRequest)
+ {
+ this.saveRequest(request, request.getSessionInternal());
+ }
Map<String, String> params = new HashMap<String, String>();
params.put(OAuthConstants.REDIRECT_URI_PARAMETER, this.returnURL);
params.put(OAuthConstants.CLIENT_ID_PARAMETER, this.clientID);
@@ -192,6 +194,7 @@
Principal principal = null;
facebookPrincipal = handleAuthenticationResponse(request, response);
+ request.getSession().setAttribute("principal", facebookPrincipal);
cachedPrincipal.set(facebookPrincipal);
if(isJBossEnv())
Modified: social/trunk/facebook/src/main/java/org/picketlink/social/facebook/FacebookLoginModule.java
===================================================================
--- social/trunk/facebook/src/main/java/org/picketlink/social/facebook/FacebookLoginModule.java 2011-09-18 07:19:35 UTC (rev 1225)
+++ social/trunk/facebook/src/main/java/org/picketlink/social/facebook/FacebookLoginModule.java 2011-09-18 07:20:17 UTC (rev 1226)
@@ -42,7 +42,7 @@
@Override
protected Principal getIdentity()
{
- return new SimplePrincipal(FacebookAuthenticator.cachedPrincipal.get().getName());
+ return FacebookAuthenticator.cachedPrincipal.get();
}
@Override
12 years, 7 months
- 1
- 0
Picketlink SVN: r1225 - in social/trunk/openid: src/main/java/org/picketlink/social/openid and 2 other directories.
by picketlink-commits＠lists.jboss.org
Author: anil.saldhana(a)jboss.com
Date: 2011-09-18 03:19:35 -0400 (Sun, 18 Sep 2011)
New Revision: 1225
Added:
social/trunk/openid/src/main/java/org/picketlink/social/openid/OpenIdPrincipal.java
social/trunk/openid/src/main/java/org/picketlink/social/openid/auth/
social/trunk/openid/src/main/java/org/picketlink/social/openid/auth/OpenIDConsumerAuthenticator.java
social/trunk/openid/src/main/java/org/picketlink/social/openid/auth/OpenIDLoginModule.java
social/trunk/openid/src/main/java/org/picketlink/social/openid/auth/SecurityActions.java
social/trunk/openid/src/main/java/org/picketlink/social/openid/constants/
social/trunk/openid/src/main/java/org/picketlink/social/openid/constants/OpenIDAliasMapper.java
Modified:
social/trunk/openid/pom.xml
Log:
PLFED-231: openid authenticator
Modified: social/trunk/openid/pom.xml
===================================================================
--- social/trunk/openid/pom.xml 2011-09-18 03:12:32 UTC (rev 1224)
+++ social/trunk/openid/pom.xml 2011-09-18 07:19:35 UTC (rev 1225)
@@ -114,8 +114,19 @@
<version>6.0.29</version>
<scope>test</scope>
</dependency>
-
<dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>catalina</artifactId>
+ <version>6.0.18</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>apache-log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.14</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
<groupId>httpunit</groupId>
<artifactId>httpunit</artifactId>
<version>1.5.4</version>
Added: social/trunk/openid/src/main/java/org/picketlink/social/openid/OpenIdPrincipal.java
===================================================================
--- social/trunk/openid/src/main/java/org/picketlink/social/openid/OpenIdPrincipal.java (rev 0)
+++ social/trunk/openid/src/main/java/org/picketlink/social/openid/OpenIdPrincipal.java 2011-09-18 07:19:35 UTC (rev 1225)
@@ -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.social.openid;
+
+import java.io.Serializable;
+import java.net.URL;
+import java.security.Principal;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * A {@link Principal} representing an OpenID Authenticated principal
+* @author Marcel Kolsteren
+* @author Anil Saldhana
+* @since Jan 30, 2010
+*/
+public class OpenIdPrincipal implements Principal, Serializable
+{
+ private static final long serialVersionUID = 4404673070085740561L;
+
+ private String identifier;
+
+ private URL openIdProvider;
+
+ private Map<String, List<String>> attributes;
+
+ public OpenIdPrincipal(String identifier, URL openIdProvider, Map<String, List<String>> attributes)
+ {
+ super();
+ this.identifier = identifier;
+ this.openIdProvider = openIdProvider;
+ this.attributes = attributes;
+ }
+
+ public String getName()
+ {
+ return identifier;
+ }
+
+ public String getIdentifier()
+ {
+ return identifier;
+ }
+
+ public URL getOpenIdProvider()
+ {
+ return openIdProvider;
+ }
+
+ public Map<String, List<String>> getAttributes()
+ {
+ return attributes;
+ }
+
+ @Override
+ public String toString()
+ {
+ return "OpenIdPrincipal [identifier=" + identifier + ", openIdProvider=" + openIdProvider + ", attributes="
+ + attributes + "]";
+ }
+}
\ No newline at end of file
Added: social/trunk/openid/src/main/java/org/picketlink/social/openid/auth/OpenIDConsumerAuthenticator.java
===================================================================
--- social/trunk/openid/src/main/java/org/picketlink/social/openid/auth/OpenIDConsumerAuthenticator.java (rev 0)
+++ social/trunk/openid/src/main/java/org/picketlink/social/openid/auth/OpenIDConsumerAuthenticator.java 2011-09-18 07:19:35 UTC (rev 1225)
@@ -0,0 +1,408 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2011, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.picketlink.social.openid.auth;
+
+import java.io.IOException;
+import java.net.URL;
+import java.security.Principal;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+
+import org.apache.catalina.Session;
+import org.apache.catalina.authenticator.Constants;
+import org.apache.catalina.authenticator.FormAuthenticator;
+import org.apache.catalina.connector.Request;
+import org.apache.catalina.connector.Response;
+import org.apache.catalina.deploy.LoginConfig;
+import org.apache.catalina.realm.GenericPrincipal;
+import org.apache.log4j.Logger;
+import org.openid4java.consumer.ConsumerException;
+import org.openid4java.consumer.ConsumerManager;
+import org.openid4java.consumer.VerificationResult;
+import org.openid4java.discovery.DiscoveryException;
+import org.openid4java.discovery.DiscoveryInformation;
+import org.openid4java.discovery.Identifier;
+import org.openid4java.message.AuthRequest;
+import org.openid4java.message.AuthSuccess;
+import org.openid4java.message.MessageException;
+import org.openid4java.message.ParameterList;
+import org.openid4java.message.ax.AxMessage;
+import org.openid4java.message.ax.FetchRequest;
+import org.openid4java.message.ax.FetchResponse;
+import org.picketlink.identity.federation.core.util.StringUtil;
+import org.picketlink.social.openid.OpenIdPrincipal;
+import org.picketlink.social.openid.constants.OpenIDAliasMapper;
+
+/**
+ * Tomcat Authenticator that provides OpenID based authentication
+ * @author Anil Saldhana
+ * @since Sep 17, 2011
+ */
+public class OpenIDConsumerAuthenticator extends FormAuthenticator
+{
+ protected static Logger log = Logger.getLogger(OpenIDConsumerAuthenticator.class);
+ protected boolean trace = log.isTraceEnabled();
+ public static final String RETURN_URL_PARAMETER = "returnUrl";
+
+ public static final String OPEN_ID_PARAMETER = "openId";
+
+ public static final String AUTHENTICATION_PROTOCOL_PARAMETER = "authProtocol";
+
+ private enum Providers
+ {
+ GOOGLE("https://www.google.com/accounts/o8/id"),
+ YAHOO("https://me.yahoo.com/"),
+ MYSPACE("myspace.com"),
+ MYOPENID("https://myopenid.com/");
+
+ private String name;
+
+ Providers(String name)
+ {
+ this.name = name;
+ }
+ String get()
+ {
+ return name;
+ }
+ }
+ private enum STATES { AUTH, AUTHZ, FINISH};
+
+ public static ThreadLocal<Principal> cachedPrincipal = new ThreadLocal<Principal>();
+
+ public static ThreadLocal<List<String>> cachedRoles = new ThreadLocal<List<String>>();
+ public static String EMPTY_PASSWORD = "EMPTY";
+
+ private ConsumerManager openIdConsumerManager = null;
+
+ private String openIdServiceUrl = null;
+
+ private String returnURL = null;
+
+ private String requiredAttributes = "name,email,ax_firstName,ax_lastName,ax_fullName";
+
+ private String optionalAttributes = null;
+
+ private FetchRequest fetchRequest;
+ protected List<String> roles = new ArrayList<String>();
+
+ //Whether the authenticator has to to save and restore request
+ protected boolean saveRestoreRequest = true;
+
+ protected boolean initialized = false;
+
+ public void setReturnURL(String returnURL)
+ {
+ this.returnURL = returnURL;
+ }
+
+ public void setRequiredAttributes(String requiredAttributes)
+ {
+ this.requiredAttributes = requiredAttributes;
+ }
+
+ public void setOptionalAttributes(String optionalAttributes)
+ {
+ this.optionalAttributes = optionalAttributes;
+ }
+
+ public void setSaveRestoreRequest(boolean saveRestoreRequest)
+ {
+ this.saveRestoreRequest = saveRestoreRequest;
+ }
+
+ public void setRoleString(String roleStr)
+ {
+ if(roleStr == null)
+ throw new RuntimeException("Role String is null in configuration");
+ List<String> tokens = StringUtil.tokenize(roleStr);
+ for(String token: tokens)
+ {
+ roles.add(token);
+ }
+ }
+
+ public void initialize() throws MessageException, ConsumerException
+ {
+ if(openIdConsumerManager == null)
+ openIdConsumerManager = new ConsumerManager();
+
+ fetchRequest = FetchRequest.createFetchRequest();
+ //Work on the required attributes
+ if(StringUtil.isNotNull(requiredAttributes))
+ {
+ List<String> tokens = StringUtil.tokenize(requiredAttributes);
+ for(String token: tokens)
+ {
+ fetchRequest.addAttribute(token, OpenIDAliasMapper.get(token),true);
+ }
+ }
+ //Work on the optional attributes
+ if(StringUtil.isNotNull(optionalAttributes))
+ {
+ List<String> tokens = StringUtil.tokenize(optionalAttributes);
+ for(String token: tokens)
+ {
+ String type = OpenIDAliasMapper.get(token);
+ if(type == null)
+ {
+ log.error("Null Type returned for " + token);
+ }
+ fetchRequest.addAttribute(token, type,false);
+ }
+ }
+ initialized = true;
+ }
+
+ public boolean authenticate(Request request, Response response, LoginConfig loginConfig) throws IOException
+ {
+ Principal userPrincipal = request.getUserPrincipal();
+ if(userPrincipal != null)
+ {
+ if(trace)
+ log.trace("Logged in as:"+userPrincipal);
+ return true;
+ }
+
+ if(!initialized)
+ {
+ try
+ {
+ initialize();
+ }
+ catch (Exception e)
+ {
+ throw new RuntimeException(e);
+ }
+ }
+
+ HttpSession httpSession = request.getSession();
+ String state = (String) httpSession.getAttribute("STATE");
+ if(trace) log.trace("state="+ state);
+
+ if( STATES.FINISH.name().equals(state))
+ return true;
+
+ if( state == null || state.isEmpty())
+ {
+ return processSend(request, response, loginConfig);
+ }
+ //We have sent an auth request
+ if( state.equals(STATES.AUTH.name()))
+ {
+ return processIncomingResult(request, response, loginConfig);
+ }
+ return false;
+ }
+
+ @SuppressWarnings("unchecked")
+ protected boolean processSend(Request request, Response response, LoginConfig loginConfig) throws IOException
+ {
+ //Figure out the service url
+ String service = request.getParameter("service");
+ determineServiceUrl(service);
+
+ String openId = openIdServiceUrl;
+ Session session = request.getSessionInternal(true);
+ if(openId != null)
+ {
+ if (saveRestoreRequest)
+ {
+ this.saveRequest(request, session);
+ }
+ session.setNote("openid", openId);
+ List<DiscoveryInformation> discoveries;
+ try
+ {
+ discoveries = openIdConsumerManager.discover(openId);
+ }
+ catch (DiscoveryException e)
+ {
+ throw new RuntimeException(e);
+ }
+
+ DiscoveryInformation discovered = openIdConsumerManager.associate(discoveries);
+ session.setNote("discovery", discovered);
+ try
+ {
+ AuthRequest authReq = openIdConsumerManager.authenticate(discovered, returnURL);
+
+ //Add in required attributes
+ authReq.addExtension(fetchRequest);
+
+ String url = authReq.getDestinationUrl(true);
+ response.sendRedirect(url);
+
+ request.getSession().setAttribute("STATE", STATES.AUTH.name());
+ return false;
+ }
+ catch (Exception e)
+ {
+ throw new RuntimeException(e);
+ }
+ }
+ return false;
+ }
+
+ @SuppressWarnings("unchecked")
+ protected boolean processIncomingResult(Request request, Response response, LoginConfig loginConfig) throws IOException
+ {
+ Session session = request.getSessionInternal(false);
+ if(session == null)
+ throw new RuntimeException("wrong lifecycle: session was null");
+
+ // extract the parameters from the authentication response
+ // (which comes in as a HTTP request from the OpenID provider)
+ ParameterList responseParamList = new ParameterList(request.getParameterMap());
+ // retrieve the previously stored discovery information
+ DiscoveryInformation discovered = (DiscoveryInformation) session.getNote("discovery");
+ if(discovered == null)
+ throw new RuntimeException("discovered information was null");
+ // extract the receiving URL from the HTTP request
+ StringBuffer receivingURL = request.getRequestURL();
+ String queryString = request.getQueryString();
+ if (queryString != null && queryString.length() > 0)
+ receivingURL.append("?").append(request.getQueryString());
+
+ // verify the response; ConsumerManager needs to be the same
+ // (static) instance used to place the authentication request
+ VerificationResult verification;
+ try
+ {
+ verification = openIdConsumerManager.verify(receivingURL.toString(), responseParamList, discovered);
+ }
+ catch (Exception e)
+ {
+ throw new RuntimeException(e);
+ }
+
+ // examine the verification result and extract the verified identifier
+ Identifier identifier = verification.getVerifiedId();
+
+ if (identifier != null)
+ {
+ AuthSuccess authSuccess = (AuthSuccess) verification.getAuthResponse();
+
+ Map<String, List<String>> attributes = null;
+ if (authSuccess.hasExtension(AxMessage.OPENID_NS_AX))
+ {
+ FetchResponse fetchResp;
+ try
+ {
+ fetchResp = (FetchResponse) authSuccess.getExtension(AxMessage.OPENID_NS_AX);
+ }
+ catch (MessageException e)
+ {
+ throw new RuntimeException(e);
+ }
+
+ attributes = fetchResp.getAttributes();
+ }
+
+ Principal principal = null;
+ OpenIdPrincipal openIDPrincipal = createPrincipal(identifier.getIdentifier(), discovered.getOPEndpoint(),
+ attributes);
+ request.getSession().setAttribute("PRINCIPAL", openIDPrincipal);
+
+ String principalName = openIDPrincipal.getName();
+ cachedPrincipal.set(openIDPrincipal);
+
+ if(isJBossEnv())
+ {
+ cachedRoles.set(roles);
+ principal = context.getRealm().authenticate(principalName, EMPTY_PASSWORD);
+ }
+ else
+ {
+ //Create a Tomcat Generic Principal
+ principal = new GenericPrincipal(getContainer().getRealm(), principalName, null, roles, openIDPrincipal);
+ }
+
+ request.getSessionInternal().setNote(Constants.SESS_USERNAME_NOTE, principalName);
+ request.getSessionInternal().setNote(Constants.SESS_PASSWORD_NOTE, "");
+ request.setUserPrincipal(principal);
+
+ if (saveRestoreRequest)
+ {
+ this.restoreRequest(request, request.getSessionInternal());
+ }
+
+ if(trace)
+ log.trace("Logged in as:" + principal);
+ register(request, response, principal, Constants.FORM_METHOD, principalName, "");
+ return true;
+ }
+ return false;
+ }
+
+
+ public boolean authenticate(HttpServletRequest request, HttpServletResponse response, LoginConfig loginConfig) throws IOException
+ {
+ if(request instanceof Request == false)
+ throw new IOException("Not of type Catalina request");
+ if(response instanceof Response == false)
+ throw new IOException("Not of type Catalina response");
+ return authenticate((Request)request, (Response)response, loginConfig);
+ }
+
+ private OpenIdPrincipal createPrincipal(String identifier, URL openIdProvider, Map<String, List<String>> attributes)
+ {
+ return new OpenIdPrincipal(identifier, openIdProvider, attributes);
+ }
+
+ private boolean isJBossEnv()
+ {
+ ClassLoader tcl = SecurityActions.getContextClassLoader();
+ Class<?> clazz = null;
+ try
+ {
+ clazz = tcl.loadClass("org.jboss.system.Service");
+ }
+ catch (ClassNotFoundException e)
+ {
+ }
+ if( clazz != null )
+ return true;
+ return false;
+ }
+
+ private void determineServiceUrl(String service)
+ {
+ openIdServiceUrl = Providers.GOOGLE.get();
+ if(StringUtil.isNotNull(service))
+ {
+ if("google".equals(service))
+ openIdServiceUrl = Providers.GOOGLE.get();
+ else if("yahoo".equals(service))
+ openIdServiceUrl = Providers.YAHOO.get();
+ else if("myspace".equals(service))
+ openIdServiceUrl = Providers.MYSPACE.get();
+ else if("myopenid".equals(service))
+ openIdServiceUrl = Providers.MYOPENID.get();
+ }
+ }
+}
\ No newline at end of file
Added: social/trunk/openid/src/main/java/org/picketlink/social/openid/auth/OpenIDLoginModule.java
===================================================================
--- social/trunk/openid/src/main/java/org/picketlink/social/openid/auth/OpenIDLoginModule.java (rev 0)
+++ social/trunk/openid/src/main/java/org/picketlink/social/openid/auth/OpenIDLoginModule.java 2011-09-18 07:19:35 UTC (rev 1225)
@@ -0,0 +1,70 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2011, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.picketlink.social.openid.auth;
+
+import java.security.Principal;
+import java.security.acl.Group;
+import java.util.List;
+
+import javax.security.auth.login.LoginException;
+import javax.security.auth.spi.LoginModule;
+
+import org.jboss.security.SimpleGroup;
+import org.jboss.security.SimplePrincipal;
+import org.jboss.security.auth.spi.UsernamePasswordLoginModule;
+
+/**
+ * A {@link LoginModule} for JBoss environment
+ * @author Anil Saldhana
+ * @since May 19, 2011
+ */
+public class OpenIDLoginModule extends UsernamePasswordLoginModule
+{
+ @Override
+ protected Principal getIdentity()
+ {
+ return OpenIDConsumerAuthenticator.cachedPrincipal.get();
+ }
+
+ @Override
+ protected String getUsersPassword() throws LoginException
+ {
+ return OpenIDConsumerAuthenticator.EMPTY_PASSWORD;
+ }
+
+ @Override
+ protected Group[] getRoleSets() throws LoginException
+ {
+ Group group = new SimpleGroup("Roles");
+
+ List<String> roles = OpenIDConsumerAuthenticator.cachedRoles.get();
+
+ if(roles != null)
+ {
+ for(String role: roles)
+ {
+ group.addMember(new SimplePrincipal(role));
+ }
+ }
+ return new Group[] {group};
+ }
+}
\ No newline at end of file
Added: social/trunk/openid/src/main/java/org/picketlink/social/openid/auth/SecurityActions.java
===================================================================
--- social/trunk/openid/src/main/java/org/picketlink/social/openid/auth/SecurityActions.java (rev 0)
+++ social/trunk/openid/src/main/java/org/picketlink/social/openid/auth/SecurityActions.java 2011-09-18 07:19:35 UTC (rev 1225)
@@ -0,0 +1,93 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2011, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.picketlink.social.openid.auth;
+
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+
+import org.jboss.security.SecurityContext;
+import org.jboss.security.SecurityContextAssociation;
+import org.jboss.security.SecurityContextFactory;
+
+/**
+ * Privileged Blocks
+ * @author Anil Saldhana
+ * @since May 19, 2011
+ */
+class SecurityActions
+{
+ static SecurityContext createSecurityContext( final String name)
+ {
+ return AccessController.doPrivileged(new PrivilegedAction<SecurityContext>()
+ {
+ public SecurityContext run()
+ {
+ try
+ {
+ return SecurityContextFactory.createSecurityContext(name);
+ }
+ catch (Exception e)
+ {
+ throw new RuntimeException(e);
+ }
+ }
+ });
+ }
+
+ static void setSecurityContext( final SecurityContext sc)
+ {
+ AccessController.doPrivileged(new PrivilegedAction<Void>()
+ {
+
+ public Void run()
+ {
+ SecurityContextAssociation.setSecurityContext(sc);
+ return null;
+ }
+ });
+ }
+
+ static SecurityContext getSecurityContext()
+ {
+ return AccessController.doPrivileged(new PrivilegedAction<SecurityContext>()
+ {
+
+ public SecurityContext run()
+ {
+ return SecurityContextAssociation.getSecurityContext();
+ }
+ });
+ }
+
+ static ClassLoader getContextClassLoader()
+ {
+ return AccessController.doPrivileged(new PrivilegedAction<ClassLoader>()
+ {
+
+ public ClassLoader run()
+ {
+ return Thread.currentThread().getContextClassLoader();
+ }
+ });
+ }
+
+}
\ No newline at end of file
Added: social/trunk/openid/src/main/java/org/picketlink/social/openid/constants/OpenIDAliasMapper.java
===================================================================
--- social/trunk/openid/src/main/java/org/picketlink/social/openid/constants/OpenIDAliasMapper.java (rev 0)
+++ social/trunk/openid/src/main/java/org/picketlink/social/openid/constants/OpenIDAliasMapper.java 2011-09-18 07:19:35 UTC (rev 1225)
@@ -0,0 +1,60 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2011, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.picketlink.social.openid.constants;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Provides a mapping of OpenID Attribute alias
+ * to type
+ * @author Anil Saldhana
+ * @since Sep 17, 2011
+ */
+public class OpenIDAliasMapper
+{
+ private static Map<String,String> map = new HashMap<String,String>();
+
+ static
+ {
+ map.put("name", "http://schema.openid.net/namePerson");
+ map.put("email", "http://schema.openid.net/contact/email");
+ map.put("birthDate", "http://schema.openid.net/birthDate");
+ map.put("gender", "http://schema.openid.net/person/gender");
+ map.put("postalCode", "http://schema.openid.net/contact/postalCode/home");
+ map.put("country", "http://schema.openid.net/contact/country/home");
+ map.put("language", "http://schema.openid.net/pref/language");
+ map.put("timezone", "http://schema.openid.net/pref/timezone");
+
+ map.put("timezone", "http://schema.openid.net/pref/timezone");
+
+ map.put( "ax_email", "http://axschema.org/contact/email");
+ map.put( "ax_firstName", "http://axschema.org/namePerson/first");
+ map.put( "ax_lastName", "http://axschema.org/namePerson/last");
+ map.put( "ax_fullName", "http://axschema.org/namePerson");
+ }
+
+ public static String get(String key)
+ {
+ return map.get(key);
+ }
+}
\ No newline at end of file
12 years, 7 months
- 1
- 0
Picketlink SVN: r1224 - social/trunk/parent.
by picketlink-commits＠lists.jboss.org
Author: anil.saldhana(a)jboss.com
Date: 2011-09-17 23:12:32 -0400 (Sat, 17 Sep 2011)
New Revision: 1224
Modified:
social/trunk/parent/pom.xml
Log:
bump openid4java ver
Modified: social/trunk/parent/pom.xml
===================================================================
--- social/trunk/parent/pom.xml 2011-09-15 05:47:43 UTC (rev 1223)
+++ social/trunk/parent/pom.xml 2011-09-18 03:12:32 UTC (rev 1224)
@@ -100,7 +100,7 @@
<dependency>
<groupId>org.openid4java</groupId>
<artifactId>openid4java-nodeps</artifactId>
- <version>0.9.5</version>
+ <version>0.9.6</version>
</dependency>
</dependencies>
</dependencyManagement>
12 years, 7 months
- 1
- 0
Picketlink SVN: r1223 - federation/trunk/picketlink-bindings/src/main/java/org/picketlink/identity/federation/bindings/tomcat.
by picketlink-commits＠lists.jboss.org
Author: anil.saldhana(a)jboss.com
Date: 2011-09-15 01:47:43 -0400 (Thu, 15 Sep 2011)
New Revision: 1223
Removed:
federation/trunk/picketlink-bindings/src/main/java/org/picketlink/identity/federation/bindings/tomcat/ClassLoadingSecurityActions.java
Modified:
federation/trunk/picketlink-bindings/src/main/java/org/picketlink/identity/federation/bindings/tomcat/PicketLinkAuthenticator.java
Log:
PLFED-229: PicketLink Authenticator has issues due to custom username that does not change
Deleted: federation/trunk/picketlink-bindings/src/main/java/org/picketlink/identity/federation/bindings/tomcat/ClassLoadingSecurityActions.java
===================================================================
--- federation/trunk/picketlink-bindings/src/main/java/org/picketlink/identity/federation/bindings/tomcat/ClassLoadingSecurityActions.java 2011-09-14 20:10:47 UTC (rev 1222)
+++ federation/trunk/picketlink-bindings/src/main/java/org/picketlink/identity/federation/bindings/tomcat/ClassLoadingSecurityActions.java 2011-09-15 05:47:43 UTC (rev 1223)
@@ -1,72 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.picketlink.identity.federation.bindings.tomcat;
-
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-
-/**
- * Privileged Blocks for loading classes
- * Redundant class added to some environment
- * with PL1 and PL2 versions of code base
- * @author Anil.Saldhana(a)redhat.com
- * @since Sep 14, 2011
- */
-class ClassLoadingSecurityActions
-{
- static Class<?> loadClass(final Class<?> theClass, final String fqn)
- {
- return AccessController.doPrivileged(new PrivilegedAction<Class<?>>()
- {
- public Class<?> run()
- {
- ClassLoader classLoader = theClass.getClassLoader();
-
- Class<?> clazz = loadClass(classLoader, fqn);
- if (clazz == null)
- {
- classLoader = Thread.currentThread().getContextClassLoader();
- clazz = loadClass(classLoader, fqn);
- }
- return clazz;
- }
- });
- }
-
- static Class<?> loadClass(final ClassLoader cl, final String fqn)
- {
- return AccessController.doPrivileged(new PrivilegedAction<Class<?>>()
- {
- public Class<?> run()
- {
- try
- {
- return cl.loadClass(fqn);
- }
- catch (ClassNotFoundException e)
- {
- }
- return null;
- }
- });
- }
-}
\ No newline at end of file
Modified: federation/trunk/picketlink-bindings/src/main/java/org/picketlink/identity/federation/bindings/tomcat/PicketLinkAuthenticator.java
===================================================================
--- federation/trunk/picketlink-bindings/src/main/java/org/picketlink/identity/federation/bindings/tomcat/PicketLinkAuthenticator.java 2011-09-14 20:10:47 UTC (rev 1222)
+++ federation/trunk/picketlink-bindings/src/main/java/org/picketlink/identity/federation/bindings/tomcat/PicketLinkAuthenticator.java 2011-09-15 05:47:43 UTC (rev 1223)
@@ -22,7 +22,9 @@
package org.picketlink.identity.federation.bindings.tomcat;
import java.io.IOException;
+import java.security.AccessController;
import java.security.Principal;
+import java.security.PrivilegedAction;
import java.util.Set;
import java.util.UUID;
@@ -156,7 +158,7 @@
{
if (subjectInteraction == null)
{
- Class<?> clazz = ClassLoadingSecurityActions.loadClass(getClass(), subjectInteractionClassName);
+ Class<?> clazz = loadClass(getClass(), subjectInteractionClassName);
try
{
subjectInteraction = (SubjectSecurityInteraction) clazz.newInstance();
@@ -178,4 +180,41 @@
}
return null;
}
+
+ Class<?> loadClass(final Class<?> theClass, final String fqn)
+ {
+ return AccessController.doPrivileged(new PrivilegedAction<Class<?>>()
+ {
+ public Class<?> run()
+ {
+ ClassLoader classLoader = theClass.getClassLoader();
+
+ Class<?> clazz = loadClass(classLoader, fqn);
+ if (clazz == null)
+ {
+ classLoader = Thread.currentThread().getContextClassLoader();
+ clazz = loadClass(classLoader, fqn);
+ }
+ return clazz;
+ }
+ });
+ }
+
+ Class<?> loadClass(final ClassLoader cl, final String fqn)
+ {
+ return AccessController.doPrivileged(new PrivilegedAction<Class<?>>()
+ {
+ public Class<?> run()
+ {
+ try
+ {
+ return cl.loadClass(fqn);
+ }
+ catch (ClassNotFoundException e)
+ {
+ }
+ return null;
+ }
+ });
+ }
}
\ No newline at end of file
12 years, 7 months
- 1
- 0