Author: wesleyhales Date: 2008-06-10 11:50:48 -0400 (Tue, 10 Jun 2008) New Revision: 10972 Added: branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/ branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/themes/renewal/ Removed: branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/ Modified: branches/JBoss_Portal_Branch_2_7/build/build-thirdparty.xml branches/JBoss_Portal_Branch_2_7/core-identity/build.xml branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/WEB-INF/faces-config.xml branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/WEB-INF/jboss-portlet.xml branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/WEB-INF/portlet.xml branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/WEB-INF/web.xml branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/assignRoles.xhtml branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/editProfile.xhtml branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/index.xhtml branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/roles.xhtml branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/roles/createRole.xhtml branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/roles/deleteRole.xhtml branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/roles/editRole.xhtml branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/roles/roleMembers.xhtml branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/roles/roleTemplate.xhtml branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/user/changePassword.xhtml branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/user/confirmPendingAction.xhtml branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/user/createUser.xhtml branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/user/deleteUser.xhtml branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/user/pendingUsers.xhtml branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/user/registerConfirm.xhtml branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/user/registerRoles.xhtml branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/user/resetPassword.xhtml branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/user/searchUsers.xhtml branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/user/userTemplate.xhtml branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/common/profile.xhtml branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/common/register.xhtml branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/index.xhtml branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/lostPassword/lost.xhtml branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/lostPassword/lostTemplate.xhtml branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/lostPassword/status.xhtml branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/profile/changeEmail.xhtml branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/profile/changePassword.xhtml branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/profile/editProfile.xhtml branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/profile/editProfileRedirect.xhtml branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/profile/editProfileTemplate.xhtml branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/profile/status.xhtml branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/profile/viewProfile.xhtml branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/profile/viewProfileTemplate.xhtml branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/register/confirm.xhtml branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/register/overview.xhtml branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/register/register.xhtml branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/register/registerTemplate.xhtml branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/register/success.xhtml branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/startTemplate.xhtml Log: migrate core-identity to portletbridge, upgraded facelets which fixes ArrayIndexOutOfBoundsException Modified: branches/JBoss_Portal_Branch_2_7/build/build-thirdparty.xml =================================================================== --- branches/JBoss_Portal_Branch_2_7/build/build-thirdparty.xml 2008-06-10 13:49:38 UTC (rev 10971) +++ branches/JBoss_Portal_Branch_2_7/build/build-thirdparty.xml 2008-06-10 15:50:48 UTC (rev 10972) @@ -76,7 +76,7 @@ <componentref name="dom4j" version="1.6.1jboss"/> <componentref name="ehcache" version="1.2.2"/> <componentref name="el" version="1.0"/> - <componentref name="facelets" version="1.1.14"/> + <componentref name="facelets" version="1.1.15-B1"/> <componentref name="richfaces" version="3.2.1.GA"/> <componentref name="jboss/portlet-bridge" version="1.0.0.B2"/> <componentref name="hibernate" version="3.2.0.CR2"/> Modified: branches/JBoss_Portal_Branch_2_7/core-identity/build.xml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-identity/build.xml 2008-06-10 13:49:38 UTC (rev 10971) +++ branches/JBoss_Portal_Branch_2_7/core-identity/build.xml 2008-06-10 15:50:48 UTC (rev 10972) @@ -100,16 +100,18 @@ <path refid="freemarker.freemarker.classpath"/> <path refid="jbossas/core.libs.classpath"/> <path refid="hibernate.hibernate.classpath"/> - <path refid="apache.myfaces.classpath"/> <path refid="apache.log4j.classpath"/> <path refid="sun.servlet.classpath"/> - <path refid="facelets.facelets.classpath"/> <path refid="jcaptcha.jcaptcha.classpath"/> + <path refid="jakarta.cactus.classpath"/> + <path refid="junit.junit.classpath"/> + <path refid="jbpm.jaronly.classpath"/> + <path refid="sun.jsf.classpath"/> <path refid="el.el.classpath"/> - <path refid="jakarta.cactus.classpath"/> - <path refid="junit.junit.classpath"/> - <path refid="jbpm.jaronly.classpath"/> - <path refid="portlet.portlet.classpath"/> + <path refid="richfaces.richfaces.classpath"/> + <path refid="facelets.facelets.classpath"/> + <path refid="portlet.portlet.classpath"/> + <path refid="jboss/portlet.bridge.classpath"/> </path> <!-- Configure modules --> @@ -203,15 +205,17 @@ </jar> <!-- portal-identity.war --> - <copy todir="${build.resources}/portal-identity-war/WEB-INF/lib2"> - <fileset dir="${apache.myfaces.lib}" includes="myfaces-api.jar,myfaces-impl.jar,jstl.jar"/> + <copy todir="${build.resources}/portal-identity-war/WEB-INF/lib"> <fileset dir="${build.lib}" includes="portal-core-identity-ui-lib.jar"/> - <fileset dir="${jboss.portal-faces.root}/lib" includes="portal-faces-lib.jar"/> - <fileset dir="src/etc/sun-jsf" includes="jsf-example.jar"/> - <fileset dir="${facelets.facelets.lib}" includes="jsf-facelets.jar"/> - <fileset dir="${el.el.lib}" includes="el-api.jar,el-ri.jar"/> - <fileset dir="${commons.el.lib}" includes="commons-el.jar"/> - <fileset dir="${apache.beanutils.lib}" includes="commons-beanutils.jar"/> + <fileset dir="${apache.myfaces.lib}" includes="jstl.jar"/> + <fileset dir="${facelets.facelets.lib}" includes="jsf-facelets.jar"/> + <fileset dir="${jboss/portlet.bridge.lib}" includes="portletbridge-api.jar"/> + <fileset dir="${jboss/portlet.bridge.lib}" includes="portletbridge-impl.jar"/> + <fileset dir="${richfaces.richfaces.lib}" includes="richfaces-api.jar"/> + <fileset dir="${richfaces.richfaces.lib}" includes="richfaces-impl.jar"/> + <fileset dir="${richfaces.richfaces.lib}" includes="richfaces-ui.jar"/> + <fileset dir="${jboss.portal-faces.root}/lib" includes="portal-faces-lib.jar"/> + <fileset dir="${apache.beanutils.lib}" includes="commons-beanutils.jar"/> <fileset dir="${apache.lang.lib}" includes="commons-lang.jar"/> <fileset dir="${apache.digester.lib}" includes="commons-digester.jar"/> </copy> Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/WEB-INF/faces-config.xml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/WEB-INF/faces-config.xml 2008-06-10 13:49:38 UTC (rev 10971) +++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/WEB-INF/faces-config.xml 2008-06-10 15:50:48 UTC (rev 10972) @@ -27,12 +27,21 @@ "http://java.sun.com/dtd/web-facesconfig_1_0.dtd"> <faces-config> - <application> - <variable-resolver>org.jboss.portal.core.identity.ui.faces.PortletVariableResolver</variable-resolver> + + <application> + <variable-resolver>org.jboss.portal.core.identity.ui.faces.PortletVariableResolver</variable-resolver> <property-resolver>org.jboss.portal.core.identity.ui.faces.PortletDelegatingPropertyResolver</property-resolver> - <view-handler>com.sun.facelets.FaceletPortletViewHandler</view-handler> - </application> + <view-handler> + org.jboss.portletbridge.application.PortletViewHandler + </view-handler> + </application> + <factory> + <faces-context-factory> + org.jboss.portletbridge.context.FacesContextFactoryImpl + </faces-context-factory> + </factory> + <managed-bean> <managed-bean-name>configurationbean</managed-bean-name> <managed-bean-class>org.jboss.portal.core.identity.ui.common.ConfigurationBean</managed-bean-class> @@ -215,271 +224,271 @@ <navigation-rule> <navigation-case> <from-outcome>start</from-outcome> - <to-view-id>/WEB-INF/jsf/index.xhtml</to-view-id> + <to-view-id>/jsf/index.xhtml</to-view-id> </navigation-case> </navigation-rule> <navigation-rule> <navigation-case> <from-outcome>lostPassword</from-outcome> - <to-view-id>/WEB-INF/jsf/lostPassword/lost.xhtml</to-view-id> + <to-view-id>/jsf/lostPassword/lost.xhtml</to-view-id> </navigation-case> </navigation-rule> <navigation-rule> - <from-view-id>/WEB-INF/jsf/lostPassword/lost.xhtml</from-view-id> + <from-view-id>/jsf/lostPassword/lost.xhtml</from-view-id> <navigation-case> <from-outcome>status</from-outcome> - <to-view-id>/WEB-INF/jsf/lostPassword/status.xhtml</to-view-id> + <to-view-id>/jsf/lostPassword/status.xhtml</to-view-id> </navigation-case> </navigation-rule> <navigation-rule> <navigation-case> <from-outcome>register</from-outcome> - <to-view-id>/WEB-INF/jsf/register/register.xhtml</to-view-id> + <to-view-id>/jsf/register/register.xhtml</to-view-id> </navigation-case> </navigation-rule> <navigation-rule> - <from-view-id>/WEB-INF/jsf/register/register.xhtml</from-view-id> + <from-view-id>/jsf/register/register.xhtml</from-view-id> <navigation-case> <from-outcome>register</from-outcome> - <to-view-id>/WEB-INF/jsf/register/confirm.xhtml</to-view-id> + <to-view-id>/jsf/register/confirm.xhtml</to-view-id> </navigation-case> </navigation-rule> <navigation-rule> - <from-view-id>/WEB-INF/jsf/register/confirm.xhtml</from-view-id> + <from-view-id>/jsf/register/confirm.xhtml</from-view-id> <navigation-case> <from-outcome>revise</from-outcome> - <to-view-id>/WEB-INF/jsf/register/register.xhtml</to-view-id> + <to-view-id>/jsf/register/register.xhtml</to-view-id> </navigation-case> <navigation-case> <from-outcome>registered</from-outcome> - <to-view-id>/WEB-INF/jsf/register/success.xhtml</to-view-id> + <to-view-id>/jsf/register/success.xhtml</to-view-id> </navigation-case> </navigation-rule> <navigation-rule> <navigation-case> <from-outcome>changePassword</from-outcome> - <to-view-id>/WEB-INF/jsf/profile/changePassword.xhtml</to-view-id> + <to-view-id>/jsf/profile/changePassword.xhtml</to-view-id> </navigation-case> </navigation-rule> <navigation-rule> - <from-view-id>/WEB-INF/jsf/profile/changePassword.xhtml</from-view-id> + <from-view-id>/jsf/profile/changePassword.xhtml</from-view-id> <navigation-case> <from-outcome>status</from-outcome> - <to-view-id>/WEB-INF/jsf/profile/viewProfile.xhtml</to-view-id> + <to-view-id>/jsf/profile/viewProfile.xhtml</to-view-id> </navigation-case> </navigation-rule> <navigation-rule> <navigation-case> <from-outcome>changeEmail</from-outcome> - <to-view-id>/WEB-INF/jsf/profile/changeEmail.xhtml</to-view-id> + <to-view-id>/jsf/profile/changeEmail.xhtml</to-view-id> </navigation-case> </navigation-rule> <navigation-rule> - <from-view-id>/WEB-INF/jsf/profile/changeEmail.xhtml</from-view-id> + <from-view-id>/jsf/profile/changeEmail.xhtml</from-view-id> <navigation-case> <from-outcome>status</from-outcome> - <to-view-id>/WEB-INF/jsf/profile/viewProfile.xhtml</to-view-id> + <to-view-id>/jsf/profile/viewProfile.xhtml</to-view-id> </navigation-case> </navigation-rule> <navigation-rule> - <from-view-id>/WEB-INF/jsf/index.xhtml</from-view-id> + <from-view-id>/jsf/index.xhtml</from-view-id> <navigation-case> <from-outcome>editProfile</from-outcome> - <to-view-id>/WEB-INF/jsf/profile/editProfileRedirect.xhtml</to-view-id> + <to-view-id>/jsf/profile/editProfileRedirect.xhtml</to-view-id> </navigation-case> </navigation-rule> <navigation-rule> - <from-view-id>/WEB-INF/jsf/profile/*</from-view-id> + <from-view-id>/jsf/profile/*</from-view-id> <navigation-case> <from-outcome>editProfile</from-outcome> - <to-view-id>/WEB-INF/jsf/profile/editProfileRedirect.xhtml</to-view-id> + <to-view-id>/jsf/profile/editProfileRedirect.xhtml</to-view-id> </navigation-case> </navigation-rule> <navigation-rule> - <from-view-id>/WEB-INF/jsf/admin/*</from-view-id> + <from-view-id>/jsf/admin/*</from-view-id> <navigation-case> <from-outcome>userAdmin</from-outcome> - <to-view-id>/WEB-INF/jsf/admin/index.xhtml</to-view-id> + <to-view-id>/jsf/admin/index.xhtml</to-view-id> </navigation-case> <navigation-case> <from-outcome>start</from-outcome> - <to-view-id>/WEB-INF/jsf/admin/index.xhtml</to-view-id> + <to-view-id>/jsf/admin/index.xhtml</to-view-id> </navigation-case> </navigation-rule> <navigation-rule> - <from-view-id>/WEB-INF/jsf/admin/*</from-view-id> + <from-view-id>/jsf/admin/*</from-view-id> <navigation-case> <from-outcome>roleAdmin</from-outcome> - <to-view-id>/WEB-INF/jsf/admin/roles.xhtml</to-view-id> + <to-view-id>/jsf/admin/roles.xhtml</to-view-id> </navigation-case> </navigation-rule> <navigation-rule> - <from-view-id>/WEB-INF/jsf/admin/index.xhtml</from-view-id> + <from-view-id>/jsf/admin/index.xhtml</from-view-id> <navigation-case> <from-outcome>createUser</from-outcome> - <to-view-id>/WEB-INF/jsf/admin/user/createUser.xhtml</to-view-id> + <to-view-id>/jsf/admin/user/createUser.xhtml</to-view-id> </navigation-case> </navigation-rule> <navigation-rule> - <from-view-id>/WEB-INF/jsf/admin/*</from-view-id> + <from-view-id>/jsf/admin/*</from-view-id> <navigation-case> <from-outcome>searchUsers</from-outcome> - <to-view-id>/WEB-INF/jsf/admin/user/searchUsers.xhtml</to-view-id> + <to-view-id>/jsf/admin/user/searchUsers.xhtml</to-view-id> </navigation-case> </navigation-rule> <navigation-rule> - <from-view-id>/WEB-INF/jsf/admin/index.xhtml</from-view-id> + <from-view-id>/jsf/admin/index.xhtml</from-view-id> <navigation-case> <from-outcome>showPendingUsers</from-outcome> - <to-view-id>/WEB-INF/jsf/admin/user/pendingUsers.xhtml</to-view-id> + <to-view-id>/jsf/admin/user/pendingUsers.xhtml</to-view-id> </navigation-case> </navigation-rule> <navigation-rule> - <from-view-id>/WEB-INF/jsf/admin/user/pendingUsers.xhtml</from-view-id> + <from-view-id>/jsf/admin/user/pendingUsers.xhtml</from-view-id> <navigation-case> <from-outcome>confirmPendingAction</from-outcome> - <to-view-id>/WEB-INF/jsf/admin/user/confirmPendingAction.xhtml</to-view-id> + <to-view-id>/jsf/admin/user/confirmPendingAction.xhtml</to-view-id> </navigation-case> <navigation-case> <from-outcome>cancel</from-outcome> - <to-view-id>/WEB-INF/jsf/admin/index.xthml</to-view-id> + <to-view-id>/jsf/admin/index.xthml</to-view-id> </navigation-case> </navigation-rule> <navigation-rule> - <from-view-id>/WEB-INF/jsf/admin/user/confirmPendingAction.xhtml</from-view-id> + <from-view-id>/jsf/admin/user/confirmPendingAction.xhtml</from-view-id> <navigation-case> <from-outcome>revise</from-outcome> - <to-view-id>/WEB-INF/jsf/admin/user/pendingUsers.xhtml</to-view-id> + <to-view-id>/jsf/admin/user/pendingUsers.xhtml</to-view-id> </navigation-case> <navigation-case> <from-outcome>success</from-outcome> - <to-view-id>/WEB-INF/jsf/admin/index.xthml</to-view-id> + <to-view-id>/jsf/admin/index.xthml</to-view-id> </navigation-case> </navigation-rule> <navigation-rule> - <from-view-id>/WEB-INF/jsf/admin/user/searchUsers.xhtml</from-view-id> + <from-view-id>/jsf/admin/user/searchUsers.xhtml</from-view-id> <navigation-case> <from-outcome>deleteUser</from-outcome> - <to-view-id>/WEB-INF/jsf/admin/user/deleteUser.xhtml</to-view-id> + <to-view-id>/jsf/admin/user/deleteUser.xhtml</to-view-id> </navigation-case> </navigation-rule> <navigation-rule> - <from-view-id>/WEB-INF/jsf/admin/editProfile.xhtml</from-view-id> + <from-view-id>/jsf/admin/editProfile.xhtml</from-view-id> <navigation-case> <from-outcome>adminChangePassword</from-outcome> - <to-view-id>/WEB-INF/jsf/admin/user/changePassword.xhtml</to-view-id> + <to-view-id>/jsf/admin/user/changePassword.xhtml</to-view-id> </navigation-case> <navigation-case> <from-outcome>start</from-outcome> - <to-view-id>/WEB-INF/jsf/admin/user/searchUsers.xhtml</to-view-id> + <to-view-id>/jsf/admin/user/searchUsers.xhtml</to-view-id> </navigation-case> </navigation-rule> <navigation-rule> - <from-view-id>/WEB-INF/jsf/admin/*</from-view-id> + <from-view-id>/jsf/admin/*</from-view-id> <navigation-case> <from-outcome>start</from-outcome> - <to-view-id>/WEB-INF/jsf/admin/user/searchUsers.xhtml</to-view-id> + <to-view-id>/jsf/admin/user/searchUsers.xhtml</to-view-id> </navigation-case> </navigation-rule> <navigation-rule> - <from-view-id>/WEB-INF/jsf/admin/*</from-view-id> + <from-view-id>/jsf/admin/*</from-view-id> <navigation-case> <from-action>#{editprofilemgr.adminEditProfile}</from-action> <from-outcome>editProfile</from-outcome> - <to-view-id>/WEB-INF/jsf/admin/editProfile.xhtml</to-view-id> + <to-view-id>/jsf/admin/editProfile.xhtml</to-view-id> </navigation-case> </navigation-rule> <navigation-rule> - <from-view-id>/WEB-INF/jsf/admin/*</from-view-id> + <from-view-id>/jsf/admin/*</from-view-id> <navigation-case> <from-action>#{assignrolemgr.assignRoles}</from-action> <from-outcome>assignRoles</from-outcome> - <to-view-id>/WEB-INF/jsf/admin/assignRoles.xhtml</to-view-id> + <to-view-id>/jsf/admin/assignRoles.xhtml</to-view-id> </navigation-case> </navigation-rule> <navigation-rule> - <from-view-id>/WEB-INF/jsf/admin/user/createUser.xhtml</from-view-id> + <from-view-id>/jsf/admin/user/createUser.xhtml</from-view-id> <navigation-case> <from-outcome>register</from-outcome> - <to-view-id>/WEB-INF/jsf/admin/user/registerRoles.xhtml</to-view-id> + <to-view-id>/jsf/admin/user/registerRoles.xhtml</to-view-id> </navigation-case> </navigation-rule> <navigation-rule> - <from-view-id>/WEB-INF/jsf/admin/user/registerRoles.xhtml</from-view-id> + <from-view-id>/jsf/admin/user/registerRoles.xhtml</from-view-id> <navigation-case> <from-outcome>register</from-outcome> - <to-view-id>/WEB-INF/jsf/admin/user/registerConfirm.xhtml</to-view-id> + <to-view-id>/jsf/admin/user/registerConfirm.xhtml</to-view-id> </navigation-case> </navigation-rule> <navigation-rule> - <from-view-id>/WEB-INF/jsf/admin/user/registerConfirm.xhtml</from-view-id> + <from-view-id>/jsf/admin/user/registerConfirm.xhtml</from-view-id> <navigation-case> <from-outcome>revise</from-outcome> - <to-view-id>/WEB-INF/jsf/admin/user/createUser.xhtml</to-view-id> + <to-view-id>/jsf/admin/user/createUser.xhtml</to-view-id> </navigation-case> <navigation-case> <from-outcome>registered</from-outcome> - <to-view-id>/WEB-INF/jsf/admin/index.xhtml</to-view-id> + <to-view-id>/jsf/admin/index.xhtml</to-view-id> </navigation-case> </navigation-rule> <navigation-rule> - <from-view-id>/WEB-INF/jsf/admin/roles.xhtml</from-view-id> + <from-view-id>/jsf/admin/roles.xhtml</from-view-id> <navigation-case> <from-outcome>createRole</from-outcome> - <to-view-id>/WEB-INF/jsf/admin/roles/createRole.xhtml</to-view-id> + <to-view-id>/jsf/admin/roles/createRole.xhtml</to-view-id> </navigation-case> </navigation-rule> <navigation-rule> - <from-view-id>/WEB-INF/jsf/admin/roles.xhtml</from-view-id> + <from-view-id>/jsf/admin/roles.xhtml</from-view-id> <navigation-case> <from-outcome>editRole</from-outcome> - <to-view-id>/WEB-INF/jsf/admin/roles/editRole.xhtml</to-view-id> + <to-view-id>/jsf/admin/roles/editRole.xhtml</to-view-id> </navigation-case> </navigation-rule> <navigation-rule> - <from-view-id>/WEB-INF/jsf/admin/roles.xhtml</from-view-id> + <from-view-id>/jsf/admin/roles.xhtml</from-view-id> <navigation-case> <from-outcome>viewMembers</from-outcome> - <to-view-id>/WEB-INF/jsf/admin/roles/roleMembers.xhtml</to-view-id> + <to-view-id>/jsf/admin/roles/roleMembers.xhtml</to-view-id> </navigation-case> </navigation-rule> <navigation-rule> - <from-view-id>/WEB-INF/jsf/admin/roles.xhtml</from-view-id> + <from-view-id>/jsf/admin/roles.xhtml</from-view-id> <navigation-case> <from-outcome>deleteRole</from-outcome> - <to-view-id>/WEB-INF/jsf/admin/roles/deleteRole.xhtml</to-view-id> + <to-view-id>/jsf/admin/roles/deleteRole.xhtml</to-view-id> </navigation-case> </navigation-rule> <navigation-rule> - <from-view-id>/WEB-INF/jsf/admin/editProfile.xhtml</from-view-id> + <from-view-id>/jsf/admin/editProfile.xhtml</from-view-id> <navigation-case> <from-outcome>resetPassword</from-outcome> - <to-view-id>/WEB-INF/jsf/admin/user/resetPassword.xhtml</to-view-id> + <to-view-id>/jsf/admin/user/resetPassword.xhtml</to-view-id> </navigation-case> </navigation-rule> <navigation-rule> - <from-view-id>/WEB-INF/jsf/admin/user/resetPassword.xhtml</from-view-id> + <from-view-id>/jsf/admin/user/resetPassword.xhtml</from-view-id> <navigation-case> <from-action>#{lostpasswordmgr.doomed}</from-action> <from-outcome>status</from-outcome> - <to-view-id>/WEB-INF/jsf/admin/user/searchUsers.xhtml</to-view-id> + <to-view-id>/jsf/admin/user/searchUsers.xhtml</to-view-id> </navigation-case> <navigation-case> <from-action>#{lostpasswordmgr.doomed}</from-action> <from-outcome>lostPassword</from-outcome> - <to-view-id>/WEB-INF/jsf/admin/editProfile.xhtml</to-view-id> + <to-view-id>/jsf/admin/editProfile.xhtml</to-view-id> </navigation-case> </navigation-rule> <navigation-rule> - <from-view-id>/WEB-INF/jsf/admin/user/changePassword.xhtml</from-view-id> + <from-view-id>/jsf/admin/user/changePassword.xhtml</from-view-id> <navigation-case> <from-outcome>status</from-outcome> - <to-view-id>/WEB-INF/jsf/admin/user/searchUsers.xhtml</to-view-id> + <to-view-id>/jsf/admin/user/searchUsers.xhtml</to-view-id> </navigation-case> <navigation-case> <from-outcome>searchUsers</from-outcome> - <to-view-id>/WEB-INF/jsf/admin/user/searchUsers.xhtml</to-view-id> + <to-view-id>/jsf/admin/user/searchUsers.xhtml</to-view-id> </navigation-case> </navigation-rule> Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/WEB-INF/jboss-portlet.xml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/WEB-INF/jboss-portlet.xml 2008-06-10 13:49:38 UTC (rev 10971) +++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/WEB-INF/jboss-portlet.xml 2008-06-10 15:50:48 UTC (rev 10972) @@ -35,6 +35,9 @@ <trans-attribute>Required</trans-attribute> </transaction> <header-content> + <script src="/faces/rfRes/org/ajax4jsf/framework.pack.js" type="text/javascript"></script> + <script src="/faces/rfRes/org/richfaces/ui.pack.js" type="text/javascript"></script> + <link rel="stylesheet" type="text/css" href="/faces/rfRes/org/richfaces/skin.xcss"/> <link rel="stylesheet" type="text/css" href="/style.css" media="screen"/> </header-content> <portlet-info> @@ -53,6 +56,9 @@ <trans-attribute>Required</trans-attribute> </transaction> <header-content> + <script src="/faces/rfRes/org/ajax4jsf/framework.pack.js" type="text/javascript"></script> + <script src="/faces/rfRes/org/richfaces/ui.pack.js" type="text/javascript"></script> + <link rel="stylesheet" type="text/css" href="/faces/rfRes/org/richfaces/skin.xcss"/> <link rel="stylesheet" type="text/css" href="/style.css" media="screen"/> </header-content> <portlet-info> Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/WEB-INF/portlet.xml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/WEB-INF/portlet.xml 2008-06-10 13:49:38 UTC (rev 10971) +++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/WEB-INF/portlet.xml 2008-06-10 15:50:48 UTC (rev 10972) @@ -46,11 +46,15 @@ <description>Identity user portlet</description> <portlet-name>IdentityUserPortlet</portlet-name> <display-name>Identity user portlet</display-name> - <portlet-class>org.jboss.portal.faces.loader.FacesPortlet</portlet-class> + <portlet-class>javax.portlet.faces.GenericFacesPortlet</portlet-class> <init-param> - <name>default-view</name> - <value>/WEB-INF/jsf/index.xhtml</value> + <name>javax.portlet.faces.defaultViewId.view</name> + <value>/jsf/index.xhtml</value> </init-param> + <init-param> + <name>javax.portlet.faces.preserveActionParams</name> + <value>true</value> + </init-param> <supports> <mime-type>text/html</mime-type> <portlet-mode>VIEW</portlet-mode> @@ -81,11 +85,16 @@ <description>Identity admin portlet</description> <portlet-name>IdentityAdminPortlet</portlet-name> <display-name>Identity admin portlet</display-name> - <portlet-class>org.jboss.portal.faces.loader.FacesPortlet</portlet-class> + <portlet-class>javax.portlet.faces.GenericFacesPortlet</portlet-class> <init-param> - <name>default-view</name> - <value>/WEB-INF/jsf/admin/index.xhtml</value> + <name>javax.portlet.faces.defaultViewId.view</name> + <value>/jsf/admin/index.xhtml</value> </init-param> + <init-param> + <name>javax.portlet.faces.preserveActionParams</name> + <value>true</value> + </init-param> + <supports> <mime-type>text/html</mime-type> <portlet-mode>VIEW</portlet-mode> Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/WEB-INF/web.xml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/WEB-INF/web.xml 2008-06-10 13:49:38 UTC (rev 10971) +++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/WEB-INF/web.xml 2008-06-10 15:50:48 UTC (rev 10972) @@ -28,32 +28,45 @@ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" version="2.4"> - <!-- MyFaces specific configuration --> <context-param> - <param-name>org.apache.myfaces.ALLOW_JAVASCRIPT</param-name> + <param-name>org.ajax4jsf.VIEW_HANDLERS</param-name> + <param-value>org.jboss.portletbridge.application.FaceletPortletViewHandler</param-value> + </context-param> + + <context-param> + <param-name>javax.portlet.faces.renderPolicy</param-name> + <param-value>ALWAYS_DELEGATE</param-value> + </context-param> + + <context-param> + <param-name>javax.portlet.faces.preserveActionParams</param-name> <param-value>true</param-value> </context-param> + <context-param> - <param-name>org.apache.myfaces.DETECT_JAVASCRIPT</param-name> - <param-value>false</param-value> + <param-name>org.ajax4jsf.RESOURCE_URI_PREFIX</param-name> + <param-value>rfRes</param-value> </context-param> + <context-param> - <param-name>org.apache.myfaces.AUTO_SCROLL</param-name> - <param-value>false</param-value> + <param-name>org.richfaces.LoadStyleStrategy</param-name> + <param-value>NONE</param-value> </context-param> + <context-param> - <param-name>org.apache.myfaces.CHECK_EXTENSIONS_FILTER</param-name> - <param-value>false</param-value> + <param-name>org.richfaces.LoadScriptStrategy</param-name> + <param-value>NONE</param-value> </context-param> + <context-param> - <param-name>org.apache.myfaces.PRETTY_HTML</param-name> - <param-value>true</param-value> + <param-name>org.ajax4jsf.COMPRESS_SCRIPT</param-name> + <param-value>false</param-value> </context-param> <!-- Facelet configuration --> <context-param> <param-name>facelets.DEVELOPMENT</param-name> - <param-value>false</param-value> + <param-value>true</param-value> </context-param> <context-param> <param-name>facelets.SKIP_COMMENTS</param-name> @@ -74,12 +87,29 @@ <param-value>server</param-value> </context-param> - <!-- The JSF servlet --> + <filter> + <display-name>Ajax4jsf Filter</display-name> + <filter-name>ajax4jsf</filter-name> + <filter-class>org.ajax4jsf.Filter</filter-class> + </filter> + <filter-mapping> + <filter-name>ajax4jsf</filter-name> + <servlet-name>Faces Servlet</servlet-name> + <dispatcher>FORWARD</dispatcher> + <dispatcher>REQUEST</dispatcher> + <dispatcher>INCLUDE</dispatcher> + </filter-mapping> + <servlet> - <servlet-name>Faces Servlet</servlet-name> - <servlet-class>org.jboss.portal.faces.loader.FacesLoaderServlet</servlet-class> - <load-on-startup>1</load-on-startup> + <servlet-name>Faces Servlet</servlet-name> + <servlet-class>javax.faces.webapp.FacesServlet</servlet-class> + <load-on-startup>1</load-on-startup> </servlet> + + <servlet-mapping> + <servlet-name>Faces Servlet</servlet-name> + <url-pattern>/faces/*</url-pattern> + </servlet-mapping> <!-- Captcha Servlet and Mapping --> <servlet> Copied: branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf (from rev 10961, branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/WEB-INF/jsf) Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/assignRoles.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/assignRoles.xhtml 2008-06-09 12:40:39 UTC (rev 10961) +++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/assignRoles.xhtml 2008-06-10 15:50:48 UTC (rev 10972) @@ -6,7 +6,7 @@ xmlns:c="http://java.sun.com/jstl/core" class="identity-ui"> -<ui:composition template="/WEB-INF/jsf/admin/user/userTemplate.xhtml"> +<ui:composition template="/jsf/admin/user/userTemplate.xhtml"> <ui:define name="title"> <li class="pathItem"> Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/editProfile.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/editProfile.xhtml 2008-06-09 12:40:39 UTC (rev 10961) +++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/editProfile.xhtml 2008-06-10 15:50:48 UTC (rev 10972) @@ -6,7 +6,7 @@ xmlns:c="http://java.sun.com/jstl/core" class="identity-ui"> -<ui:composition template="/WEB-INF/jsf/admin/user/userTemplate.xhtml"> +<ui:composition template="/jsf/admin/user/userTemplate.xhtml"> <ui:define name="title"> <li class="pathItem"> @@ -23,7 +23,7 @@ </ui:define> <ui:define name="content"> - <ui:decorate template="/WEB-INF/jsf/common/profile.xhtml"> + <ui:decorate template="/jsf/common/profile.xhtml"> <ui:param name="manager" value="#{editprofilemgr}"/> <ui:param name="adminMode" value="true"/> </ui:decorate> Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/index.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/index.xhtml 2008-06-09 12:40:39 UTC (rev 10961) +++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/index.xhtml 2008-06-10 15:50:48 UTC (rev 10972) @@ -6,7 +6,7 @@ xmlns:c="http://java.sun.com/jstl/core" class="identity-ui"> -<ui:composition template="/WEB-INF/jsf/admin/user/userTemplate.xhtml"> +<ui:composition template="/jsf/admin/user/userTemplate.xhtml"> <ui:define name="title"> <li class="selected"> <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}" /> Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/roles/createRole.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/createRole.xhtml 2008-06-09 12:40:39 UTC (rev 10961) +++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/roles/createRole.xhtml 2008-06-10 15:50:48 UTC (rev 10972) @@ -6,7 +6,7 @@ xmlns:c="http://java.sun.com/jstl/core" class="identity-ui"> -<ui:composition template="/WEB-INF/jsf/admin/roles/roleTemplate.xhtml"> +<ui:composition template="/jsf/admin/roles/roleTemplate.xhtml"> <ui:define name="title"> <li class="pathItem"> Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/roles/deleteRole.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/deleteRole.xhtml 2008-06-09 12:40:39 UTC (rev 10961) +++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/roles/deleteRole.xhtml 2008-06-10 15:50:48 UTC (rev 10972) @@ -6,7 +6,7 @@ xmlns:c="http://java.sun.com/jstl/core" class="identity-ui"> -<ui:composition template="/WEB-INF/jsf/admin/roles/roleTemplate.xhtml"> +<ui:composition template="/jsf/admin/roles/roleTemplate.xhtml"> <ui:define name="title"> @@ -43,7 +43,7 @@ </h:form> </div> </div> - + </ui:define> </ui:composition> </div> \ No newline at end of file Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/roles/editRole.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/editRole.xhtml 2008-06-09 12:40:39 UTC (rev 10961) +++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/roles/editRole.xhtml 2008-06-10 15:50:48 UTC (rev 10972) @@ -6,7 +6,7 @@ xmlns:c="http://java.sun.com/jstl/core" class="identity-ui"> -<ui:composition template="/WEB-INF/jsf/admin/roles/roleTemplate.xhtml"> +<ui:composition template="/jsf/admin/roles/roleTemplate.xhtml"> <ui:define name="title"> <li class="pathItem"> Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/roles/roleMembers.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/roleMembers.xhtml 2008-06-09 12:40:39 UTC (rev 10961) +++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/roles/roleMembers.xhtml 2008-06-10 15:50:48 UTC (rev 10972) @@ -6,7 +6,7 @@ xmlns:c="http://java.sun.com/jstl/core" class="identity-ui"> -<ui:composition template="/WEB-INF/jsf/admin/roles/roleTemplate.xhtml"> +<ui:composition template="/jsf/admin/roles/roleTemplate.xhtml"> <ui:define name="title"> <li class="pathItem"> Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/roles/roleTemplate.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/roleTemplate.xhtml 2008-06-09 12:40:39 UTC (rev 10961) +++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/roles/roleTemplate.xhtml 2008-06-10 15:50:48 UTC (rev 10972) @@ -18,7 +18,7 @@ </ul> </h:form> -<ui:decorate template="/WEB-INF/jsf/common/tabContainer.xhtml"> +<ui:decorate template="/jsf/common/tabContainer.xhtml"> <ui:define name="tab-object-path"><!-- Title --> <h:form> Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/roles.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles.xhtml 2008-06-09 12:40:39 UTC (rev 10961) +++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/roles.xhtml 2008-06-10 15:50:48 UTC (rev 10972) @@ -6,7 +6,7 @@ xmlns:c="http://java.sun.com/jstl/core" class="identity-ui"> -<ui:composition template="/WEB-INF/jsf/admin/roles/roleTemplate.xhtml"> +<ui:composition template="/jsf/admin/roles/roleTemplate.xhtml"> <ui:define name="title"> <li class="selected"> <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ROLE_MANAGEMENT}" /> @@ -20,7 +20,8 @@ <br/> <h:form> - <h:dataTable id="userlist" value="#{rolemanagementbean.roleList}" var="role" rowClasses="portlet-section-body,portlet-section-alternate" headerClass="portlet-section-header" styleClass="datatable" width="100%"> + + <h:dataTable id="userlist" value="#{rolemanagementbean.roleList}" var="role" rowClasses="portlet-section-body,portlet-section-alternate" headerClass="portlet-section-header" styleClass="datatable" width="100%"> <h:column> <f:facet name="header"> <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ROLE}" /> Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/user/changePassword.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/changePassword.xhtml 2008-06-09 12:40:39 UTC (rev 10961) +++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/user/changePassword.xhtml 2008-06-10 15:50:48 UTC (rev 10972) @@ -6,7 +6,7 @@ xmlns:c="http://java.sun.com/jstl/core" class="identity-ui"> -<ui:composition template="/WEB-INF/jsf/admin/user/userTemplate.xhtml"> +<ui:composition template="/jsf/admin/user/userTemplate.xhtml"> <ui:define name="title"> Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/user/confirmPendingAction.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/confirmPendingAction.xhtml 2008-06-09 12:40:39 UTC (rev 10961) +++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/user/confirmPendingAction.xhtml 2008-06-10 15:50:48 UTC (rev 10972) @@ -6,7 +6,7 @@ xmlns:c="http://java.sun.com/jstl/core" class="identity-ui"> -<ui:composition template="/WEB-INF/jsf/admin/user/userTemplate.xhtml"> +<ui:composition template="/jsf/admin/user/userTemplate.xhtml"> <ui:define name="title"> Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/user/createUser.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/createUser.xhtml 2008-06-09 12:40:39 UTC (rev 10961) +++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/user/createUser.xhtml 2008-06-10 15:50:48 UTC (rev 10972) @@ -6,13 +6,13 @@ xmlns:c="http://java.sun.com/jstl/core" class="identity-ui"> -<ui:composition template="/WEB-INF/jsf/admin/user/userTemplate.xhtml"> +<ui:composition template="/jsf/admin/user/userTemplate.xhtml"> <ui:define name="title"> <li class="pathItem"> <h:commandLink action="userAdmin" value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}" /> </li> - <li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li> + <li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt="I"/></li> <li class="selected"> <h:outputText value="#{bundle.IDENTITY_REGISTER_TITLE}" /> </li> @@ -20,7 +20,7 @@ <ui:define name="content"> <h3><h:outputText value="#{bundle.IDENTITY_MANAGEMENT_CREATE_USER}" /></h3> - <ui:decorate template="/WEB-INF/jsf/common/register.xhtml"> + <ui:decorate template="/jsf/common/register.xhtml"> <ui:param name="manager" value="#{userregistermgr}"/> </ui:decorate> Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/user/deleteUser.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/deleteUser.xhtml 2008-06-09 12:40:39 UTC (rev 10961) +++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/user/deleteUser.xhtml 2008-06-10 15:50:48 UTC (rev 10972) @@ -6,7 +6,7 @@ xmlns:c="http://java.sun.com/jstl/core" class="identity-ui"> -<ui:composition template="/WEB-INF/jsf/admin/user/userTemplate.xhtml"> +<ui:composition template="/jsf/admin/user/userTemplate.xhtml"> <ui:define name="title"> Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/user/pendingUsers.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/pendingUsers.xhtml 2008-06-09 12:40:39 UTC (rev 10961) +++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/user/pendingUsers.xhtml 2008-06-10 15:50:48 UTC (rev 10972) @@ -6,7 +6,7 @@ xmlns:c="http://java.sun.com/jstl/core" class="identity-ui"> -<ui:composition template="/WEB-INF/jsf/admin/user/userTemplate.xhtml"> +<ui:composition template="/jsf/admin/user/userTemplate.xhtml"> <ui:define name="title"> <li class="pathItem"> Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/user/registerConfirm.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/registerConfirm.xhtml 2008-06-09 12:40:39 UTC (rev 10961) +++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/user/registerConfirm.xhtml 2008-06-10 15:50:48 UTC (rev 10972) @@ -6,7 +6,7 @@ xmlns:c="http://java.sun.com/jstl/core" class="identity-ui"> -<ui:composition template="/WEB-INF/jsf/admin/user/userTemplate.xhtml"> +<ui:composition template="/jsf/admin/user/userTemplate.xhtml"> <ui:define name="title"> @@ -20,7 +20,7 @@ </ui:define> <ui:define name="content"> <h3><h:outputText value="#{bundle.IDENTITY_REGISTER_TITLE_CONFIRM}" /></h3> - <ui:decorate template="/WEB-INF/jsf/common/confirm.xhtml"> + <ui:decorate template="/jsf/common/confirm.xhtml"> <ui:param name="manager" value="#{userregistermgr}"/> <ui:param name="show_roles" value="true"/> <ui:param name="subscriptionMode" value="admin" /> Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/user/registerRoles.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/registerRoles.xhtml 2008-06-09 12:40:39 UTC (rev 10961) +++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/user/registerRoles.xhtml 2008-06-10 15:50:48 UTC (rev 10972) @@ -6,7 +6,7 @@ xmlns:c="http://java.sun.com/jstl/core" class="identity-ui"> -<ui:composition template="/WEB-INF/jsf/admin/user/userTemplate.xhtml"> +<ui:composition template="/jsf/admin/user/userTemplate.xhtml"> <ui:define name="title"> <li class="pathItem"> Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/user/resetPassword.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/resetPassword.xhtml 2008-06-09 12:40:39 UTC (rev 10961) +++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/user/resetPassword.xhtml 2008-06-10 15:50:48 UTC (rev 10972) @@ -6,7 +6,7 @@ xmlns:c="http://java.sun.com/jstl/core" class="identity-ui"> -<ui:composition template="/WEB-INF/jsf/admin/user/userTemplate.xhtml"> +<ui:composition template="/jsf/admin/user/userTemplate.xhtml"> <ui:define name="title"> <li class="pathItem"> Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/user/searchUsers.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/searchUsers.xhtml 2008-06-09 12:40:39 UTC (rev 10961) +++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/user/searchUsers.xhtml 2008-06-10 15:50:48 UTC (rev 10972) @@ -6,7 +6,7 @@ xmlns:c="http://java.sun.com/jstl/core" class="identity-ui"> -<ui:composition template="/WEB-INF/jsf/admin/user/userTemplate.xhtml"> +<ui:composition template="/jsf/admin/user/userTemplate.xhtml"> <ui:define name="title"> <li class="pathItem"> Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/user/userTemplate.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/userTemplate.xhtml 2008-06-09 12:40:39 UTC (rev 10961) +++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/user/userTemplate.xhtml 2008-06-10 15:50:48 UTC (rev 10972) @@ -19,7 +19,7 @@ </h:form> -<ui:decorate template="/WEB-INF/jsf/common/tabContainer.xhtml"> +<ui:decorate template="/jsf/common/tabContainer.xhtml"> <ui:define name="tab-object-path"> <!-- Title --> Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/common/profile.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/profile.xhtml 2008-06-09 12:40:39 UTC (rev 10961) +++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/common/profile.xhtml 2008-06-10 15:50:48 UTC (rev 10972) @@ -8,7 +8,7 @@ <h:form> - <ui:include src="/WEB-INF/jsf/common/userInfo.xhtml" /> + <ui:include src="/jsf/common/userInfo.xhtml" /> <!-- User Profile --> <h:panelGrid columns="2" cellpadding="3"> Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/common/register.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/register.xhtml 2008-06-09 12:40:39 UTC (rev 10961) +++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/common/register.xhtml 2008-06-10 15:50:48 UTC (rev 10972) @@ -42,7 +42,7 @@ </h:panelGrid> <!-- include captcha --> - <ui:include src="/WEB-INF/jsf/common/captcha.xhtml" /> + <ui:include src="/jsf/common/captcha.xhtml" /> <hr/> <p style="text-align: left;"> Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/index.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/index.xhtml 2008-06-09 12:40:39 UTC (rev 10961) +++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/index.xhtml 2008-06-10 15:50:48 UTC (rev 10972) @@ -7,15 +7,15 @@ <c:choose> <c:when test="#{portletRenderParameter.operation != null}"> - <ui:include src="/WEB-INF/jsf/validationStatus/jbp_status.xhtml" /> + <ui:include src="/jsf/validationStatus/jbp_status.xhtml" /> </c:when> <c:otherwise> <c:choose> <c:when test="#{facesContext.externalContext.remoteUser != null}"> - <ui:include src="/WEB-INF/jsf/profile/viewProfile.xhtml"/> + <ui:include src="/jsf/profile/viewProfile.xhtml"/> </c:when> <c:otherwise> - <ui:include src="/WEB-INF/jsf/register/overview.xhtml"/> + <ui:include src="/jsf/register/overview.xhtml"/> </c:otherwise> </c:choose> </c:otherwise> Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/lostPassword/lost.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/lostPassword/lost.xhtml 2008-06-09 12:40:39 UTC (rev 10961) +++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/lostPassword/lost.xhtml 2008-06-10 15:50:48 UTC (rev 10972) @@ -6,7 +6,7 @@ xmlns:c="http://java.sun.com/jstl/core" class="identity-ui"> -<ui:composition template="/WEB-INF/jsf/lostPassword/lostTemplate.xhtml"> +<ui:composition template="/jsf/lostPassword/lostTemplate.xhtml"> <ui:define name="title"> <h:outputText value="#{bundle.IDENTITY_LOST_PASSWORD_TITLE}" /> @@ -22,7 +22,7 @@ </h:panelGrid> <!-- include captcha --> - <ui:include src="/WEB-INF/jsf/common/captcha.xhtml" /> + <ui:include src="/jsf/common/captcha.xhtml" /> <hr/> <p style="text-align: right;"> Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/lostPassword/lostTemplate.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/lostPassword/lostTemplate.xhtml 2008-06-09 12:40:39 UTC (rev 10961) +++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/lostPassword/lostTemplate.xhtml 2008-06-10 15:50:48 UTC (rev 10972) @@ -22,7 +22,7 @@ </li> </ul> </h:form> - <ui:decorate template="/WEB-INF/jsf/common/noTabContainer.xhtml"> + <ui:decorate template="/jsf/common/noTabContainer.xhtml"> <ui:define name="tab-object-path"><!-- Title --> <ul class="objectpath"> Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/lostPassword/status.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/lostPassword/status.xhtml 2008-06-09 12:40:39 UTC (rev 10961) +++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/lostPassword/status.xhtml 2008-06-10 15:50:48 UTC (rev 10972) @@ -6,7 +6,7 @@ xmlns:c="http://java.sun.com/jstl/core" class="identity-ui"> -<ui:composition template="/WEB-INF/jsf/lostPassword/lostTemplate.xhtml"> +<ui:composition template="/jsf/lostPassword/lostTemplate.xhtml"> <ui:define name="title"> <h:outputText value="#{bundle.IDENTITY_LOST_PASSWORD_STATUS_TITLE}" /> Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/profile/changeEmail.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/changeEmail.xhtml 2008-06-09 12:40:39 UTC (rev 10961) +++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/profile/changeEmail.xhtml 2008-06-10 15:50:48 UTC (rev 10972) @@ -6,7 +6,7 @@ xmlns:c="http://java.sun.com/jstl/core" class="identity-ui"> <f:loadBundle var="bundle" basename="conf.bundles.Identity" /> -<ui:composition template="/WEB-INF/jsf/profile/editProfileTemplate.xhtml"> +<ui:composition template="/jsf/profile/editProfileTemplate.xhtml"> <ui:define name="title"> <li class="pathItem"> Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/profile/changePassword.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/changePassword.xhtml 2008-06-09 12:40:39 UTC (rev 10961) +++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/profile/changePassword.xhtml 2008-06-10 15:50:48 UTC (rev 10972) @@ -6,7 +6,7 @@ xmlns:c="http://java.sun.com/jstl/core" class="identity-ui"> <f:loadBundle var="bundle" basename="conf.bundles.Identity" /> -<ui:composition template="/WEB-INF/jsf/profile/editProfileTemplate.xhtml"> +<ui:composition template="/jsf/profile/editProfileTemplate.xhtml"> <ui:define name="title"> <li class="pathItem"> Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/profile/editProfile.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/editProfile.xhtml 2008-06-09 12:40:39 UTC (rev 10961) +++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/profile/editProfile.xhtml 2008-06-10 15:50:48 UTC (rev 10972) @@ -8,14 +8,14 @@ <f:loadBundle var="bundle" basename="conf.bundles.Identity" /> - <ui:composition template="/WEB-INF/jsf/profile/editProfileTemplate.xhtml"> + <ui:composition template="/jsf/profile/editProfileTemplate.xhtml"> <ui:define name="title"> <li class="selected"> <h:outputText value="#{bundle.IDENTITY_EDIT_PROFILE_TITLE}" /> </li> </ui:define> <ui:define name="content"> - <ui:decorate template="/WEB-INF/jsf/common/profile.xhtml"> + <ui:decorate template="/jsf/common/profile.xhtml"> <ui:param name="manager" value="#{editprofilemgr}"/> <ui:param name="adminMode" value="false"/> </ui:decorate> Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/profile/editProfileRedirect.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/editProfileRedirect.xhtml 2008-06-09 12:40:39 UTC (rev 10961) +++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/profile/editProfileRedirect.xhtml 2008-06-10 15:50:48 UTC (rev 10972) @@ -11,11 +11,11 @@ <c:choose> <c:when test="#{editprofilemgr.currentWindowState == 'maximized'}"> <!-- Show edit profile page --> - <ui:include src="/WEB-INF/jsf/profile/editProfile.xhtml" /> + <ui:include src="/jsf/profile/editProfile.xhtml" /> </c:when> <c:otherwise> <!-- Show view profile page --> - <ui:include src="/WEB-INF/jsf/profile/viewProfile.xhtml" /> + <ui:include src="/jsf/profile/viewProfile.xhtml" /> </c:otherwise> </c:choose> </div> \ No newline at end of file Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/profile/editProfileTemplate.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/editProfileTemplate.xhtml 2008-06-09 12:40:39 UTC (rev 10961) +++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/profile/editProfileTemplate.xhtml 2008-06-10 15:50:48 UTC (rev 10972) @@ -18,7 +18,7 @@ <li id="currentTab"><h:outputText value="#{bundle.IDENTITY_EDIT_PROFILE_TITLE}" /></li> </ul> </h:form> - <ui:decorate template="/WEB-INF/jsf/common/noTabContainer.xhtml"> + <ui:decorate template="/jsf/common/noTabContainer.xhtml"> <ui:define name="tab-object-path"> <!-- Title --> <h:form> Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/profile/status.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/status.xhtml 2008-06-09 12:40:39 UTC (rev 10961) +++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/profile/status.xhtml 2008-06-10 15:50:48 UTC (rev 10972) @@ -8,7 +8,7 @@ <f:loadBundle var="bundle" basename="conf.bundles.Identity" /> -<ui:composition template="/WEB-INF/jsf/profile/editProfileTemplate.xhtml"> +<ui:composition template="/jsf/profile/editProfileTemplate.xhtml"> <ui:define name="title"> <li class="selected"> Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/profile/viewProfile.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/viewProfile.xhtml 2008-06-09 12:40:39 UTC (rev 10961) +++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/profile/viewProfile.xhtml 2008-06-10 15:50:48 UTC (rev 10972) @@ -8,7 +8,7 @@ <f:loadBundle var="bundle" basename="conf.bundles.Identity" /> -<ui:composition template="/WEB-INF/jsf/profile/viewProfileTemplate.xhtml"> +<ui:composition template="/jsf/profile/viewProfileTemplate.xhtml"> <ui:define name="title"> <h:outputText value="#{bundle.IDENTITY_VIEW_PROFILE_TITLE}" /> Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/profile/viewProfileTemplate.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/viewProfileTemplate.xhtml 2008-06-09 12:40:39 UTC (rev 10961) +++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/profile/viewProfileTemplate.xhtml 2008-06-10 15:50:48 UTC (rev 10972) @@ -17,7 +17,7 @@ </li> </ul> </h:form> - <ui:decorate template="/WEB-INF/jsf/common/noTabContainer.xhtml"> + <ui:decorate template="/jsf/common/noTabContainer.xhtml"> <ui:define name="tab-object-path"> <!-- Title --> <ul class="objectpath"> Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/register/confirm.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/register/confirm.xhtml 2008-06-09 12:40:39 UTC (rev 10961) +++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/register/confirm.xhtml 2008-06-10 15:50:48 UTC (rev 10972) @@ -6,13 +6,13 @@ xmlns:c="http://java.sun.com/jstl/core" class="identity-ui"> -<ui:composition template="/WEB-INF/jsf/register/registerTemplate.xhtml"> +<ui:composition template="/jsf/register/registerTemplate.xhtml"> <ui:define name="title"> <h:outputText value="#{bundle.IDENTITY_REGISTER_TITLE_CONFIRM}" /> </ui:define> <ui:define name="content"> - <ui:decorate template="/WEB-INF/jsf/common/confirm.xhtml"> + <ui:decorate template="/jsf/common/confirm.xhtml"> <ui:param name="manager" value="#{userregistermgr}"/> <ui:param name="subscriptionMode" value="user" /> </ui:decorate> Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/register/overview.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/register/overview.xhtml 2008-06-09 12:40:39 UTC (rev 10961) +++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/register/overview.xhtml 2008-06-10 15:50:48 UTC (rev 10972) @@ -6,7 +6,7 @@ xmlns:c="http://java.sun.com/jstl/core" class="identity-ui"> -<ui:composition template="/WEB-INF/jsf/startTemplate.xhtml"> +<ui:composition template="/jsf/startTemplate.xhtml"> <ui:define name="title"> <h:outputText value="#{bundle.IDENTITY_NOT_LOGGED_IN}" /> Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/register/register.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/register/register.xhtml 2008-06-09 12:40:39 UTC (rev 10961) +++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/register/register.xhtml 2008-06-10 15:50:48 UTC (rev 10972) @@ -6,7 +6,7 @@ xmlns:c="http://java.sun.com/jstl/core" class="identity-ui"> -<ui:composition template="/WEB-INF/jsf/register/registerTemplate.xhtml"> +<ui:composition template="/jsf/register/registerTemplate.xhtml"> <ui:define name="title"> <h:outputText value="#{bundle.IDENTITY_REGISTER_TITLE}" /> @@ -14,7 +14,7 @@ <ui:define name="content"> - <ui:decorate template="/WEB-INF/jsf/common/register.xhtml"> + <ui:decorate template="/jsf/common/register.xhtml"> <ui:param name="manager" value="#{userregistermgr}"/> </ui:decorate> Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/register/registerTemplate.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/register/registerTemplate.xhtml 2008-06-09 12:40:39 UTC (rev 10961) +++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/register/registerTemplate.xhtml 2008-06-10 15:50:48 UTC (rev 10972) @@ -26,7 +26,7 @@ </c:if> </ul> </h:form> - <ui:decorate template="/WEB-INF/jsf/common/noTabContainer.xhtml"> + <ui:decorate template="/jsf/common/noTabContainer.xhtml"> <ui:define name="tab-object-path"> <!-- Title --> <ul class="objectpath"> Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/register/success.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/register/success.xhtml 2008-06-09 12:40:39 UTC (rev 10961) +++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/register/success.xhtml 2008-06-10 15:50:48 UTC (rev 10972) @@ -6,7 +6,7 @@ xmlns:c="http://java.sun.com/jstl/core" class="identity-ui"> -<ui:composition template="/WEB-INF/jsf/register/registerTemplate.xhtml"> +<ui:composition template="/jsf/register/registerTemplate.xhtml"> <ui:define name="title"> <h:outputText value="#{bundle.IDENTITY_REGISTER_STATUS_TITLE}"/> Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/startTemplate.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/startTemplate.xhtml 2008-06-09 12:40:39 UTC (rev 10961) +++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/startTemplate.xhtml 2008-06-10 15:50:48 UTC (rev 10972) @@ -26,7 +26,7 @@ </c:if> </ul> </h:form> - <ui:decorate template="/WEB-INF/jsf/common/noTabContainer.xhtml"> + <ui:decorate template="/jsf/common/noTabContainer.xhtml"> <ui:define name="tab-object-path"> <!-- Title -->