Author: hfnukal Date: 2011-07-02 07:31:04 -0400 (Sat, 02 Jul 2011) New Revision: 6798 Modified: epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/java/org/exoplatform/portal/pom/data/Mapper.java epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/pom.xml epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/portal/webui/UILoginForm.gtmpl epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/portal/webui/workspace/UIPortalApplication.gtmpl Log: JBEPP-970 configuration changes Modified: epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/java/org/exoplatform/portal/pom/data/Mapper.java =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/java/org/exoplatform/portal/pom/data/Mapper.java 2011-07-01 20:15:36 UTC (rev 6797) +++ epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/java/org/exoplatform/portal/pom/data/Mapper.java 2011-07-02 11:31:04 UTC (rev 6798) @@ -357,6 +357,10 @@ pr.setAccessPermissions(src.getAccessPermissions()); pr.setEditPermission(src.getEditPermission()); + Described described = dst.adapt(Described.class); + described.setName(src.getLabel()); + described.setDescription(src.getDescription()); + // org.gatein.mop.api.workspace.Page templates = dst.getRootPage().getChild("templates"); org.gatein.mop.api.workspace.Page template = templates.getChild("default"); @@ -584,6 +588,11 @@ pr.setEditPermission(src.getEditPermission()); // + Described described = dst.adapt(Described.class); + described.setName(src.getTitle()); + described.setDescription(src.getDescription()); + + // Attributes attrs = dst.getAttributes(); attrs.setValue(MappedAttributes.FACTORY_ID, src.getFactoryId()); attrs.setValue(MappedAttributes.SHOW_MAX_WINDOW, src.isShowMaxWindow()); @@ -629,6 +638,10 @@ ProtectedResource pr = dst.adapt(ProtectedResource.class); pr.setAccessPermissions(src.getAccessPermissions()); + Described described = dst.adapt(Described.class); + described.setName(src.getTitle()); + described.setDescription(src.getDescription()); + Attributes dstAttrs = dst.getAttributes(); dstAttrs.setValue(MappedAttributes.ID, src.getId()); dstAttrs.setValue(MappedAttributes.TYPE, src instanceof DashboardData ? "dashboard" : null); Modified: epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/pom.xml 2011-07-01 20:15:36 UTC (rev 6797) +++ epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/pom.xml 2011-07-02 11:31:04 UTC (rev 6798) @@ -160,7 +160,7 @@ <executions> <execution> <id>distro-assembly-zip</id> - <phase>compile</phase> + <phase>packaging</phase> <goals> <goal>single</goal> </goals> Modified: epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/portal/webui/UILoginForm.gtmpl =================================================================== --- epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/portal/webui/UILoginForm.gtmpl 2011-07-01 20:15:36 UTC (rev 6797) +++ epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/portal/webui/UILoginForm.gtmpl 2011-07-02 11:31:04 UTC (rev 6798) @@ -22,22 +22,20 @@ <div class="MiddleRightLoginDecorator"> <div class="LoginDecoratorBackground"> <div class="LoginDetailBox"> - <% uiform.begin(); %> - <!--<form class="UIForm" id="$uicomponent.id" name="loginForm" action="<%= rcontext.getRequestContextPath() + "/login"%>" method="post" style="margin: 0px;"> - <input type="hidden" name="<%= uiform.ACTION %>" value=""/>--> + <form class="UIForm" id="$uicomponent.id" name="loginForm" action="<%= rcontext.getRequestContextPath() + "/login"%>" method="post" style="margin: 0px;"> <input type="hidden" name="initialURI" value="<%=requestPath %>"/> <div class="VerticalLayout"> <table class="UIFormGrid"> <tr class="UserNameField"> <td class="FieldLabel"><%=_ctx.appRes("UILoginForm.label.UserName")%></td> - <td><% uiform.renderChild(0)%></td> + <td><input class="UserName" name="username"/></td> </tr> <tr class="PasswordField" id="UIPortalLoginFormControl" onkeypress="eXo.portal.UIPortalControl.onEnterPress(event)"> <td class="FieldLabel"><%=_ctx.appRes("UILoginForm.label.password")%></td> - <td><% uiform.renderChild(1)%></td> + <td><input class="Password" type="password" name="password"/></td> </tr> <tr class="RememberField" onkeypress="eXo.portal.UIPortalControl.onEnterPress(event)"> - <td class="FieldLabel"><% uiform.renderChild(2)%></td> + <td class="FieldLabel"><input type="checkbox" class="checkbox" value="true" name="rememberme"/></td> <td><%=_ctx.appRes("UILoginForm.label.RememberOnComputer")%></td> </tr> </table> @@ -69,7 +67,7 @@ </table> </div> </div> - <%uiform.end()%> + </form> </div> </div> </div> @@ -84,7 +82,6 @@ <script> function login(ele) { var formEle = eXo.core.DOMUtil.findAncestorByTagName(ele,'form'); - formEle.action = eXo.env.portal.context + "/login"; formEle.submit(); } </script> Modified: epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/portal/webui/workspace/UIPortalApplication.gtmpl =================================================================== --- epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/portal/webui/workspace/UIPortalApplication.gtmpl 2011-07-01 20:15:36 UTC (rev 6797) +++ epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/portal/webui/workspace/UIPortalApplication.gtmpl 2011-07-02 11:31:04 UTC (rev 6798) @@ -7,7 +7,10 @@ import java.util.Iterator; import org.exoplatform.portal.webui.portal.UIPortal ; import org.exoplatform.portal.config.model.PortalProperties ; - + import org.gatein.common.text.EntityEncoder; + + EntityEncoder encoder = EntityEncoder.FULL; + def rcontext = _ctx.getRequestContext() ; String docBase = rcontext.getRequestContextPath() ; String skin = uicomponent.getSkin(); @@ -15,7 +18,7 @@ def portletSkins = uicomponent.getPortletSkins() ; def scriptsPaths = uicomponent.getJavascriptURLs(); def lang = uicomponent.getLocale().getLanguage(); - def title = rcontext.getTitle(); + def title = encoder.encode(rcontext.getTitle()); def metaInformation = rcontext.getMetaInformation(); %>