GTNPORTAL-2859 Add security-jboss module and move PortalClusteredSSOS…

…upportValve to it, so it won't be used for tomcat packaging

component/web/pom.xml

@@ -37,5 +37,6 @@
     <module>server</module>
     <module>resources</module>
     <module>api</module>
+    <module>security-jboss</module>
   </modules>
 </project>

component/web/security-jboss/pom.xml

@@ -0,0 +1,65 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <parent>
+    <artifactId>exo.portal.component.web</artifactId>
+    <groupId>org.gatein.portal</groupId>
+    <version>3.6.0.MO1-SNAPSHOT</version>
+  </parent>
+
+  <modelVersion>4.0.0</modelVersion>
+  <artifactId>exo.portal.component.web.security-jboss</artifactId>
+  <packaging>jar</packaging>
+  <name>GateIn Portal Component Web Security JBoss</name>
+  <description>GateIn Portal Component Web Security JBoss</description>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.gatein.portal</groupId>
+      <artifactId>exo.portal.component.common</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss.jbossas</groupId>
+      <artifactId>jboss-as-tomcat</artifactId>
+      <scope>provided</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>jpl-pattern</groupId>
+          <artifactId>jpl-pattern</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>jpl-util</groupId>
+          <artifactId>jpl-util</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>cglib</groupId>
+          <artifactId>cglib</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>javax.security</groupId>
+          <artifactId>jacc</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>javax.security</groupId>
+          <artifactId>jaas</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>sun-jaxws</groupId>
+          <artifactId>jsr181-api</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>sun-jaxws</groupId>
+          <artifactId>jaxws-api</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>trove</groupId>
+          <artifactId>trove</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>apache-log4j</groupId>
+          <artifactId>log4j</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+  </dependencies>
+
+</project>

component/web/security/src/main/java/org/exoplatform/web/login/PortalClusteredSSOSupportValve.java → component/web/security-jboss/src/main/java/org/gatein/portal/security/jboss/PortalClusteredSSOSupportValve.java

@@ -1,6 +1,6 @@
 /*
  * JBoss, a division of Red Hat
- * Copyright 2011, Red Hat Middleware, LLC, and individual
+ * Copyright 2013, Red Hat Middleware, LLC, and individual
  * contributors as indicated by the @authors tag. See the
  * copyright.txt in the distribution for a full listing of
  * individual contributors.
@@ -21,7 +21,7 @@
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
 
-package org.exoplatform.web.login;
+package org.gatein.portal.security.jboss;
 
 import java.io.IOException;
 
@@ -42,8 +42,7 @@
 import org.apache.catalina.util.LifecycleSupport;
 import org.apache.catalina.valves.ValveBase;
 import org.exoplatform.container.ExoContainer;
-import org.gatein.common.logging.Logger;
-import org.gatein.common.logging.LoggerFactory;
+import org.jboss.logging.Logger;
 
 /**
  * Helper valve for supporting JBoss clustered SSO Valve. Re-authentication is not initiated by JBoss as it is not aware that
@@ -55,7 +54,7 @@
  */
 public class PortalClusteredSSOSupportValve extends ValveBase implements Lifecycle {
 
-    private static final Logger log = LoggerFactory.getLogger(PortalClusteredSSOSupportValve.class);
+    private static final Logger log = Logger.getLogger(PortalClusteredSSOSupportValve.class);
 
     private final LifecycleSupport support = new LifecycleSupport(this);
 

component/web/security/src/main/java/org/exoplatform/web/login/ClusteredSSOFilter.java

@@ -39,7 +39,7 @@
 /**
  * @author <a href="mailto:boleslaw.dawidowicz at redhat.com">Boleslaw Dawidowicz</a>
  *
- * @deprecated This filter is no longer needed. Cluster SSO is handled by JBoss AS ClusteredValve and {@link PortalClusteredSSOSupportValve}
+ * @deprecated This filter is no longer needed. Cluster SSO is handled by JBoss AS ClusteredValve and PortalClusteredSSOSupportValve
  * Filter class should be removed in the future together with {@link PortalLoginModule}
  */
 public class ClusteredSSOFilter extends AbstractFilter {

component/web/security/src/main/java/org/exoplatform/web/security/PortalLoginModule.java

@@ -46,7 +46,7 @@
  * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a>
  * @version $Revision$
  *
- * @deprecated Cluster authentication is now handled by {@link org.exoplatform.web.login.PortalClusteredSSOSupportValve} and
+ * @deprecated Cluster authentication is now handled by PortalClusteredSSOSupportValve and
  *             this login module is no longer used. Likely will be removed in the future.
  */
 public class PortalLoginModule extends AbstractLoginModule {

packaging/jboss-as7/modules/build.xml

@@ -113,6 +113,7 @@
       <maven-resource group="org.gatein.portal" artifact="exo.portal.component.web.controller"/>
       <maven-resource group="org.gatein.portal" artifact="exo.portal.component.web.resources"/>
       <maven-resource group="org.gatein.portal" artifact="exo.portal.component.web.security"/>
+      <maven-resource group="org.gatein.portal" artifact="exo.portal.component.web.security-jboss"/>
       <maven-resource group="org.gatein.portal" artifact="exo.portal.component.web.server"/>
       <maven-resource group="org.gatein.portal" artifact="exo.portal.gadgets-core"/>
       <maven-resource group="org.gatein.portal" artifact="exo.portal.webui.core"/>

packaging/jboss-as7/modules/pom.xml

@@ -802,6 +802,10 @@
       <groupId>org.gatein.portal</groupId>
       <artifactId>exo.portal.component.web.security</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.gatein.portal</groupId>
+      <artifactId>exo.portal.component.web.security-jboss</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.gatein.portal</groupId>
       <artifactId>exo.portal.component.web.server</artifactId>

pom.xml

@@ -498,6 +498,11 @@
         <artifactId>exo.portal.component.web.security</artifactId>
         <version>3.5.4.Final-SNAPSHOT</version>
       </dependency>
+      <dependency>
+        <groupId>org.gatein.portal</groupId>
+        <artifactId>exo.portal.component.web.security-jboss</artifactId>
+        <version>3.6.0.MO1-SNAPSHOT</version>
+      </dependency>
       <dependency>
         <groupId>org.gatein.portal</groupId>
         <artifactId>exo.portal.component.web.server</artifactId>

web/portal/src/main/webapp/WEB-INF/context.xml

@@ -24,6 +24,6 @@
 <!-- This context file is specific to JBoss AS. Tomcat specific file is in META-INF/context.xml -->
 <Context>
 
-  <Valve className="org.exoplatform.web.login.PortalClusteredSSOSupportValve"/>
+  <Valve className="org.gatein.portal.security.jboss.PortalClusteredSSOSupportValve"/>
 
 </Context>

web/portal/src/main/webapp/WEB-INF/jboss-web.xml

@@ -23,7 +23,7 @@
 <jboss-web>
   <security-domain>java:/jaas/gatein-domain</security-domain>
   <valve>
-    <class-name>org.exoplatform.web.login.PortalClusteredSSOSupportValve</class-name>
+    <class-name>org.gatein.portal.security.jboss.PortalClusteredSSOSupportValve</class-name>
   </valve>
   <valve>
     <class-name>org.gatein.sso.integration.SSODelegateValve</class-name>