September 2007 - portal-commits - Jboss List Archives

JBoss Portal SVN: r8375 - branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/META-INF.

by portal-commits＠lists.jboss.org

Author: sohil.shah(a)jboss.com Date: 2007-09-19 22:00:51 -0400 (Wed, 19 Sep 2007) New Revision: 8375 Modified: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/META-INF/jboss-service.xml Log: sso related configuration cleanup 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-20 01:58:45 UTC (rev 8374) +++ branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/META-INF/jboss-service.xml 2007-09-20 02:00:51 UTC (rev 8375) @@ -602,40 +602,6 @@ @portal.single.xml.open@ --> -  - -  - -  -  -  <mbean code="org.jboss.portal.portlet.impl.container.PortletApplicationRegistryImpl"

16 years, 9 months

1
0
0 / 0

JBoss Portal SVN: r8374 - in modules/identity/trunk/sso: src/etc/josso and 5 other directories.

by portal-commits＠lists.jboss.org

Author: sohil.shah(a)jboss.com Date: 2007-09-19 21:58:45 -0400 (Wed, 19 Sep 2007) New Revision: 8374 Added: modules/identity/trunk/sso/src/etc/josso/login.jsp modules/identity/trunk/sso/src/resources/portal-josso-sso-sar/ modules/identity/trunk/sso/src/resources/portal-josso-sso-sar/META-INF/ modules/identity/trunk/sso/src/resources/portal-josso-sso-sar/META-INF/jboss-service.xml Removed: modules/identity/trunk/sso/src/etc/josso/josso_login.jsp Modified: modules/identity/trunk/sso/build.xml modules/identity/trunk/sso/src/etc/josso/context.xml modules/identity/trunk/sso/src/etc/josso/josso-agent-config.xml modules/identity/trunk/sso/src/etc/josso/login-config.xml modules/identity/trunk/sso/src/main/org/jboss/portal/test/identity/sso/CASTestCase.java modules/identity/trunk/sso/src/main/org/jboss/portal/test/identity/sso/JOSSOTestCase.java modules/identity/trunk/sso/src/resources/portal-identity-test-jar/org/jboss/portal/test/identity/sso-beans.xml Log: JOSSO integration fixes and more tests Modified: modules/identity/trunk/sso/build.xml =================================================================== --- modules/identity/trunk/sso/build.xml 2007-09-19 22:28:58 UTC (rev 8373) +++ modules/identity/trunk/sso/build.xml 2007-09-20 01:58:45 UTC (rev 8374) @@ -208,10 +208,17 @@ <mkdir dir="${build.lib}"/> <jar jarfile="${build.lib}/portal-identity-sso-lib.jar"> <fileset dir="${build.classes}" excludes="org/jboss/portal/test/**"/> - </jar> + </jar> </target> + <target name="package-tests" depends="output"> + <jar jarfile="${build.lib}/portal-identity-sso-test-lib.jar"> + <fileset dir="${build.classes}"/> + <fileset dir="${build.resources}/portal-identity-test-jar"/> + </jar> + </target> +    @@ -238,8 +245,11 @@ <target name="main" depends="most"/> <target name="all" depends="_default:all"/> <target name="most" depends="_default:most"/> - <target name="help" depends="_default:help"/> + <target name="help" depends="_default:help"/> +  +  +   + <copy todir="${jboss.home}/server/${portal.deploy.dir}/portal-cas-sso.sar/META-INF" overwrite="true"> <fileset dir="${build.resources}/portal-cas-sso-sar/META-INF" includes="jboss-service.xml"/> </copy> <copy todir="${jboss.home}/server/${portal.deploy.dir}/portal-cas-sso.sar/lib" overwrite="true"> <fileset dir="${cas.cas.lib}" includes="casclient.jar"/> <fileset dir="${build.lib}" includes="portal-identity-sso-lib.jar"/> </copy> + +  <copy todir="${jboss.home}/server/${portal.deploy.dir}/cas.war/WEB-INF/lib" overwrite="true"> <fileset dir="${build.lib}" includes="portal-identity-sso-lib.jar"/> </copy> <copy todir="${jboss.home}/server/${portal.deploy.dir}/cas.war/WEB-INF" overwrite="true"> <fileset dir="${build.etc}/cas" includes="deployerConfigContext.xml"/> </copy> + +  <copy todir="${jboss.home}/server/${portal.deploy.dir}/jboss-portal.sar/portal-server.war/WEB-INF" overwrite="true"> <fileset dir="${build.etc}/cas" includes="context.xml"/> </copy> @@ -273,6 +289,8 @@ <target name="deploy-cas-lenient" depends="output"> <require file="${jboss.home}/server/${portal.deploy.dir}"/> <delete file="${jboss.home}/server/${portal.deploy.dir}/portal-cas-sso.sar/lib/casclient.jar"/> + +  <copy todir="${jboss.home}/server/${portal.deploy.dir}/portal-cas-sso.sar/META-INF" overwrite="true"> <fileset dir="${build.resources}/portal-cas-sso-sar/META-INF" includes="jboss-service.xml"/> </copy> @@ -280,14 +298,125 @@ <fileset dir="${cas.cas.lib}" includes="casclient-lenient.jar"/> <fileset dir="${build.lib}" includes="portal-identity-sso-lib.jar"/> </copy> + +  <copy todir="${jboss.home}/server/${portal.deploy.dir}/cas.war/WEB-INF/lib" overwrite="true"> <fileset dir="${build.lib}" includes="portal-identity-sso-lib.jar"/> </copy> <copy todir="${jboss.home}/server/${portal.deploy.dir}/cas.war/WEB-INF" overwrite="true"> <fileset dir="${build.etc}/cas" includes="deployerConfigContext.xml"/> </copy> + +  <copy todir="${jboss.home}/server/${portal.deploy.dir}/jboss-portal.sar/portal-server.war/WEB-INF" overwrite="true"> <fileset dir="${build.etc}/cas" includes="context.xml"/> </copy> </target> + +  + <target name="deploy-josso" depends="output"> + <require file="${jboss.home}/server/${portal.deploy.dir}"/> +  + <copy todir="${jboss.home}/server/${portal.deploy.dir}/portal-josso-sso.sar/META-INF" overwrite="true"> + <fileset dir="${build.resources}/portal-josso-sso-sar/META-INF" includes="jboss-service.xml"/> + </copy> + <copy todir="${jboss.home}/server/${portal.deploy.dir}/portal-josso-sso.sar/lib" overwrite="true"> + <fileset dir="${build.lib}" includes="portal-identity-sso-lib.jar"/> + </copy> + +  + <copy todir="${jboss.home}/server/${portal.deploy.dir}/../conf" overwrite="true"> + <fileset dir="${build.etc}/josso" includes="josso-agent-config.xml, josso-config.xml, login-config.xml"/> + </copy> + <copy todir="${jboss.home}/server/${portal.deploy.dir}/jbossweb-tomcat55.sar" overwrite="true"> + <fileset dir="${build.etc}/josso" includes="server.xml"/> + <fileset dir="${josso.josso.lib}" includes="josso-1.5.jar, josso-common-1.5.jar, josso-jboss4-plugin-1.5.jar, josso-tomcat55-plugin-1.5.jar"/> + </copy> + +  + <copy todir="${jboss.home}/server/${portal.deploy.dir}/josso.war/WEB-INF/classes" overwrite="true"> + <fileset dir="${build.etc}/josso" includes="josso-gateway-config.xml"/> + </copy> + <copy todir="${jboss.home}/server/${portal.deploy.dir}/josso.war/WEB-INF/lib" overwrite="true"> + <fileset dir="${build.lib}" includes="portal-identity-sso-lib.jar"/> + </copy> + +  + <copy todir="${jboss.home}/server/${portal.deploy.dir}/jboss-portal.sar/portal-server.war" overwrite="true"> + <fileset dir="${build.etc}/josso" includes="login.jsp, error.jsp"/> + </copy> + <copy todir="${jboss.home}/server/${portal.deploy.dir}/jboss-portal.sar/portal-server.war/WEB-INF" overwrite="true"> + <fileset dir="${build.etc}/josso" includes="context.xml"/> + </copy> + </target> + + +  +  +  +  + <target name="tests" depends="package-tests"> + <execute-tests> +  + <x-test> + <test todir="${test.reports}" name="org.jboss.portal.test.identity.sso.CASTestCase"/> + <test todir="${test.reports}" name="org.jboss.portal.test.identity.sso.JOSSOTestCase"/> + </x-test> + <x-classpath> + <pathelement location="${build.lib}/portal-identity-sso-test-lib.jar"/> + <path refid="jboss.microcontainer.classpath"/> + <path refid="jboss.jbossxb.classpath"/> + <path refid="jbossas/core.libs.classpath"/> + <path refid="apache.commons.classpath"/> + <path refid="apache.xerces.classpath"/> + <path refid="apache.log4j.classpath"/> + <path refid="apache.codec.classpath"/> + <path refid="oswego.concurrent.classpath"/> + <path refid="junit.junit.classpath"/> + <path refid="jboss.portal/modules/test.classpath"/> + <path refid="jboss.portal/modules/common.classpath"/> + </x-classpath> + </execute-tests> + </target> + +  + <target name="reports" depends="init"> + <mkdir dir="${build.reports}"/> + <mkdir dir="${build.reports}/html"/> + <property name="test.reports" value="${module.output}/tests"/> + <junitreport todir="${build.reports}"> + <fileset dir="${test.reports}"> + <include name="TEST-*.xml"/> + </fileset> + <report format="frames" todir="${build.reports}/html"/> + </junitreport> + </target> + <target name="reports-noframes" depends="init"> + <mkdir dir="${build.reports}"/> + <mkdir dir="${build.reports}/html"/> + <property name="test.reports" value="${module.output}/tests"/> + <junitreport todir="${build.reports}"> + <fileset dir="${test.reports}"> + <include name="TEST-*.xml"/> + </fileset> + <report format="noframes" todir="${build.reports}/html"/> + </junitreport> + </target> </project> Modified: modules/identity/trunk/sso/src/etc/josso/context.xml =================================================================== --- modules/identity/trunk/sso/src/etc/josso/context.xml 2007-09-19 22:28:58 UTC (rev 8373) +++ modules/identity/trunk/sso/src/etc/josso/context.xml 2007-09-20 01:58:45 UTC (rev 8374) @@ -1,4 +1,4 @@ <?xml version="1.0"?> <Context> - <Valve className="org.jboss.portal.identity.sso.cas.JOSSOLogoutValve"/> + <Valve className="org.jboss.portal.identity.sso.josso.JOSSOLogoutValve"/> </Context> Modified: modules/identity/trunk/sso/src/etc/josso/josso-agent-config.xml =================================================================== --- modules/identity/trunk/sso/src/etc/josso/josso-agent-config.xml 2007-09-19 22:28:58 UTC (rev 8373) +++ modules/identity/trunk/sso/src/etc/josso/josso-agent-config.xml 2007-09-20 01:58:45 UTC (rev 8374) @@ -11,9 +11,8 @@ <partner-app> <context>/portal</context> </partner-app> -  <partner-app> <context>/portal2</context> - </partner-app> + </partner-app> </partner-apps> </agent> Deleted: modules/identity/trunk/sso/src/etc/josso/josso_login.jsp =================================================================== --- modules/identity/trunk/sso/src/etc/josso/josso_login.jsp 2007-09-19 22:28:58 UTC (rev 8373) +++ modules/identity/trunk/sso/src/etc/josso/josso_login.jsp 2007-09-20 01:58:45 UTC (rev 8374) @@ -1,41 +0,0 @@ -<%-- - ~ Copyright (c) 2004-2006, Novascope S.A. and the JOSSO team - ~ All rights reserved. - ~ Redistribution and use in source and binary forms, with or - ~ without modification, are permitted provided that the following - ~ conditions are met: - ~ - ~ * Redistributions of source code must retain the above copyright - ~ notice, this list of conditions and the following disclaimer. - ~ - ~ * Redistributions in binary form must reproduce the above copyright - ~ notice, this list of conditions and the following disclaimer in - ~ the documentation and/or other materials provided with the - ~ distribution. - ~ - ~ * Neither the name of the JOSSO team nor the names of its - ~ contributors may be used to endorse or promote products derived - ~ from this software without specific prior written permission. - ~ - ~ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND - ~ CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, - ~ INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF - ~ MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - ~ DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS - ~ BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - ~ EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED - ~ TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - ~ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON - ~ ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - ~ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - ~ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - ~ POSSIBILITY OF SUCH DAMAGE. - --%> - -<%@page contentType="text/html; charset=iso-8859-1" language="java" session="true" %> - -<% - response.sendRedirect(request.getContextPath() + "/josso_login/"); -%> Modified: modules/identity/trunk/sso/src/etc/josso/login-config.xml =================================================================== --- modules/identity/trunk/sso/src/etc/josso/login-config.xml 2007-09-19 22:28:58 UTC (rev 8373) +++ modules/identity/trunk/sso/src/etc/josso/login-config.xml 2007-09-20 01:58:45 UTC (rev 8374) @@ -156,7 +156,7 @@  <application-policy name = "josso"> <authentication> - <login-module code = "org.jboss.portal.identity.auth.JOSSOLoginModule" + <login-module code = "org.jboss.portal.identity.sso.josso.JOSSOLoginModule" flag = "required"> <module-option name="debug">true</module-option> </login-module> Added: modules/identity/trunk/sso/src/etc/josso/login.jsp =================================================================== --- modules/identity/trunk/sso/src/etc/josso/login.jsp (rev 0) +++ modules/identity/trunk/sso/src/etc/josso/login.jsp 2007-09-20 01:58:45 UTC (rev 8374) @@ -0,0 +1,41 @@ +<%-- + ~ Copyright (c) 2004-2006, Novascope S.A. and the JOSSO team + ~ All rights reserved. + ~ Redistribution and use in source and binary forms, with or + ~ without modification, are permitted provided that the following + ~ conditions are met: + ~ + ~ * Redistributions of source code must retain the above copyright + ~ notice, this list of conditions and the following disclaimer. + ~ + ~ * Redistributions in binary form must reproduce the above copyright + ~ notice, this list of conditions and the following disclaimer in + ~ the documentation and/or other materials provided with the + ~ distribution. + ~ + ~ * Neither the name of the JOSSO team nor the names of its + ~ contributors may be used to endorse or promote products derived + ~ from this software without specific prior written permission. + ~ + ~ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND + ~ CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, + ~ INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + ~ MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + ~ DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS + ~ BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + ~ EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED + ~ TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + ~ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON + ~ ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + ~ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + ~ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + ~ POSSIBILITY OF SUCH DAMAGE. + --%> + +<%@page contentType="text/html; charset=iso-8859-1" language="java" session="true" %> + +<% + response.sendRedirect(request.getContextPath() + "/josso_login/"); +%> Modified: modules/identity/trunk/sso/src/main/org/jboss/portal/test/identity/sso/CASTestCase.java =================================================================== --- modules/identity/trunk/sso/src/main/org/jboss/portal/test/identity/sso/CASTestCase.java 2007-09-19 22:28:58 UTC (rev 8373) +++ modules/identity/trunk/sso/src/main/org/jboss/portal/test/identity/sso/CASTestCase.java 2007-09-20 01:58:45 UTC (rev 8374) @@ -47,9 +47,9 @@ /** * */ - private String portalServer = null; - private String firstPortalContext = null; - private String secondPortalContext = null; + private String firstPortal = null; + private String secondPortal = null; + private String sameHostSecondPortal = null; private String userLoggedInIndicator = null; private String username = null; private String password = null; @@ -88,132 +88,130 @@ this.runtimeContext.stop(); //Data cleanup - this.runtimeContext = null; - this.portalServer = null; - this.firstPortalContext = null; - this.secondPortalContext = null; + this.runtimeContext = null; } - + /** * * @return */ - public String getFirstPortalContext() + public String getUserLoggedInIndicator() { - return firstPortalContext; + return userLoggedInIndicator; } /** * - * @param firstPortalContext + * @param userLoggedInIndicator */ - public void setFirstPortalContext(String firstPortalContext) + public void setUserLoggedInIndicator(String userLoggedInIndicator) { - this.firstPortalContext = firstPortalContext; + this.userLoggedInIndicator = userLoggedInIndicator; } - + /** * * @return */ - public String getPortalServer() + public String getPassword() { - return portalServer; + return password; } /** * - * @param portalServer + * @param password */ - public void setPortalServer(String portalServer) + public void setPassword(String password) { - this.portalServer = portalServer; + this.password = password; } /** * * @return */ - public String getSecondPortalContext() + public String getUsername() { - return secondPortalContext; + return username; } /** * - * @param secondPortalContext + * @param username */ - public void setSecondPortalContext(String secondPortalContext) + public void setUsername(String username) { - this.secondPortalContext = secondPortalContext; + this.username = username; } /** * * @return - */ - public String getUserLoggedInIndicator() + */ + public String getFirstPortal() { - return userLoggedInIndicator; + return firstPortal; } /** * - * @param userLoggedInIndicator + * @param firstPortal */ - public void setUserLoggedInIndicator(String userLoggedInIndicator) + public void setFirstPortal(String firstPortal) { - this.userLoggedInIndicator = userLoggedInIndicator; + this.firstPortal = firstPortal; } - + /** * * @return */ - public String getPassword() + public String getSecondPortal() { - return password; + return secondPortal; } /** * - * @param password + * @param secondPortal */ - public void setPassword(String password) + public void setSecondPortal(String secondPortal) { - this.password = password; + this.secondPortal = secondPortal; } - + /** * * @return */ - public String getUsername() + public String getSameHostSecondPortal() { - return username; + return sameHostSecondPortal; } /** * - * @param username + * @param sameHostSecondPortal */ - public void setUsername(String username) + public void setSameHostSecondPortal(String sameHostSecondPortal) { - this.username = username; + this.sameHostSecondPortal = sameHostSecondPortal; } /** + * This tests the scenario when the two portals are deployed on separate hosts/servers * * @throws Exception */ - public void test() throws Exception + public void testMultiHostDeployment() throws Exception { Cookie casCookie = null; String firstPortalFinalResponse = null; String secondPortalFinalResponse = null; //Load the main portal page on firstPortalContext - String firstContextPortalUrl = "http://"+this.portalServer+"/"+this.firstPortalContext; + String firstContextPortalUrl = this.firstPortal; WebConversation portalConversation = this.startConversation(firstContextPortalUrl); TestCase.assertFalse(this.isUserLoggedIn(portalConversation.getResponse())); @@ -252,7 +250,7 @@ TestCase.assertTrue(this.isUserLoggedIn(firstPortalFinalResponse)); //Load the main portal page on secondPortalContext - String secondContextPortalUrl = "http://"+this.portalServer+"/"+this.secondPortalContext; + String secondContextPortalUrl = this.secondPortal; portalConversation = this.startConversation(secondContextPortalUrl); //Click the Login Link on the secondPortalContext @@ -280,7 +278,86 @@ } /** + * This tests the scenario where the two portals are deployed within the same host/server but under + * different web contexts * + * @throws Exception + */ + public void testSameHostDeployment() throws Exception + { + Cookie casCookie = null; + String firstPortalFinalResponse = null; + String secondPortalFinalResponse = null; + + //Load the main portal page on firstPortalContext + String firstContextPortalUrl = this.firstPortal; + WebConversation portalConversation = this.startConversation(firstContextPortalUrl); + TestCase.assertFalse(this.isUserLoggedIn(portalConversation.getResponse())); + + //Click the Login link on the firstPortalContext + String firstContextLoginUrl = firstContextPortalUrl + "/auth/portal/default/default"; + this.sendGet(firstContextLoginUrl, portalConversation); + + //Perform redirect to the CAS Server + TestCase.assertNotNull(portalConversation.getRedirectLocation()); + TestCase.assertEquals(portalConversation.getStatusCode(), 302); + String casLocation = portalConversation.getRedirectLocation(); + WebConversation casConversation = this.startConversation(casLocation); + String response = casConversation.getResponse(); + //Extract the conversionId from the response + int searchIndex = response.indexOf("value=\"_c")+7; + int endIndex = response.indexOf('"', searchIndex); + String lt = response.substring(searchIndex,endIndex); + + //Perform HTTP Post based authentication with the CAS Server + Map postParams = new HashMap(); + postParams.put("username", this.username); + postParams.put("password", this.password); + postParams.put("_eventId", "submit"); + postParams.put("lt",lt); + this.sendPost(casLocation,postParams, casConversation); + + //The Portal Session should now be autenticated + TestCase.assertNotNull(casConversation.getRedirectLocation()); + TestCase.assertEquals(casConversation.getStatusCode(), 302); + TestCase.assertTrue(casConversation.getRedirectLocation().indexOf(firstContextLoginUrl) != -1); + TestCase.assertNotNull(casConversation.getCasCookie()); + String goBack = casConversation.getRedirectLocation(); + casCookie = casConversation.getCasCookie(); + portalConversation = this.startConversation(goBack); + firstPortalFinalResponse = portalConversation.getResponse(); + TestCase.assertTrue(this.isUserLoggedIn(firstPortalFinalResponse)); + + //Load the main portal page on secondPortalContext + String secondContextPortalUrl = this.sameHostSecondPortal; + portalConversation = this.startConversation(secondContextPortalUrl); + + //Click the Login Link on the secondPortalContext + String secondContextLoginUrl = secondContextPortalUrl + "/auth/portal/default/default"; + this.sendGet(secondContextLoginUrl, portalConversation); + + //Perform re-direct to the CAS Server but this time sending in the CAS cookie + TestCase.assertNotNull(portalConversation.getRedirectLocation()); + TestCase.assertEquals(portalConversation.getStatusCode(), 302); + casLocation = portalConversation.getRedirectLocation(); + casConversation = this.startConversation(casLocation,casCookie); + + + //Assert the redirect and it should be to the CAS Server, but this time + //It should end up with an Authenticated session back to the secondPortalContext + secondPortalFinalResponse = casConversation.getResponse(); + TestCase.assertTrue(this.isUserLoggedIn(secondPortalFinalResponse)); + + //Assert and make sure its the same user logged into both Portals + String firstPortalUser = this.extractLoggedInUser(firstPortalFinalResponse); + String secondPortalUser = this.extractLoggedInUser(secondPortalFinalResponse); + TestCase.assertEquals(firstPortalUser, this.username); + TestCase.assertEquals(secondPortalUser, this.username); + TestCase.assertEquals(firstPortalUser, secondPortalUser); + } + + /** + * * @param portalUrl * @return * @throws Exception Modified: modules/identity/trunk/sso/src/main/org/jboss/portal/test/identity/sso/JOSSOTestCase.java =================================================================== --- modules/identity/trunk/sso/src/main/org/jboss/portal/test/identity/sso/JOSSOTestCase.java 2007-09-19 22:28:58 UTC (rev 8373) +++ modules/identity/trunk/sso/src/main/org/jboss/portal/test/identity/sso/JOSSOTestCase.java 2007-09-20 01:58:45 UTC (rev 8374) @@ -47,9 +47,10 @@ /** * */ - private String portalServer = null; - private String firstPortalContext = null; - private String secondPortalContext = null; + private String firstPortal = null; + private String secondPortal = null; + private String sameHostSecondPortal = null; + private String jossoServer = null; private String userLoggedInIndicator = null; private String username = null; private String password = null; @@ -88,132 +89,148 @@ this.runtimeContext.stop(); //Data cleanup - this.runtimeContext = null; - this.portalServer = null; - this.firstPortalContext = null; - this.secondPortalContext = null; + this.runtimeContext = null; } - + /** * * @return */ - public String getFirstPortalContext() + public String getUserLoggedInIndicator() { - return firstPortalContext; + return userLoggedInIndicator; } /** * - * @param firstPortalContext + * @param userLoggedInIndicator */ - public void setFirstPortalContext(String firstPortalContext) + public void setUserLoggedInIndicator(String userLoggedInIndicator) { - this.firstPortalContext = firstPortalContext; + this.userLoggedInIndicator = userLoggedInIndicator; } - + /** * * @return */ - public String getPortalServer() + public String getPassword() { - return portalServer; + return password; } /** * - * @param portalServer + * @param password */ - public void setPortalServer(String portalServer) + public void setPassword(String password) { - this.portalServer = portalServer; + this.password = password; } /** * * @return */ - public String getSecondPortalContext() + public String getUsername() { - return secondPortalContext; + return username; } /** * - * @param secondPortalContext + * @param username */ - public void setSecondPortalContext(String secondPortalContext) + public void setUsername(String username) { - this.secondPortalContext = secondPortalContext; + this.username = username; } /** * * @return - */ - public String getUserLoggedInIndicator() + */ + public String getFirstPortal() { - return userLoggedInIndicator; + return firstPortal; } /** * - * @param userLoggedInIndicator + * @param firstPortal */ - public void setUserLoggedInIndicator(String userLoggedInIndicator) + public void setFirstPortal(String firstPortal) { - this.userLoggedInIndicator = userLoggedInIndicator; + this.firstPortal = firstPortal; } - + /** * * @return */ - public String getPassword() + public String getSecondPortal() { - return password; + return secondPortal; } /** * - * @param password + * @param secondPortal */ - public void setPassword(String password) + public void setSecondPortal(String secondPortal) { - this.password = password; + this.secondPortal = secondPortal; } + + /** + * + * @return + */ + public String getJossoServer() + { + return jossoServer; + } /** * + * @param jossoServer + */ + public void setJossoServer(String jossoServer) + { + this.jossoServer = jossoServer; + } + + /** + * * @return */ - public String getUsername() + public String getSameHostSecondPortal() { - return username; + return sameHostSecondPortal; } /** * - * @param username + * @param sameHostSecondPortal */ - public void setUsername(String username) + public void setSameHostSecondPortal(String sameHostSecondPortal) { - this.username = username; + this.sameHostSecondPortal = sameHostSecondPortal; } /** + * This tests the scenario when the two portals are deployed on separate hosts/servers * * @throws Exception */ - public void test() throws Exception + public void testMultiHostDeployment() throws Exception { Cookie ssoCookie = null; String firstPortalFinalResponse = null; String secondPortalFinalResponse = null; //Load the main portal page on firstPortalContext - String firstContextPortalUrl = "http://"+this.portalServer+"/"+this.firstPortalContext; + String firstContextPortalUrl = this.firstPortal; WebConversation portalConversation = this.startConversation(firstContextPortalUrl); TestCase.assertFalse(this.isUserLoggedIn(portalConversation.getResponse())); @@ -242,7 +259,7 @@ postParams.put("josso_username", this.username); postParams.put("josso_password", this.password); postParams.put("josso_cmd", "login"); - this.sendPost("http://"+this.portalServer+"/"+action,postParams, ssoConversation); + this.sendPost("http://"+ this.jossoServer +"/"+action,postParams, ssoConversation); //Go back to the Portal since login has succeeded, starting with assertion on the JOSSO Agent installed on the Portal String assertUrl = ssoConversation.getRedirectLocation(); @@ -260,7 +277,7 @@ TestCase.assertTrue(this.isUserLoggedIn(firstPortalFinalResponse)); //Load the main portal page on secondPortalContext - String secondContextPortalUrl = "http://"+this.portalServer+"/"+this.secondPortalContext; + String secondContextPortalUrl = this.secondPortal; portalConversation = this.startConversation(secondContextPortalUrl); //Click the Login Link on the secondPortalContext @@ -290,7 +307,96 @@ } /** + * This tests the scenario where the two portals are deployed within the same host/server but under + * different web contexts * + * @throws Exception + */ + public void testSameHostDeployment() throws Exception + { + Cookie ssoCookie = null; + String firstPortalFinalResponse = null; + String secondPortalFinalResponse = null; + + //Load the main portal page on firstPortalContext + String firstContextPortalUrl = this.firstPortal; + WebConversation portalConversation = this.startConversation(firstContextPortalUrl); + TestCase.assertFalse(this.isUserLoggedIn(portalConversation.getResponse())); + + //Click the Login link on the firstPortalContext + String firstContextLoginUrl = firstContextPortalUrl + "/auth/portal/default/default"; + this.sendGet(firstContextLoginUrl, portalConversation); + + //Navigate to a secured resource on the portal + TestCase.assertNotNull(portalConversation.getRedirectLocation()); + TestCase.assertEquals(portalConversation.getStatusCode(), 302); + String portalToJOSSO = portalConversation.getRedirectLocation(); + this.sendGet(portalToJOSSO, portalConversation); + + //When authentication is triggered, move over to the JOSSO server establishing an SSO session with JOSSO + String jossoLocation = portalConversation.getRedirectLocation(); + WebConversation ssoConversation = this.startConversation(jossoLocation); + String response = ssoConversation.getResponse(); + + //Extract the josso post action value + int searchIndex = response.indexOf("action=\"")+9; + int endIndex = response.indexOf('"', searchIndex); + String action = response.substring(searchIndex,endIndex); + + //Perform HTTP Post based authentication with the JOSSO Server + Map postParams = new HashMap(); + postParams.put("josso_username", this.username); + postParams.put("josso_password", this.password); + postParams.put("josso_cmd", "login"); + this.sendPost("http://"+ this.jossoServer +"/"+action,postParams, ssoConversation); + + //Go back to the Portal since login has succeeded, starting with assertion on the JOSSO Agent installed on the Portal + String assertUrl = ssoConversation.getRedirectLocation(); + this.sendGet(assertUrl, portalConversation); + + //Now go back to the original Portal resource requested. This time user should have an authenticated session established + TestCase.assertNotNull(portalConversation.getRedirectLocation()); + TestCase.assertEquals(portalConversation.getStatusCode(), 302); + TestCase.assertTrue(portalConversation.getRedirectLocation().indexOf(firstContextLoginUrl) != -1); + TestCase.assertNotNull(portalConversation.getSSOCookie()); + String goBack = portalConversation.getRedirectLocation(); + ssoCookie = ssoConversation.getSSOCookie(); + this.sendGet(goBack, portalConversation); + firstPortalFinalResponse = portalConversation.getResponse(); + TestCase.assertTrue(this.isUserLoggedIn(firstPortalFinalResponse)); + + //Load the main portal page on secondPortalContext + String secondContextPortalUrl = this.sameHostSecondPortal; + portalConversation = this.startConversation(secondContextPortalUrl); + + //Click the Login Link on the secondPortalContext + String secondContextLoginUrl = secondContextPortalUrl + "/auth/portal/default/default"; + this.sendGet(secondContextLoginUrl, portalConversation); + + //Perform re-direct to the JOSSO Server but this time sending in the JOSSO cookie + TestCase.assertNotNull(portalConversation.getRedirectLocation()); + TestCase.assertEquals(portalConversation.getStatusCode(), 302); + portalToJOSSO = portalConversation.getRedirectLocation(); + this.sendGet(portalToJOSSO, portalConversation); + + + //Assert the redirect and it should be to the JOSSO Server, but this time + //It should end up with an Authenticated session back to the secondPortalContext + jossoLocation = portalConversation.getRedirectLocation(); + ssoConversation = this.startConversation(jossoLocation,ssoCookie); + secondPortalFinalResponse = ssoConversation.getResponse(); + TestCase.assertTrue(this.isUserLoggedIn(secondPortalFinalResponse)); + + //Assert and make sure its the same user logged into both Portals + String firstPortalUser = this.extractLoggedInUser(firstPortalFinalResponse); + String secondPortalUser = this.extractLoggedInUser(secondPortalFinalResponse); + TestCase.assertEquals(firstPortalUser, this.username); + TestCase.assertEquals(secondPortalUser, this.username); + TestCase.assertEquals(firstPortalUser, secondPortalUser); + } + + /** + * * @param portalUrl * @return * @throws Exception Modified: modules/identity/trunk/sso/src/resources/portal-identity-test-jar/org/jboss/portal/test/identity/sso-beans.xml =================================================================== --- modules/identity/trunk/sso/src/resources/portal-identity-test-jar/org/jboss/portal/test/identity/sso-beans.xml 2007-09-19 22:28:58 UTC (rev 8373) +++ modules/identity/trunk/sso/src/resources/portal-identity-test-jar/org/jboss/portal/test/identity/sso-beans.xml 2007-09-20 01:58:45 UTC (rev 8374) @@ -31,9 +31,9 @@ <factory bean="BeanFactory"/> <parameter>CASConfig</parameter> </constructor> - <property name="portalServer">localhost</property> - <property name="firstPortalContext">portal</property> - <property name="secondPortalContext">portal2</property> + <property name="firstPortal">http://cas-01/portal</property> + <property name="secondPortal">http://cas-02/portal</property> + <property name="sameHostSecondPortal">http://cas-01/portal2</property> <property name="userLoggedInIndicator">Logged in as:</property> <property name="username">user</property> <property name="password">user</property> @@ -44,9 +44,10 @@ <factory bean="BeanFactory"/> <parameter>JOSSOConfig</parameter> </constructor> - <property name="portalServer">localhost</property> - <property name="firstPortalContext">portal</property> - <property name="secondPortalContext">portal2</property> + <property name="firstPortal">http://josso-01/portal</property> + <property name="secondPortal">http://josso-02/portal</property> + <property name="sameHostSecondPortal">http://josso-01/portal2</property> + <property name="jossoServer">josso-01</property> <property name="userLoggedInIndicator">Logged in as:</property> <property name="username">user</property> <property name="password">user</property> Added: modules/identity/trunk/sso/src/resources/portal-josso-sso-sar/META-INF/jboss-service.xml =================================================================== --- modules/identity/trunk/sso/src/resources/portal-josso-sso-sar/META-INF/jboss-service.xml (rev 0) +++ modules/identity/trunk/sso/src/resources/portal-josso-sso-sar/META-INF/jboss-service.xml 2007-09-20 01:58:45 UTC (rev 8374) @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<server> + <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> +</server> \ No newline at end of file

