[portal-commits] JBoss Portal SVN: r8150 - in branches/JBoss_Portal_Branch_2_6: cms and 4 other directories.

Author: bdaw Date: 2007-09-04 13:21:09 -0400 (Tue, 04 Sep 2007) New Revision: 8150 Added: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-server-war/WEB-INF/context.xml Modified: branches/JBoss_Portal_Branch_2_6/build/build-thirdparty.xml branches/JBoss_Portal_Branch_2_6/cms/build.xml branches/JBoss_Portal_Branch_2_6/core/build.xml branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/META-INF/jboss-service.xml branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-server-war/error.jsp branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-server-war/login.jsp Log: files for SSO integration Modified: branches/JBoss_Portal_Branch_2_6/build/build-thirdparty.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/build/build-thirdparty.xml 2007-09-04 16:57:58 UTC (rev 8149) +++ branches/JBoss_Portal_Branch_2_6/build/build-thirdparty.xml 2007-09-04 17:21:09 UTC (rev 8150) @@ -59,7 +59,6 @@ <componentref name="apache-codec" version="1.3.0"/> <componentref name="apache-collections" version="3.1"/> <componentref name="apache-digester" version="1.6"/> - <!--<componentref name="apache-directory" version="mixed"/>--> <componentref name="apache-fileupload" version="1.1.1"/> <componentref name="apache-httpclient" version="3.0.1"/> <componentref name="apache-lang" version="2.1"/> @@ -117,7 +116,7 @@ <componentref name="jbpm/jaronly" version="3.1.2"/> <componentref name="freemarker" version="2.3.9"/> <componentref name="wutka-dtdparser" version="1.2.1"/> - <componentref name="portals-bridges" version="1.0.3"/> + <componentref name="portals-bridges" version="1.0.3"/> </build> <synchronizeinfo/> Modified: branches/JBoss_Portal_Branch_2_6/cms/build.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/cms/build.xml 2007-09-04 16:57:58 UTC (rev 8149) +++ branches/JBoss_Portal_Branch_2_6/cms/build.xml 2007-09-04 17:21:09 UTC (rev 8150) @@ -252,7 +252,8 @@ --> <fileset dir="${jboss.portal-core-cms.lib}" includes="portal-core-cms-lib.jar"/> <fileset dir="${jboss.portal/modules/identity.lib}" includes="portal-identity-lib.jar"/> - <fileset dir="${jboss.portal-workflow.lib}" includes="portal-workflow-lib.jar"/> + <fileset dir="${jboss.portal/modules/identity.lib}" includes="portal-identity-sso-lib.jar"/> + <fileset dir="${jboss.portal-workflow.lib}" includes="portal-workflow-lib.jar"/> <fileset dir="${jboss.portal-portlet.lib}" includes="portal-portlet-testframework-lib.jar"/> </jar> <jar jarfile="${build.lib}/test-cms-cluster.war"> Modified: branches/JBoss_Portal_Branch_2_6/core/build.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/build.xml 2007-09-04 16:57:58 UTC (rev 8149) +++ branches/JBoss_Portal_Branch_2_6/core/build.xml 2007-09-04 17:21:09 UTC (rev 8150) @@ -336,6 +336,7 @@ <fileset dir="${jboss.portal-security.root}/lib" includes="portal-security-lib.jar"/> <fileset dir="${jboss.portal-search.root}/lib" includes="portal-search-lib.jar"/> <fileset dir="${jboss.portal/modules/identity.root}/lib" includes="portal-identity-lib.jar"/> + <fileset dir="${jboss.portal/modules/identity.root}/lib" includes="portal-identity-sso-lib.jar"/> <fileset dir="${jboss.portal-registration.root}/lib" includes="portal-registration-lib.jar"/> <fileset dir="${ehcache.ehcache.lib}" includes="ehcache.jar"/> <fileset dir="${apache.collections.lib}" includes="commons-collections.jar"/> Modified: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/META-INF/jboss-service.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/META-INF/jboss-service.xml 2007-09-04 16:57:58 UTC (rev 8149) +++ branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/META-INF/jboss-service.xml 2007-09-04 17:21:09 UTC (rev 8150) @@ -599,7 +599,40 @@ @portal.single.xml.open@ --> + <!-- + | Uncomment to enable CAS server based SSO authentication. This will expose authentication service that will + | be leveraged by CAS to perform user authentication. Its usefull only when both CAS and JBoss Portal are + | deployed on the same AS instance + --> + <!-- + <mbean + code="org.jboss.portal.identity.sso.cas.CASAuthenticationService" + name="portal:service=Module,type=CASAuthenticationService" + xmbean-dd="" + xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> + <xmbean/> + <depends>portal:service=Module,type=IdentityServiceController</depends> + <attribute name="HavingRole"></attribute> + </mbean> + --> + + <!-- + | Uncomment to enable JOSSO server based SSO authentication. This will expose authentication service that will + | be leveraged by JOSSO to perform user authentication. Its usefull only when both JOSSO and JBoss Portal are + | deployed on the same AS instance + --> + <!-- + <mbean + code="org.jboss.portal.identity.sso.josso.JOSSOIdentityServiceImpl" + name="portal:service=Module,type=JOSSOIdentityService" + xmbean-dd="" + xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> + <xmbean/> + <depends>portal:service=Module,type=IdentityServiceController</depends> + </mbean> + --> + <!-- Registries --> <mbean code="org.jboss.portal.portlet.impl.container.PortletApplicationRegistryImpl" Added: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-server-war/WEB-INF/context.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-server-war/WEB-INF/context.xml (rev 0) +++ branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-server-war/WEB-INF/context.xml 2007-09-04 17:21:09 UTC (rev 8150) @@ -0,0 +1,27 @@ +<?xml version="1.0"?> +<Context> + + + + <!-- + | Uncomment to enable CAS server based SSO authentication. + --> + + <!-- + <Valve className="org.jboss.portal.identity.sso.cas.CASAuthenticationValve" + casLogin="https://localhost/cas/login" + casValidate="https://localhost/cas/serviceValidate" + casServerName="localhost" + authType="FORM" + /> + --> + + <!-- + | Uncomment to enable JOSSO server based SSO authentication. + --> + + <!-- + <Valve className="org.jboss.portal.identity.sso.josso.JOSSOLogoutValve"/> + --> + +</Context> \ No newline at end of file Modified: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-server-war/error.jsp =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-server-war/error.jsp 2007-09-04 16:57:58 UTC (rev 8149) +++ branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-server-war/error.jsp 2007-09-04 17:21:09 UTC (rev 8150) @@ -24,6 +24,15 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + | Uncomment to enable JOSSO server based SSO authentication. + | Redirects the user to the propper login page. Configured as the login url the web.xml for this application. +--> + +<% + /* response.sendRedirect(request.getContextPath() + "/josso_login/"); */ +%> + <html> <head> <style> Modified: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-server-war/login.jsp =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-server-war/login.jsp 2007-09-04 16:57:58 UTC (rev 8149) +++ branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-server-war/login.jsp 2007-09-04 17:21:09 UTC (rev 8150) @@ -24,6 +24,16 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- + | Uncomment to enable JOSSO server based SSO authentication. + | Redirects the user to the propper login page. Configured as the login url the web.xml for this application. +--> + +<% + /* response.sendRedirect(request.getContextPath() + "/josso_login/"); */ +%> + + <html> <head> <style>