GTNPORTAL-3543 - Updated gatein-sso to and picketlink.

packaging/jboss/modules/build.xml

@@ -357,12 +357,6 @@
       <maven-resource group="org.picketlink.idm" artifact="picketlink-idm-spi"/>
     </module-def>
 
-    <!-- We need to override old version on AS 7.1.1 with newer version. TODO: remove once support for AS 7.1.1 will be dropped -->
-    <module-def name="org.picketlink" slot="gatein">
-      <maven-resource group="org.picketlink" artifact="picketlink-core" />
-      <maven-resource group="org.picketlink.distribution" artifact="picketlink-jbas7" />
-    </module-def>
-
     <module-def name="org.picocontainer">
       <maven-resource group="picocontainer" artifact="picocontainer"/>
     </module-def>

packaging/jboss/modules/pom.xml

@@ -752,14 +752,6 @@
       <groupId>org.jasig.cas.client</groupId>
       <artifactId>cas-client-core</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.picketlink</groupId>
-      <artifactId>picketlink-core</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.picketlink.distribution</groupId>
-      <artifactId>picketlink-jbas7</artifactId>
-    </dependency>
 
     <!-- GateIn OAuth -->
     <dependency>

packaging/jboss/modules/src/main/resources/modules/org/gatein/sso/main/module.xml

@@ -39,8 +39,11 @@
     <module name="org.jboss.as.web"/>
     <module name="org.jboss.logging"/>
     <module name="org.jboss.security.negotiation" export="true"/>
+    <module name="org.picketlink.common"/>
+    <module name="org.picketlink.config"/>
+    <module name="org.picketlink.federation"/>
+    <module name="org.picketlink.federation.bindings"/>
     <module name="org.picketbox"/>
-    <module name="org.picketlink" slot="gatein"/>
     <module name="javax.xml.rpc.api"/>
     <module name="javax.wsdl4j.api"/>
     <module name="javax.mail.api"/>

pom.xml

@@ -48,7 +48,7 @@
     <org.gatein.common.version>2.2.2.Final</org.gatein.common.version>
     <org.gatein.wci.version>2.4.2.Final</org.gatein.wci.version>
     <org.gatein.pc.version>2.5.1.Final</org.gatein.pc.version>
-    <org.gatein.sso.version>1.4.2.Final</org.gatein.sso.version>
+    <org.gatein.sso.version>1.4.3.Final</org.gatein.sso.version>
     <org.picketlink.idm>1.4.5.Final</org.picketlink.idm>
     <org.gatein.wsrp.version>2.3.4.Final</org.gatein.wsrp.version>
     <org.gatein.mop.version>1.3.3.Final</org.gatein.mop.version>

web/portal/src/main/webapp/WEB-INF/conf/sso/saml/picketlink-idp.xml → web/portal/src/main/webapp/WEB-INF/classes/sso/saml/picketlink-idp.xml

@@ -1,6 +1,6 @@
 <PicketLink xmlns="urn:picketlink:identity-federation:config:2.1">
   <PicketLinkIDP xmlns="urn:picketlink:identity-federation:config:1.0"
-                 ServerEnvironment="tomcat" BindingType="POST" SupportsSignatures="true">
+                 ServerEnvironment="tomcat" BindingType="POST" SupportsSignatures="true" RoleGenerator="org.picketlink.identity.federation.core.impl.EmptyRoleGenerator">
     <IdentityURL>${gatein.sso.idp.url}</IdentityURL>
     <Trust>
       <Domains>${gatein.sso.sp.domains}</Domains>