16 years, 9 months

1
0
0 / 0

JBoss Portal SVN: r8373 - modules/portlet/trunk/test/src/main/org/jboss/portal/portlet/test.

by portal-commits＠lists.jboss.org

Author: julien(a)jboss.com Date: 2007-09-19 18:28:58 -0400 (Wed, 19 Sep 2007) New Revision: 8373 Modified: modules/portlet/trunk/test/src/main/org/jboss/portal/portlet/test/StringCodecTestCase.java Log: encode euro sign as unisign in order to avoid encoding issues for the test case Modified: modules/portlet/trunk/test/src/main/org/jboss/portal/portlet/test/StringCodecTestCase.java =================================================================== --- modules/portlet/trunk/test/src/main/org/jboss/portal/portlet/test/StringCodecTestCase.java 2007-09-19 18:52:47 UTC (rev 8372) +++ modules/portlet/trunk/test/src/main/org/jboss/portal/portlet/test/StringCodecTestCase.java 2007-09-19 22:28:58 UTC (rev 8373) @@ -31,6 +31,8 @@ public class StringCodecTestCase extends TestCase { + private static final char EURO_CHAR = '\u20AC'; + public void testA() { @@ -39,8 +41,8 @@ assertEquals("0123456789", StringCodec.encode("0123456789")); assertEquals("_2F", StringCodec.encode("/")); assertEquals("_40", StringCodec.encode("@")); - assertEquals("_E2_82_AC", StringCodec.encode("�")); - assertEquals("A_E2_82_ACB_40C", StringCodec.encode("A�B@C")); + assertEquals("_E2_82_AC", StringCodec.encode(Character.toString(EURO_CHAR))); + assertEquals("A_E2_82_ACB_40C", StringCodec.encode("A" + EURO_CHAR + "B@C")); } @@ -51,8 +53,8 @@ assertEquals("0123456789", StringCodec.decode(StringCodec.encode("0123456789"))); assertEquals("/", StringCodec.decode(StringCodec.encode("/"))); assertEquals("@", StringCodec.decode(StringCodec.encode("@"))); - assertEquals("�", StringCodec.decode(StringCodec.encode("�"))); - assertEquals("A�B@C", StringCodec.decode(StringCodec.encode("A�B@C"))); + assertEquals(Character.toString(EURO_CHAR), StringCodec.decode(StringCodec.encode(Character.toString(EURO_CHAR)))); + assertEquals("A" + EURO_CHAR +"B@C", StringCodec.decode(StringCodec.encode("A" + EURO_CHAR + "B@C"))); } }

