GTNPORTAL-2980 Improved Modularization - SSO modularization

- added module org.jasig.cas.client, Property substitution in standalone.xml changed to use #{...}
gatein · May 7, 2013 · e8e9daa · e8e9daa
1 parent ec04ced
commit e8e9daa
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 5 deletions.
diff --git a/packaging/jboss-as7/modules/build.xml b/packaging/jboss-as7/modules/build.xml
@@ -126,6 +126,10 @@
       <maven-resource group="net.oauth.core" artifact="oauth"/>
     </module-def>
 
+    <module-def name="org.jasig.cas.client">
+      <maven-resource group="org.jasig.cas.client" artifact="cas-client-core"/>
+    </module-def>
+
     <module-def name="com.jhlabs.filters">
       <maven-resource group="com.jhlabs" artifact="filters"/>
     </module-def>
@@ -324,7 +328,6 @@
       <maven-resource group="org.gatein.sso" artifact="spnego"/>
       <maven-resource group="org.gatein.sso" artifact="sso-saml-plugin"/>
       <maven-resource group="org.gatein.sso" artifact="sso-integration"/>
-      <maven-resource group="org.jasig.cas.client" artifact="cas-client-core"/>
     </module-def>
 
     <module-def name="org.picketlink.idm">

diff --git a/packaging/jboss-as7/modules/src/main/resources/modules/org/gatein/sso/main/module.xml b/packaging/jboss-as7/modules/src/main/resources/modules/org/gatein/sso/main/module.xml
@@ -35,6 +35,7 @@
     <module name="org.gatein.common"/>
     <module name="org.gatein.lib"/>
     <module name="org.gatein.wci"/>
+    <module name="org.jasig.cas.client" />
     <module name="org.jboss.as.web"/>
     <module name="org.jboss.logging"/>
     <module name="org.jboss.security.negotiation" export="true"/>

diff --git a/packaging/jboss-as7/modules/src/main/resources/modules/org/jasig/cas/client/main/module.xml b/packaging/jboss-as7/modules/src/main/resources/modules/org/jasig/cas/client/main/module.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  ~ JBoss, Home of Professional Open Source.
+  ~ Copyright 2013, Red Hat, Inc., 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.
+  -->
+
+<module xmlns="urn:jboss:module:1.1" name="org.jasig.cas.client">
+  <resources>
+    <!-- Insert resources here -->
+  </resources>
+  <dependencies>
+    <module name="javax.api"/>
+    <module name="org.apache.commons.logging"/>
+  </dependencies>
+</module>
diff --git a/packaging/jboss-as7/pkg/src/main/xslt/standalone.xsl b/packaging/jboss-as7/pkg/src/main/xslt/standalone.xsl
@@ -141,10 +141,10 @@
          <authentication>
             <login-module code="org.gatein.sso.integration.SSODelegateLoginModule" flag="required">
                <module-option name="enabled">
-                  <xsl:attribute name="value">${gatein.sso.login.module.enabled:false}</xsl:attribute>
+                  <xsl:attribute name="value">#{gatein.sso.login.module.enabled}</xsl:attribute>
                </module-option>
                <module-option name="delegateClassName">
-                  <xsl:attribute name="value">${gatein.sso.login.module.class:}</xsl:attribute>
+                  <xsl:attribute name="value">#{gatein.sso.login.module.class}</xsl:attribute>
                </module-option>
                <module-option name="portalContainerName" value="portal"/>
                <module-option name="realmName" value="gatein-domain"/>
@@ -164,8 +164,8 @@
                 <![CDATA[<security-domain name="gatein-domain-sample-portal" cache-type="default">
                     <authentication>
                         <login-module code="org.gatein.sso.integration.SSODelegateLoginModule" flag="required">
-                            <module-option name="enabled" value="${gatein.sso.login.module.enabled:false}" />
-                            <module-option name="delegateClassName" value="${gatein.sso.login.module.class:}" />
+                            <module-option name="enabled" value="#{gatein.sso.login.module.enabled}" />
+                            <module-option name="delegateClassName" value="#{gatein.sso.login.module.class}" />
                             <module-option name="portalContainerName" value="sample-portal" />
                             <module-option name="realmName" value="gatein-domain-sample-portal" />
                             <module-option name="password-stacking" value="useFirstPass" />