Author: thomas.heute(a)jboss.com Date: 2009-11-18 10:36:13 -0500 (Wed, 18 Nov 2009) New Revision: 644 Added: portal/trunk/sample/portal/ear/src/ portal/trunk/sample/portal/ear/src/main/ portal/trunk/sample/portal/ear/src/main/application/ portal/trunk/sample/portal/ear/src/main/application/META-INF/ portal/trunk/sample/portal/ear/src/main/application/META-INF/gatein-jboss-beans.xml portal/trunk/server/jboss/patch-ear/src/main/jboss/server/default/deploy/gatein.ear/META-INF/gatein-jboss-beans.xml Removed: portal/trunk/server/jboss/patch-ear/src/main/jboss/server/default/conf/login-config.xml Modified: portal/trunk/component/application-registry/src/test/java/conf/portal/repository-configuration.xml portal/trunk/component/portal/src/test/java/conf/portal/repository-configuration.xml portal/trunk/component/resources/src/test/java/conf/portal/testjcr/test-jcr-config.xml portal/trunk/docs/user-guide/en/modules/security/Use_Spring_Security.xml portal/trunk/packaging/exopackage/src/main/javascript/eXo/server/Tomcat.js portal/trunk/sample/extension/README.txt portal/trunk/sample/extension/config/src/main/java/conf/configuration.xml portal/trunk/sample/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/jcr/repository-configuration.xml portal/trunk/sample/extension/war/src/main/webapp/WEB-INF/jboss-web.xml portal/trunk/sample/portal/README.txt portal/trunk/sample/portal/config/src/main/java/conf/configuration.xml portal/trunk/sample/portal/rest-war/src/main/webapp/WEB-INF/jboss-web.xml portal/trunk/sample/portal/rest-war/src/main/webapp/WEB-INF/web.xml portal/trunk/sample/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/jcr/repository-configuration.xml portal/trunk/sample/portal/war/src/main/webapp/WEB-INF/jboss-web.xml portal/trunk/sample/portal/war/src/main/webapp/WEB-INF/web.xml portal/trunk/server/jboss/patch/src/main/jboss/server/default/deploy/exoplatform.sar/META-INF/login-config.xml portal/trunk/server/tomcat/patch/src/main/tomcat/conf/Catalina/localhost/portal.xml portal/trunk/server/tomcat/patch/src/main/tomcat/conf/Catalina/localhost/rest.xml portal/trunk/server/tomcat/patch/src/main/tomcat/conf/jaas.conf portal/trunk/web/portal/src/main/resources/tomcat/portal.xml portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/repository-configuration.tmpl.xml portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/repository-configuration.xml portal/trunk/web/portal/src/main/webapp/WEB-INF/jboss-web.xml portal/trunk/web/portal/src/main/webapp/WEB-INF/web.xml portal/trunk/web/rest/src/main/webapp/WEB-INF/jboss-web.xml portal/trunk/web/rest/src/main/webapp/WEB-INF/web.xml Log: GTNPORTAL-255: Do not Configure application policy inside server/default/conf/login-config.xml Also included the security domain of portal-samples in its ear. GTNPORTAL-268: Rename exo-domain -> gatein-domain Modified: portal/trunk/component/application-registry/src/test/java/conf/portal/repository-configuration.xml =================================================================== --- portal/trunk/component/application-registry/src/test/java/conf/portal/repository-configuration.xml 2009-11-18 14:51:28 UTC (rev 643) +++ portal/trunk/component/application-registry/src/test/java/conf/portal/repository-configuration.xml 2009-11-18 15:36:13 UTC (rev 644) @@ -23,7 +23,7 @@ <repositories> <repository name="repository" system-workspace="system" default-workspace="collaboration"> - <security-domain>exo-domain</security-domain> + <security-domain>gatein-domain</security-domain> <access-control>optional</access-control> <!-- config for replication IPv4 --> Modified: portal/trunk/component/portal/src/test/java/conf/portal/repository-configuration.xml =================================================================== --- portal/trunk/component/portal/src/test/java/conf/portal/repository-configuration.xml 2009-11-18 14:51:28 UTC (rev 643) +++ portal/trunk/component/portal/src/test/java/conf/portal/repository-configuration.xml 2009-11-18 15:36:13 UTC (rev 644) @@ -22,7 +22,7 @@ <repository-service default-repository="repository"> <repositories> <repository name="repository" system-workspace="system" default-workspace="portal-system"> - <security-domain>exo-domain</security-domain> + <security-domain>gatein-domain</security-domain> <access-control>optional</access-control> <authentication-policy>org.exoplatform.services.jcr.impl.core.access.JAASAuthenticator</authentication-policy> <workspaces> @@ -170,4 +170,4 @@ </workspaces> </repository> </repositories> -</repository-service> \ No newline at end of file +</repository-service> Modified: portal/trunk/component/resources/src/test/java/conf/portal/testjcr/test-jcr-config.xml =================================================================== --- portal/trunk/component/resources/src/test/java/conf/portal/testjcr/test-jcr-config.xml 2009-11-18 14:51:28 UTC (rev 643) +++ portal/trunk/component/resources/src/test/java/conf/portal/testjcr/test-jcr-config.xml 2009-11-18 15:36:13 UTC (rev 644) @@ -22,7 +22,7 @@ <repository-service default-repository="repository"> <repositories> <repository name="repository" system-workspace="system" default-workspace="collaboration"> - <security-domain>exo-domain</security-domain> + <security-domain>gatein-domain</security-domain> <access-control>enable</access-control> <authentication-policy>org.exoplatform.services.jcr.impl.core.access.JAASAuthenticator</authentication-policy> <workspaces> Modified: portal/trunk/docs/user-guide/en/modules/security/Use_Spring_Security.xml =================================================================== --- portal/trunk/docs/user-guide/en/modules/security/Use_Spring_Security.xml 2009-11-18 14:51:28 UTC (rev 643) +++ portal/trunk/docs/user-guide/en/modules/security/Use_Spring_Security.xml 2009-11-18 15:36:13 UTC (rev 644) @@ -77,7 +77,7 @@ &lt;login-config&gt; &lt;auth-method&gt;FORM&lt;/auth-method&gt; - &lt;realm-name&gt;exo-domain&lt;/realm-name&gt; + &lt;realm-name&gt;gatein-domain&lt;/realm-name&gt; &lt;form-login-config&gt; &lt;form-login-page&gt;/login/jsp/login.jsp&lt;/form-login-page&gt; &lt;form-error-page&gt;/login/jsp/login.jsp&lt;/form-error-page&gt; @@ -367,4 +367,4 @@ </programlisting> <section><title>Conclusion</title></section> <para>We are done! Now we know how to integrate the spring security framework in the GateIn portal. Thanks to the the great integration capabilities of both GateIn portal and Spring framework. You can have a look to the attachment section on this page and get the source code of this tutorial.</para> -</section> \ No newline at end of file +</section> Modified: portal/trunk/packaging/exopackage/src/main/javascript/eXo/server/Tomcat.js =================================================================== --- portal/trunk/packaging/exopackage/src/main/javascript/eXo/server/Tomcat.js 2009-11-18 14:51:28 UTC (rev 643) +++ portal/trunk/packaging/exopackage/src/main/javascript/eXo/server/Tomcat.js 2009-11-18 15:36:13 UTC (rev 644) @@ -100,7 +100,7 @@ // " <Manager className='org.apache.catalina.session.PersistentManager' // saveOnRestart='false'/> \n" + // " <Realm className='org.apache.catalina.realm.JAASRealm' \n" + - // " appName='exo-domain' \n" + + // " appName='gatein-domain' \n" + // " userClassNames='org.exoplatform.services.security.jaas.UserPrincipal' // \n" + // " roleClassNames='org.exoplatform.services.security.jaas.RolePrincipal' Modified: portal/trunk/sample/extension/README.txt =================================================================== --- portal/trunk/sample/extension/README.txt 2009-11-18 14:51:28 UTC (rev 643) +++ portal/trunk/sample/extension/README.txt 2009-11-18 15:36:13 UTC (rev 644) @@ -25,8 +25,8 @@ # On JBoss (tested on JBoss 5.1.0.GA) ######################################## -We assume that you have a clean JBoss version of GateIn: ie We assume that you have already the file exoplatform.ear in the deploy directory -of jboss and you have the retlated application policy "exo-domain" in your conf/login-config.xml +We assume that you have a clean JBoss version of GateIn: ie We assume that you have already the file gatein.ear in the deploy directory +of jboss You need to: @@ -41,7 +41,7 @@ ######################################## We assume that you have a clean Tomcat version of GateIn: ie We assume that you have already all the jar files of GateIn and their dependencies -into tomcat/lib and you have the related relam name "exo-domain" defined in the file tomcat/conf/jaas.conf +into tomcat/lib and you have the related relam name "gatein-domain" defined in the file tomcat/conf/jaas.conf 1. Add the file sample-ext.war from sample/extension/war/target/ to the tomcat/webapps directory 2. Add the folder starter from starter/war/target/ to the tomcat/webapps directory Modified: portal/trunk/sample/extension/config/src/main/java/conf/configuration.xml =================================================================== --- portal/trunk/sample/extension/config/src/main/java/conf/configuration.xml 2009-11-18 14:51:28 UTC (rev 643) +++ portal/trunk/sample/extension/config/src/main/java/conf/configuration.xml 2009-11-18 15:36:13 UTC (rev 644) @@ -41,7 +41,7 @@ <!-- The name of the context name of the rest web application --> <field name="restContextName"><string>rest</string></field> <!-- The name of the realm --> - <field name="realmName"><string>exo-domain</string></field> + <field name="realmName"><string>gatein-domain</string></field> <!-- All the dependencies of the portal container ordered by loading priority --> <field name="dependencies"> <collection type="java.util.ArrayList"> Modified: portal/trunk/sample/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/jcr/repository-configuration.xml =================================================================== --- portal/trunk/sample/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/jcr/repository-configuration.xml 2009-11-18 14:51:28 UTC (rev 643) +++ portal/trunk/sample/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/jcr/repository-configuration.xml 2009-11-18 15:36:13 UTC (rev 644) @@ -22,7 +22,7 @@ <repository-service default-repository="repository"> <repositories> <repository name="repository" system-workspace="system" default-workspace="portal-system"> - <security-domain>exo-domain</security-domain> + <security-domain>gatein-domain</security-domain> <access-control>optional</access-control> <authentication-policy>org.exoplatform.services.jcr.impl.core.access.JAASAuthenticator</authentication-policy> <workspaces> Modified: portal/trunk/sample/extension/war/src/main/webapp/WEB-INF/jboss-web.xml =================================================================== --- portal/trunk/sample/extension/war/src/main/webapp/WEB-INF/jboss-web.xml 2009-11-18 14:51:28 UTC (rev 643) +++ portal/trunk/sample/extension/war/src/main/webapp/WEB-INF/jboss-web.xml 2009-11-18 15:36:13 UTC (rev 644) @@ -21,5 +21,5 @@ --> <jboss-web> - <security-domain>java:/jaas/exo-domain</security-domain> + <security-domain>java:/jaas/gatein-domain</security-domain> </jboss-web> Modified: portal/trunk/sample/portal/README.txt =================================================================== --- portal/trunk/sample/portal/README.txt 2009-11-18 14:51:28 UTC (rev 643) +++ portal/trunk/sample/portal/README.txt 2009-11-18 15:36:13 UTC (rev 644) @@ -25,41 +25,23 @@ # On JBoss (tested on JBoss 5.1.0.GA) ######################################## -We assume that you have a clean JBoss version of GateIn: ie We assume that you have already the file exoplatform.ear in the deploy directory -of jboss and you have the retlated application policy in your conf/login-config.xml +We assume that you have a clean JBoss version of GateIn: ie We assume that you have already the file gatein.ear in the deploy directory +of jboss You need to: 1. Add the file sample-portal.ear from sample/portal/ear/target/ to the deploy directory of jboss 2. Add the file starter.ear from starter/ear/target/ to the deploy directory of jboss -3. Define the related application policy in your file conf/login-config.xml, as below: - - <application-policy name="exo-domain-sample-portal"> - <authentication> - <login-module code="org.exoplatform.web.security.PortalLoginModule" flag="required"> - <module-option name="portalContainerName">sample-portal</module-option> - <module-option name="realmName">exo-domain-sample-portal</module-option> - </login-module> - <login-module code="org.exoplatform.services.security.jaas.SharedStateLoginModule" flag="required"> - <module-option name="portalContainerName">sample-portal</module-option> - <module-option name="realmName">exo-domain-sample-portal</module-option> - </login-module> - <login-module code="org.exoplatform.services.security.j2ee.JbossLoginModule" flag="required"> - <module-option name="portalContainerName">sample-portal</module-option> - <module-option name="realmName">exo-domain-sample-portal</module-option> - </login-module> - </authentication> - </application-policy> WARNING: This can only work if a Unified ClassLoader has been configured on your JBoss (default behavior) and -the load order is first the exoplatform.ear then the sample-portal.ear and finally the starter.ear +the load order is first the gatein.ear then the sample-portal.ear and finally the starter.ear ######################################## # On Tomcat (tested on Tomcat 6.0.20) ######################################## We assume that you have a clean Tomcat version of GateIn: ie We assume that you have already all the jar files of GateIn and their dependencies -into tomcat/lib and you have the related relam name "exo-domain" defined in the file tomcat/conf/jaas.conf +into tomcat/lib and you have the related relam name "gatein-domain" defined in the file tomcat/conf/jaas.conf 1. Add the file sample-portal.war from sample/portal/war/target/ to the tomcat/webapps directory 2. Add the file rest-sample-portal.war from sample/portal/rest-war/target/ to the tomcat/webapps directory @@ -69,16 +51,16 @@ 6. Add the jar file exo.portal.sample.portal.jar-X.Y.Z.jar from sample/portal/jar/target/ to the tomcat/lib directory 7. Define the related realm in your file tomcat/conf/jaas.conf, as below: -exo-domain-sample-portal { +gatein-domain-sample-portal { org.exoplatform.web.security.PortalLoginModule required portalContainerName="sample-portal" - realmName="exo-domain-sample-portal"; + realmName="gatein-domain-sample-portal"; org.exoplatform.services.security.jaas.SharedStateLoginModule required portalContainerName="sample-portal" - realmName="exo-domain-sample-portal"; + realmName="gatein-domain-sample-portal"; org.exoplatform.services.security.j2ee.TomcatLoginModule required portalContainerName="sample-portal" - realmName="exo-domain-sample-portal"; + realmName="gatein-domain-sample-portal"; }; 8. Define the context of sample-portal by creating a file called "sample-portal.xml" in tomcat/conf/Catalina/localhost/ with the following content @@ -87,7 +69,7 @@ prefix='localhost_portal_log.' suffix='.txt' timestamp='true'/> <Manager className='org.apache.catalina.session.PersistentManager' saveOnRestart='false'/> <Realm className='org.apache.catalina.realm.JAASRealm' - appName='exo-domain-sample-portal' + appName='gatein-domain-sample-portal' userClassNames='org.exoplatform.services.security.jaas.UserPrincipal' roleClassNames='org.exoplatform.services.security.jaas.RolePrincipal' debug='0' cache='false'/> @@ -101,7 +83,7 @@ prefix='localhost_portal_log.' suffix='.txt' timestamp='true'/> <Manager className='org.apache.catalina.session.PersistentManager' saveOnRestart='false'/> <Realm className='org.apache.catalina.realm.JAASRealm' - appName='exo-domain-sample-portal' + appName='gatein-domain-sample-portal' userClassNames="org.exoplatform.services.security.jaas.UserPrincipal" roleClassNames="org.exoplatform.services.security.jaas.RolePrincipal" debug='0' cache='false'/> Modified: portal/trunk/sample/portal/config/src/main/java/conf/configuration.xml =================================================================== --- portal/trunk/sample/portal/config/src/main/java/conf/configuration.xml 2009-11-18 14:51:28 UTC (rev 643) +++ portal/trunk/sample/portal/config/src/main/java/conf/configuration.xml 2009-11-18 15:36:13 UTC (rev 644) @@ -41,7 +41,7 @@ <!-- The name of the context name of the rest web application --> <field name="restContextName"><string>rest-sample-portal</string></field> <!-- The name of the realm --> - <field name="realmName"><string>exo-domain-sample-portal</string></field> + <field name="realmName"><string>gatein-domain-sample-portal</string></field> <!-- All the dependencies of the portal container ordered by loading priority --> <field name="dependencies"> <collection type="java.util.ArrayList"> Added: portal/trunk/sample/portal/ear/src/main/application/META-INF/gatein-jboss-beans.xml =================================================================== --- portal/trunk/sample/portal/ear/src/main/application/META-INF/gatein-jboss-beans.xml (rev 0) +++ portal/trunk/sample/portal/ear/src/main/application/META-INF/gatein-jboss-beans.xml 2009-11-18 15:36:13 UTC (rev 644) @@ -0,0 +1,20 @@ +<deployment xmlns="urn:jboss:bean-deployer:2.0"> + + <application-policy xmlns="urn:jboss:security-beans:1.0" name="gatein-domain-sample-portal"> + <authentication> + <login-module code="org.exoplatform.web.security.PortalLoginModule" flag="required"> + <module-option name="portalContainerName">sample-portal</module-option> + <module-option name="realmName">gatein-domain-sample-portal</module-option> + </login-module> + <login-module code="org.exoplatform.services.security.jaas.SharedStateLoginModule" flag="required"> + <module-option name="portalContainerName">sample-portal</module-option> + <module-option name="realmName">gatein-domain-sample-portal</module-option> + </login-module> + <login-module code="org.exoplatform.services.security.j2ee.JbossLoginModule" flag="required"> + <module-option name="portalContainerName">sample-portal</module-option> + <module-option name="realmName">gatein-domain-sample-portal</module-option> + </login-module> + </authentication> + </application-policy> + +</deployment> Modified: portal/trunk/sample/portal/rest-war/src/main/webapp/WEB-INF/jboss-web.xml =================================================================== --- portal/trunk/sample/portal/rest-war/src/main/webapp/WEB-INF/jboss-web.xml 2009-11-18 14:51:28 UTC (rev 643) +++ portal/trunk/sample/portal/rest-war/src/main/webapp/WEB-INF/jboss-web.xml 2009-11-18 15:36:13 UTC (rev 644) @@ -21,5 +21,5 @@ --> <jboss-web> - <security-domain>java:/jaas/exo-domain-sample-portal</security-domain> + <security-domain>java:/jaas/gatein-domain-sample-portal</security-domain> </jboss-web> Modified: portal/trunk/sample/portal/rest-war/src/main/webapp/WEB-INF/web.xml =================================================================== --- portal/trunk/sample/portal/rest-war/src/main/webapp/WEB-INF/web.xml 2009-11-18 14:51:28 UTC (rev 643) +++ portal/trunk/sample/portal/rest-war/src/main/webapp/WEB-INF/web.xml 2009-11-18 15:36:13 UTC (rev 644) @@ -89,7 +89,7 @@ <login-config> <auth-method>BASIC</auth-method> - <realm-name>exo-domain-sample-portal</realm-name> + <realm-name>gatein-domain-sample-portal</realm-name> </login-config> <security-role> Modified: portal/trunk/sample/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/jcr/repository-configuration.xml =================================================================== --- portal/trunk/sample/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/jcr/repository-configuration.xml 2009-11-18 14:51:28 UTC (rev 643) +++ portal/trunk/sample/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/jcr/repository-configuration.xml 2009-11-18 15:36:13 UTC (rev 644) @@ -22,7 +22,7 @@ <repository-service default-repository="repository"> <repositories> <repository name="repository" system-workspace="system" default-workspace="portal-system"> - <security-domain>exo-domain</security-domain> + <security-domain>gatein-domain</security-domain> <access-control>optional</access-control> <authentication-policy>org.exoplatform.services.jcr.impl.core.access.JAASAuthenticator</authentication-policy> <workspaces> Modified: portal/trunk/sample/portal/war/src/main/webapp/WEB-INF/jboss-web.xml =================================================================== --- portal/trunk/sample/portal/war/src/main/webapp/WEB-INF/jboss-web.xml 2009-11-18 14:51:28 UTC (rev 643) +++ portal/trunk/sample/portal/war/src/main/webapp/WEB-INF/jboss-web.xml 2009-11-18 15:36:13 UTC (rev 644) @@ -21,5 +21,5 @@ --> <jboss-web> - <security-domain>java:/jaas/exo-domain-sample-portal</security-domain> + <security-domain>java:/jaas/gatein-domain-sample-portal</security-domain> </jboss-web> Modified: portal/trunk/sample/portal/war/src/main/webapp/WEB-INF/web.xml =================================================================== --- portal/trunk/sample/portal/war/src/main/webapp/WEB-INF/web.xml 2009-11-18 14:51:28 UTC (rev 643) +++ portal/trunk/sample/portal/war/src/main/webapp/WEB-INF/web.xml 2009-11-18 15:36:13 UTC (rev 644) @@ -278,7 +278,7 @@ </security-constraint> <login-config> <auth-method>FORM</auth-method> - <realm-name>exo-domain-sample-portal</realm-name> + <realm-name>gatein-domain-sample-portal</realm-name> <form-login-config> <form-login-page>/initiatelogin</form-login-page> <form-error-page>/errorlogin</form-error-page> @@ -292,4 +292,4 @@ <description>the admin role</description> <role-name>admin</role-name> </security-role> -</web-app> \ No newline at end of file +</web-app> Modified: portal/trunk/server/jboss/patch/src/main/jboss/server/default/deploy/exoplatform.sar/META-INF/login-config.xml =================================================================== --- portal/trunk/server/jboss/patch/src/main/jboss/server/default/deploy/exoplatform.sar/META-INF/login-config.xml 2009-11-18 14:51:28 UTC (rev 643) +++ portal/trunk/server/jboss/patch/src/main/jboss/server/default/deploy/exoplatform.sar/META-INF/login-config.xml 2009-11-18 15:36:13 UTC (rev 644) @@ -23,7 +23,7 @@ <!DOCTYPE policy PUBLIC "-//JBoss//DTD JBOSS Security Config 3.0//EN" "http://www.jboss.org/j2ee/dtd/security_config.dtd"> <policy> - <application-policy name="exo-domain"> + <application-policy name="gatein-domain"> <authentication> <login-module code="org.exoplatform.services.security.j2ee.JbossLoginModule" flag="required"></login-module> </authentication> Deleted: portal/trunk/server/jboss/patch-ear/src/main/jboss/server/default/conf/login-config.xml =================================================================== --- portal/trunk/server/jboss/patch-ear/src/main/jboss/server/default/conf/login-config.xml 2009-11-18 14:51:28 UTC (rev 643) +++ portal/trunk/server/jboss/patch-ear/src/main/jboss/server/default/conf/login-config.xml 2009-11-18 15:36:13 UTC (rev 644) @@ -1,205 +0,0 @@ -<?xml version='1.0'?> -<!-- - - Copyright (C) 2009 eXo Platform SAS. - - 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. - ---> - -<!DOCTYPE policy PUBLIC - "-//JBoss//DTD JBOSS Security Config 3.0//EN" - "http://www.jboss.org/j2ee/dtd/security_config.dtd"> - -<!-- The XML based JAAS login configuration read by the -org.jboss.security.auth.login.XMLLoginConfig mbean. Add -an application-policy element for each security domain. - -The outline of the application-policy is: -<application-policy name="security-domain-name"> - <authentication> - <login-module code="login.module1.class.name" flag="control_flag"> - <module-option name = "option1-name">option1-value</module-option> - <module-option name = "option2-name">option2-value</module-option> - ... - </login-module> - - <login-module code="login.module2.class.name" flag="control_flag"> - ... - </login-module> - ... - </authentication> -</application-policy> - -$Revision: 64598 $ ---> - -<policy> - <!-- Used by clients within the application server VM such as - mbeans and servlets that access EJBs. - --> - <application-policy name = "client-login"> - <authentication> - <login-module code = "org.jboss.security.ClientLoginModule" - flag = "required"> - <!-- Any existing security context will be restored on logout --> - <module-option name="restore-login-identity">true</module-option> - </login-module> - </authentication> - </application-policy> - - <!-- Security domain for JBossMQ --> - <application-policy name = "jbossmq"> - <authentication> - <login-module code = "org.jboss.security.auth.spi.DatabaseServerLoginModule" - flag = "required"> - <module-option name = "unauthenticatedIdentity">guest</module-option> - <module-option name = "dsJndiName">java:/DefaultDS</module-option> - <module-option name = "principalsQuery">SELECT PASSWD FROM JMS_USERS WHERE USERID=?</module-option> - <module-option name = "rolesQuery">SELECT ROLEID, 'Roles' FROM JMS_ROLES WHERE USERID=?</module-option> - </login-module> - </authentication> - </application-policy> - - <!-- Security domain for JBossMQ when using file-state-service.xml - <application-policy name = "jbossmq"> - <authentication> - <login-module code = "org.jboss.mq.sm.file.DynamicLoginModule" - flag = "required"> - <module-option name = "unauthenticatedIdentity">guest</module-option> - <module-option name = "sm.objectname">jboss.mq:service=StateManager</module-option> - </login-module> - </authentication> - </application-policy> - --> - - <!-- Security domains for testing new jca framework --> - <application-policy name = "HsqlDbRealm"> - <authentication> - <login-module code = "org.jboss.resource.security.ConfiguredIdentityLoginModule" - flag = "required"> - <module-option name = "principal">sa</module-option> - <module-option name = "userName">sa</module-option> - <module-option name = "password"></module-option> - <module-option name = "managedConnectionFactoryName">jboss.jca:service=LocalTxCM,name=DefaultDS</module-option> - </login-module> - </authentication> - </application-policy> - - <application-policy name = "JmsXARealm"> - <authentication> - <login-module code = "org.jboss.resource.security.ConfiguredIdentityLoginModule" - flag = "required"> - <module-option name = "principal">guest</module-option> - <module-option name = "userName">guest</module-option> - <module-option name = "password">guest</module-option> - <module-option name = "managedConnectionFactoryName">jboss.jca:service=TxCM,name=JmsXA</module-option> - </login-module> - </authentication> - </application-policy> - - <!-- A template configuration for the jmx-console web application. This - defaults to the UsersRolesLoginModule the same as other and should be - changed to a stronger authentication mechanism as required. - --> - <application-policy name = "jmx-console"> - <authentication> - <login-module code="org.jboss.security.auth.spi.UsersRolesLoginModule" - flag = "required"> - <module-option name="usersProperties">props/jmx-console-users.properties</module-option> - <module-option name="rolesProperties">props/jmx-console-roles.properties</module-option> - </login-module> - </authentication> - </application-policy> - - <!-- A template configuration for the web-console web application. This - defaults to the UsersRolesLoginModule the same as other and should be - changed to a stronger authentication mechanism as required. - --> - <application-policy name = "web-console"> - <authentication> - <login-module code="org.jboss.security.auth.spi.UsersRolesLoginModule" - flag = "required"> - <module-option name="usersProperties">web-console-users.properties</module-option> - <module-option name="rolesProperties">web-console-roles.properties</module-option> - </login-module> - </authentication> - </application-policy> - - <!-- - A template configuration for the JBossWS security domain. - This defaults to the UsersRolesLoginModule the same as other and should be - changed to a stronger authentication mechanism as required. - --> - <application-policy name="JBossWS"> - <authentication> - <login-module code="org.jboss.security.auth.spi.UsersRolesLoginModule" - flag="required"> - <module-option name="usersProperties">props/jbossws-users.properties</module-option> - <module-option name="rolesProperties">props/jbossws-roles.properties</module-option> - <module-option name="unauthenticatedIdentity">anonymous</module-option> - </login-module> - </authentication> - </application-policy> - - <!-- The default login configuration used by any security domain that - does not have a application-policy entry with a matching name - --> - <application-policy name = "other"> - <!-- A simple server login module, which can be used when the number - of users is relatively small. It uses two properties files: - users.properties, which holds users (key) and their password (value). - roles.properties, which holds users (key) and a comma-separated list of - their roles (value). - The unauthenticatedIdentity property defines the name of the principal - that will be used when a null username and password are presented as is - the case for an unuathenticated web client or MDB. If you want to - allow such users to be authenticated add the property, e.g., - unauthenticatedIdentity="nobody" - --> - <authentication> - <login-module code = "org.jboss.security.auth.spi.UsersRolesLoginModule" - flag = "required" /> - </authentication> - </application-policy> - - <application-policy name="exo-domain"> - <authentication> - <login-module code="org.exoplatform.web.security.PortalLoginModule" flag="required"></login-module> - <login-module code="org.exoplatform.services.security.jaas.SharedStateLoginModule" flag="required"></login-module> - <login-module code="org.exoplatform.services.security.j2ee.JbossLoginModule" flag="required"></login-module> - </authentication> - </application-policy> - - <application-policy name="exo-domain-sample-portal"> - <authentication> - <login-module code="org.exoplatform.web.security.PortalLoginModule" flag="required"> - <module-option name="portalContainerName">sample-portal</module-option> - <module-option name="realmName">exo-domain-sample-portal</module-option> - </login-module> - <login-module code="org.exoplatform.services.security.jaas.SharedStateLoginModule" flag="required"> - <module-option name="portalContainerName">sample-portal</module-option> - <module-option name="realmName">exo-domain-sample-portal</module-option> - </login-module> - <login-module code="org.exoplatform.services.security.j2ee.JbossLoginModule" flag="required"> - <module-option name="portalContainerName">sample-portal</module-option> - <module-option name="realmName">exo-domain-sample-portal</module-option> - </login-module> - </authentication> - </application-policy> - -</policy> - Added: portal/trunk/server/jboss/patch-ear/src/main/jboss/server/default/deploy/gatein.ear/META-INF/gatein-jboss-beans.xml =================================================================== --- portal/trunk/server/jboss/patch-ear/src/main/jboss/server/default/deploy/gatein.ear/META-INF/gatein-jboss-beans.xml (rev 0) +++ portal/trunk/server/jboss/patch-ear/src/main/jboss/server/default/deploy/gatein.ear/META-INF/gatein-jboss-beans.xml 2009-11-18 15:36:13 UTC (rev 644) @@ -0,0 +1,20 @@ +<deployment xmlns="urn:jboss:bean-deployer:2.0"> + + <application-policy xmlns="urn:jboss:security-beans:1.0" name="gatein-domain"> + <authentication> + <login-module code="org.exoplatform.web.security.PortalLoginModule" flag="required"> + <module-option name="portalContainerName">portal</module-option> + <module-option name="realmName">gatein-domain</module-option> + </login-module> + <login-module code="org.exoplatform.services.security.jaas.SharedStateLoginModule" flag="required"> + <module-option name="portalContainerName">portal</module-option> + <module-option name="realmName">gatein-domain</module-option> + </login-module> + <login-module code="org.exoplatform.services.security.j2ee.JbossLoginModule" flag="required"> + <module-option name="portalContainerName">portal</module-option> + <module-option name="realmName">gatein-domain</module-option> + </login-module> + </authentication> + </application-policy> + +</deployment> Modified: portal/trunk/server/tomcat/patch/src/main/tomcat/conf/Catalina/localhost/portal.xml =================================================================== --- portal/trunk/server/tomcat/patch/src/main/tomcat/conf/Catalina/localhost/portal.xml 2009-11-18 14:51:28 UTC (rev 643) +++ portal/trunk/server/tomcat/patch/src/main/tomcat/conf/Catalina/localhost/portal.xml 2009-11-18 15:36:13 UTC (rev 644) @@ -24,7 +24,7 @@ prefix='localhost_portal_log.' suffix='.txt' timestamp='true'/> <Manager className='org.apache.catalina.session.PersistentManager' saveOnRestart='false'/> <Realm className='org.apache.catalina.realm.JAASRealm' - appName='exo-domain' + appName='gatein-domain' userClassNames='org.exoplatform.services.security.jaas.UserPrincipal' roleClassNames='org.exoplatform.services.security.jaas.RolePrincipal' debug='0' cache='false'/> Modified: portal/trunk/server/tomcat/patch/src/main/tomcat/conf/Catalina/localhost/rest.xml =================================================================== --- portal/trunk/server/tomcat/patch/src/main/tomcat/conf/Catalina/localhost/rest.xml 2009-11-18 14:51:28 UTC (rev 643) +++ portal/trunk/server/tomcat/patch/src/main/tomcat/conf/Catalina/localhost/rest.xml 2009-11-18 15:36:13 UTC (rev 644) @@ -25,7 +25,7 @@ prefix='localhost_portal_log.' suffix='.txt' timestamp='true'/> <Manager className='org.apache.catalina.session.PersistentManager' saveOnRestart='false'/> <Realm className='org.apache.catalina.realm.JAASRealm' - appName='exo-domain' + appName='gatein-domain' userClassNames="org.exoplatform.services.security.jaas.UserPrincipal" roleClassNames="org.exoplatform.services.security.jaas.RolePrincipal" debug='0' cache='false'/> Modified: portal/trunk/server/tomcat/patch/src/main/tomcat/conf/jaas.conf =================================================================== --- portal/trunk/server/tomcat/patch/src/main/tomcat/conf/jaas.conf 2009-11-18 14:51:28 UTC (rev 643) +++ portal/trunk/server/tomcat/patch/src/main/tomcat/conf/jaas.conf 2009-11-18 15:36:13 UTC (rev 644) @@ -1,4 +1,4 @@ -exo-domain { +gatein-domain { org.exoplatform.web.security.PortalLoginModule required; org.exoplatform.services.security.jaas.SharedStateLoginModule required; org.exoplatform.services.security.j2ee.TomcatLoginModule required; Modified: portal/trunk/web/portal/src/main/resources/tomcat/portal.xml =================================================================== --- portal/trunk/web/portal/src/main/resources/tomcat/portal.xml 2009-11-18 14:51:28 UTC (rev 643) +++ portal/trunk/web/portal/src/main/resources/tomcat/portal.xml 2009-11-18 15:36:13 UTC (rev 644) @@ -28,7 +28,7 @@ <Manager className="org.apache.catalina.session.PersistentManager" saveOnRestart="false"/> <Realm className="org.apache.catalina.realm.JAASRealm" - appName="exo-domain" + appName="gatein-domain" userClassNames="org.exoplatform.services.security.jaas.UserPrincipal" roleClassNames="org.exoplatform.services.security.jaas.RolePrincipal" debug="0" cache="false"/> Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/repository-configuration.tmpl.xml =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/repository-configuration.tmpl.xml 2009-11-18 14:51:28 UTC (rev 643) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/repository-configuration.tmpl.xml 2009-11-18 15:36:13 UTC (rev 644) @@ -22,7 +22,7 @@ <repository-service default-repository="repository"> <repositories> <repository name="repository" system-workspace="system" default-workspace="portal-system"> - <security-domain>exo-domain</security-domain> + <security-domain>gatein-domain</security-domain> <access-control>optional</access-control> <authentication-policy>org.exoplatform.services.jcr.impl.core.access.JAASAuthenticator</authentication-policy> <workspaces> Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/repository-configuration.xml =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/repository-configuration.xml 2009-11-18 14:51:28 UTC (rev 643) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/repository-configuration.xml 2009-11-18 15:36:13 UTC (rev 644) @@ -22,7 +22,7 @@ <repository-service default-repository="repository"> <repositories> <repository name="repository" system-workspace="system" default-workspace="portal-system"> - <security-domain>exo-domain</security-domain> + <security-domain>gatein-domain</security-domain> <access-control>optional</access-control> <authentication-policy>org.exoplatform.services.jcr.impl.core.access.JAASAuthenticator</authentication-policy> <workspaces> Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/jboss-web.xml =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/jboss-web.xml 2009-11-18 14:51:28 UTC (rev 643) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/jboss-web.xml 2009-11-18 15:36:13 UTC (rev 644) @@ -21,5 +21,5 @@ --> <jboss-web> - <security-domain>java:/jaas/exo-domain</security-domain> + <security-domain>java:/jaas/gatein-domain</security-domain> </jboss-web> Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/web.xml =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/web.xml 2009-11-18 14:51:28 UTC (rev 643) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/web.xml 2009-11-18 15:36:13 UTC (rev 644) @@ -278,7 +278,7 @@ </security-constraint> <login-config> <auth-method>FORM</auth-method> - <realm-name>exo-domain</realm-name> + <realm-name>gatein-domain</realm-name> <form-login-config> <form-login-page>/initiatelogin</form-login-page> <form-error-page>/errorlogin</form-error-page> @@ -292,4 +292,4 @@ <description>the admin role</description> <role-name>admin</role-name> </security-role> -</web-app> \ No newline at end of file +</web-app> Modified: portal/trunk/web/rest/src/main/webapp/WEB-INF/jboss-web.xml =================================================================== --- portal/trunk/web/rest/src/main/webapp/WEB-INF/jboss-web.xml 2009-11-18 14:51:28 UTC (rev 643) +++ portal/trunk/web/rest/src/main/webapp/WEB-INF/jboss-web.xml 2009-11-18 15:36:13 UTC (rev 644) @@ -21,5 +21,5 @@ --> <jboss-web> - <security-domain>java:/jaas/exo-domain</security-domain> + <security-domain>java:/jaas/gatein-domain</security-domain> </jboss-web> Modified: portal/trunk/web/rest/src/main/webapp/WEB-INF/web.xml =================================================================== --- portal/trunk/web/rest/src/main/webapp/WEB-INF/web.xml 2009-11-18 14:51:28 UTC (rev 643) +++ portal/trunk/web/rest/src/main/webapp/WEB-INF/web.xml 2009-11-18 15:36:13 UTC (rev 644) @@ -89,7 +89,7 @@ <login-config> <auth-method>BASIC</auth-method> - <realm-name>exo-domain</realm-name> + <realm-name>gatein-domain</realm-name> </login-config> <security-role>