16 years, 9 months

1
0
0 / 0

JBoss Portal SVN: r8372 - docs/trunk.

by portal-commits＠lists.jboss.org

Author: tom.benninger(a)jboss.com Date: 2007-09-19 14:52:47 -0400 (Wed, 19 Sep 2007) New Revision: 8372 Modified: docs/trunk/ Log: Removing external link per request. Property changes on: docs/trunk ___________________________________________________________________ Name: svn:externals - docbook-support http://anonsvn.jboss.org/repos/jbossas/trunk/docbook-support

16 years, 9 months

1
0
0 / 0

JBoss Portal SVN: r8371 - in branches/JBoss_Portal_Branch_2_6/core-identity/src: resources/portal-identity-war/WEB-INF/jsf/admin and 3 other directories.

by portal-commits＠lists.jboss.org

Author: emuckenhuber Date: 2007-09-19 12:55:27 -0400 (Wed, 19 Sep 2007) New Revision: 8371 Added: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/tabContainer.xhtml Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/bin/portal-identity-war/style.css branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/index.xhtml branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles.xhtml branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/roleMembers.xhtml branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/roleTemplate.xhtml branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/pendingUsers.xhtml branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/searchUsers.xhtml branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/userTemplate.xhtml branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/captcha.xhtml branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/profile.xhtml branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/register.xhtml branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/userInfo.xhtml Log: - added required tags in users profile - added border around content area.. based on revision 8366 Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/bin/portal-identity-war/style.css =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-identity/src/bin/portal-identity-war/style.css 2007-09-19 16:53:58 UTC (rev 8370) +++ branches/JBoss_Portal_Branch_2_6/core-identity/src/bin/portal-identity-war/style.css 2007-09-19 16:55:27 UTC (rev 8371) @@ -14,6 +14,13 @@ border: 0; } +div.identity-ui div.tab-container{ + border-bottom:1px solid #B3C0C7; + border-right:1px solid #B3C0C7; + border-left:1px solid #B3C0C7; + padding: 15px 0 10px 0; +} + .identity-ui th { text-align: left; border: 0; @@ -55,7 +62,7 @@ /* Top nav. */ .identity-ui ul.topnav { - margin-left: 0; + margin: 0; padding: 4px 0px 3px; border-bottom: 1px solid #b3c0c7; } Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/index.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/index.xhtml 2007-09-19 16:53:58 UTC (rev 8370) +++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/index.xhtml 2007-09-19 16:55:27 UTC (rev 8371) @@ -28,27 +28,27 @@ <h:commandLink value="#{bundle.IDENTITY_MANAGEMENT_CREATE_USER}" action="createUser" styleClass="actionCreateInstance"/> </h:panelGrid> </h:form> - + <br/> <table style="width: 100%;"> <tr> - <td colspan="2"><h3 class="sectionTitle"><h:outputText value="#{bundle.IDENTITY_MANAGEMENT_MATRIX}" /></h3></td> + <th colspan="2" class="portlet-section-header"><h:outputText value="#{bundle.IDENTITY_MANAGEMENT_MATRIX}" /></th> </tr> - <tr> + <tr class="portlet-section-body"> <td><h:outputText value="#{bundle.IDENTITY_MANAGEMENT_COUNT_REGISTERED_USERS}"/></td> <td> <h:outputText value="#{useradministrationbean.userCount}" /> </td> </tr> <c:if test="#{useradministrationbean.pendingCount > 0}"> - <tr> - <td><h:outputText value="#{bundle.IDENTITY_MANAGEMENT_COUNT_PENDING_USERS}" /></td> + <tr class="portlet-section-body"> + <td> <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_COUNT_PENDING_USERS}" /></td> <td><h:outputText value="#{useradministrationbean.pendingCount}" /></td> </tr> </c:if> <tr> - <td colspan="2"><h3 class="sectionTitle"><h:outputText value="#{bundle.IDENTITY_MANAGEMENT_SUBSCRIPTION_MODES}" /></h3></td> + <th colspan="2" class="portlet-section-header"><h:outputText value="#{bundle.IDENTITY_MANAGEMENT_SUBSCRIPTION_MODES}" /></th> </tr> - <tr> + <tr class="portlet-section-body"> <td><h:outputText value="#{bundle.IDENTITY_MANAGEMENT_SUBSCRIPTION_MODE}" /></td> <td> <c:choose> @@ -67,7 +67,7 @@ </c:choose> </td> </tr> - <tr> + <tr class="portlet-section-body"> <td><h:outputText value="#{bundle.IDENTITY_MANAGEMENT_SUBSCRIPTION_ADMIN_MODE}" /></td> <td> <c:choose> Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/roleMembers.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/roleMembers.xhtml 2007-09-19 16:53:58 UTC (rev 8370) +++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/roleMembers.xhtml 2007-09-19 16:55:27 UTC (rev 8371) @@ -34,6 +34,14 @@ </h:column> <h:column> <f:facet name="header"> + <h:outputText value="#{bundle.IDENTITY_EMAIL}"/> + </f:facet> + <a href="mailto:#{uiUser.attribute.email}"> + <h:outputText value="#{uiUser.attribute.email}"/> + </a> + </h:column> + <h:column> + <f:facet name="header"> <h:outputText value="#{bundle.IDENTITY_GIVENNAME}"/> </f:facet> <h:outputText value="#{uiUser.attribute.givenname}"/> @@ -65,8 +73,10 @@ </h:column> </h:dataTable> </h:form> -<h:commandLink value=" < " action="#{rolemanagementbean.prevPage}" rendered="#{rolemanagementbean.page > 1}" styleClass="portlet-form-button"/> -<h:commandLink value=" > " action="#{rolemanagementbean.nextPage}" rendered="#{rolemanagementbean.roleMembers.rowCount > rolemanagementbean.limit}" styleClass="portlet-form-button"/> +<p style="text-align: center;"> + <h:commandButton value=" < " action="#{rolemanagementbean.prevPage}" rendered="#{rolemanagementbean.page > 1}" styleClass="portlet-form-button"/> + <h:commandButton value=" > " action="#{rolemanagementbean.nextPage}" rendered="#{rolemanagementbean.roleMembers.rowCount > rolemanagementbean.limit}" styleClass="portlet-form-button"/> +</p> <br/> <hr/> <h:form> Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/roleTemplate.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/roleTemplate.xhtml 2007-09-19 16:53:58 UTC (rev 8370) +++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/roleTemplate.xhtml 2007-09-19 16:55:27 UTC (rev 8371) @@ -8,7 +8,7 @@ <f:loadBundle var="bundle" basename="conf.bundles.Identity" /> - <h:form> + <h:form> <ul class="topnav"> <li> <h:commandLink action="userAdmin" value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}"/> @@ -17,15 +17,19 @@ </ul> </h:form> +<ui:decorate template="/WEB-INF/jsf/common/tabContainer.xhtml"> + <ui:define name="tab-container-content">  <h:form> <ul class="objectpath"> <ui:insert name="title">Title</ui:insert> </ul> </h:form> - + <br/>  <ui:insert name="content">Content</ui:insert> + </ui:define> +</ui:decorate> </div> Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles.xhtml 2007-09-19 16:53:58 UTC (rev 8370) +++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles.xhtml 2007-09-19 16:55:27 UTC (rev 8371) @@ -54,7 +54,7 @@ <hr/> <h:form> - <p style="text-align: right"><h:commandLink value="Create new role" action="createRole" styleClass="actionCreateInstance"/></p> + <p style="text-align: right; padding-right: 5px;"><h:commandLink value="Create new role" action="createRole" styleClass="actionCreateInstance"/></p> </h:form> </ui:define> </ui:composition> Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/pendingUsers.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/pendingUsers.xhtml 2007-09-19 16:53:58 UTC (rev 8370) +++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/pendingUsers.xhtml 2007-09-19 16:55:27 UTC (rev 8371) @@ -20,7 +20,7 @@ <ui:define name="content"> <f:verbatim> -<script> +<script type="text/javascript"> // <![CDATA[ function selectAll() { var form=$('pending'); Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/searchUsers.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/searchUsers.xhtml 2007-09-19 16:53:58 UTC (rev 8370) +++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/searchUsers.xhtml 2007-09-19 16:55:27 UTC (rev 8371) @@ -91,9 +91,9 @@ </h:commandLink> </h:column> </h:dataTable> - <p style="text-align: right;"> - <h:commandLink value=" < " action="#{useradministrationbean.prevPage}" rendered="#{useradministrationbean.page > 1}" styleClass="portlet-form-button"/> - <h:commandLink value=" > " action="#{useradministrationbean.nextPage}" rendered="#{useradministrationbean.userList.rowCount > useradministrationbean.limit}" styleClass="portlet-form-button"/> + <p style="text-align: center;"> + <h:commandButton value=" < " action="#{useradministrationbean.prevPage}" rendered="#{useradministrationbean.page > 1}" styleClass="portlet-form-button"/> + <h:commandButton value=" > " action="#{useradministrationbean.nextPage}" rendered="#{useradministrationbean.userList.rowCount > useradministrationbean.limit}" styleClass="portlet-form-button"/> </p> </h:form> <br/> Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/userTemplate.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/userTemplate.xhtml 2007-09-19 16:53:58 UTC (rev 8370) +++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/userTemplate.xhtml 2007-09-19 16:55:27 UTC (rev 8371) @@ -7,8 +7,8 @@ class="identity-ui"> <f:loadBundle var="bundle" basename="conf.bundles.Identity" /> - - <h:form> + + <h:form> <ul class="topnav"> <li id="currentTab"><h:outputText value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}"/></li> <li> @@ -16,7 +16,9 @@ </li> </ul> </h:form> - + +<ui:decorate template="/WEB-INF/jsf/common/tabContainer.xhtml"> + <ui:define name="tab-container-content">  <h:form> <ul class="objectpath"> @@ -26,5 +28,8 @@ <br/>  <ui:insert name="content">Content</ui:insert> + + </ui:define> +</ui:decorate> </div> Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/captcha.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/captcha.xhtml 2007-09-19 16:53:58 UTC (rev 8370) +++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/captcha.xhtml 2007-09-19 16:55:27 UTC (rev 8371) @@ -8,7 +8,9 @@ <c:if test="#{portletPreferenceValue.captcha == true}"> <hr/> - <h:graphicImage url="/jcaptcha" /> + <div id="captchaContainer" style="width: 200px; height: 100px"> + <h:graphicImage id="jcaptchaimp" url="/jcaptcha" /> + </div> <h:panelGrid columns="2"> <h:outputText value="#{bundle.IDENTITY_REGISTER_VERIFY_CAPTCHA} *" /> <h:inputText id="validateCaptcha" value="" required="true"> Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/profile.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/profile.xhtml 2007-09-19 16:53:58 UTC (rev 8370) +++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/profile.xhtml 2007-09-19 16:55:27 UTC (rev 8371) @@ -21,21 +21,31 @@ </ul> </h:panelGroup> - <h:outputText value="#{bundle.IDENTITY_TIMEZONE}"/> + <h:panelGroup> + <h:outputText value="#{bundle.IDENTITY_TIMEZONE}"/> + <h:outputText value=" *" rendered="#{metadataservice.timezone.required}" /> + </h:panelGroup> <h:selectOneMenu id="timezone" value="#{manager.uiUser.attribute.timezone}" required="#{metadataservice.timezone.required}"> <f:selectItems value="#{metadataservice.timezone.values}" /> </h:selectOneMenu> <h:panelGroup /> <h:message for="timezone" infoClass="portlet-msg-success" errorClass="portlet-msg-error" fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/> - <h:outputText value="#{bundle.IDENTITY_THEME}"/> + <h:panelGroup> + <h:outputText value="#{bundle.IDENTITY_THEME}"/> + <h:outputText value=" *" rendered="#{metadataservice.theme.required}" /> + </h:panelGroup> <h:selectOneMenu id="theme" value="#{manager.uiUser.attribute.theme}" required="#{metadataservice.theme.required}"> <f:selectItems value="#{metadataservice.theme.values}" /> </h:selectOneMenu> <h:panelGroup /> <h:message for="theme" infoClass="portlet-msg-success" errorClass="portlet-msg-error" fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/> - <h:outputText value="#{bundle.IDENTITY_LOCALE}"/> + + <h:panelGroup> + <h:outputText value="#{bundle.IDENTITY_LOCALE}"/> + <h:outputText value=" *" rendered="#{metadataservice.locale.required}" /> + </h:panelGroup> <h:selectOneMenu id="locale" value="#{manager.uiUser.attribute.locale}" required="#{metadataservice.locale.required}"> <f:selectItems value="#{metadataservice.locale.values}" /> </h:selectOneMenu> @@ -51,17 +61,27 @@ </ul> </h:panelGroup> - <h:outputText value="#{bundle.IDENTITY_GIVENNAME}"/> + + <h:panelGroup> + <h:outputText value="#{bundle.IDENTITY_GIVENNAME}"/> + <h:outputText value=" *" rendered="#{metadataservice.givenname.required}" /> + </h:panelGroup> <h:inputText id="givenname" value="#{manager.uiUser.attribute.givenname}" required="#{metadataservice.givenname.required}"/> <h:panelGroup /> <h:message for="givenname" infoClass="portlet-msg-success" errorClass="portlet-msg-error" fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/> - <h:outputText value="#{bundle.IDENTITY_FAMILYNAME}"/> + <h:panelGroup> + <h:outputText value="#{bundle.IDENTITY_FAMILYNAME}"/> + <h:outputText value=" *" rendered="#{metadataservice.familyname.required}" /> + </h:panelGroup> <h:inputText id="lastname" value="#{manager.uiUser.attribute.familyname}" required="#{metadataservice.familyname.required}"/> <h:panelGroup /> <h:message for="lastname" infoClass="portlet-msg-success" errorClass="portlet-msg-error" fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/> - <h:outputText value="#{bundle.IDENTITY_LOCATION}"/> + <h:panelGroup> + <h:outputText value="#{bundle.IDENTITY_LOCATION}"/> + <h:outputText value=" *" rendered="#{metadataservice.location.required}" /> + </h:panelGroup> <h:inputText id="location" value="#{manager.uiUser.attribute.location}" required="#{metadataservice.location.required}"/> <h:panelGroup /> <h:message for="location" infoClass="portlet-msg-success" errorClass="portlet-msg-error" fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/> @@ -75,32 +95,51 @@ </ul> </h:panelGroup> - <h:outputText value="#{bundle.IDENTITY_SKYPE}"/> + + <h:panelGroup> + <h:outputText value="#{bundle.IDENTITY_SKYPE}"/> + <h:outputText value=" *" rendered="#{metadataservice.skype.required}" /> + </h:panelGroup> <h:inputText id="skype" value="#{manager.uiUser.attribute.skype}" required="#{metadataservice.skype.required}"/> <h:panelGroup /> <h:message for="skype" infoClass="portlet-msg-success" errorClass="portlet-msg-error" fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/> - <h:outputText value="#{bundle.IDENTITY_ICQ}"/> + <h:panelGroup> + <h:outputText value="#{bundle.IDENTITY_ICQ}"/> + <h:outputText value=" *" rendered="#{metadataservice.icq.required}" /> + </h:panelGroup> <h:inputText id="icq" value="#{manager.uiUser.attribute.icq}" required="#{metadataservice.icq.required}"/> <h:panelGroup /> <h:message for="icq" infoClass="portlet-msg-success" errorClass="portlet-msg-error" fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/> - <h:outputText value="#{bundle.IDENTITY_AIM}"/> + <h:panelGroup> + <h:outputText value="#{bundle.IDENTITY_AIM}"/> + <h:outputText value=" *" rendered="#{metadataservice.aim.required}" /> + </h:panelGroup> <h:inputText id="aim" value="#{manager.uiUser.attribute.aim}" required="#{metadataservice.aim.required}"/> <h:panelGroup /> <h:message for="aim" infoClass="portlet-msg-success" errorClass="portlet-msg-error" fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/> - <h:outputText value="#{bundle.IDENTITY_MSNM}"/> + <h:panelGroup> + <h:outputText value="#{bundle.IDENTITY_MSNM}"/> + <h:outputText value=" *" rendered="#{metadataservice.msnm.required}" /> + </h:panelGroup> <h:inputText id="msnm" value="#{manager.uiUser.attribute.msnm}" required="#{metadataservice.msnm.required}"/> <h:panelGroup /> <h:message for="msnm" infoClass="portlet-msg-success" errorClass="portlet-msg-error" fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/> - <h:outputText value="#{bundle.IDENTITY_YIM}"/> + <h:panelGroup> + <h:outputText value="#{bundle.IDENTITY_YIM}"/> + <h:outputText value=" *" rendered="#{metadataservice.yim.required}" /> + </h:panelGroup> <h:inputText id="yim" value="#{manager.uiUser.attribute.yim}" required="#{metadataservice.yim.required}"/> <h:panelGroup /> <h:message for="yim" infoClass="portlet-msg-success" errorClass="portlet-msg-error" fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/> - <h:outputText value="#{bundle.IDENTITY_XMMP}"/> + <h:panelGroup> + <h:outputText value="#{bundle.IDENTITY_XMMP}"/> + <h:outputText value=" *" rendered="#{metadataservice.xmmp.required}" /> + </h:panelGroup> <h:inputText id="xmmp" value="#{manager.uiUser.attribute.xmmp}" required="#{metadataservice.xmmp.required}"/> <h:panelGroup /> <h:message for="xmmp" infoClass="portlet-msg-success" errorClass="portlet-msg-error" fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/> @@ -114,22 +153,37 @@ </ul> </h:panelGroup> - <h:outputText value="#{bundle.IDENTITY_HOMEPAGE}"/> + <h:panelGroup> + <h:outputText value="#{bundle.IDENTITY_HOMEPAGE}"/> + <h:outputText value=" *" rendered="#{metadataservice.homepage.required}" /> + </h:panelGroup> <h:inputText id="homepage" value="#{manager.uiUser.attribute.homepage}" required="#{metadataservice.homepage.required}"/> <h:panelGroup /> <h:message for="homepage" infoClass="portlet-msg-success" errorClass="portlet-msg-error" fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/> - <h:outputText value="#{bundle.IDENTITY_OCCUPATION}"/> + + <h:panelGroup> + <h:outputText value="#{bundle.IDENTITY_OCCUPATION}"/> + <h:outputText value=" *" rendered="#{metadataservice.occupation.required}" /> + </h:panelGroup> <h:inputText id="occupation" value="#{manager.uiUser.attribute.occupation}" required="#{metadataservice.occupation.required}"/> <h:panelGroup /> <h:message for="occupation" infoClass="portlet-msg-success" errorClass="portlet-msg-error" fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/> - <h:outputText value="#{bundle.IDENTITY_INTERESTS}"/> + + <h:panelGroup> + <h:outputText value="#{bundle.IDENTITY_INTERESTS}"/> + <h:outputText value=" *" rendered="#{metadataservice.interests.required}" /> + </h:panelGroup> <h:inputText id="interests" value="#{manager.uiUser.attribute.interests}" required="#{metadataservice.interests.required}"/> <h:panelGroup /> <h:message for="interests" infoClass="portlet-msg-success" errorClass="portlet-msg-error" fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/> - <h:outputText value="#{bundle.IDENTITY_SIGNATURE}"/> + + <h:panelGroup> + <h:outputText value="#{bundle.IDENTITY_SIGNATURE}"/> + <h:outputText value=" *" rendered="#{metadataservice.signature.required}" /> + </h:panelGroup> <h:panelGroup> <h:inputTextarea id="signature" value="#{manager.uiUser.attribute.signature}" cols="50" rows="5" required="#{metadataservice.signature.required}"/><br/> <h:outputText value="#{bundle.IDENTITY_CATEGORY_ADDITIONAL_SIGNATURE}" /> @@ -137,7 +191,11 @@ <h:panelGroup /> <h:message for="signature" infoClass="portlet-msg-success" errorClass="portlet-msg-error" fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/> - <h:outputText value="#{bundle.IDENTITY_EXTRA}"/> + + <h:panelGroup> + <h:outputText value="#{bundle.IDENTITY_EXTRA}"/> + <h:outputText value=" *" rendered="#{metadataservice.extra.required}" /> + </h:panelGroup> <h:panelGroup> <h:inputTextarea id="extra" value="#{manager.uiUser.attribute.extra}" cols="50" rows="5" required="#{metadataservice.extra.required}"/><br/> <h:outputText value="#{bundle.IDENTITY_CATEGORY_ADDITIONAL_EXTRA}" /> Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/register.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/register.xhtml 2007-09-19 16:53:58 UTC (rev 8370) +++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/register.xhtml 2007-09-19 16:55:27 UTC (rev 8371) @@ -16,8 +16,8 @@ <h:message for="username" infoClass="portlet-msg-success" errorClass="portlet-msg-error" fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/> <h:panelGroup> - <h:outputText value="#{bundle.IDENTITY_EMAIL}"/> - <h:outputText value=" *" rendered="#{metadataservice.email.required}" /> + <h:outputText value="#{bundle.IDENTITY_EMAIL}"/> + <h:outputText value=" *" rendered="#{metadataservice.email.required}" /> </h:panelGroup> <h:inputText id="#{metadataservice.email.name}" value="#{manager.uiUser.attribute.email}" required="#{metadataservice.email.required}"> <f:validator validatorId="#{metadataservice.email.validator}"/> Copied: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/tabContainer.xhtml (from rev 8370, trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/tabContainer.xhtml) =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/tabContainer.xhtml (rev 0) +++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/tabContainer.xhtml 2007-09-19 16:55:27 UTC (rev 8371) @@ -0,0 +1,10 @@ +<ui:composition + xmlns="http://www.w3.org/1999/xhtml" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:ui="http://java.sun.com/jsf/facelets"> + + <div class="tab-container"> + <ui:insert name="tab-container-content"/> + </div> + +</ui:composition> \ No newline at end of file Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/userInfo.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/userInfo.xhtml 2007-09-19 16:53:58 UTC (rev 8370) +++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/userInfo.xhtml 2007-09-19 16:55:27 UTC (rev 8371) @@ -36,7 +36,10 @@ <h:outputText id="username" value="#{manager.uiUser.username}"/> <h:message for="username" infoClass="portlet-msg-success" errorClass="portlet-msg-error" fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/> - <h:outputText value="#{bundle.IDENTITY_EMAIL}"/> + <h:panelGroup> + <h:outputText value="#{bundle.IDENTITY_EMAIL}"/> + <h:outputText value=" *" rendered="#{metadataservice.email.required}" /> + </h:panelGroup> <h:inputText id="#{metadataservice.email.name}" value="#{manager.uiUser.attribute.email}" required="#{metadataservice.email.required}"> <f:validator validatorId="#{metadataservice.email.validator}" infoClass="portlet-msg-success" errorClass="portlet-msg-error" fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/> </h:inputText>

16 years, 9 months

1
0
0 / 0

JBoss Portal SVN: r8370 - trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common.

by portal-commits＠lists.jboss.org

Author: emuckenhuber Date: 2007-09-19 12:53:58 -0400 (Wed, 19 Sep 2007) New Revision: 8370 Added: trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/tabContainer.xhtml Log: - oops forgot tabContainer template Added: trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/tabContainer.xhtml =================================================================== --- trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/tabContainer.xhtml (rev 0) +++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/tabContainer.xhtml 2007-09-19 16:53:58 UTC (rev 8370) @@ -0,0 +1,10 @@ +<ui:composition + xmlns="http://www.w3.org/1999/xhtml" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:ui="http://java.sun.com/jsf/facelets"> + + <div class="tab-container"> + <ui:insert name="tab-container-content"/> + </div> + +</ui:composition> \ No newline at end of file

16 years, 9 months

1
0
0 / 0

JBoss Portal SVN: r8369 - in trunk/core-identity/src: resources/portal-identity-war/WEB-INF/jsf/admin and 3 other directories.

by portal-commits＠lists.jboss.org

Author: emuckenhuber Date: 2007-09-19 12:49:45 -0400 (Wed, 19 Sep 2007) New Revision: 8369 Modified: trunk/core-identity/src/bin/portal-identity-war/style.css trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/index.xhtml trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles.xhtml trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/roleMembers.xhtml trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/roleTemplate.xhtml trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/pendingUsers.xhtml trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/searchUsers.xhtml trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/userTemplate.xhtml trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/captcha.xhtml trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/profile.xhtml trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/register.xhtml trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/userInfo.xhtml Log: - added required tags in users profile - added border around content area.. based on revision 8366 Modified: trunk/core-identity/src/bin/portal-identity-war/style.css =================================================================== --- trunk/core-identity/src/bin/portal-identity-war/style.css 2007-09-19 16:04:33 UTC (rev 8368) +++ trunk/core-identity/src/bin/portal-identity-war/style.css 2007-09-19 16:49:45 UTC (rev 8369) @@ -14,6 +14,13 @@ border: 0; } +div.identity-ui div.tab-container{ + border-bottom:1px solid #B3C0C7; + border-right:1px solid #B3C0C7; + border-left:1px solid #B3C0C7; + padding: 15px 0 10px 0; +} + .identity-ui th { text-align: left; border: 0; @@ -55,7 +62,7 @@ /* Top nav. */ .identity-ui ul.topnav { - margin-left: 0; + margin: 0; padding: 4px 0px 3px; border-bottom: 1px solid #b3c0c7; } Modified: trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/index.xhtml =================================================================== --- trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/index.xhtml 2007-09-19 16:04:33 UTC (rev 8368) +++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/index.xhtml 2007-09-19 16:49:45 UTC (rev 8369) @@ -28,27 +28,27 @@ <h:commandLink value="#{bundle.IDENTITY_MANAGEMENT_CREATE_USER}" action="createUser" styleClass="actionCreateInstance"/> </h:panelGrid> </h:form> - + <br/> <table style="width: 100%;"> <tr> - <td colspan="2"><h3 class="sectionTitle"><h:outputText value="#{bundle.IDENTITY_MANAGEMENT_MATRIX}" /></h3></td> + <th colspan="2" class="portlet-section-header"><h:outputText value="#{bundle.IDENTITY_MANAGEMENT_MATRIX}" /></th> </tr> - <tr> + <tr class="portlet-section-body"> <td><h:outputText value="#{bundle.IDENTITY_MANAGEMENT_COUNT_REGISTERED_USERS}"/></td> <td> <h:outputText value="#{useradministrationbean.userCount}" /> </td> </tr> <c:if test="#{useradministrationbean.pendingCount > 0}"> - <tr> - <td><h:outputText value="#{bundle.IDENTITY_MANAGEMENT_COUNT_PENDING_USERS}" /></td> + <tr class="portlet-section-body"> + <td> <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_COUNT_PENDING_USERS}" /></td> <td><h:outputText value="#{useradministrationbean.pendingCount}" /></td> </tr> </c:if> <tr> - <td colspan="2"><h3 class="sectionTitle"><h:outputText value="#{bundle.IDENTITY_MANAGEMENT_SUBSCRIPTION_MODES}" /></h3></td> + <th colspan="2" class="portlet-section-header"><h:outputText value="#{bundle.IDENTITY_MANAGEMENT_SUBSCRIPTION_MODES}" /></th> </tr> - <tr> + <tr class="portlet-section-body"> <td><h:outputText value="#{bundle.IDENTITY_MANAGEMENT_SUBSCRIPTION_MODE}" /></td> <td> <c:choose> @@ -67,7 +67,7 @@ </c:choose> </td> </tr> - <tr> + <tr class="portlet-section-body"> <td><h:outputText value="#{bundle.IDENTITY_MANAGEMENT_SUBSCRIPTION_ADMIN_MODE}" /></td> <td> <c:choose> Modified: trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/roleMembers.xhtml =================================================================== --- trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/roleMembers.xhtml 2007-09-19 16:04:33 UTC (rev 8368) +++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/roleMembers.xhtml 2007-09-19 16:49:45 UTC (rev 8369) @@ -34,6 +34,14 @@ </h:column> <h:column> <f:facet name="header"> + <h:outputText value="#{bundle.IDENTITY_EMAIL}"/> + </f:facet> + <a href="mailto:#{uiUser.attribute.email}"> + <h:outputText value="#{uiUser.attribute.email}"/> + </a> + </h:column> + <h:column> + <f:facet name="header"> <h:outputText value="#{bundle.IDENTITY_GIVENNAME}"/> </f:facet> <h:outputText value="#{uiUser.attribute.givenname}"/> @@ -65,8 +73,10 @@ </h:column> </h:dataTable> </h:form> -<h:commandLink value=" < " action="#{rolemanagementbean.prevPage}" rendered="#{rolemanagementbean.page > 1}" styleClass="portlet-form-button"/> -<h:commandLink value=" > " action="#{rolemanagementbean.nextPage}" rendered="#{rolemanagementbean.roleMembers.rowCount > rolemanagementbean.limit}" styleClass="portlet-form-button"/> +<p style="text-align: center;"> + <h:commandButton value=" < " action="#{rolemanagementbean.prevPage}" rendered="#{rolemanagementbean.page > 1}" styleClass="portlet-form-button"/> + <h:commandButton value=" > " action="#{rolemanagementbean.nextPage}" rendered="#{rolemanagementbean.roleMembers.rowCount > rolemanagementbean.limit}" styleClass="portlet-form-button"/> +</p> <br/> <hr/> <h:form> Modified: trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/roleTemplate.xhtml =================================================================== --- trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/roleTemplate.xhtml 2007-09-19 16:04:33 UTC (rev 8368) +++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/roleTemplate.xhtml 2007-09-19 16:49:45 UTC (rev 8369) @@ -8,7 +8,7 @@ <f:loadBundle var="bundle" basename="conf.bundles.Identity" /> - <h:form> + <h:form> <ul class="topnav"> <li> <h:commandLink action="userAdmin" value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}"/> @@ -17,15 +17,19 @@ </ul> </h:form> +<ui:decorate template="/WEB-INF/jsf/common/tabContainer.xhtml"> + <ui:define name="tab-container-content">  <h:form> <ul class="objectpath"> <ui:insert name="title">Title</ui:insert> </ul> </h:form> - + <br/>  <ui:insert name="content">Content</ui:insert> + </ui:define> +</ui:decorate> </div> Modified: trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles.xhtml =================================================================== --- trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles.xhtml 2007-09-19 16:04:33 UTC (rev 8368) +++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles.xhtml 2007-09-19 16:49:45 UTC (rev 8369) @@ -54,7 +54,7 @@ <hr/> <h:form> - <p style="text-align: right"><h:commandLink value="Create new role" action="createRole" styleClass="actionCreateInstance"/></p> + <p style="text-align: right; padding-right: 5px;"><h:commandLink value="Create new role" action="createRole" styleClass="actionCreateInstance"/></p> </h:form> </ui:define> </ui:composition> Modified: trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/pendingUsers.xhtml =================================================================== --- trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/pendingUsers.xhtml 2007-09-19 16:04:33 UTC (rev 8368) +++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/pendingUsers.xhtml 2007-09-19 16:49:45 UTC (rev 8369) @@ -20,7 +20,7 @@ <ui:define name="content"> <f:verbatim> -<script> +<script type="text/javascript"> // <![CDATA[ function selectAll() { var form=$('pending'); Modified: trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/searchUsers.xhtml =================================================================== --- trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/searchUsers.xhtml 2007-09-19 16:04:33 UTC (rev 8368) +++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/searchUsers.xhtml 2007-09-19 16:49:45 UTC (rev 8369) @@ -91,9 +91,9 @@ </h:commandLink> </h:column> </h:dataTable> - <p style="text-align: right;"> - <h:commandLink value=" < " action="#{useradministrationbean.prevPage}" rendered="#{useradministrationbean.page > 1}" styleClass="portlet-form-button"/> - <h:commandLink value=" > " action="#{useradministrationbean.nextPage}" rendered="#{useradministrationbean.userList.rowCount > useradministrationbean.limit}" styleClass="portlet-form-button"/> + <p style="text-align: center;"> + <h:commandButton value=" < " action="#{useradministrationbean.prevPage}" rendered="#{useradministrationbean.page > 1}" styleClass="portlet-form-button"/> + <h:commandButton value=" > " action="#{useradministrationbean.nextPage}" rendered="#{useradministrationbean.userList.rowCount > useradministrationbean.limit}" styleClass="portlet-form-button"/> </p> </h:form> <br/> Modified: trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/userTemplate.xhtml =================================================================== --- trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/userTemplate.xhtml 2007-09-19 16:04:33 UTC (rev 8368) +++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/userTemplate.xhtml 2007-09-19 16:49:45 UTC (rev 8369) @@ -7,8 +7,8 @@ class="identity-ui"> <f:loadBundle var="bundle" basename="conf.bundles.Identity" /> - - <h:form> + + <h:form> <ul class="topnav"> <li id="currentTab"><h:outputText value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}"/></li> <li> @@ -16,7 +16,9 @@ </li> </ul> </h:form> - + +<ui:decorate template="/WEB-INF/jsf/common/tabContainer.xhtml"> + <ui:define name="tab-container-content">  <h:form> <ul class="objectpath"> @@ -26,5 +28,8 @@ <br/>  <ui:insert name="content">Content</ui:insert> + + </ui:define> +</ui:decorate> </div> Modified: trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/captcha.xhtml =================================================================== --- trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/captcha.xhtml 2007-09-19 16:04:33 UTC (rev 8368) +++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/captcha.xhtml 2007-09-19 16:49:45 UTC (rev 8369) @@ -8,7 +8,9 @@ <c:if test="#{portletPreferenceValue.captcha == true}"> <hr/> - <h:graphicImage url="/jcaptcha" /> + <div id="captchaContainer" style="width: 200px; height: 100px"> + <h:graphicImage id="jcaptchaimp" url="/jcaptcha" /> + </div> <h:panelGrid columns="2"> <h:outputText value="#{bundle.IDENTITY_REGISTER_VERIFY_CAPTCHA} *" /> <h:inputText id="validateCaptcha" value="" required="true"> Modified: trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/profile.xhtml =================================================================== --- trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/profile.xhtml 2007-09-19 16:04:33 UTC (rev 8368) +++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/profile.xhtml 2007-09-19 16:49:45 UTC (rev 8369) @@ -21,21 +21,31 @@ </ul> </h:panelGroup> - <h:outputText value="#{bundle.IDENTITY_TIMEZONE}"/> + <h:panelGroup> + <h:outputText value="#{bundle.IDENTITY_TIMEZONE}"/> + <h:outputText value=" *" rendered="#{metadataservice.timezone.required}" /> + </h:panelGroup> <h:selectOneMenu id="timezone" value="#{manager.uiUser.attribute.timezone}" required="#{metadataservice.timezone.required}"> <f:selectItems value="#{metadataservice.timezone.values}" /> </h:selectOneMenu> <h:panelGroup /> <h:message for="timezone" infoClass="portlet-msg-success" errorClass="portlet-msg-error" fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/> - <h:outputText value="#{bundle.IDENTITY_THEME}"/> + <h:panelGroup> + <h:outputText value="#{bundle.IDENTITY_THEME}"/> + <h:outputText value=" *" rendered="#{metadataservice.theme.required}" /> + </h:panelGroup> <h:selectOneMenu id="theme" value="#{manager.uiUser.attribute.theme}" required="#{metadataservice.theme.required}"> <f:selectItems value="#{metadataservice.theme.values}" /> </h:selectOneMenu> <h:panelGroup /> <h:message for="theme" infoClass="portlet-msg-success" errorClass="portlet-msg-error" fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/> - <h:outputText value="#{bundle.IDENTITY_LOCALE}"/> + + <h:panelGroup> + <h:outputText value="#{bundle.IDENTITY_LOCALE}"/> + <h:outputText value=" *" rendered="#{metadataservice.locale.required}" /> + </h:panelGroup> <h:selectOneMenu id="locale" value="#{manager.uiUser.attribute.locale}" required="#{metadataservice.locale.required}"> <f:selectItems value="#{metadataservice.locale.values}" /> </h:selectOneMenu> @@ -51,17 +61,27 @@ </ul> </h:panelGroup> - <h:outputText value="#{bundle.IDENTITY_GIVENNAME}"/> + + <h:panelGroup> + <h:outputText value="#{bundle.IDENTITY_GIVENNAME}"/> + <h:outputText value=" *" rendered="#{metadataservice.givenname.required}" /> + </h:panelGroup> <h:inputText id="givenname" value="#{manager.uiUser.attribute.givenname}" required="#{metadataservice.givenname.required}"/> <h:panelGroup /> <h:message for="givenname" infoClass="portlet-msg-success" errorClass="portlet-msg-error" fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/> - <h:outputText value="#{bundle.IDENTITY_FAMILYNAME}"/> + <h:panelGroup> + <h:outputText value="#{bundle.IDENTITY_FAMILYNAME}"/> + <h:outputText value=" *" rendered="#{metadataservice.familyname.required}" /> + </h:panelGroup> <h:inputText id="lastname" value="#{manager.uiUser.attribute.familyname}" required="#{metadataservice.familyname.required}"/> <h:panelGroup /> <h:message for="lastname" infoClass="portlet-msg-success" errorClass="portlet-msg-error" fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/> - <h:outputText value="#{bundle.IDENTITY_LOCATION}"/> + <h:panelGroup> + <h:outputText value="#{bundle.IDENTITY_LOCATION}"/> + <h:outputText value=" *" rendered="#{metadataservice.location.required}" /> + </h:panelGroup> <h:inputText id="location" value="#{manager.uiUser.attribute.location}" required="#{metadataservice.location.required}"/> <h:panelGroup /> <h:message for="location" infoClass="portlet-msg-success" errorClass="portlet-msg-error" fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/> @@ -75,32 +95,51 @@ </ul> </h:panelGroup> - <h:outputText value="#{bundle.IDENTITY_SKYPE}"/> + + <h:panelGroup> + <h:outputText value="#{bundle.IDENTITY_SKYPE}"/> + <h:outputText value=" *" rendered="#{metadataservice.skype.required}" /> + </h:panelGroup> <h:inputText id="skype" value="#{manager.uiUser.attribute.skype}" required="#{metadataservice.skype.required}"/> <h:panelGroup /> <h:message for="skype" infoClass="portlet-msg-success" errorClass="portlet-msg-error" fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/> - <h:outputText value="#{bundle.IDENTITY_ICQ}"/> + <h:panelGroup> + <h:outputText value="#{bundle.IDENTITY_ICQ}"/> + <h:outputText value=" *" rendered="#{metadataservice.icq.required}" /> + </h:panelGroup> <h:inputText id="icq" value="#{manager.uiUser.attribute.icq}" required="#{metadataservice.icq.required}"/> <h:panelGroup /> <h:message for="icq" infoClass="portlet-msg-success" errorClass="portlet-msg-error" fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/> - <h:outputText value="#{bundle.IDENTITY_AIM}"/> + <h:panelGroup> + <h:outputText value="#{bundle.IDENTITY_AIM}"/> + <h:outputText value=" *" rendered="#{metadataservice.aim.required}" /> + </h:panelGroup> <h:inputText id="aim" value="#{manager.uiUser.attribute.aim}" required="#{metadataservice.aim.required}"/> <h:panelGroup /> <h:message for="aim" infoClass="portlet-msg-success" errorClass="portlet-msg-error" fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/> - <h:outputText value="#{bundle.IDENTITY_MSNM}"/> + <h:panelGroup> + <h:outputText value="#{bundle.IDENTITY_MSNM}"/> + <h:outputText value=" *" rendered="#{metadataservice.msnm.required}" /> + </h:panelGroup> <h:inputText id="msnm" value="#{manager.uiUser.attribute.msnm}" required="#{metadataservice.msnm.required}"/> <h:panelGroup /> <h:message for="msnm" infoClass="portlet-msg-success" errorClass="portlet-msg-error" fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/> - <h:outputText value="#{bundle.IDENTITY_YIM}"/> + <h:panelGroup> + <h:outputText value="#{bundle.IDENTITY_YIM}"/> + <h:outputText value=" *" rendered="#{metadataservice.yim.required}" /> + </h:panelGroup> <h:inputText id="yim" value="#{manager.uiUser.attribute.yim}" required="#{metadataservice.yim.required}"/> <h:panelGroup /> <h:message for="yim" infoClass="portlet-msg-success" errorClass="portlet-msg-error" fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/> - <h:outputText value="#{bundle.IDENTITY_XMMP}"/> + <h:panelGroup> + <h:outputText value="#{bundle.IDENTITY_XMMP}"/> + <h:outputText value=" *" rendered="#{metadataservice.xmmp.required}" /> + </h:panelGroup> <h:inputText id="xmmp" value="#{manager.uiUser.attribute.xmmp}" required="#{metadataservice.xmmp.required}"/> <h:panelGroup /> <h:message for="xmmp" infoClass="portlet-msg-success" errorClass="portlet-msg-error" fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/> @@ -114,22 +153,37 @@ </ul> </h:panelGroup> - <h:outputText value="#{bundle.IDENTITY_HOMEPAGE}"/> + <h:panelGroup> + <h:outputText value="#{bundle.IDENTITY_HOMEPAGE}"/> + <h:outputText value=" *" rendered="#{metadataservice.homepage.required}" /> + </h:panelGroup> <h:inputText id="homepage" value="#{manager.uiUser.attribute.homepage}" required="#{metadataservice.homepage.required}"/> <h:panelGroup /> <h:message for="homepage" infoClass="portlet-msg-success" errorClass="portlet-msg-error" fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/> - <h:outputText value="#{bundle.IDENTITY_OCCUPATION}"/> + + <h:panelGroup> + <h:outputText value="#{bundle.IDENTITY_OCCUPATION}"/> + <h:outputText value=" *" rendered="#{metadataservice.occupation.required}" /> + </h:panelGroup> <h:inputText id="occupation" value="#{manager.uiUser.attribute.occupation}" required="#{metadataservice.occupation.required}"/> <h:panelGroup /> <h:message for="occupation" infoClass="portlet-msg-success" errorClass="portlet-msg-error" fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/> - <h:outputText value="#{bundle.IDENTITY_INTERESTS}"/> + + <h:panelGroup> + <h:outputText value="#{bundle.IDENTITY_INTERESTS}"/> + <h:outputText value=" *" rendered="#{metadataservice.interests.required}" /> + </h:panelGroup> <h:inputText id="interests" value="#{manager.uiUser.attribute.interests}" required="#{metadataservice.interests.required}"/> <h:panelGroup /> <h:message for="interests" infoClass="portlet-msg-success" errorClass="portlet-msg-error" fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/> - <h:outputText value="#{bundle.IDENTITY_SIGNATURE}"/> + + <h:panelGroup> + <h:outputText value="#{bundle.IDENTITY_SIGNATURE}"/> + <h:outputText value=" *" rendered="#{metadataservice.signature.required}" /> + </h:panelGroup> <h:panelGroup> <h:inputTextarea id="signature" value="#{manager.uiUser.attribute.signature}" cols="50" rows="5" required="#{metadataservice.signature.required}"/><br/> <h:outputText value="#{bundle.IDENTITY_CATEGORY_ADDITIONAL_SIGNATURE}" /> @@ -137,7 +191,11 @@ <h:panelGroup /> <h:message for="signature" infoClass="portlet-msg-success" errorClass="portlet-msg-error" fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/> - <h:outputText value="#{bundle.IDENTITY_EXTRA}"/> + + <h:panelGroup> + <h:outputText value="#{bundle.IDENTITY_EXTRA}"/> + <h:outputText value=" *" rendered="#{metadataservice.extra.required}" /> + </h:panelGroup> <h:panelGroup> <h:inputTextarea id="extra" value="#{manager.uiUser.attribute.extra}" cols="50" rows="5" required="#{metadataservice.extra.required}"/><br/> <h:outputText value="#{bundle.IDENTITY_CATEGORY_ADDITIONAL_EXTRA}" /> Modified: trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/register.xhtml =================================================================== --- trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/register.xhtml 2007-09-19 16:04:33 UTC (rev 8368) +++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/register.xhtml 2007-09-19 16:49:45 UTC (rev 8369) @@ -16,8 +16,8 @@ <h:message for="username" infoClass="portlet-msg-success" errorClass="portlet-msg-error" fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/> <h:panelGroup> - <h:outputText value="#{bundle.IDENTITY_EMAIL}"/> - <h:outputText value=" *" rendered="#{metadataservice.email.required}" /> + <h:outputText value="#{bundle.IDENTITY_EMAIL}"/> + <h:outputText value=" *" rendered="#{metadataservice.email.required}" /> </h:panelGroup> <h:inputText id="#{metadataservice.email.name}" value="#{manager.uiUser.attribute.email}" required="#{metadataservice.email.required}"> <f:validator validatorId="#{metadataservice.email.validator}"/> Modified: trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/userInfo.xhtml =================================================================== --- trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/userInfo.xhtml 2007-09-19 16:04:33 UTC (rev 8368) +++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/userInfo.xhtml 2007-09-19 16:49:45 UTC (rev 8369) @@ -36,7 +36,10 @@ <h:outputText id="username" value="#{manager.uiUser.username}"/> <h:message for="username" infoClass="portlet-msg-success" errorClass="portlet-msg-error" fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/> - <h:outputText value="#{bundle.IDENTITY_EMAIL}"/> + <h:panelGroup> + <h:outputText value="#{bundle.IDENTITY_EMAIL}"/> + <h:outputText value=" *" rendered="#{metadataservice.email.required}" /> + </h:panelGroup> <h:inputText id="#{metadataservice.email.name}" value="#{manager.uiUser.attribute.email}" required="#{metadataservice.email.required}"> <f:validator validatorId="#{metadataservice.email.validator}" infoClass="portlet-msg-success" errorClass="portlet-msg-error" fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/> </h:inputText>

16 years, 9 months

1
0
0 / 0

JBoss Portal SVN: r8368 - in trunk/core-admin/src: resources/portal-admin-war/WEB-INF/jsf and 1 other directories.

by portal-commits＠lists.jboss.org

Author: wesleyhales Date: 2007-09-19 12:04:33 -0400 (Wed, 19 Sep 2007) New Revision: 8368 Added: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/tabContainer.xhtml Modified: trunk/core-admin/src/bin/portal-admin-war/style.css trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/dashboardsTemplate.xhtml trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/instancesTemplate.xhtml trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectTemplate.xhtml trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/portletsTemplate.xhtml Log: added border around admin tab content area Modified: trunk/core-admin/src/bin/portal-admin-war/style.css =================================================================== --- trunk/core-admin/src/bin/portal-admin-war/style.css 2007-09-19 15:57:11 UTC (rev 8367) +++ trunk/core-admin/src/bin/portal-admin-war/style.css 2007-09-19 16:04:33 UTC (rev 8368) @@ -10,6 +10,13 @@ text-decoration: underline; } +div.admin-ui div.tab-container{ + border-bottom:1px solid #B3C0C7; + border-right:1px solid #B3C0C7; + border-left:1px solid #B3C0C7; + padding: 15px 0 10px 0; +} + .admin-ui table { border: 0; } @@ -55,9 +62,9 @@ /* Top nav. */ .admin-ui ul.topnav { - margin-left: 0; padding: 4px 0px 3px; border-bottom: 1px solid #b3c0c7; + margin: 0; } .admin-ui ul.topnav li { Added: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/tabContainer.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/tabContainer.xhtml (rev 0) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/tabContainer.xhtml 2007-09-19 16:04:33 UTC (rev 8368) @@ -0,0 +1,10 @@ +<ui:composition + xmlns="http://www.w3.org/1999/xhtml" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:ui="http://java.sun.com/jsf/facelets"> + + <div class="tab-container"> + <ui:insert name="tab-container-content"/> + </div> + +</ui:composition> \ No newline at end of file Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/dashboardsTemplate.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/dashboardsTemplate.xhtml 2007-09-19 15:57:11 UTC (rev 8367) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/dashboardsTemplate.xhtml 2007-09-19 16:04:33 UTC (rev 8368) @@ -21,11 +21,13 @@ <li id="currentTab">Dashboards</li> </ul> </h:form> - + <ui:decorate template="common/tabContainer.xhtml"> + <ui:define name="tab-container-content">  <h:message id="status" for="status" infoClass="portlet-msg-success" errorClass="portlet-msg-error" fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/>  <ui:insert name="content">Content</ui:insert> - + </ui:define> + </ui:decorate> </div> Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/instancesTemplate.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/instancesTemplate.xhtml 2007-09-19 15:57:11 UTC (rev 8367) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/instancesTemplate.xhtml 2007-09-19 16:04:33 UTC (rev 8368) @@ -20,12 +20,14 @@ </li> </ul> </h:form> - + <ui:decorate template="common/tabContainer.xhtml"> + <ui:define name="tab-container-content">  <h:message id="status" for="status" infoClass="portlet-msg-success" errorClass="portlet-msg-error" fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/>  <ui:insert name="content">Content</ui:insert> - + </ui:define> + </ui:decorate> </div> Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectTemplate.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectTemplate.xhtml 2007-09-19 15:57:11 UTC (rev 8367) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectTemplate.xhtml 2007-09-19 16:04:33 UTC (rev 8368) @@ -21,7 +21,8 @@ </li> </ul> </h:form> - + <ui:decorate template="common/tabContainer.xhtml"> + <ui:define name="tab-container-content">  <h:form> <ul class="objectpath"> @@ -50,5 +51,6 @@  <ui:insert name="content">Content</ui:insert> - + </ui:define> + </ui:decorate> </div> Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/portletsTemplate.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/portletsTemplate.xhtml 2007-09-19 15:57:11 UTC (rev 8367) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/portletsTemplate.xhtml 2007-09-19 16:04:33 UTC (rev 8368) @@ -20,12 +20,14 @@ </li> </ul> </h:form> - + <ui:decorate template="common/tabContainer.xhtml"> + <ui:define name="tab-container-content">  <h:message id="status" for="status" infoClass="portlet-msg-success" errorClass="portlet-msg-error" fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/>  <ui:insert name="content">Content</ui:insert> - + </ui:define> + </ui:decorate> </div>

16 years, 9 months

1
0
0 / 0

JBoss Portal SVN: r8367 - branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-users-samples-war/WEB-INF/classes.

by portal-commits＠lists.jboss.org

Author: thomas.heute(a)jboss.com Date: 2007-09-19 11:57:11 -0400 (Wed, 19 Sep 2007) New Revision: 8367 Modified: branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-users-samples-war/WEB-INF/classes/Resource.properties Log: English fix Modified: branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-users-samples-war/WEB-INF/classes/Resource.properties =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-users-samples-war/WEB-INF/classes/Resource.properties 2007-09-19 15:34:19 UTC (rev 8366) +++ branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-users-samples-war/WEB-INF/classes/Resource.properties 2007-09-19 15:57:11 UTC (rev 8367) @@ -22,11 +22,11 @@ ################################################################################ NO_USERS_ONLINE=No user is logged -ONE_USER_ONLINE_0=Actually there is <b> +ONE_USER_ONLINE_0=There is <b> ONE_USER_ONLINE_1=</b> user online: ONE_USER_IS_0=<b> ONE_USER_IS_1=</b> -USERS_ONLINE_0=Actually there are <b> +USERS_ONLINE_0=There are <b> USERS_ONLINE_1=</b> users online: USERS_ARE_0=<b> USERS_ARE_1=</b> \ No newline at end of file

16 years, 9 months

1
0
0 / 0

JBoss Portal SVN: r8366 - in branches/JBoss_Portal_Branch_2_6/core-admin/src: resources/portal-admin-war/WEB-INF/jsf and 1 other directories.

by portal-commits＠lists.jboss.org

Author: wesleyhales Date: 2007-09-19 11:34:19 -0400 (Wed, 19 Sep 2007) New Revision: 8366 Added: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/tabContainer.xhtml Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/bin/portal-admin-war/style.css branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/dashboardsTemplate.xhtml branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/instancesTemplate.xhtml branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectTemplate.xhtml branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/portletsTemplate.xhtml Log: added border around admin tab content area Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/bin/portal-admin-war/style.css =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/bin/portal-admin-war/style.css 2007-09-19 14:58:17 UTC (rev 8365) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/bin/portal-admin-war/style.css 2007-09-19 15:34:19 UTC (rev 8366) @@ -10,6 +10,13 @@ text-decoration: underline; } +div.admin-ui div.tab-container{ + border-bottom:1px solid #B3C0C7; + border-right:1px solid #B3C0C7; + border-left:1px solid #B3C0C7; + padding: 15px 0 10px 0; +} + .admin-ui table { border: 0; } @@ -55,9 +62,9 @@ /* Top nav. */ .admin-ui ul.topnav { - margin-left: 0; padding: 4px 0px 3px; border-bottom: 1px solid #b3c0c7; + margin: 0; } .admin-ui ul.topnav li { Added: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/tabContainer.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/tabContainer.xhtml (rev 0) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/tabContainer.xhtml 2007-09-19 15:34:19 UTC (rev 8366) @@ -0,0 +1,10 @@ +<ui:composition + xmlns="http://www.w3.org/1999/xhtml" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:ui="http://java.sun.com/jsf/facelets"> + + <div class="tab-container"> + <ui:insert name="tab-container-content"/> + </div> + +</ui:composition> \ No newline at end of file Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/dashboardsTemplate.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/dashboardsTemplate.xhtml 2007-09-19 14:58:17 UTC (rev 8365) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/dashboardsTemplate.xhtml 2007-09-19 15:34:19 UTC (rev 8366) @@ -21,11 +21,13 @@ <li id="currentTab">Dashboards</li> </ul> </h:form> + <ui:decorate template="common/tabContainer.xhtml"> + <ui:define name="tab-container-content"> +  + <h:message id="status" for="status" infoClass="portlet-msg-success" errorClass="portlet-msg-error" fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/> -  - <h:message id="status" for="status" infoClass="portlet-msg-success" errorClass="portlet-msg-error" fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/> - -  - <ui:insert name="content">Content</ui:insert> - +  + <ui:insert name="content">Content</ui:insert> + </ui:define> + </ui:decorate> </div> Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/instancesTemplate.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/instancesTemplate.xhtml 2007-09-19 14:58:17 UTC (rev 8365) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/instancesTemplate.xhtml 2007-09-19 15:34:19 UTC (rev 8366) @@ -20,12 +20,14 @@ </li> </ul> </h:form> - + <ui:decorate template="common/tabContainer.xhtml"> + <ui:define name="tab-container-content">  <h:message id="status" for="status" infoClass="portlet-msg-success" errorClass="portlet-msg-error" fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/>  <ui:insert name="content">Content</ui:insert> - + </ui:define> + </ui:decorate> </div> Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectTemplate.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectTemplate.xhtml 2007-09-19 14:58:17 UTC (rev 8365) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectTemplate.xhtml 2007-09-19 15:34:19 UTC (rev 8366) @@ -21,7 +21,8 @@ </li> </ul> </h:form> - + <ui:decorate template="common/tabContainer.xhtml"> + <ui:define name="tab-container-content">  <h:form> <ul class="objectpath"> @@ -50,5 +51,6 @@  <ui:insert name="content">Content</ui:insert> - + </ui:define> + </ui:decorate> </div> Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/portletsTemplate.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/portletsTemplate.xhtml 2007-09-19 14:58:17 UTC (rev 8365) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/portletsTemplate.xhtml 2007-09-19 15:34:19 UTC (rev 8366) @@ -20,12 +20,14 @@ </li> </ul> </h:form> + <ui:decorate template="common/tabContainer.xhtml"> + <ui:define name="tab-container-content"> +  + <h:message id="status" for="status" infoClass="portlet-msg-success" errorClass="portlet-msg-error" + fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/> -  - <h:message id="status" for="status" infoClass="portlet-msg-success" errorClass="portlet-msg-error" - fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/> - -  - <ui:insert name="content">Content</ui:insert> - +  + <ui:insert name="content">Content</ui:insert> + </ui:define> + </ui:decorate> </div>

16 years, 9 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

portal-commits September 2007