August 2011 - gatein-commits - Jboss List Archives

gatein SVN: r7128 - epp/portal/branches/EPP_5_1_0_GA_JBEPP-1071/component/identity/src/main/java/org/exoplatform/services/organization/idm.

by do-not-reply＠jboss.org

Author: ghjboss Date: 2011-08-15 11:48:37 -0400 (Mon, 15 Aug 2011) New Revision: 7128 Modified: epp/portal/branches/EPP_5_1_0_GA_JBEPP-1071/component/identity/src/main/java/org/exoplatform/services/organization/idm/CustomMembershipLoginModule.java Log: fix for JBEPP-1071 Modified: epp/portal/branches/EPP_5_1_0_GA_JBEPP-1071/component/identity/src/main/java/org/exoplatform/services/organization/idm/CustomMembershipLoginModule.java =================================================================== --- epp/portal/branches/EPP_5_1_0_GA_JBEPP-1071/component/identity/src/main/java/org/exoplatform/services/organization/idm/CustomMembershipLoginModule.java 2011-08-15 13:44:53 UTC (rev 7127) +++ epp/portal/branches/EPP_5_1_0_GA_JBEPP-1071/component/identity/src/main/java/org/exoplatform/services/organization/idm/CustomMembershipLoginModule.java 2011-08-15 15:48:37 UTC (rev 7128) @@ -146,9 +146,10 @@ */ private void addUserToPlatformUsers(String userId) throws Exception { + OrganizationService orgService = null; try { - OrganizationService orgService = (OrganizationService)getContainer().getComponentInstanceOfType(OrganizationService.class); + orgService = (OrganizationService)getContainer().getComponentInstanceOfType(OrganizationService.class); begin(orgService); User user = orgService.getUserHandler().findUserByName(userId); MembershipType memberType = orgService.getMembershipTypeHandler().findMembershipType(membershipType); @@ -162,6 +163,10 @@ // don't rethrow login exception in case of failure. // throw e; } + finally + { + end(orgService); + } } private void begin(OrganizationService orgService) throws Exception {

13 years, 1 month

1
0
0 / 0

gatein SVN: r7126 - in portal/trunk: portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component and 2 other directories.

by do-not-reply＠jboss.org

Author: kien_nguyen Date: 2011-08-15 07:36:41 -0400 (Mon, 15 Aug 2011) New Revision: 7126 Removed: portal/trunk/gadgets/core/src/main/java/org/exoplatform/portal/gadget/core/ShindigClientEndpoint.java Modified: portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component/UIGadgetEditor.java portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/portal/PortalHttpRequest.js portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/gadget-configuration.xml Log: GTNPORTAL-1957: Caching issue when edit gadget in ApplicationRegistry (Revert to use javascript request) Deleted: portal/trunk/gadgets/core/src/main/java/org/exoplatform/portal/gadget/core/ShindigClientEndpoint.java =================================================================== --- portal/trunk/gadgets/core/src/main/java/org/exoplatform/portal/gadget/core/ShindigClientEndpoint.java 2011-08-15 10:39:08 UTC (rev 7125) +++ portal/trunk/gadgets/core/src/main/java/org/exoplatform/portal/gadget/core/ShindigClientEndpoint.java 2011-08-15 11:36:41 UTC (rev 7126) @@ -1,122 +0,0 @@ -/* - * Copyright (C) 2011 eXo Platform SAS. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.exoplatform.portal.gadget.core; - -import org.exoplatform.container.xml.InitParams; -import org.exoplatform.container.xml.ValueParam; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStreamWriter; -import java.net.URL; -import java.net.URLConnection; -import java.util.Timer; -import java.util.TimerTask; - -/** - * An endpoint to send requests to Shindig from Portal. - * - * This endpoint is necessary as Shindig does not expose any public API to manipulates - * its caches from Portal. - * - * @author <a href="hoang281283(a)gmail.com">Minh Hoang TO</a> - * @date 8/15/11 - */ -public class ShindigClientEndpoint -{ - - private final long delay; - - private final Timer timer; - - public ShindigClientEndpoint(InitParams params) throws Exception - { - long delayTime = 1000; - if(params != null) - { - ValueParam delayParam = params.getValueParam("delayTime"); - delayTime = Long.parseLong(delayParam.getValue()); - } - delay = delayTime; - timer = new Timer(true); - } - - /** - * Etablish URLConnection to shindigURL and post request data to it - * - * @param requestData - * @param shindigURL - */ - public void sendRequest(String requestData, String shindigURL) - { - timer.schedule(createTimerTask(requestData, shindigURL), delay); - } - - private TimerTask createTimerTask(final String requestData, final String shindigURL) - { - return new TimerTask() - { - @Override - public void run() - { - OutputStreamWriter out = null; - InputStream in = null; - - try - { - URLConnection conn = new URL(shindigURL).openConnection(); - conn.setDoOutput(true); - out = new OutputStreamWriter(conn.getOutputStream()); - out.write(requestData); - out.flush(); - - in = conn.getInputStream(); //Don't remove this if you don't understand! - } - catch (IOException ioEx) - { - ioEx.printStackTrace(); - - } - finally - { - try - { - if (out != null) - out.close(); - } - catch (IOException ex) - { - ex.printStackTrace(); - } - - try - { - if (in != null) - in.close(); - } - catch (IOException ex) - { - ex.printStackTrace(); - } - } - - } - }; - } - -} Modified: portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component/UIGadgetEditor.java =================================================================== --- portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component/UIGadgetEditor.java 2011-08-15 10:39:08 UTC (rev 7125) +++ portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component/UIGadgetEditor.java 2011-08-15 11:36:41 UTC (rev 7126) @@ -26,9 +26,8 @@ import org.exoplatform.application.gadget.GadgetRegistryService; import org.exoplatform.application.gadget.Source; import org.exoplatform.application.gadget.SourceStorage; -import org.exoplatform.commons.serialization.api.annotations.Serialized; -import org.exoplatform.portal.gadget.core.ShindigClientEndpoint; import org.exoplatform.portal.webui.application.GadgetUtil; +import org.exoplatform.commons.serialization.api.annotations.Serialized; import org.exoplatform.web.application.ApplicationMessage; import org.exoplatform.webui.application.WebuiRequestContext; import org.exoplatform.webui.config.InitParams; @@ -214,14 +213,6 @@ source.setLastModified(Calendar.getInstance()); sourceStorage.saveSource(gadget, source); - - //Send request to invalidate the cache on Shindig - String requestData = "{\"context\":{\"ignoreCache\":\"true\"},\"gadgets\":[" + "{\"url\":\"" + GadgetUtil.reproduceUrl(gadget.getUrl(), gadget.isLocal()) + "\"}]}"; - String gadgetServerURL = GadgetUtil.getGadgetServerUrl(); - String gadgetShindigURL = gadgetServerURL + (gadgetServerURL.endsWith("/")?"" : "/") + "metadata"; - ShindigClientEndpoint endPoint = uiForm.getApplicationComponent(ShindigClientEndpoint.class); - endPoint.sendRequest(requestData, gadgetShindigURL); - uiManagement.removeChild(UIGadgetEditor.class); // This will update the source and also update the gadget related // cached meta data @@ -229,6 +220,13 @@ uiManagement.initData(); uiManagement.setSelectedGadget(gadget.getName()); event.getRequestContext().addUIComponentToUpdateByAjax(uiManagement); + + //Send request to invalidate the cache to Shindig + String gadgetServerUrl = GadgetUtil.getGadgetServerUrl(); + String gadgetUrl = GadgetUtil.reproduceUrl(gadget.getUrl(), gadget.isLocal()); + String metadataUrl = gadgetServerUrl + (gadgetServerUrl.endsWith("/") ? "" : "/") + "metadata"; + String queryString = "{\"context\":{\"ignoreCache\":\"true\"},\"gadgets\":[" + "{\"url\":\"" + gadgetUrl + "\"}]}"; + event.getRequestContext().getJavascriptManager().addJavascript("ajaxAsyncRequest('" + metadataUrl + "', true, 'POST', '" + queryString + "');"); } } Modified: portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/portal/PortalHttpRequest.js =================================================================== --- portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/portal/PortalHttpRequest.js 2011-08-15 10:39:08 UTC (rev 7125) +++ portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/portal/PortalHttpRequest.js 2011-08-15 11:36:41 UTC (rev 7126) @@ -724,17 +724,28 @@ } ; /** + * Create a ajax GET request + * @param {String} url - Url + * @param {boolean} async - asynchronous or none + * @return {String} response text if request is not async + */ +function ajaxAsyncGetRequest(url, async) { + ajaxAsyncRequest("GET", url, async); +} + +/** * Create a ajax request + * @param {String} method - GET, POST, etc * @param {String} url - Url * @param {boolean} async - asynchronous or none * @return {String} response text if request is not async */ -function ajaxAsyncGetRequest(url, async) { +function ajaxAsyncRequest(url, async, method, queryString) { if(async == undefined) async = true ; var request = eXo.core.Browser.createHttpRequest() ; - request.open('GET', url, async) ; + request.open(method, url, async) ; request.setRequestHeader("Cache-Control", "max-age=86400") ; - request.send(null) ; + request.send((queryString != undefined && queryString != null) ? queryString : null) ; eXo.session.itvDestroy() ; if(eXo.session.canKeepState && eXo.session.isOpen && eXo.env.portal.accessMode == 'private') { eXo.session.itvInit() ; Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/gadget-configuration.xml =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/gadget-configuration.xml 2011-08-15 10:39:08 UTC (rev 7125) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/gadget-configuration.xml 2011-08-15 11:36:41 UTC (rev 7126) @@ -39,10 +39,6 @@ </values-param> </init-params> </component> - - <component> - <type>org.exoplatform.portal.gadget.core.ShindigClientEndpoint</type> - </component> <external-component-plugins> <target-component>org.exoplatform.commons.chromattic.ChromatticManager</target-component>

13 years, 1 month

1
0
0 / 0

gatein SVN: r7125 - portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/application.

by do-not-reply＠jboss.org

Author: trong.tran Date: 2011-08-15 06:39:08 -0400 (Mon, 15 Aug 2011) New Revision: 7125 Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/application/PortalRequestContext.java Log: GTNPORTAL-1993 Keep the portal name only if the portal is available to user Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/application/PortalRequestContext.java =================================================================== --- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/application/PortalRequestContext.java 2011-08-15 09:05:23 UTC (rev 7124) +++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/application/PortalRequestContext.java 2011-08-15 10:39:08 UTC (rev 7125) @@ -297,7 +297,10 @@ { userPortalConfig = service_.getUserPortalConfig(portalName, remoteUser, PortalRequestContext.USER_PORTAL_CONTEXT); - session.setAttribute(LAST_PORTAL_NAME, portalName); + if (userPortalConfig != null) + { + session.setAttribute(LAST_PORTAL_NAME, portalName); + } } catch (Exception e) {

13 years, 1 month

1
0
0 / 0

gatein SVN: r7124 - in portal/trunk: portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component and 1 other directories.

by do-not-reply＠jboss.org

Author: hoang_to Date: 2011-08-15 05:05:23 -0400 (Mon, 15 Aug 2011) New Revision: 7124 Added: portal/trunk/gadgets/core/src/main/java/org/exoplatform/portal/gadget/core/ShindigClientEndpoint.java Modified: portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component/UIGadgetEditor.java portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/gadget-configuration.xml Log: GTNPORTAL-1957: Caching issue when edit gadget in ApplicationRegistry Added: portal/trunk/gadgets/core/src/main/java/org/exoplatform/portal/gadget/core/ShindigClientEndpoint.java =================================================================== --- portal/trunk/gadgets/core/src/main/java/org/exoplatform/portal/gadget/core/ShindigClientEndpoint.java (rev 0) +++ portal/trunk/gadgets/core/src/main/java/org/exoplatform/portal/gadget/core/ShindigClientEndpoint.java 2011-08-15 09:05:23 UTC (rev 7124) @@ -0,0 +1,122 @@ +/* + * Copyright (C) 2011 eXo Platform SAS. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.exoplatform.portal.gadget.core; + +import org.exoplatform.container.xml.InitParams; +import org.exoplatform.container.xml.ValueParam; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStreamWriter; +import java.net.URL; +import java.net.URLConnection; +import java.util.Timer; +import java.util.TimerTask; + +/** + * An endpoint to send requests to Shindig from Portal. + * + * This endpoint is necessary as Shindig does not expose any public API to manipulates + * its caches from Portal. + * + * @author <a href="hoang281283(a)gmail.com">Minh Hoang TO</a> + * @date 8/15/11 + */ +public class ShindigClientEndpoint +{ + + private final long delay; + + private final Timer timer; + + public ShindigClientEndpoint(InitParams params) throws Exception + { + long delayTime = 1000; + if(params != null) + { + ValueParam delayParam = params.getValueParam("delayTime"); + delayTime = Long.parseLong(delayParam.getValue()); + } + delay = delayTime; + timer = new Timer(true); + } + + /** + * Etablish URLConnection to shindigURL and post request data to it + * + * @param requestData + * @param shindigURL + */ + public void sendRequest(String requestData, String shindigURL) + { + timer.schedule(createTimerTask(requestData, shindigURL), delay); + } + + private TimerTask createTimerTask(final String requestData, final String shindigURL) + { + return new TimerTask() + { + @Override + public void run() + { + OutputStreamWriter out = null; + InputStream in = null; + + try + { + URLConnection conn = new URL(shindigURL).openConnection(); + conn.setDoOutput(true); + out = new OutputStreamWriter(conn.getOutputStream()); + out.write(requestData); + out.flush(); + + in = conn.getInputStream(); //Don't remove this if you don't understand! + } + catch (IOException ioEx) + { + ioEx.printStackTrace(); + + } + finally + { + try + { + if (out != null) + out.close(); + } + catch (IOException ex) + { + ex.printStackTrace(); + } + + try + { + if (in != null) + in.close(); + } + catch (IOException ex) + { + ex.printStackTrace(); + } + } + + } + }; + } + +} Modified: portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component/UIGadgetEditor.java =================================================================== --- portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component/UIGadgetEditor.java 2011-08-15 08:46:31 UTC (rev 7123) +++ portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component/UIGadgetEditor.java 2011-08-15 09:05:23 UTC (rev 7124) @@ -26,9 +26,11 @@ import org.exoplatform.application.gadget.GadgetRegistryService; import org.exoplatform.application.gadget.Source; import org.exoplatform.application.gadget.SourceStorage; +import org.exoplatform.commons.serialization.api.annotations.Serialized; +import org.exoplatform.portal.gadget.core.ShindigClientEndpoint; +import org.exoplatform.portal.webui.application.GadgetUtil; import org.exoplatform.web.application.ApplicationMessage; import org.exoplatform.webui.application.WebuiRequestContext; -import org.exoplatform.commons.serialization.api.annotations.Serialized; import org.exoplatform.webui.config.InitParams; import org.exoplatform.webui.config.Param; import org.exoplatform.webui.config.annotation.ComponentConfig; @@ -37,20 +39,18 @@ import org.exoplatform.webui.core.UIApplication; import org.exoplatform.webui.core.lifecycle.UIFormLifecycle; import org.exoplatform.webui.event.Event; +import org.exoplatform.webui.event.Event.Phase; import org.exoplatform.webui.event.EventListener; -import org.exoplatform.webui.event.Event.Phase; import org.exoplatform.webui.exception.MessageException; import org.exoplatform.webui.form.UIForm; import org.exoplatform.webui.form.UIFormInput; import org.exoplatform.webui.form.UIFormStringInput; import org.exoplatform.webui.form.UIFormTextAreaInput; import org.exoplatform.webui.form.validator.ExpressionValidator; -import org.exoplatform.webui.form.validator.IdentifierValidator; import org.exoplatform.webui.form.validator.MandatoryValidator; import org.exoplatform.webui.form.validator.ResourceValidator; import org.exoplatform.webui.form.validator.StringLengthValidator; import org.exoplatform.webui.form.validator.Validator; - import java.io.Serializable; import java.util.Calendar; @@ -215,6 +215,13 @@ sourceStorage.saveSource(gadget, source); + //Send request to invalidate the cache on Shindig + String requestData = "{\"context\":{\"ignoreCache\":\"true\"},\"gadgets\":[" + "{\"url\":\"" + GadgetUtil.reproduceUrl(gadget.getUrl(), gadget.isLocal()) + "\"}]}"; + String gadgetServerURL = GadgetUtil.getGadgetServerUrl(); + String gadgetShindigURL = gadgetServerURL + (gadgetServerURL.endsWith("/")?"" : "/") + "metadata"; + ShindigClientEndpoint endPoint = uiForm.getApplicationComponent(ShindigClientEndpoint.class); + endPoint.sendRequest(requestData, gadgetShindigURL); + uiManagement.removeChild(UIGadgetEditor.class); // This will update the source and also update the gadget related // cached meta data Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/gadget-configuration.xml =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/gadget-configuration.xml 2011-08-15 08:46:31 UTC (rev 7123) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/gadget-configuration.xml 2011-08-15 09:05:23 UTC (rev 7124) @@ -39,6 +39,10 @@ </values-param> </init-params> </component> + + <component> + <type>org.exoplatform.portal.gadget.core.ShindigClientEndpoint</type> + </component> <external-component-plugins> <target-component>org.exoplatform.commons.chromattic.ChromatticManager</target-component>

13 years, 1 month

1
0
0 / 0

gatein SVN: r7123 - in portal/trunk: component/web/resources/src/main/java/org/exoplatform/portal/resource and 7 other directories.

by do-not-reply＠jboss.org

Author: kien_nguyen Date: 2011-08-15 04:46:31 -0400 (Mon, 15 Aug 2011) New Revision: 7123 Added: portal/trunk/component/web/resources/src/main/java/gatein_resources_1_2.xsd portal/trunk/component/web/resources/src/test/resources/org/exoplatform/portal/resource/gatein-resources-1_2.xml Modified: portal/trunk/component/web/resources/src/main/java/org/exoplatform/portal/resource/SimpleSkin.java portal/trunk/component/web/resources/src/main/java/org/exoplatform/portal/resource/SkinConfig.java portal/trunk/component/web/resources/src/main/java/org/exoplatform/portal/resource/SkinService.java portal/trunk/component/web/resources/src/main/java/org/exoplatform/portal/resource/config/tasks/AbstractSkinModule.java portal/trunk/component/web/resources/src/main/java/org/exoplatform/portal/resource/config/tasks/PortalSkinTask.java portal/trunk/component/web/resources/src/main/java/org/exoplatform/portal/resource/config/tasks/PortletSkinTask.java portal/trunk/component/web/resources/src/main/java/org/exoplatform/portal/resource/config/xml/SkinConfigParser.java portal/trunk/component/web/resources/src/test/java/org/exoplatform/portal/resource/TestGateInResourceParser.java portal/trunk/component/web/resources/src/test/java/org/exoplatform/portal/resource/TestXSDCorruption.java portal/trunk/examples/skins/simpleskin/src/main/webapp/WEB-INF/gatein-resources.xml portal/trunk/web/eXoResources/src/main/webapp/WEB-INF/gatein-resources.xml portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIPortalApplication.java Log: GTNPORTAL-1450 Priority for skin modules Added: portal/trunk/component/web/resources/src/main/java/gatein_resources_1_2.xsd =================================================================== --- portal/trunk/component/web/resources/src/main/java/gatein_resources_1_2.xsd (rev 0) +++ portal/trunk/component/web/resources/src/main/java/gatein_resources_1_2.xsd 2011-08-15 08:46:31 UTC (rev 7123) @@ -0,0 +1,120 @@ +<?xml version="1.0"?> + + +<xs:schema + targetNamespace="http://www.gatein.org/xml/ns/gatein_resources_1_2" + xmlns="http://www.gatein.org/xml/ns/gatein_resources_1_2" + xmlns:xs="http://www.w3.org/2001/XMLSchema" + elementFormDefault="qualified" + attributeFormDefault="unqualified" + version="1.0"> + +  + <xs:element name="gatein-resources"> + <xs:complexType> + <xs:choice minOccurs="0" maxOccurs="unbounded"> + <xs:element name="portal-skin" type="portal-skin" /> + <xs:element name="portlet-skin" type="portlet-skin" /> + <xs:element name="window-style" type="window-style" /> + <xs:element name="javascript" type="javascript" /> + <xs:element name="resource-bundle" type="resource-bundle" /> + </xs:choice> + </xs:complexType> + </xs:element> + +  + <xs:complexType name="portal-skin"> + <xs:sequence> + <xs:element name="skin-name" type="xs:string" minOccurs="1" maxOccurs="1"/> + <xs:element name="skin-module" type="xs:string" minOccurs="0" maxOccurs="1"/> + <xs:element name="css-path" type="xs:string" minOccurs="1" maxOccurs="1"/> + <xs:element name="css-priority" type="xs:string" minOccurs="0" maxOccurs="1"/> + <xs:element name="overwrite" type="xs:integer" minOccurs="0" maxOccurs="1"/> + </xs:sequence> + </xs:complexType> + +  + <xs:complexType name="portlet-skin"> + <xs:sequence> +  + <xs:element name="application-name" type="xs:string" minOccurs="1" maxOccurs="1"/> + +  + <xs:element name="portlet-name" type="xs:string" minOccurs="1" maxOccurs="1"/> + +  + <xs:element name="skin-name" type="xs:string" minOccurs="1" maxOccurs="1"/> + +  + <xs:element name="css-path" type="xs:string" minOccurs="1" maxOccurs="1"/> + +  + <xs:element name="overwrite" type="xs:string" minOccurs="0" maxOccurs="1"/> + +  + <xs:element name="css-priority" type="xs:integer" minOccurs="0" maxOccurs="1"/> + </xs:sequence> + </xs:complexType> + +  + <xs:complexType name="window-style" mixed="true"> + <xs:sequence> + +  + <xs:element name="style-name" type="xs:string" minOccurs="1" maxOccurs="1"/> + +  + <xs:element name="style-theme" type="style-theme" minOccurs="0" maxOccurs="unbounded"/> + </xs:sequence> + </xs:complexType> + +  + <xs:complexType name="style-theme"> + <xs:sequence> +  + <xs:element name="theme-name" type="xs:string" minOccurs="1" maxOccurs="1"/> + </xs:sequence> + </xs:complexType> + +  + <xs:complexType name="javascript"> + <xs:sequence> + <xs:element name="param" type="param" minOccurs="0" maxOccurs="unbounded"/> + </xs:sequence> + </xs:complexType> + + <xs:complexType name="param"> + <xs:sequence> +  + <xs:element name="js-module" type="xs:string" minOccurs="1" maxOccurs="1"/> + +  + <xs:element name="js-path" type="xs:string" minOccurs="1" maxOccurs="1"/> + +  + <xs:element name="js-priority" type="xs:string" minOccurs="0" maxOccurs="1"/> + </xs:sequence> + </xs:complexType> + +  + <xs:complexType name="resource-bundle"> + </xs:complexType> + +</xs:schema> \ No newline at end of file Modified: portal/trunk/component/web/resources/src/main/java/org/exoplatform/portal/resource/SimpleSkin.java =================================================================== --- portal/trunk/component/web/resources/src/main/java/org/exoplatform/portal/resource/SimpleSkin.java 2011-08-15 07:18:06 UTC (rev 7122) +++ portal/trunk/component/web/resources/src/main/java/org/exoplatform/portal/resource/SimpleSkin.java 2011-08-15 08:46:31 UTC (rev 7123) @@ -39,6 +39,8 @@ private final String cssPath_; private final String id_; + + private final int cssPriority_; public SimpleSkin(SkinService service, String module, String name, String cssPath) { @@ -47,8 +49,24 @@ name_ = name; cssPath_ = cssPath; id_ = module.replace('/', '_'); + cssPriority_ = -1; } + public SimpleSkin(SkinService service, String module, String name, String cssPath, Integer cssPriority) + { + service_ = service; + module_ = module; + name_ = name; + cssPath_ = cssPath; + id_ = module.replace('/', '_'); + cssPriority_ = cssPriority != null ? cssPriority : -1; + } + + public int getCSSPriority() + { + return cssPriority_; + } + public String getId() { return id_; Modified: portal/trunk/component/web/resources/src/main/java/org/exoplatform/portal/resource/SkinConfig.java =================================================================== --- portal/trunk/component/web/resources/src/main/java/org/exoplatform/portal/resource/SkinConfig.java 2011-08-15 07:18:06 UTC (rev 7122) +++ portal/trunk/component/web/resources/src/main/java/org/exoplatform/portal/resource/SkinConfig.java 2011-08-15 08:46:31 UTC (rev 7123) @@ -48,5 +48,12 @@ * @return the css path */ String getCSSPath(); + + /** + * Returns the priority number + * + * @return the priority number + */ + int getCSSPriority(); } \ No newline at end of file Modified: portal/trunk/component/web/resources/src/main/java/org/exoplatform/portal/resource/SkinService.java =================================================================== --- portal/trunk/component/web/resources/src/main/java/org/exoplatform/portal/resource/SkinService.java 2011-08-15 07:18:06 UTC (rev 7122) +++ portal/trunk/component/web/resources/src/main/java/org/exoplatform/portal/resource/SkinService.java 2011-08-15 08:46:31 UTC (rev 7123) @@ -51,6 +51,7 @@ import java.util.ArrayList; import java.util.Collection; import java.util.Collections; +import java.util.Comparator; import java.util.Date; import java.util.EnumMap; import java.util.HashMap; @@ -186,7 +187,7 @@ /** * add category into portletThemes_ if portletThemes does not contain one - * @param categoryName: category's name that want to add into portletThemes + * @param categoryName: category's name that wangt to add into portletThemes */ public void addCategoryTheme(String categoryName) { @@ -274,9 +275,102 @@ rtCache.remove(cssPath); } + /** + * Register the stylesheet for a portal Skin. Do not replace any previous skin. Support priority + * + * @param module + * skin module identifier + * @param skinName + * skin name + * @param cssPath + * path uri to the css file. This is relative to the root context, + * use leading '/' + * @param scontext + * the webapp's {@link javax.servlet.ServletContext} + * @param cssPriority + * priority to support sorting in skin list + */ + public void addPortalSkin(String module, String skinName, String cssPath, ServletContext scontext, Integer cssPriority) + { + addPortalSkin(module, skinName, cssPath, scontext, false, cssPriority); + } /** + * Register the stylesheet for a portal Skin. Support priority * + * @param module + * skin module identifier + * @param skinName + * skin name + * @param cssPath + * path uri to the css file. This is relative to the root context, + * use leading '/' + * @param scontext + * the webapp's {@link javax.servlet.ServletContext} + * @param overwrite + * if any previous skin should be replaced by that one + * @param cssPriority + * priority to support sorting in skin list + */ + public void addPortalSkin(String module, String skinName, String cssPath, ServletContext scontext, boolean overwrite, Integer cssPrioriry) + { + availableSkins_.add(skinName); + SkinKey key = new SkinKey(module, skinName); + SkinConfig skinConfig = portalSkins_.get(key); + if (skinConfig == null || overwrite) + { + skinConfig = new SimpleSkin(this, module, skinName, cssPath, cssPrioriry); + portalSkins_.put(key, skinConfig); + + if (log.isDebugEnabled()) + { + log.debug("Adding Portal skin : Bind " + key + " to " + skinConfig); + } + } + } + + /** + * Register the stylesheet for a portal Skin. Support priority + * + * @param module + * skin module identifier + * @param skinName + * skin name + * @param cssPath + * path uri to the css file. This is relative to the root context, + * use leading '/' + * @param cssData + * the content of css + * @param cssPriority + * priority to support sorting in skin list + */ + public void addPortalSkin(String module, String skinName, String cssPath, String cssData, Integer cssPriority) + { + SkinKey key = new SkinKey(module, skinName); + SkinConfig skinConfig = portalSkins_.get(key); + if (skinConfig == null) + { + portalSkins_.put(key, new SimpleSkin(this, module, skinName, cssPath, cssPriority)); + + if (log.isDebugEnabled()) + { + log.debug("Adding Portal skin : Bind " + key + " to " + skinConfig); + } + } + try + { + StringWriter output = new StringWriter(); + compressor.compress(new StringReader(cssData), output, ResourceType.STYLESHEET); + cssData = output.toString(); + } + catch (Exception e) + { + log.debug("Error when compressing CSS, will use normal CSS instead", e); + } + } + + /** + * * Register the Skin for available portal Skins. Do not override previous skin * * @param module @@ -344,6 +438,36 @@ skinConfigs_.put(key, skinConfig); } } + + /** + * + * Register the Skin for available portal Skins. Support priority + * + * @param module + * skin module identifier + * @param skinName + * skin name + * @param cssPath + * path uri to the css file. This is relative to the root context, + * use leading '/' + * @param scontext + * the webapp's {@link javax.servlet.ServletContext} + * @param overwrite + * if any previous skin should be replaced by that one + * @param cssPriority + * priority to support sorting in skin list + */ + public void addSkin(String module, String skinName, String cssPath, ServletContext scontext, boolean overwrite, Integer cssPriority) + { + availableSkins_.add(skinName); + SkinKey key = new SkinKey(module, skinName); + SkinConfig skinConfig = skinConfigs_.get(key); + if (skinConfig == null || overwrite) + { + skinConfig = new SimpleSkin(this, module, skinName, cssPath, cssPriority); + skinConfigs_.put(key, skinConfig); + } + } /** * @@ -504,12 +628,26 @@ public Collection<SkinConfig> getPortalSkins(String skinName) { Set<SkinKey> keys = portalSkins_.keySet(); - Collection<SkinConfig> portalSkins = new ArrayList<SkinConfig>(); + List<SkinConfig> portalSkins = new ArrayList<SkinConfig>(); for (SkinKey key : keys) { if (key.getName().equals(skinName)) portalSkins.add(portalSkins_.get(key)); } + Collections.sort(portalSkins, new Comparator<SkinConfig>() + { + public int compare(SkinConfig o1, SkinConfig o2) + { + if (o1.getCSSPriority() == o2.getCSSPriority()) + return 1;//Can indicate others condition here + else if (o1.getCSSPriority() < 0) + return 1; + else if (o2.getCSSPriority() < 0) + return -1; + else + return o1.getCSSPriority() - o2.getCSSPriority(); + } + }); return portalSkins; } Modified: portal/trunk/component/web/resources/src/main/java/org/exoplatform/portal/resource/config/tasks/AbstractSkinModule.java =================================================================== --- portal/trunk/component/web/resources/src/main/java/org/exoplatform/portal/resource/config/tasks/AbstractSkinModule.java 2011-08-15 07:18:06 UTC (rev 7122) +++ portal/trunk/component/web/resources/src/main/java/org/exoplatform/portal/resource/config/tasks/AbstractSkinModule.java 2011-08-15 08:46:31 UTC (rev 7123) @@ -33,6 +33,7 @@ protected String skinName; protected String cssPath; protected boolean overwrite; + protected String cssPriority; public AbstractSkinModule(String name) { @@ -70,6 +71,16 @@ setOverwrite("true".equals(overwrite)); } + protected void bindingCSSPriority(Element element) + { + NodeList nodes = element.getElementsByTagName(SkinConfigParser.CSS_PRIORITY_TAG); + if (nodes == null || nodes.getLength() < 1) + { + return; + } + this.cssPriority = nodes.item(0).getFirstChild().getNodeValue(); + } + public void setSkinName(String name) { this.skinName = name; @@ -85,4 +96,9 @@ { this.overwrite = _overwrite; } + + public void setCSSPriority(String _cssPriority) + { + this.cssPriority = _cssPriority; + } } Modified: portal/trunk/component/web/resources/src/main/java/org/exoplatform/portal/resource/config/tasks/PortalSkinTask.java =================================================================== --- portal/trunk/component/web/resources/src/main/java/org/exoplatform/portal/resource/config/tasks/PortalSkinTask.java 2011-08-15 07:18:06 UTC (rev 7122) +++ portal/trunk/component/web/resources/src/main/java/org/exoplatform/portal/resource/config/tasks/PortalSkinTask.java 2011-08-15 08:46:31 UTC (rev 7123) @@ -65,6 +65,7 @@ bindingSkinName(elemt); bindingModuleName(elemt); bindingOverwrite(elemt); + bindingCSSPriority(elemt); } public void execute(SkinService skinService, ServletContext scontext) @@ -75,7 +76,14 @@ } String contextPath = scontext.getContextPath(); String fullCSSPath = contextPath + cssPath; - skinService.addPortalSkin(moduleName, skinName, fullCSSPath, scontext, overwrite); + Integer iCssPriority = null; + try + { + iCssPriority = Integer.valueOf(cssPriority); + } catch (Exception e) { + //Don't set cssPriority when it is not a numarical + } + skinService.addPortalSkin(moduleName, skinName, fullCSSPath, scontext, overwrite, iCssPriority); updateSkinDependentManager(contextPath, moduleName, skinName); } Modified: portal/trunk/component/web/resources/src/main/java/org/exoplatform/portal/resource/config/tasks/PortletSkinTask.java =================================================================== --- portal/trunk/component/web/resources/src/main/java/org/exoplatform/portal/resource/config/tasks/PortletSkinTask.java 2011-08-15 07:18:06 UTC (rev 7122) +++ portal/trunk/component/web/resources/src/main/java/org/exoplatform/portal/resource/config/tasks/PortletSkinTask.java 2011-08-15 08:46:31 UTC (rev 7123) @@ -93,7 +93,14 @@ String moduleName = applicationName + "/" + portletName; String contextPath = scontext.getContextPath(); String fullCSSPath = contextPath + cssPath; - skinService.addSkin(moduleName, skinName, fullCSSPath, scontext, overwrite); + Integer iCSSPriority = null; + try + { + iCSSPriority = Integer.valueOf(cssPriority); + } catch (Exception e) { + //Don't set cssPriority when it is not a numarical + } + skinService.addSkin(moduleName, skinName, fullCSSPath, scontext, overwrite, iCSSPriority); updateSkinDependentManager(contextPath, moduleName, skinName); } @@ -109,7 +116,8 @@ bindingPortletName(elemt); bindingCSSPath(elemt); bindingSkinName(elemt); - bindingOverwrite(elemt); + bindingOverwrite(elemt); + bindingCSSPriority(elemt); } } Modified: portal/trunk/component/web/resources/src/main/java/org/exoplatform/portal/resource/config/xml/SkinConfigParser.java =================================================================== --- portal/trunk/component/web/resources/src/main/java/org/exoplatform/portal/resource/config/xml/SkinConfigParser.java 2011-08-15 07:18:06 UTC (rev 7122) +++ portal/trunk/component/web/resources/src/main/java/org/exoplatform/portal/resource/config/xml/SkinConfigParser.java 2011-08-15 08:46:31 UTC (rev 7123) @@ -52,10 +52,16 @@ public static final String GATEIN_RESOURCES_1_1_SYSTEM_ID = "http://www.gatein.org/xml/ns/gatein_resources_1_1"; /** . */ + public static final String GATEIN_RESOURCES_1_2_SYSTEM_ID = "http://www.gatein.org/xml/ns/gatein_resources_1_2"; + + /** . */ private static final String GATEIN_RESOURCE_1_0_XSD_PATH = "gatein_resources_1_0.xsd"; /** . */ private static final String GATEIN_RESOURCE_1_1_XSD_PATH = "gatein_resources_1_1.xsd"; + + /** . */ + private static final String GATEIN_RESOURCE_1_2_XSD_PATH = "gatein_resources_1_2.xsd"; /** . */ private static final XMLValidator VALIDATOR; @@ -83,6 +89,9 @@ /** . */ final public static String CSS_PATH_TAG = "css-path"; + + /** . */ + final public static String CSS_PRIORITY_TAG = "css-priority"; /** . */ final public static String WINDOW_STYLE_TAG = "window-style"; @@ -101,6 +110,7 @@ Map<String, String> systemIdToResourcePath = new HashMap<String, String>(); systemIdToResourcePath.put(GATEIN_RESOURCES_1_0_SYSTEM_ID, GATEIN_RESOURCE_1_0_XSD_PATH); systemIdToResourcePath.put(GATEIN_RESOURCES_1_1_SYSTEM_ID, GATEIN_RESOURCE_1_1_XSD_PATH); + systemIdToResourcePath.put(GATEIN_RESOURCES_1_2_SYSTEM_ID, GATEIN_RESOURCE_1_2_XSD_PATH); VALIDATOR = new XMLValidator(SkinConfigParser.class, systemIdToResourcePath); } Modified: portal/trunk/component/web/resources/src/test/java/org/exoplatform/portal/resource/TestGateInResourceParser.java =================================================================== --- portal/trunk/component/web/resources/src/test/java/org/exoplatform/portal/resource/TestGateInResourceParser.java 2011-08-15 07:18:06 UTC (rev 7122) +++ portal/trunk/component/web/resources/src/test/java/org/exoplatform/portal/resource/TestGateInResourceParser.java 2011-08-15 08:46:31 UTC (rev 7123) @@ -27,6 +27,10 @@ assertDescriptorCanBeLoaded("org/exoplatform/portal/resource/gatein-resources-1_1.xml"); } + public void testResources1_2() throws MalformedURLException + { + assertDescriptorCanBeLoaded("org/exoplatform/portal/resource/gatein-resources-1_2.xml"); + } private void assertDescriptorCanBeLoaded(String descriptorPath) throws MalformedURLException { URL url = Thread.currentThread().getContextClassLoader().getResource(descriptorPath); Modified: portal/trunk/component/web/resources/src/test/java/org/exoplatform/portal/resource/TestXSDCorruption.java =================================================================== --- portal/trunk/component/web/resources/src/test/java/org/exoplatform/portal/resource/TestXSDCorruption.java 2011-08-15 07:18:06 UTC (rev 7122) +++ portal/trunk/component/web/resources/src/test/java/org/exoplatform/portal/resource/TestXSDCorruption.java 2011-08-15 08:46:31 UTC (rev 7123) @@ -55,9 +55,10 @@ assertEquals(expected, sb.toString()); } - public void testGateInResources1_0() throws Exception + public void testGateInResources1_x() throws Exception { assertHash("c68ea6831c3d24a242f63abd2db261a6", "gatein_resources_1_0.xsd"); assertHash("c55b7e0dc8ae23e2d34430b38260cd96", "gatein_resources_1_1.xsd"); + assertHash("378178d66c1efacf87619c3c60a4cbf6", "gatein_resources_1_2.xsd"); } } \ No newline at end of file Added: portal/trunk/component/web/resources/src/test/resources/org/exoplatform/portal/resource/gatein-resources-1_2.xml =================================================================== --- portal/trunk/component/web/resources/src/test/resources/org/exoplatform/portal/resource/gatein-resources-1_2.xml (rev 0) +++ portal/trunk/component/web/resources/src/test/resources/org/exoplatform/portal/resource/gatein-resources-1_2.xml 2011-08-15 08:46:31 UTC (rev 7123) @@ -0,0 +1,335 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<gatein-resources + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_resources_1_2 http://www.gatein.org/xml/ns/gatein_resources_1_2" + xmlns="http://www.gatein.org/xml/ns/gatein_resources_1_2"> + +  + <portal-skin> + <skin-name>Default</skin-name> + <skin-module>MyModule</skin-module> + <css-path>/skin/Stylesheet.css</css-path> + <css-priority>0</css-priority> + </portal-skin> + +  + + <portlet-skin> + <application-name>web</application-name> + <portlet-name>BannerPortlet</portlet-name> + <skin-name>Default</skin-name> + <css-path>/skin/portal/webui/component/UIBannerPortlet/DefaultStylesheet.css</css-path> + </portlet-skin> + +  + + <portlet-skin> + <application-name>web</application-name> + <portlet-name>FooterPortlet</portlet-name> + <skin-name>Default</skin-name> + <css-path>/skin/portal/webui/component/UIFooterPortlet/DefaultStylesheet.css</css-path> + </portlet-skin> + +  + <window-style> + <style-name>Simple</style-name> + <style-theme> + <theme-name>SimpleBlue</theme-name> + </style-theme> + <style-theme> + <theme-name>SimpleViolet</theme-name> + </style-theme> + <style-theme> + <theme-name>SimpleOrange</theme-name> + </style-theme> + <style-theme> + <theme-name>SimplePink</theme-name> + </style-theme> + <style-theme> + <theme-name>SimpleGreen</theme-name> + </style-theme> + </window-style> + +  + <window-style> + <style-name>RoundConer</style-name> + <style-theme> + <theme-name>RoundConerBlue</theme-name> + </style-theme> + <style-theme> + <theme-name>RoundConerViolet</theme-name> + </style-theme> + <style-theme> + <theme-name>RoundConerOrange</theme-name> + </style-theme> + <style-theme> + <theme-name>RoundConerPink</theme-name> + </style-theme> + <style-theme> + <theme-name>RoundConerGreen</theme-name> + </style-theme> + </window-style> + +  + <window-style> + <style-name>Shadow</style-name> + <style-theme> + <theme-name>ShadowBlue</theme-name> + </style-theme> + <style-theme> + <theme-name>ShadowViolet</theme-name> + </style-theme> + <style-theme> + <theme-name>ShadowOrange</theme-name> + </style-theme> + <style-theme> + <theme-name>ShadowPink</theme-name> + </style-theme> + <style-theme> + <theme-name>ShadowGreen</theme-name> + </style-theme> + </window-style> + +  + <window-style> + <style-name>MacStyle</style-name> + <style-theme> + <theme-name>MacTheme</theme-name> + </style-theme> + <style-theme> + <theme-name>MacGray</theme-name> + </style-theme> + <style-theme> + <theme-name>MacGreenSteel</theme-name> + </style-theme> + </window-style> + +  + <window-style> + <style-name>VistaStyle</style-name> + <style-theme> + <theme-name>VistaTheme</theme-name> + </style-theme> + </window-style> + + <javascript> + <param> + <js-module>eXo</js-module> + <js-path>/javascript/eXo.js</js-path> + <js-priority>0</js-priority> + </param> + </javascript> + +  + <javascript> + <param> + <js-module>eXo.core.Utils</js-module> + <js-path>/javascript/eXo/core/Util.js</js-path> + <js-priority>1</js-priority> + </param> + <param> + <js-module>eXo.core.DOMUtil</js-module> + <js-path>/javascript/eXo/core/DOMUtil.js</js-path> + <js-priority>1</js-priority> + </param> + <param> + <js-module>eXo.core.Browser</js-module> + <js-path>/javascript/eXo/core/Browser.js</js-path> + <js-priority>2</js-priority> + </param> + <param> + <js-module>eXo.core.MouseEventManager</js-module> + <js-path>/javascript/eXo/core/MouseEventManager.js</js-path> + </param> + <param> + <js-module>eXo.core.UIMaskLayer</js-module> + <js-path>/javascript/eXo/core/UIMaskLayer.js</js-path> + </param> + <param> + <js-module>eXo.core.Skin</js-module> + <js-path>/javascript/eXo/core/Skin.js</js-path> + </param> + <param> + <js-module>eXo.core.DragDrop</js-module> + <js-path>/javascript/eXo/core/DragDrop.js</js-path> + </param> + <param> + <js-module>eXo.core.DragDrop2</js-module> + <js-path>/javascript/eXo/core/DragDrop2.js</js-path> + </param> + <param> + <js-module>eXo.core.Topic</js-module> + <js-path>/javascript/eXo/core/Topic.js</js-path> + </param> + <param> + <js-module>eXo.core.JSON</js-module> + <js-path>/javascript/eXo/core/JSON.js</js-path> + </param> + <param> + <js-module>eXo.core.Cometd</js-module> + <js-path>/javascript/eXo/core/Cometd.js</js-path> + </param> + <param> + <js-module>eXo.core.Spliter</js-module> + <js-path>/javascript/eXo/core/Spliter.js</js-path> + </param> + <param> + <js-module>eXo.core.Notification</js-module> + <js-path>/javascript/eXo/core/Notification.js</js-path> + </param> + <param> + <js-module>eXo.core.Loader</js-module> + <js-path>/javascript/eXo/core/Loader.js</js-path> + </param> + <param> + <js-module>eXo.core.I18n</js-module> + <js-path>/javascript/eXo/core/I18n.js</js-path> + </param> + </javascript> + +  + <javascript> + <param> + <js-module>eXo.gadget.UIGadget</js-module> + <js-path>/javascript/eXo/gadget/UIGadget.js</js-path> + </param> + </javascript> + +  + <javascript> + <param> + <js-module>eXo.webui.UIItemSelector</js-module> + <js-path>/javascript/eXo/webui/UIItemSelector.js</js-path> + </param> + <param> + <js-module>eXo.webui.UIForm</js-module> + <js-path>/javascript/eXo/webui/UIForm.js</js-path> + </param> + <param> + <js-module>eXo.webui.UIPopup</js-module> + <js-path>/javascript/eXo/webui/UIPopup.js</js-path> + </param> + <param> + <js-module>eXo.webui.UIPopupSelectCategory</js-module> + <js-path>/javascript/eXo/webui/UIPopupSelectCategory.js</js-path> + </param> + <param> + <js-module>eXo.webui.UIPopupWindow</js-module> + <js-path>/javascript/eXo/webui/UIPopupWindow.js</js-path> + </param> + <param> + <js-module>eXo.webui.UIHorizontalTabs</js-module> + <js-path>/javascript/eXo/webui/UIHorizontalTabs.js</js-path> + </param> + <param> + <js-module>eXo.webui.UIPopupMenu</js-module> + <js-path>/javascript/eXo/webui/UIPopupMenu.js</js-path> + </param> + <param> + <js-module>eXo.webui.UIDropDownControl</js-module> + <js-path>/javascript/eXo/webui/UIDropDownControl.js</js-path> + </param> + <param> + <js-module>eXo.webui.UIRightClickPopupMenu</js-module> + <js-path>/javascript/eXo/webui/UIRightClickPopupMenu.js</js-path> + </param> + <param> + <js-module>eXo.webui.UIVerticalSlideTabs</js-module> + <js-path>/javascript/eXo/webui/UIVerticalSlideTabs.js</js-path> + </param> + <param> + <js-module>eXo.webui.UIPermissionSelectorTab</js-module> + <js-path>/javascript/eXo/webui/UIPermissionSelectorTab.js</js-path> + </param> + <param> + <js-module>eXo.webui.UIDashboard</js-module> + <js-path>/javascript/eXo/webui/UIDashboard.js</js-path> + </param> + <param> + <js-module>eXo.webui.UIDashboardUtil</js-module> + <js-path>/javascript/eXo/webui/UIDashboardUtil.js</js-path> + </param> + <param> + <js-module>eXo.webui.UINotification</js-module> + <js-path>/javascript/eXo/webui/UINotification.js</js-path> + </param> + <param> + <js-module>eXo.webui.UIUserSelector</js-module> + <js-path>/javascript/eXo/webui/UIUserSelector.js</js-path> + </param> + <param> + <js-module>eXo.webui.UICombobox</js-module> + <js-path>/javascript/eXo/webui/UICombobox.js</js-path> + </param> + <param> + <js-module>eXo.webui.UICombobox</js-module> + <js-path>/javascript/eXo/webui/UIVirtualList.js</js-path> + </param> + <param> + <js-module>eXo.webui.UIColorPicker</js-module> + <js-path>/javascript/eXo/webui/UIColorPicker.js</js-path> + </param> + </javascript> + +  + <javascript> + <param> + <js-module>eXo.portal.PortalHttpRequest</js-module> + <js-path>/javascript/eXo/portal/PortalHttpRequest.js</js-path> + </param> + <param> + <js-module>eXo.portal.UIPortal</js-module> + <js-path>/javascript/eXo/portal/UIPortal.js</js-path> + </param> + <param> + <js-module>eXo.portal.UIWorkspace</js-module> + <js-path>/javascript/eXo/portal/UIWorkspace.js</js-path> + </param> + <param> + <js-module>eXo.portal.UIPortalControl</js-module> + <js-path>/javascript/eXo/portal/UIPortalControl.js</js-path> + </param> + <param> + <js-module>eXo.portal.PortalDragDrop</js-module> + <js-path>/javascript/eXo/portal/PortalDragDrop.js</js-path> + </param> + <param> + <js-module>eXo.portal.UIPortalNavigation</js-module> + <js-path>/javascript/eXo/portal/UIPortalNavigation.js</js-path> + </param> + <param> + <js-module>eXo.portal.UIMaskWorkspace</js-module> + <js-path>/javascript/eXo/portal/UIMaskWorkspace.js</js-path> + </param> + <param> + <js-module>eXo.portal.UIBrowseContent</js-module> + <js-path>/javascript/eXo/portal/UIBrowseContent.js</js-path> + </param> + </javascript> + + <javascript> + <param> + <js-module>eXo.webui.UIPortlet</js-module> + <js-path>/javascript/eXo/webui/UIPortlet.js</js-path> + </param> + </javascript> +</gatein-resources> Modified: portal/trunk/examples/skins/simpleskin/src/main/webapp/WEB-INF/gatein-resources.xml =================================================================== --- portal/trunk/examples/skins/simpleskin/src/main/webapp/WEB-INF/gatein-resources.xml 2011-08-15 07:18:06 UTC (rev 7122) +++ portal/trunk/examples/skins/simpleskin/src/main/webapp/WEB-INF/gatein-resources.xml 2011-08-15 08:46:31 UTC (rev 7123) @@ -21,12 +21,13 @@ --> <gatein-resources xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_resources_1_1 http://www.gatein.org/xml/ns/gatein_resources_1_1" - xmlns="http://www.gatein.org/xml/ns/gatein_resources_1_1"> + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_resources_1_2 http://www.gatein.org/xml/ns/gatein_resources_1_2" + xmlns="http://www.gatein.org/xml/ns/gatein_resources_1_2"> <portal-skin> <skin-name>SimpleSkin</skin-name> <css-path>/skin/Stylesheet.css</css-path> + <css-priority>0</css-priority> </portal-skin>  Modified: portal/trunk/web/eXoResources/src/main/webapp/WEB-INF/gatein-resources.xml =================================================================== --- portal/trunk/web/eXoResources/src/main/webapp/WEB-INF/gatein-resources.xml 2011-08-15 07:18:06 UTC (rev 7122) +++ portal/trunk/web/eXoResources/src/main/webapp/WEB-INF/gatein-resources.xml 2011-08-15 08:46:31 UTC (rev 7123) @@ -21,12 +21,13 @@ --> <gatein-resources xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_resources_1_1 http://www.gatein.org/xml/ns/gatein_resources_1_1" - xmlns="http://www.gatein.org/xml/ns/gatein_resources_1_1"> + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_resources_1_2 http://www.gatein.org/xml/ns/gatein_resources_1_2" + xmlns="http://www.gatein.org/xml/ns/gatein_resources_1_2"> <portal-skin> <skin-name>Default</skin-name> <css-path>/skin/Stylesheet.css</css-path> + <css-priority>0</css-priority> </portal-skin>  Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIPortalApplication.java =================================================================== --- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIPortalApplication.java 2011-08-15 07:18:06 UTC (rev 7122) +++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIPortalApplication.java 2011-08-15 08:46:31 UTC (rev 7123) @@ -62,6 +62,8 @@ import java.net.URLDecoder; import java.util.ArrayList; import java.util.Collection; +import java.util.Collections; +import java.util.Comparator; import java.util.HashMap; import java.util.HashSet; import java.util.List; @@ -388,9 +390,6 @@ */ public Set<Skin> getPortletSkins() { - // Set to avoid repetition - Set<Skin> skins = new HashSet<Skin>(); - // Determine portlets visible on the page List<UIPortlet> uiportlets = new ArrayList<UIPortlet>(); UIWorkingWorkspace uiWorkingWS = getChildById(UI_WORKING_WS_ID); @@ -405,7 +404,8 @@ // Get portal portlets to filter since they are already in the portal // skins Set<SkinConfig> portletConfigs = getPortalPortletSkins(); - + List<SkinConfig> portletSkins = new ArrayList<SkinConfig>(); + // for (UIPortlet uiPortlet : uiportlets) { @@ -416,12 +416,28 @@ } if (skinConfig != null && !portletConfigs.contains(skinConfig)) { - skins.add(skinConfig); + portletSkins.add(skinConfig); } } + //Sort skins by priority + Collections.sort(portletSkins, new Comparator<SkinConfig>() + { + public int compare(SkinConfig o1, SkinConfig o2) + { + if (o1.getCSSPriority() == o2.getCSSPriority()) + return 1;//Can indicate others condition here + else if (o1.getCSSPriority() < 0) + return 1; + else if (o2.getCSSPriority() < 0) + return -1; + else + return o1.getCSSPriority() - o2.getCSSPriority(); + } + }); + // - return skins; + return (new HashSet<Skin>(portletSkins)); } private SkinConfig getDefaultPortletSkinConfig(UIPortlet portlet)

13 years, 1 month

1
0
0 / 0

gatein SVN: r7122 - in portal/trunk: web/portal/src/main/webapp/WEB-INF/classes/locale/portal and 2 other directories.

by do-not-reply＠jboss.org

Author: kien_nguyen Date: 2011-08-15 03:18:06 -0400 (Mon, 15 Aug 2011) New Revision: 7122 Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/model/Application.java portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/model/PortalConfig.java portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/model/PortalProperties.java portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_en.properties portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_fr.properties portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_vi.properties portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/classic/portal.xml portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortal.java portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalComponentActionListener.java portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalForm.java Log: GTNPORTAL-1558 Have an option to set the default value for Show Info Bar and make it disable by default Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/model/Application.java =================================================================== --- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/model/Application.java 2011-08-15 06:21:28 UTC (rev 7121) +++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/model/Application.java 2011-08-15 07:18:06 UTC (rev 7122) @@ -46,7 +46,7 @@ private String description; - private boolean showInfoBar = true; + private boolean showInfoBar; private boolean showApplicationState = true; Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/model/PortalConfig.java =================================================================== --- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/model/PortalConfig.java 2011-08-15 06:21:28 UTC (rev 7121) +++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/model/PortalConfig.java 2011-08-15 07:18:06 UTC (rev 7122) @@ -245,6 +245,28 @@ setProperty(PortalProperties.SESSION_ALIVE, type); } + public Boolean isShowInfobar() + { + String value = getProperty(PortalProperties.SHOW_PORTLET_INFO, "1"); + if (Integer.parseInt(value) == 1) + { + return true; + } + return false; + } + + public void setShowInfobar(Boolean value) + { + if (value) + { + setProperty(PortalProperties.SHOW_PORTLET_INFO, "1"); + } + else + { + setProperty(PortalProperties.SHOW_PORTLET_INFO, "0"); + } + } + public void setDescription(String description) { this.description = description; Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/model/PortalProperties.java =================================================================== --- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/model/PortalProperties.java 2011-08-15 06:21:28 UTC (rev 7121) +++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/model/PortalProperties.java 2011-08-15 07:18:06 UTC (rev 7122) @@ -35,4 +35,6 @@ final public static String SESSION_NEVER = "never"; final public static String GADGET_SERVER = "gadgetServer"; + + final public static String SHOW_PORTLET_INFO = "showPortletInfo"; } Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_en.properties =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_en.properties 2011-08-15 06:21:28 UTC (rev 7121) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_en.properties 2011-08-15 07:18:06 UTC (rev 7122) @@ -364,6 +364,7 @@ UIPortalForm.label.option.always=Always UIPortalForm.label.option.onDemand=On Demand UIPortalForm.label.option.never=Never +UIPortalForm.label.showInfobar=Show info bar by default UIPortalForm.tab.label.PortalSetting=Portal Setting UIPortalForm.tab.label.PortalTemplate=Portal Templates UIPortalForm.tab.label.PermissionSetting=Permission Setting Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_fr.properties =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_fr.properties 2011-08-15 06:21:28 UTC (rev 7121) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_fr.properties 2011-08-15 07:18:06 UTC (rev 7122) @@ -336,6 +336,7 @@ UIPortalForm.label.option.always=Always UIPortalForm.label.option.onDemand=On Demand UIPortalForm.label.option.never=Never +UIPortalForm.label.showInfobar=Afficher la barre d'info par défaut UIPortalForm.tab.label.PortalSetting=Configuration du portal UIPortalForm.tab.label.PortalTemplate=Modèles de portails UIPortalForm.tab.label.PermissionSetting=Configuration des permissions Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_vi.properties =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_vi.properties 2011-08-15 06:21:28 UTC (rev 7121) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_vi.properties 2011-08-15 07:18:06 UTC (rev 7122) @@ -331,6 +331,7 @@ UIPortalForm.label.option.always=Luôn luôn UIPortalForm.label.option.onDemand=Theo yêu cầu UIPortalForm.label.option.never=Không bao giờ +UIPortalForm.label.showInfobar=Mặc định hiển thị thanh thông tin UIPortalForm.tab.label.PortalSetting=Cấu hình Portal UIPortalForm.tab.label.PortalTemplate=Các Portal mẫu UIPortalForm.tab.label.PermissionSetting=Tùy chọn phân quyền sử dụng Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/classic/portal.xml =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/classic/portal.xml 2011-08-15 06:21:28 UTC (rev 7121) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/classic/portal.xml 2011-08-15 07:18:06 UTC (rev 7122) @@ -32,6 +32,7 @@ <edit-permission>*:/platform/administrators</edit-permission> <properties> <entry key="sessionAlive">onDemand</entry> + <entry key="showPortletInfo">0</entry> </properties> <portal-layout> Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortal.java =================================================================== --- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortal.java 2011-08-15 06:21:28 UTC (rev 7121) +++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortal.java 2011-08-15 07:18:06 UTC (rev 7122) @@ -309,6 +309,28 @@ setProperty(PortalProperties.SESSION_ALIVE, type); } + public Boolean isShowInfobar() + { + String value = getProperty(PortalProperties.SHOW_PORTLET_INFO, "1"); + if (Integer.parseInt(value) == 1) + { + return true; + } + return false; + } + + public void setShowInfobar(Boolean value) + { + if (value) + { + setProperty(PortalProperties.SHOW_PORTLET_INFO, "1"); + } + else + { + setProperty(PortalProperties.SHOW_PORTLET_INFO, "0"); + } + } + public String getLabel() { return label; Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalComponentActionListener.java =================================================================== --- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalComponentActionListener.java 2011-08-15 06:21:28 UTC (rev 7121) +++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalComponentActionListener.java 2011-08-15 07:18:06 UTC (rev 7122) @@ -21,6 +21,7 @@ import org.exoplatform.application.registry.Application; import org.exoplatform.portal.application.PortalRequestContext; +import org.exoplatform.portal.config.DataStorage; import org.exoplatform.portal.config.UserACL; import org.exoplatform.portal.config.UserPortalConfigService; import org.exoplatform.portal.config.model.ApplicationState; @@ -28,6 +29,7 @@ import org.exoplatform.portal.config.model.CloneApplicationState; import org.exoplatform.portal.config.model.Container; import org.exoplatform.portal.config.model.TransientApplicationState; +import org.exoplatform.portal.mop.SiteType; import org.exoplatform.portal.webui.application.PortletState; import org.exoplatform.portal.webui.application.UIPortlet; import org.exoplatform.portal.webui.container.UITabContainer; @@ -332,6 +334,12 @@ } uiPortlet.setPortletInPortal(uiTarget instanceof UIPortal); uiPortlet.setShowEditControl(true); + + //TODO Wait to fix issue EXOGTN-213 and then + //we should get "showInfobar" from current UI portal instead of Storage service + UIPortal currentPortal = Util.getUIPortal(); + DataStorage storage = uiApp.getApplicationComponent(DataStorage.class); + uiPortlet.setShowInfoBar(storage.getPortalConfig(currentPortal.getSiteKey().getTypeName(), currentPortal.getSiteKey().getName()).isShowInfobar()); uiSource = uiPortlet; } List<UIComponent> children = uiTarget.getChildren(); Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalForm.java =================================================================== --- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalForm.java 2011-08-15 06:21:28 UTC (rev 7121) +++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalForm.java 2011-08-15 07:18:06 UTC (rev 7122) @@ -55,6 +55,7 @@ import org.exoplatform.webui.event.Event; import org.exoplatform.webui.event.Event.Phase; import org.exoplatform.webui.event.EventListener; +import org.exoplatform.webui.form.UIFormCheckBoxInput; import org.exoplatform.webui.form.UIFormInputItemSelector; import org.exoplatform.webui.form.UIFormInputSet; import org.exoplatform.webui.form.UIFormSelectBox; @@ -80,7 +81,8 @@ @ComponentConfigs({ @ComponentConfig(lifecycle = UIFormLifecycle.class, template = "system:/groovy/webui/form/UIFormTabPane.gtmpl", events = { @EventConfig(listeners = UIPortalForm.SaveActionListener.class), - @EventConfig(listeners = UIMaskWorkspace.CloseActionListener.class, phase = Phase.DECODE)}), + @EventConfig(listeners = UIMaskWorkspace.CloseActionListener.class, phase = Phase.DECODE), + @EventConfig(listeners = UIPortalForm.CheckShowActionListener.class)}), @ComponentConfig(id = "CreatePortal", lifecycle = UIFormLifecycle.class, template = "system:/groovy/webui/form/UIFormTabPane.gtmpl", initParams = @ParamConfig(name = "PortalTemplateConfigOption", value = "system:/WEB-INF/conf/uiconf/portal/webui/portal/PortalTemplateConfigOption.groovy"), events = { @EventConfig(name = "Save", listeners = UIPortalForm.CreateActionListener.class), @EventConfig(listeners = UIPortalForm.SelectItemOptionActionListener.class, phase = Phase.DECODE), @@ -97,6 +99,8 @@ private static final String FIELD_SESSION_ALIVE = "sessionAlive"; + private static final String FIELD_SHOW_INFOBAR = "showInfobar"; + private static final String FIELD_LABEL = "label"; private static final String FIELD_DESCRIPTION = "description"; @@ -268,6 +272,11 @@ new UIFormSelectBox(FIELD_SESSION_ALIVE, FIELD_SESSION_ALIVE, listSessionAlive); uiSessionAliveBox.setValue(PortalProperties.SESSION_ON_DEMAND); uiPropertiesSet.addUIFormInput(uiSessionAliveBox); + + //TODO add more box for showPortletMode and showWindowState if needed + UIFormCheckBoxInput<Boolean> uiShowInfobarBox = new UIFormCheckBoxInput<Boolean>(FIELD_SHOW_INFOBAR, FIELD_SHOW_INFOBAR, true); + uiShowInfobarBox.setOnChange("CheckShowInfobar"); + uiPropertiesSet.addChild(uiShowInfobarBox); addUIFormInput(uiPropertiesSet); UIFormInputSet uiPermissionSetting = createUIComponent(UIFormInputSet.class, "PermissionSetting", null); @@ -416,6 +425,21 @@ } } + static public class CheckShowActionListener extends EventListener<UIPortalForm> + { + public void execute(Event<UIPortalForm> event) throws Exception + { + UIPortalForm uiForm = event.getSource(); + UIFormInputSet InfoForm = uiForm.getChildById("Properties"); + UIFormCheckBoxInput<Boolean> showInfobarForm = InfoForm.getUIFormCheckBoxInput(UIPortalForm.FIELD_SHOW_INFOBAR); + + //TODO: When we need to implement for showPortletMode or showWindowState + // we can change how to get/set value for showInfobarForm (as well as of PortalConfig) + showInfobarForm.setValue(showInfobarForm.isChecked()); + event.getRequestContext().addUIComponentToUpdateByAjax(uiForm); + } + } + private String capitalizeFirstLetter(String word) { if (word == null)

13 years, 1 month

1
0
0 / 0

gatein SVN: r7121 - in epp/portal/branches/EPP_5_2_Branch: component and 94 other directories.

by do-not-reply＠jboss.org

Author: hfnukal Date: 2011-08-15 02:21:28 -0400 (Mon, 15 Aug 2011) New Revision: 7121 Modified: epp/portal/branches/EPP_5_2_Branch/component/application-registry/pom.xml epp/portal/branches/EPP_5_2_Branch/component/common/pom.xml epp/portal/branches/EPP_5_2_Branch/component/identity/pom.xml epp/portal/branches/EPP_5_2_Branch/component/management/pom.xml epp/portal/branches/EPP_5_2_Branch/component/pc/pom.xml epp/portal/branches/EPP_5_2_Branch/component/pom.xml epp/portal/branches/EPP_5_2_Branch/component/portal/pom.xml epp/portal/branches/EPP_5_2_Branch/component/resources/pom.xml epp/portal/branches/EPP_5_2_Branch/component/scripting/pom.xml epp/portal/branches/EPP_5_2_Branch/component/test/core/pom.xml epp/portal/branches/EPP_5_2_Branch/component/test/jcr/pom.xml epp/portal/branches/EPP_5_2_Branch/component/test/organization/pom.xml epp/portal/branches/EPP_5_2_Branch/component/test/pom.xml epp/portal/branches/EPP_5_2_Branch/component/web/api/pom.xml epp/portal/branches/EPP_5_2_Branch/component/web/controller/pom.xml epp/portal/branches/EPP_5_2_Branch/component/web/pom.xml epp/portal/branches/EPP_5_2_Branch/component/web/resources/pom.xml epp/portal/branches/EPP_5_2_Branch/component/web/security/pom.xml epp/portal/branches/EPP_5_2_Branch/component/web/server/pom.xml epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/examples/pom.xml epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/pom.xml epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/portletbridge/pom.xml epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/serverAddon/gatein.ear/pom.xml epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/serverAddon/integration.war/pom.xml epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/serverAddon/pom.xml epp/portal/branches/EPP_5_2_Branch/distribution/pom.xml epp/portal/branches/EPP_5_2_Branch/examples/extension/config/pom.xml epp/portal/branches/EPP_5_2_Branch/examples/extension/ear/pom.xml epp/portal/branches/EPP_5_2_Branch/examples/extension/jar/pom.xml epp/portal/branches/EPP_5_2_Branch/examples/extension/pom.xml epp/portal/branches/EPP_5_2_Branch/examples/extension/war/pom.xml epp/portal/branches/EPP_5_2_Branch/examples/pom.xml epp/portal/branches/EPP_5_2_Branch/examples/portal/config/pom.xml epp/portal/branches/EPP_5_2_Branch/examples/portal/ear/pom.xml epp/portal/branches/EPP_5_2_Branch/examples/portal/jar/pom.xml epp/portal/branches/EPP_5_2_Branch/examples/portal/pom.xml epp/portal/branches/EPP_5_2_Branch/examples/portal/rest-war/pom.xml epp/portal/branches/EPP_5_2_Branch/examples/portal/war/pom.xml epp/portal/branches/EPP_5_2_Branch/examples/portlets/api/pom.xml epp/portal/branches/EPP_5_2_Branch/examples/portlets/jsfhellouser/pom.xml epp/portal/branches/EPP_5_2_Branch/examples/portlets/jsphellouser/pom.xml epp/portal/branches/EPP_5_2_Branch/examples/portlets/pom.xml epp/portal/branches/EPP_5_2_Branch/examples/portlets/simplesthelloworld/pom.xml epp/portal/branches/EPP_5_2_Branch/examples/portlets/struts-jpetstore/pom.xml epp/portal/branches/EPP_5_2_Branch/examples/skins/pom.xml epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/pom.xml epp/portal/branches/EPP_5_2_Branch/gadgets/core/pom.xml epp/portal/branches/EPP_5_2_Branch/gadgets/eXoGadgets/pom.xml epp/portal/branches/EPP_5_2_Branch/gadgets/pom.xml epp/portal/branches/EPP_5_2_Branch/gadgets/server/pom.xml epp/portal/branches/EPP_5_2_Branch/packaging/jboss-as/ear/pom.xml epp/portal/branches/EPP_5_2_Branch/packaging/jboss-as/integration.war/pom.xml epp/portal/branches/EPP_5_2_Branch/packaging/jboss-as/pkg/pom.xml epp/portal/branches/EPP_5_2_Branch/packaging/jboss-as/pom.xml epp/portal/branches/EPP_5_2_Branch/packaging/jetty/pkg/pom.xml epp/portal/branches/EPP_5_2_Branch/packaging/jetty/pom.xml epp/portal/branches/EPP_5_2_Branch/packaging/module/pom.xml epp/portal/branches/EPP_5_2_Branch/packaging/pkg/pom.xml epp/portal/branches/EPP_5_2_Branch/packaging/pom.xml epp/portal/branches/EPP_5_2_Branch/packaging/product/pom.xml epp/portal/branches/EPP_5_2_Branch/packaging/reports/pom.xml epp/portal/branches/EPP_5_2_Branch/pom.xml epp/portal/branches/EPP_5_2_Branch/portlet/dashboard/pom.xml epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/pom.xml epp/portal/branches/EPP_5_2_Branch/portlet/pom.xml epp/portal/branches/EPP_5_2_Branch/portlet/web/pom.xml epp/portal/branches/EPP_5_2_Branch/server/jboss/patch-ear/pom.xml epp/portal/branches/EPP_5_2_Branch/server/jboss/patch-ear/src/main/jboss/server/default/deploy/gatein.ear/integration.war/pom.xml epp/portal/branches/EPP_5_2_Branch/server/jboss/plugin/pom.xml epp/portal/branches/EPP_5_2_Branch/server/jboss/pom.xml epp/portal/branches/EPP_5_2_Branch/server/pom.xml epp/portal/branches/EPP_5_2_Branch/starter/ear/pom.xml epp/portal/branches/EPP_5_2_Branch/starter/jar/pom.xml epp/portal/branches/EPP_5_2_Branch/starter/pom.xml epp/portal/branches/EPP_5_2_Branch/starter/war/pom.xml epp/portal/branches/EPP_5_2_Branch/testsuite/htmlunit-tests/pom.xml epp/portal/branches/EPP_5_2_Branch/testsuite/pom.xml epp/portal/branches/EPP_5_2_Branch/testsuite/selenium-snifftests/pom.xml epp/portal/branches/EPP_5_2_Branch/testsuite/webuibasedsamples/pom.xml epp/portal/branches/EPP_5_2_Branch/web/eXoResources/pom.xml epp/portal/branches/EPP_5_2_Branch/web/pom.xml epp/portal/branches/EPP_5_2_Branch/web/portal/pom.xml epp/portal/branches/EPP_5_2_Branch/web/rest/pom.xml epp/portal/branches/EPP_5_2_Branch/webui/core/pom.xml epp/portal/branches/EPP_5_2_Branch/webui/dashboard/pom.xml epp/portal/branches/EPP_5_2_Branch/webui/eXo/pom.xml epp/portal/branches/EPP_5_2_Branch/webui/framework/pom.xml epp/portal/branches/EPP_5_2_Branch/webui/pom.xml epp/portal/branches/EPP_5_2_Branch/webui/portal/pom.xml epp/portal/branches/EPP_5_2_Branch/webui/portlet/pom.xml epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-component/pom.xml epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-config/pom.xml epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-ear-as5/pom.xml epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-ear/pom.xml epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-war/pom.xml epp/portal/branches/EPP_5_2_Branch/wsrp-integration/pom.xml Log: Update for next development version 5.2.0-DEV03-SNAPSHOT Modified: epp/portal/branches/EPP_5_2_Branch/component/application-registry/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/application-registry/pom.xml 2011-08-14 20:57:51 UTC (rev 7120) +++ epp/portal/branches/EPP_5_2_Branch/component/application-registry/pom.xml 2011-08-15 06:21:28 UTC (rev 7121) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV03-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_2_Branch/component/common/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/common/pom.xml 2011-08-14 20:57:51 UTC (rev 7120) +++ epp/portal/branches/EPP_5_2_Branch/component/common/pom.xml 2011-08-15 06:21:28 UTC (rev 7121) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV03-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>exo.portal.component.common</artifactId> Modified: epp/portal/branches/EPP_5_2_Branch/component/identity/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/identity/pom.xml 2011-08-14 20:57:51 UTC (rev 7120) +++ epp/portal/branches/EPP_5_2_Branch/component/identity/pom.xml 2011-08-15 06:21:28 UTC (rev 7121) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV03-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_2_Branch/component/management/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/management/pom.xml 2011-08-14 20:57:51 UTC (rev 7120) +++ epp/portal/branches/EPP_5_2_Branch/component/management/pom.xml 2011-08-15 06:21:28 UTC (rev 7121) @@ -21,7 +21,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV03-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_2_Branch/component/pc/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/pc/pom.xml 2011-08-14 20:57:51 UTC (rev 7120) +++ epp/portal/branches/EPP_5_2_Branch/component/pc/pom.xml 2011-08-15 06:21:28 UTC (rev 7121) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV03-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_2_Branch/component/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/pom.xml 2011-08-14 20:57:51 UTC (rev 7120) +++ epp/portal/branches/EPP_5_2_Branch/component/pom.xml 2011-08-15 06:21:28 UTC (rev 7121) @@ -26,7 +26,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV03-SNAPSHOT</version> </parent> <artifactId>exo.portal.component</artifactId> Modified: epp/portal/branches/EPP_5_2_Branch/component/portal/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/portal/pom.xml 2011-08-14 20:57:51 UTC (rev 7120) +++ epp/portal/branches/EPP_5_2_Branch/component/portal/pom.xml 2011-08-15 06:21:28 UTC (rev 7121) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV03-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_2_Branch/component/resources/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/resources/pom.xml 2011-08-14 20:57:51 UTC (rev 7120) +++ epp/portal/branches/EPP_5_2_Branch/component/resources/pom.xml 2011-08-15 06:21:28 UTC (rev 7121) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV03-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_2_Branch/component/scripting/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/scripting/pom.xml 2011-08-14 20:57:51 UTC (rev 7120) +++ epp/portal/branches/EPP_5_2_Branch/component/scripting/pom.xml 2011-08-15 06:21:28 UTC (rev 7121) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV03-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_2_Branch/component/test/core/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/test/core/pom.xml 2011-08-14 20:57:51 UTC (rev 7120) +++ epp/portal/branches/EPP_5_2_Branch/component/test/core/pom.xml 2011-08-15 06:21:28 UTC (rev 7121) @@ -22,7 +22,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.test</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV03-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_2_Branch/component/test/jcr/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/test/jcr/pom.xml 2011-08-14 20:57:51 UTC (rev 7120) +++ epp/portal/branches/EPP_5_2_Branch/component/test/jcr/pom.xml 2011-08-15 06:21:28 UTC (rev 7121) @@ -22,7 +22,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.test</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV03-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_2_Branch/component/test/organization/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/test/organization/pom.xml 2011-08-14 20:57:51 UTC (rev 7120) +++ epp/portal/branches/EPP_5_2_Branch/component/test/organization/pom.xml 2011-08-15 06:21:28 UTC (rev 7121) @@ -22,7 +22,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.test</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV03-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_2_Branch/component/test/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/test/pom.xml 2011-08-14 20:57:51 UTC (rev 7120) +++ epp/portal/branches/EPP_5_2_Branch/component/test/pom.xml 2011-08-15 06:21:28 UTC (rev 7121) @@ -22,7 +22,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV03-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_2_Branch/component/web/api/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/web/api/pom.xml 2011-08-14 20:57:51 UTC (rev 7120) +++ epp/portal/branches/EPP_5_2_Branch/component/web/api/pom.xml 2011-08-15 06:21:28 UTC (rev 7121) @@ -21,7 +21,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.web</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV03-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_2_Branch/component/web/controller/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/web/controller/pom.xml 2011-08-14 20:57:51 UTC (rev 7120) +++ epp/portal/branches/EPP_5_2_Branch/component/web/controller/pom.xml 2011-08-15 06:21:28 UTC (rev 7121) @@ -21,7 +21,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.web</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV03-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_2_Branch/component/web/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/web/pom.xml 2011-08-14 20:57:51 UTC (rev 7120) +++ epp/portal/branches/EPP_5_2_Branch/component/web/pom.xml 2011-08-15 06:21:28 UTC (rev 7121) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV03-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_2_Branch/component/web/resources/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/web/resources/pom.xml 2011-08-14 20:57:51 UTC (rev 7120) +++ epp/portal/branches/EPP_5_2_Branch/component/web/resources/pom.xml 2011-08-15 06:21:28 UTC (rev 7121) @@ -21,7 +21,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.web</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV03-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_2_Branch/component/web/security/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/web/security/pom.xml 2011-08-14 20:57:51 UTC (rev 7120) +++ epp/portal/branches/EPP_5_2_Branch/component/web/security/pom.xml 2011-08-15 06:21:28 UTC (rev 7121) @@ -21,7 +21,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.web</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV03-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_2_Branch/component/web/server/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/web/server/pom.xml 2011-08-14 20:57:51 UTC (rev 7120) +++ epp/portal/branches/EPP_5_2_Branch/component/web/server/pom.xml 2011-08-15 06:21:28 UTC (rev 7121) @@ -21,7 +21,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.web</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV03-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/examples/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/examples/pom.xml 2011-08-14 20:57:51 UTC (rev 7120) +++ epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/examples/pom.xml 2011-08-15 06:21:28 UTC (rev 7121) @@ -5,7 +5,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>distribution.parent</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV03-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> 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-08-14 20:57:51 UTC (rev 7120) +++ epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/pom.xml 2011-08-15 06:21:28 UTC (rev 7121) @@ -7,7 +7,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>distribution.parent</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV03-SNAPSHOT</version> </parent> <artifactId>distribution</artifactId> Modified: epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/portletbridge/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/portletbridge/pom.xml 2011-08-14 20:57:51 UTC (rev 7120) +++ epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/portletbridge/pom.xml 2011-08-15 06:21:28 UTC (rev 7121) @@ -5,7 +5,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>distribution.parent</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV03-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/serverAddon/gatein.ear/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/serverAddon/gatein.ear/pom.xml 2011-08-14 20:57:51 UTC (rev 7120) +++ epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/serverAddon/gatein.ear/pom.xml 2011-08-15 06:21:28 UTC (rev 7121) @@ -5,7 +5,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>distribution.parent</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV03-SNAPSHOT</version> <relativePath>../../../pom.xml</relativePath> </parent> <artifactId>gatein</artifactId> Modified: epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/serverAddon/integration.war/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/serverAddon/integration.war/pom.xml 2011-08-14 20:57:51 UTC (rev 7120) +++ epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/serverAddon/integration.war/pom.xml 2011-08-15 06:21:28 UTC (rev 7121) @@ -4,7 +4,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>distribution.parent</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV03-SNAPSHOT</version> <relativePath>../../../pom.xml</relativePath> </parent> <artifactId>integration</artifactId> Modified: epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/serverAddon/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/serverAddon/pom.xml 2011-08-14 20:57:51 UTC (rev 7120) +++ epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/serverAddon/pom.xml 2011-08-15 06:21:28 UTC (rev 7121) @@ -5,7 +5,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>distribution.parent</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV03-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: epp/portal/branches/EPP_5_2_Branch/distribution/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/distribution/pom.xml 2011-08-14 20:57:51 UTC (rev 7120) +++ epp/portal/branches/EPP_5_2_Branch/distribution/pom.xml 2011-08-15 06:21:28 UTC (rev 7121) @@ -7,7 +7,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV03-SNAPSHOT</version> </parent> <artifactId>distribution.parent</artifactId> Modified: epp/portal/branches/EPP_5_2_Branch/examples/extension/config/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/extension/config/pom.xml 2011-08-14 20:57:51 UTC (rev 7120) +++ epp/portal/branches/EPP_5_2_Branch/examples/extension/config/pom.xml 2011-08-15 06:21:28 UTC (rev 7121) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV03-SNAPSHOT</version> <relativePath>../../../pom.xml</relativePath> </parent> Modified: epp/portal/branches/EPP_5_2_Branch/examples/extension/ear/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/extension/ear/pom.xml 2011-08-14 20:57:51 UTC (rev 7120) +++ epp/portal/branches/EPP_5_2_Branch/examples/extension/ear/pom.xml 2011-08-15 06:21:28 UTC (rev 7121) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV03-SNAPSHOT</version> <relativePath>../../../pom.xml</relativePath> </parent> @@ -38,23 +38,23 @@ <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.sample.extension.config</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV03-SNAPSHOT</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.sample.extension.jar</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV03-SNAPSHOT</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.web.api</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV03-SNAPSHOT</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.sample.extension.war</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV03-SNAPSHOT</version> <type>war</type> </dependency> </dependencies> Modified: epp/portal/branches/EPP_5_2_Branch/examples/extension/jar/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/extension/jar/pom.xml 2011-08-14 20:57:51 UTC (rev 7120) +++ epp/portal/branches/EPP_5_2_Branch/examples/extension/jar/pom.xml 2011-08-15 06:21:28 UTC (rev 7121) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV03-SNAPSHOT</version> <relativePath>../../../pom.xml</relativePath> </parent> Modified: epp/portal/branches/EPP_5_2_Branch/examples/extension/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/extension/pom.xml 2011-08-14 20:57:51 UTC (rev 7120) +++ epp/portal/branches/EPP_5_2_Branch/examples/extension/pom.xml 2011-08-15 06:21:28 UTC (rev 7121) @@ -24,7 +24,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV03-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: epp/portal/branches/EPP_5_2_Branch/examples/extension/war/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/extension/war/pom.xml 2011-08-14 20:57:51 UTC (rev 7120) +++ epp/portal/branches/EPP_5_2_Branch/examples/extension/war/pom.xml 2011-08-15 06:21:28 UTC (rev 7121) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV03-SNAPSHOT</version> <relativePath>../../../pom.xml</relativePath> </parent> Modified: epp/portal/branches/EPP_5_2_Branch/examples/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/pom.xml 2011-08-14 20:57:51 UTC (rev 7120) +++ epp/portal/branches/EPP_5_2_Branch/examples/pom.xml 2011-08-15 06:21:28 UTC (rev 7121) @@ -26,7 +26,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV03-SNAPSHOT</version> </parent> <artifactId>exo.portal.sample</artifactId> Modified: epp/portal/branches/EPP_5_2_Branch/examples/portal/config/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/portal/config/pom.xml 2011-08-14 20:57:51 UTC (rev 7120) +++ epp/portal/branches/EPP_5_2_Branch/examples/portal/config/pom.xml 2011-08-15 06:21:28 UTC (rev 7121) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV03-SNAPSHOT</version> <relativePath>../../../pom.xml</relativePath> </parent> Modified: epp/portal/branches/EPP_5_2_Branch/examples/portal/ear/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/portal/ear/pom.xml 2011-08-14 20:57:51 UTC (rev 7120) +++ epp/portal/branches/EPP_5_2_Branch/examples/portal/ear/pom.xml 2011-08-15 06:21:28 UTC (rev 7121) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV03-SNAPSHOT</version> <relativePath>../../../pom.xml</relativePath> </parent> @@ -38,29 +38,29 @@ <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.sample.portal.config</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV03-SNAPSHOT</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.sample.portal.jar</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV03-SNAPSHOT</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.web.api</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV03-SNAPSHOT</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.sample.portal.war</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV03-SNAPSHOT</version> <type>war</type> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.sample.portal.rest-war</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV03-SNAPSHOT</version> <type>war</type> </dependency> </dependencies> Modified: epp/portal/branches/EPP_5_2_Branch/examples/portal/jar/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/portal/jar/pom.xml 2011-08-14 20:57:51 UTC (rev 7120) +++ epp/portal/branches/EPP_5_2_Branch/examples/portal/jar/pom.xml 2011-08-15 06:21:28 UTC (rev 7121) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV03-SNAPSHOT</version> <relativePath>../../../pom.xml</relativePath> </parent> Modified: epp/portal/branches/EPP_5_2_Branch/examples/portal/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/portal/pom.xml 2011-08-14 20:57:51 UTC (rev 7120) +++ epp/portal/branches/EPP_5_2_Branch/examples/portal/pom.xml 2011-08-15 06:21:28 UTC (rev 7121) @@ -24,7 +24,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV03-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: epp/portal/branches/EPP_5_2_Branch/examples/portal/rest-war/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/portal/rest-war/pom.xml 2011-08-14 20:57:51 UTC (rev 7120) +++ epp/portal/branches/EPP_5_2_Branch/examples/portal/rest-war/pom.xml 2011-08-15 06:21:28 UTC (rev 7121) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV03-SNAPSHOT</version> <relativePath>../../../pom.xml</relativePath> </parent> Modified: epp/portal/branches/EPP_5_2_Branch/examples/portal/war/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/portal/war/pom.xml 2011-08-14 20:57:51 UTC (rev 7120) +++ epp/portal/branches/EPP_5_2_Branch/examples/portal/war/pom.xml 2011-08-15 06:21:28 UTC (rev 7121) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV03-SNAPSHOT</version> <relativePath>../../../pom.xml</relativePath> </parent> Modified: epp/portal/branches/EPP_5_2_Branch/examples/portlets/api/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/portlets/api/pom.xml 2011-08-14 20:57:51 UTC (rev 7120) +++ epp/portal/branches/EPP_5_2_Branch/examples/portlets/api/pom.xml 2011-08-15 06:21:28 UTC (rev 7121) @@ -9,7 +9,7 @@ <parent> <groupId>org.gatein.portal.examples.portlets</groupId> <artifactId>portlets-parent</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV03-SNAPSHOT</version> </parent> <artifactId>gatein-api</artifactId> Modified: epp/portal/branches/EPP_5_2_Branch/examples/portlets/jsfhellouser/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/portlets/jsfhellouser/pom.xml 2011-08-14 20:57:51 UTC (rev 7120) +++ epp/portal/branches/EPP_5_2_Branch/examples/portlets/jsfhellouser/pom.xml 2011-08-15 06:21:28 UTC (rev 7121) @@ -9,7 +9,7 @@ <parent> <groupId>org.gatein.portal.examples.portlets</groupId> <artifactId>portlets-parent</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV03-SNAPSHOT</version> </parent> <artifactId>gatein-jsf-hellouser</artifactId> Modified: epp/portal/branches/EPP_5_2_Branch/examples/portlets/jsphellouser/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/portlets/jsphellouser/pom.xml 2011-08-14 20:57:51 UTC (rev 7120) +++ epp/portal/branches/EPP_5_2_Branch/examples/portlets/jsphellouser/pom.xml 2011-08-15 06:21:28 UTC (rev 7121) @@ -9,7 +9,7 @@ <parent> <groupId>org.gatein.portal.examples.portlets</groupId> <artifactId>portlets-parent</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV03-SNAPSHOT</version> </parent> <artifactId>gatein-jsp-hellouser</artifactId> Modified: epp/portal/branches/EPP_5_2_Branch/examples/portlets/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/portlets/pom.xml 2011-08-14 20:57:51 UTC (rev 7120) +++ epp/portal/branches/EPP_5_2_Branch/examples/portlets/pom.xml 2011-08-15 06:21:28 UTC (rev 7121) @@ -5,7 +5,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV03-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: epp/portal/branches/EPP_5_2_Branch/examples/portlets/simplesthelloworld/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/portlets/simplesthelloworld/pom.xml 2011-08-14 20:57:51 UTC (rev 7120) +++ epp/portal/branches/EPP_5_2_Branch/examples/portlets/simplesthelloworld/pom.xml 2011-08-15 06:21:28 UTC (rev 7121) @@ -9,7 +9,7 @@ <parent> <groupId>org.gatein.portal.examples.portlets</groupId> <artifactId>portlets-parent</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV03-SNAPSHOT</version> </parent> <artifactId>gatein-simplest-helloworld</artifactId> Modified: epp/portal/branches/EPP_5_2_Branch/examples/portlets/struts-jpetstore/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/portlets/struts-jpetstore/pom.xml 2011-08-14 20:57:51 UTC (rev 7120) +++ epp/portal/branches/EPP_5_2_Branch/examples/portlets/struts-jpetstore/pom.xml 2011-08-15 06:21:28 UTC (rev 7121) @@ -5,7 +5,7 @@ <parent> <groupId>org.gatein.portal.examples.portlets</groupId> <artifactId>portlets-parent</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV03-SNAPSHOT</version> </parent> <artifactId>struts-jpetstore</artifactId> Modified: epp/portal/branches/EPP_5_2_Branch/examples/skins/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/skins/pom.xml 2011-08-14 20:57:51 UTC (rev 7120) +++ epp/portal/branches/EPP_5_2_Branch/examples/skins/pom.xml 2011-08-15 06:21:28 UTC (rev 7121) @@ -5,7 +5,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV03-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/pom.xml 2011-08-14 20:57:51 UTC (rev 7120) +++ epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/pom.xml 2011-08-15 06:21:28 UTC (rev 7121) @@ -25,7 +25,7 @@ <parent> <groupId>org.gatein.portal.examples.skins</groupId> <artifactId>skins-parent</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV03-SNAPSHOT</version> </parent> <artifactId>gatein-sample-skin</artifactId> Modified: epp/portal/branches/EPP_5_2_Branch/gadgets/core/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/gadgets/core/pom.xml 2011-08-14 20:57:51 UTC (rev 7120) +++ epp/portal/branches/EPP_5_2_Branch/gadgets/core/pom.xml 2011-08-15 06:21:28 UTC (rev 7121) @@ -14,7 +14,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.gadgets</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV03-SNAPSHOT</version> </parent> <artifactId>exo.portal.gadgets-core</artifactId> Modified: epp/portal/branches/EPP_5_2_Branch/gadgets/eXoGadgets/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/gadgets/eXoGadgets/pom.xml 2011-08-14 20:57:51 UTC (rev 7120) +++ epp/portal/branches/EPP_5_2_Branch/gadgets/eXoGadgets/pom.xml 2011-08-15 06:21:28 UTC (rev 7121) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.gadgets</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV03-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_2_Branch/gadgets/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/gadgets/pom.xml 2011-08-14 20:57:51 UTC (rev 7120) +++ epp/portal/branches/EPP_5_2_Branch/gadgets/pom.xml 2011-08-15 06:21:28 UTC (rev 7121) @@ -24,7 +24,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV03-SNAPSHOT</version> </parent> <artifactId>exo.portal.gadgets</artifactId> Modified: epp/portal/branches/EPP_5_2_Branch/gadgets/server/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/gadgets/server/pom.xml 2011-08-14 20:57:51 UTC (rev 7120) +++ epp/portal/branches/EPP_5_2_Branch/gadgets/server/pom.xml 2011-08-15 06:21:28 UTC (rev 7121) @@ -25,7 +25,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.gadgets</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV03-SNAPSHOT</version> </parent> <artifactId>exo.portal.gadgets-server</artifactId> Modified: epp/portal/branches/EPP_5_2_Branch/packaging/jboss-as/ear/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/packaging/jboss-as/ear/pom.xml 2011-08-14 20:57:51 UTC (rev 7120) +++ epp/portal/branches/EPP_5_2_Branch/packaging/jboss-as/ear/pom.xml 2011-08-15 06:21:28 UTC (rev 7121) @@ -4,7 +4,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV03-SNAPSHOT</version> </parent> <artifactId>exo.portal.packaging.jboss-as.ear</artifactId> <packaging>ear</packaging> Modified: epp/portal/branches/EPP_5_2_Branch/packaging/jboss-as/integration.war/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/packaging/jboss-as/integration.war/pom.xml 2011-08-14 20:57:51 UTC (rev 7120) +++ epp/portal/branches/EPP_5_2_Branch/packaging/jboss-as/integration.war/pom.xml 2011-08-15 06:21:28 UTC (rev 7121) @@ -4,7 +4,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV03-SNAPSHOT</version> </parent> <artifactId>exo.portal.packaging.jboss-as.integration</artifactId> <packaging>war</packaging> Modified: epp/portal/branches/EPP_5_2_Branch/packaging/jboss-as/pkg/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/packaging/jboss-as/pkg/pom.xml 2011-08-14 20:57:51 UTC (rev 7120) +++ epp/portal/branches/EPP_5_2_Branch/packaging/jboss-as/pkg/pom.xml 2011-08-15 06:21:28 UTC (rev 7121) @@ -6,7 +6,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV03-SNAPSHOT</version> </parent> <artifactId>exo.portal.packaging.jboss-as.pkg</artifactId> <packaging>pom</packaging> Modified: epp/portal/branches/EPP_5_2_Branch/packaging/jboss-as/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/packaging/jboss-as/pom.xml 2011-08-14 20:57:51 UTC (rev 7120) +++ epp/portal/branches/EPP_5_2_Branch/packaging/jboss-as/pom.xml 2011-08-15 06:21:28 UTC (rev 7121) @@ -5,7 +5,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV03-SNAPSHOT</version> </parent> <artifactId>exo.portal.packaging.jboss-as</artifactId> <packaging>pom</packaging> Modified: epp/portal/branches/EPP_5_2_Branch/packaging/jetty/pkg/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/packaging/jetty/pkg/pom.xml 2011-08-14 20:57:51 UTC (rev 7120) +++ epp/portal/branches/EPP_5_2_Branch/packaging/jetty/pkg/pom.xml 2011-08-15 06:21:28 UTC (rev 7121) @@ -8,7 +8,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV03-SNAPSHOT</version> </parent> <artifactId>exo.portal.packaging.jetty.pkg</artifactId> <packaging>pom</packaging> Modified: epp/portal/branches/EPP_5_2_Branch/packaging/jetty/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/packaging/jetty/pom.xml 2011-08-14 20:57:51 UTC (rev 7120) +++ epp/portal/branches/EPP_5_2_Branch/packaging/jetty/pom.xml 2011-08-15 06:21:28 UTC (rev 7121) @@ -5,7 +5,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV03-SNAPSHOT</version> </parent> <artifactId>exo.portal.packaging.jetty</artifactId> <packaging>pom</packaging> Modified: epp/portal/branches/EPP_5_2_Branch/packaging/module/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/packaging/module/pom.xml 2011-08-14 20:57:51 UTC (rev 7120) +++ epp/portal/branches/EPP_5_2_Branch/packaging/module/pom.xml 2011-08-15 06:21:28 UTC (rev 7121) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.packaging</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV03-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_2_Branch/packaging/pkg/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/packaging/pkg/pom.xml 2011-08-14 20:57:51 UTC (rev 7120) +++ epp/portal/branches/EPP_5_2_Branch/packaging/pkg/pom.xml 2011-08-15 06:21:28 UTC (rev 7121) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.packaging</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV03-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> @@ -67,13 +67,13 @@ <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>portal.packaging.module</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV03-SNAPSHOT</version> <type>js</type> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>portal.packaging.product</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV03-SNAPSHOT</version> <type>js</type> </dependency> </dependencies> Modified: epp/portal/branches/EPP_5_2_Branch/packaging/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/packaging/pom.xml 2011-08-14 20:57:51 UTC (rev 7120) +++ epp/portal/branches/EPP_5_2_Branch/packaging/pom.xml 2011-08-15 06:21:28 UTC (rev 7121) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV03-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_2_Branch/packaging/product/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/packaging/product/pom.xml 2011-08-14 20:57:51 UTC (rev 7120) +++ epp/portal/branches/EPP_5_2_Branch/packaging/product/pom.xml 2011-08-15 06:21:28 UTC (rev 7121) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.packaging</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV03-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_2_Branch/packaging/reports/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/packaging/reports/pom.xml 2011-08-14 20:57:51 UTC (rev 7120) +++ epp/portal/branches/EPP_5_2_Branch/packaging/reports/pom.xml 2011-08-15 06:21:28 UTC (rev 7121) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.packaging</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV03-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_2_Branch/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/pom.xml 2011-08-14 20:57:51 UTC (rev 7120) +++ epp/portal/branches/EPP_5_2_Branch/pom.xml 2011-08-15 06:21:28 UTC (rev 7121) @@ -31,7 +31,7 @@ <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV03-SNAPSHOT</version> <packaging>pom</packaging> <name>EPP GateIn - Portal - ${project.version}</name> @@ -446,167 +446,157 @@ <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.common</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV03-SNAPSHOT</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.web</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV03-SNAPSHOT</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.web.controller</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV03-SNAPSHOT</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.web.security</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV03-SNAPSHOT</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.web.server</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV03-SNAPSHOT</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.web.api</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV03-SNAPSHOT</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.web.resources</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV03-SNAPSHOT</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.portal</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV03-SNAPSHOT</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.portal</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV03-SNAPSHOT</version> <type>test-jar</type> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.pc</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV03-SNAPSHOT</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.identity</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV03-SNAPSHOT</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.resources</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV03-SNAPSHOT</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.application-registry</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV03-SNAPSHOT</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.xml-parser</artifactId> - <version>5.1.0-epp-ER01-SNAPSHOT</version> + <version>5.1.0-epp-DEV02</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.scripting</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV03-SNAPSHOT</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.management</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV03-SNAPSHOT</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.webui.framework</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV03-SNAPSHOT</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.webui.portlet</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV03-SNAPSHOT</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.webui.portal</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV03-SNAPSHOT</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.webui.eXo</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV03-SNAPSHOT</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.webui.core</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV03-SNAPSHOT</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.webui.dashboard</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV03-SNAPSHOT</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.gadgets-core</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV03-SNAPSHOT</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.test.core</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV03-SNAPSHOT</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.test.core</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV03-SNAPSHOT</version> <type>test-jar</type> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.test.jcr</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV03-SNAPSHOT</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.test.jcr</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV03-SNAPSHOT</version> <type>test-jar</type> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.test.organization</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV03-SNAPSHOT</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.test.organization</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV03-SNAPSHOT</version> <type>test-jar</type> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> - <artifactId>gatein.portal.component.wsrp</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.server.jboss.plugin</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV03-SNAPSHOT</version> </dependency> - <dependency> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.server.tomcat.plugin</artifactId> - <version>5.1.0-epp-ER01-SNAPSHOT</version> - </dependency>  <dependency> Modified: epp/portal/branches/EPP_5_2_Branch/portlet/dashboard/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/portlet/dashboard/pom.xml 2011-08-14 20:57:51 UTC (rev 7120) +++ epp/portal/branches/EPP_5_2_Branch/portlet/dashboard/pom.xml 2011-08-15 06:21:28 UTC (rev 7121) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.portlet</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV03-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/pom.xml 2011-08-14 20:57:51 UTC (rev 7120) +++ epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/pom.xml 2011-08-15 06:21:28 UTC (rev 7121) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.portlet</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV03-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_2_Branch/portlet/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/portlet/pom.xml 2011-08-14 20:57:51 UTC (rev 7120) +++ epp/portal/branches/EPP_5_2_Branch/portlet/pom.xml 2011-08-15 06:21:28 UTC (rev 7121) @@ -26,7 +26,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV03-SNAPSHOT</version> </parent> <artifactId>exo.portal.portlet</artifactId> Modified: epp/portal/branches/EPP_5_2_Branch/portlet/web/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/portlet/web/pom.xml 2011-08-14 20:57:51 UTC (rev 7120) +++ epp/portal/branches/EPP_5_2_Branch/portlet/web/pom.xml 2011-08-15 06:21:28 UTC (rev 7121) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.portlet</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV03-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_2_Branch/server/jboss/patch-ear/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/server/jboss/patch-ear/pom.xml 2011-08-14 20:57:51 UTC (rev 7120) +++ epp/portal/branches/EPP_5_2_Branch/server/jboss/patch-ear/pom.xml 2011-08-15 06:21:28 UTC (rev 7121) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.server.jboss</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV03-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_2_Branch/server/jboss/patch-ear/src/main/jboss/server/default/deploy/gatein.ear/integration.war/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/server/jboss/patch-ear/src/main/jboss/server/default/deploy/gatein.ear/integration.war/pom.xml 2011-08-14 20:57:51 UTC (rev 7120) +++ epp/portal/branches/EPP_5_2_Branch/server/jboss/patch-ear/src/main/jboss/server/default/deploy/gatein.ear/integration.war/pom.xml 2011-08-15 06:21:28 UTC (rev 7121) @@ -4,7 +4,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV03-SNAPSHOT</version> </parent> <artifactId>exo.portal.packaging.jboss-as.integration</artifactId> <packaging>war</packaging> Modified: epp/portal/branches/EPP_5_2_Branch/server/jboss/plugin/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/server/jboss/plugin/pom.xml 2011-08-14 20:57:51 UTC (rev 7120) +++ epp/portal/branches/EPP_5_2_Branch/server/jboss/plugin/pom.xml 2011-08-15 06:21:28 UTC (rev 7121) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.server.jboss</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV03-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_2_Branch/server/jboss/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/server/jboss/pom.xml 2011-08-14 20:57:51 UTC (rev 7120) +++ epp/portal/branches/EPP_5_2_Branch/server/jboss/pom.xml 2011-08-15 06:21:28 UTC (rev 7121) @@ -26,7 +26,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.server</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV03-SNAPSHOT</version> </parent> <artifactId>exo.portal.server.jboss</artifactId> Modified: epp/portal/branches/EPP_5_2_Branch/server/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/server/pom.xml 2011-08-14 20:57:51 UTC (rev 7120) +++ epp/portal/branches/EPP_5_2_Branch/server/pom.xml 2011-08-15 06:21:28 UTC (rev 7121) @@ -26,7 +26,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV03-SNAPSHOT</version> </parent> <artifactId>exo.portal.server</artifactId> Modified: epp/portal/branches/EPP_5_2_Branch/starter/ear/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/starter/ear/pom.xml 2011-08-14 20:57:51 UTC (rev 7120) +++ epp/portal/branches/EPP_5_2_Branch/starter/ear/pom.xml 2011-08-15 06:21:28 UTC (rev 7121) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV03-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> @@ -38,7 +38,7 @@ <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.starter.war</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV03-SNAPSHOT</version> <type>war</type> </dependency> </dependencies> Modified: epp/portal/branches/EPP_5_2_Branch/starter/jar/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/starter/jar/pom.xml 2011-08-14 20:57:51 UTC (rev 7120) +++ epp/portal/branches/EPP_5_2_Branch/starter/jar/pom.xml 2011-08-15 06:21:28 UTC (rev 7121) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV03-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: epp/portal/branches/EPP_5_2_Branch/starter/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/starter/pom.xml 2011-08-14 20:57:51 UTC (rev 7120) +++ epp/portal/branches/EPP_5_2_Branch/starter/pom.xml 2011-08-15 06:21:28 UTC (rev 7121) @@ -24,7 +24,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV03-SNAPSHOT</version> </parent> <artifactId>exo.portal.starter.root</artifactId> Modified: epp/portal/branches/EPP_5_2_Branch/starter/war/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/starter/war/pom.xml 2011-08-14 20:57:51 UTC (rev 7120) +++ epp/portal/branches/EPP_5_2_Branch/starter/war/pom.xml 2011-08-15 06:21:28 UTC (rev 7121) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV03-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> @@ -51,7 +51,7 @@ <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.starter.jar</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV03-SNAPSHOT</version> </dependency> </dependencies> </project> Modified: epp/portal/branches/EPP_5_2_Branch/testsuite/htmlunit-tests/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/testsuite/htmlunit-tests/pom.xml 2011-08-14 20:57:51 UTC (rev 7120) +++ epp/portal/branches/EPP_5_2_Branch/testsuite/htmlunit-tests/pom.xml 2011-08-15 06:21:28 UTC (rev 7121) @@ -23,10 +23,14 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> - + <parent> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.testsuite</artifactId> + <version>5.2.0-epp-DEV03-SNAPSHOT</version> + </parent> + <groupId>org.jboss.gatein</groupId> <artifactId>gatein.tests.htmlunit</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> <packaging>jar</packaging> <name>HTMLUnit Tests for GateIn</name> <description>HTMLUnit Tests for GateIn</description> Modified: epp/portal/branches/EPP_5_2_Branch/testsuite/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/testsuite/pom.xml 2011-08-14 20:57:51 UTC (rev 7120) +++ epp/portal/branches/EPP_5_2_Branch/testsuite/pom.xml 2011-08-15 06:21:28 UTC (rev 7121) @@ -3,7 +3,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV03-SNAPSHOT</version> </parent> <artifactId>exo.portal.testsuite</artifactId> Modified: epp/portal/branches/EPP_5_2_Branch/testsuite/selenium-snifftests/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/testsuite/selenium-snifftests/pom.xml 2011-08-14 20:57:51 UTC (rev 7120) +++ epp/portal/branches/EPP_5_2_Branch/testsuite/selenium-snifftests/pom.xml 2011-08-15 06:21:28 UTC (rev 7121) @@ -3,7 +3,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.testsuite</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV03-SNAPSHOT</version> </parent> <artifactId>exo.portal.selenium.snifftests</artifactId> Modified: epp/portal/branches/EPP_5_2_Branch/testsuite/webuibasedsamples/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/testsuite/webuibasedsamples/pom.xml 2011-08-14 20:57:51 UTC (rev 7120) +++ epp/portal/branches/EPP_5_2_Branch/testsuite/webuibasedsamples/pom.xml 2011-08-15 06:21:28 UTC (rev 7121) @@ -3,7 +3,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.testsuite</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV03-SNAPSHOT</version> </parent> <artifactId>exo.webui.based.samples</artifactId> Modified: epp/portal/branches/EPP_5_2_Branch/web/eXoResources/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/web/eXoResources/pom.xml 2011-08-14 20:57:51 UTC (rev 7120) +++ epp/portal/branches/EPP_5_2_Branch/web/eXoResources/pom.xml 2011-08-15 06:21:28 UTC (rev 7121) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.web</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV03-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_2_Branch/web/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/web/pom.xml 2011-08-14 20:57:51 UTC (rev 7120) +++ epp/portal/branches/EPP_5_2_Branch/web/pom.xml 2011-08-15 06:21:28 UTC (rev 7121) @@ -26,7 +26,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV03-SNAPSHOT</version> </parent> <artifactId>exo.portal.web</artifactId> Modified: epp/portal/branches/EPP_5_2_Branch/web/portal/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/web/portal/pom.xml 2011-08-14 20:57:51 UTC (rev 7120) +++ epp/portal/branches/EPP_5_2_Branch/web/portal/pom.xml 2011-08-15 06:21:28 UTC (rev 7121) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.web</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV03-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_2_Branch/web/rest/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/web/rest/pom.xml 2011-08-14 20:57:51 UTC (rev 7120) +++ epp/portal/branches/EPP_5_2_Branch/web/rest/pom.xml 2011-08-15 06:21:28 UTC (rev 7121) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.web</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV03-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_2_Branch/webui/core/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/webui/core/pom.xml 2011-08-14 20:57:51 UTC (rev 7120) +++ epp/portal/branches/EPP_5_2_Branch/webui/core/pom.xml 2011-08-15 06:21:28 UTC (rev 7121) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.webui</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV03-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_2_Branch/webui/dashboard/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/webui/dashboard/pom.xml 2011-08-14 20:57:51 UTC (rev 7120) +++ epp/portal/branches/EPP_5_2_Branch/webui/dashboard/pom.xml 2011-08-15 06:21:28 UTC (rev 7121) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.webui</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV03-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_2_Branch/webui/eXo/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/webui/eXo/pom.xml 2011-08-14 20:57:51 UTC (rev 7120) +++ epp/portal/branches/EPP_5_2_Branch/webui/eXo/pom.xml 2011-08-15 06:21:28 UTC (rev 7121) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.webui</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV03-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_2_Branch/webui/framework/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/webui/framework/pom.xml 2011-08-14 20:57:51 UTC (rev 7120) +++ epp/portal/branches/EPP_5_2_Branch/webui/framework/pom.xml 2011-08-15 06:21:28 UTC (rev 7121) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.webui</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV03-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_2_Branch/webui/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/webui/pom.xml 2011-08-14 20:57:51 UTC (rev 7120) +++ epp/portal/branches/EPP_5_2_Branch/webui/pom.xml 2011-08-15 06:21:28 UTC (rev 7121) @@ -26,7 +26,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV03-SNAPSHOT</version> </parent> <artifactId>exo.portal.webui</artifactId> Modified: epp/portal/branches/EPP_5_2_Branch/webui/portal/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/webui/portal/pom.xml 2011-08-14 20:57:51 UTC (rev 7120) +++ epp/portal/branches/EPP_5_2_Branch/webui/portal/pom.xml 2011-08-15 06:21:28 UTC (rev 7121) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.webui</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV03-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_2_Branch/webui/portlet/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/webui/portlet/pom.xml 2011-08-14 20:57:51 UTC (rev 7120) +++ epp/portal/branches/EPP_5_2_Branch/webui/portlet/pom.xml 2011-08-15 06:21:28 UTC (rev 7121) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.webui</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV03-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-component/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-component/pom.xml 2011-08-14 20:57:51 UTC (rev 7120) +++ epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-component/pom.xml 2011-08-15 06:21:28 UTC (rev 7121) @@ -28,7 +28,7 @@ <parent> <artifactId>gatein-wsrp-integration-parent</artifactId> <groupId>org.gatein.integration</groupId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV03-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-config/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-config/pom.xml 2011-08-14 20:57:51 UTC (rev 7120) +++ epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-config/pom.xml 2011-08-15 06:21:28 UTC (rev 7121) @@ -27,7 +27,7 @@ <parent> <artifactId>gatein-wsrp-integration-parent</artifactId> <groupId>org.gatein.integration</groupId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV03-SNAPSHOT</version> </parent> <artifactId>extension-config</artifactId> Modified: epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-ear/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-ear/pom.xml 2011-08-14 20:57:51 UTC (rev 7120) +++ epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-ear/pom.xml 2011-08-15 06:21:28 UTC (rev 7121) @@ -28,7 +28,7 @@ <parent> <artifactId>gatein-wsrp-integration-parent</artifactId> <groupId>org.gatein.integration</groupId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV03-SNAPSHOT</version> </parent> <artifactId>extension-ear</artifactId> Modified: epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-ear-as5/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-ear-as5/pom.xml 2011-08-14 20:57:51 UTC (rev 7120) +++ epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-ear-as5/pom.xml 2011-08-15 06:21:28 UTC (rev 7121) @@ -27,7 +27,7 @@ <parent> <groupId>org.gatein.integration</groupId> <artifactId>gatein-wsrp-integration-parent</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV03-SNAPSHOT</version> </parent> <artifactId>extension-ear-as5</artifactId> Modified: epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-war/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-war/pom.xml 2011-08-14 20:57:51 UTC (rev 7120) +++ epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-war/pom.xml 2011-08-15 06:21:28 UTC (rev 7121) @@ -28,7 +28,7 @@ <parent> <artifactId>gatein-wsrp-integration-parent</artifactId> <groupId>org.gatein.integration</groupId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV03-SNAPSHOT</version> </parent> <artifactId>extension-war</artifactId> Modified: epp/portal/branches/EPP_5_2_Branch/wsrp-integration/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/wsrp-integration/pom.xml 2011-08-14 20:57:51 UTC (rev 7120) +++ epp/portal/branches/EPP_5_2_Branch/wsrp-integration/pom.xml 2011-08-15 06:21:28 UTC (rev 7121) @@ -35,7 +35,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0-epp-DEV02-SNAPSHOT</version> + <version>5.2.0-epp-DEV03-SNAPSHOT</version> </parent> <description>GateIn WSRP Integration extension parent</description>

13 years, 1 month

1
0
0 / 0

gatein SVN: r7120 - in portal/trunk/component/portal/src: test/java/org/exoplatform/portal and 1 other directory.

by do-not-reply＠jboss.org

Author: julien_viet Date: 2011-08-14 16:57:51 -0400 (Sun, 14 Aug 2011) New Revision: 7120 Modified: portal/trunk/component/portal/src/main/java/gatein_objects_1_2.xsd portal/trunk/component/portal/src/test/java/org/exoplatform/portal/TestXSDCorruption.java Log: factor out the common XML elements as applicationGroup in gatein object 1.2 XSD Modified: portal/trunk/component/portal/src/main/java/gatein_objects_1_2.xsd =================================================================== --- portal/trunk/component/portal/src/main/java/gatein_objects_1_2.xsd 2011-08-14 20:46:07 UTC (rev 7119) +++ portal/trunk/component/portal/src/main/java/gatein_objects_1_2.xsd 2011-08-14 20:57:51 UTC (rev 7120) @@ -180,22 +180,19 @@ <xs:element name="portlet" type="portletType"/> <xs:element name="wsrp" type="xs:string"/> </xs:choice> - <xs:element name="theme" type="xs:string" minOccurs="0" maxOccurs="1"/> - <xs:element name="title" type="xs:string" minOccurs="0" maxOccurs="1"/> - <xs:element name="access-permissions" type="xs:string" minOccurs="1" maxOccurs="1"/> - <xs:element name="show-info-bar" type="xs:boolean" minOccurs="1" maxOccurs="1"/> - <xs:element name="show-application-state" type="xs:boolean" minOccurs="0" maxOccurs="1"/> - <xs:element name="show-application-mode" type="xs:boolean" minOccurs="0" maxOccurs="1"/> - <xs:element name="description" type="xs:string" minOccurs="0" maxOccurs="1"/> - <xs:element name="icon" type="xs:string" minOccurs="0" maxOccurs="1"/> - <xs:element name="width" type="xs:string" minOccurs="0" maxOccurs="1"/> - <xs:element name="height" type="xs:string" minOccurs="0" maxOccurs="1"/> + <xs:group ref="applicationGroup"/> </xs:sequence> </xs:complexType> <xs:complexType name="gadgetApplicationType"> <xs:sequence> <xs:element name="gadget" type="gadgetType" minOccurs="1" maxOccurs="1"/> + <xs:group ref="applicationGroup"/> + </xs:sequence> + </xs:complexType> + + <xs:group name="applicationGroup"> + <xs:sequence> <xs:element name="theme" type="xs:string" minOccurs="0" maxOccurs="1"/> <xs:element name="title" type="xs:string" minOccurs="0" maxOccurs="1"/> <xs:element name="access-permissions" type="xs:string" minOccurs="1" maxOccurs="1"/> @@ -207,7 +204,7 @@ <xs:element name="width" type="xs:string" minOccurs="0" maxOccurs="1"/> <xs:element name="height" type="xs:string" minOccurs="0" maxOccurs="1"/> </xs:sequence> - </xs:complexType> + </xs:group> <xs:complexType name="portletType"> <xs:sequence> @@ -236,4 +233,4 @@ <xs:element name="read-only" type="xs:string" minOccurs="0" maxOccurs="1"/> </xs:sequence> </xs:complexType> -</xs:schema> \ No newline at end of file +</xs:schema> Modified: portal/trunk/component/portal/src/test/java/org/exoplatform/portal/TestXSDCorruption.java =================================================================== --- portal/trunk/component/portal/src/test/java/org/exoplatform/portal/TestXSDCorruption.java 2011-08-14 20:46:07 UTC (rev 7119) +++ portal/trunk/component/portal/src/test/java/org/exoplatform/portal/TestXSDCorruption.java 2011-08-14 20:57:51 UTC (rev 7120) @@ -60,6 +60,6 @@ { assertHash("d0591b0a022a0c2929e1aed8979857cd", "gatein_objects_1_0.xsd"); assertHash("99ae24c9bbfe1b59e066756a29ab6c79", "gatein_objects_1_1.xsd"); - assertHash("852e20df61c51199e3425f0882f2581d", "gatein_objects_1_2.xsd"); + assertHash("b0e79a35641cccf49c8796a99a5a91a3", "gatein_objects_1_2.xsd"); } }

13 years, 1 month

1
0
0 / 0

gatein SVN: r7119 - in portal/trunk/component/web/controller/src: main/java/org/exoplatform/web/controller/router and 2 other directories.

by do-not-reply＠jboss.org

Author: julien_viet Date: 2011-08-14 16:46:07 -0400 (Sun, 14 Aug 2011) New Revision: 7119 Added: portal/trunk/component/web/controller/src/main/java/org/exoplatform/web/controller/regexp/REParser.java portal/trunk/component/web/controller/src/main/java/org/exoplatform/web/controller/regexp/RERenderer.java Removed: portal/trunk/component/web/controller/src/main/java/org/exoplatform/web/controller/regexp/Parser.java portal/trunk/component/web/controller/src/main/java/org/exoplatform/web/controller/regexp/RegExpParser.java portal/trunk/component/web/controller/src/main/java/org/exoplatform/web/controller/regexp/RegExpRenderer.java portal/trunk/component/web/controller/src/main/java/org/exoplatform/web/controller/regexp/SubCharSequence.java portal/trunk/component/web/controller/src/test/java/org/exoplatform/web/controller/regexp/TestSubCharSequence.java Modified: portal/trunk/component/web/controller/src/main/java/org/exoplatform/web/controller/router/PathParam.java portal/trunk/component/web/controller/src/test/java/org/exoplatform/web/controller/regexp/TestParser.java portal/trunk/component/web/controller/src/test/java/org/exoplatform/web/controller/regexp/TestRegExpAnalyser.java portal/trunk/component/web/controller/src/test/java/org/exoplatform/web/controller/regexp/TestRegExpParser.java portal/trunk/component/web/controller/src/test/java/org/exoplatform/web/controller/regexp/TestRegExpRenderer.java portal/trunk/component/web/controller/src/test/java/org/exoplatform/web/controller/router/TestRouteEscaper.java Log: - rename RegExpRender and RegExpParser - remove obsolete code Deleted: portal/trunk/component/web/controller/src/main/java/org/exoplatform/web/controller/regexp/Parser.java =================================================================== --- portal/trunk/component/web/controller/src/main/java/org/exoplatform/web/controller/regexp/Parser.java 2011-08-14 20:35:39 UTC (rev 7118) +++ portal/trunk/component/web/controller/src/main/java/org/exoplatform/web/controller/regexp/Parser.java 2011-08-14 20:46:07 UTC (rev 7119) @@ -1,41 +0,0 @@ -/* - * Copyright (C) 2011 eXo Platform SAS. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ - -package org.exoplatform.web.controller.regexp; - -/** - * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> - * @version $Revision$ - */ -public abstract class Parser -{ - - public Parser() - { - } - -/* - protected final SyntaxException createSyntaxException(String msg, int start, int end) - { - StringBuilder sb = new StringBuilder(msg).append(" : "); - sb.append(s, 0, start).append(" ->").append(s, start, end).append("<- ").append(s, end, s.length()); - return new SyntaxException(sb.toString()); - } -*/ -} Copied: portal/trunk/component/web/controller/src/main/java/org/exoplatform/web/controller/regexp/REParser.java (from rev 7117, portal/trunk/component/web/controller/src/main/java/org/exoplatform/web/controller/regexp/RegExpParser.java) =================================================================== --- portal/trunk/component/web/controller/src/main/java/org/exoplatform/web/controller/regexp/REParser.java (rev 0) +++ portal/trunk/component/web/controller/src/main/java/org/exoplatform/web/controller/regexp/REParser.java 2011-08-14 20:46:07 UTC (rev 7119) @@ -0,0 +1,375 @@ +/* + * Copyright (C) 2011 eXo Platform SAS. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ + +package org.exoplatform.web.controller.regexp; + +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +/** + * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> + * @version $Revision$ + */ +public class REParser +{ + + /** . */ + private final Lexer lexer; + + public REParser(CharSequence seq) + { + this.lexer = new Lexer(seq); + } + + public REParser(Lexer lexer) + { + this.lexer = lexer; + } + + public void reset() + { + lexer.reset(); + } + + public int getIndex() + { + return lexer.getIndex(); + } + + public RENode parse() throws SyntaxException + { + return parseDisjunction(); + } + + public boolean isDone() + { + return lexer.isDone(); + } + + public RENode.Disjunction parseDisjunction() throws SyntaxException + { + RENode.Alternative alternative = parseAlternative(); + if (alternative != null) + { + if (lexer.next(Kind.OR)) + { + RENode.Disjunction next = parseDisjunction(); + return new RENode.Disjunction(alternative, next); + } + else + { + return new RENode.Disjunction(alternative); + } + } + else + { + if (lexer.next(Kind.OR)) + { + RENode.Disjunction next = parseDisjunction(); + return new RENode.Disjunction(null, next); + } + else + { + return null; + } + } + } + + public RENode.Alternative parseAlternative() throws SyntaxException + { + RENode.Expr expr = parseExpression(); + if (expr != null) + { + RENode.Alternative next = parseAlternative(); + return new RENode.Alternative(expr, next); + } + else + { + return null; + } + } + + public RENode.Expr parseExpression() throws SyntaxException + { + RENode.Expr expr; + if (lexer.next(Kind.BEGIN)) + { + expr = new RENode.Assertion.Begin(); + } + else if (lexer.next(Kind.END)) + { + expr = new RENode.Assertion.End(); + } + else if (lexer.next(Kind.GROUP_OPEN)) + { + GroupType groupType = GroupType.forPrefix(lexer.getToken()); + RENode.Disjunction group = parseDisjunction(); + if (lexer.next(Kind.GROUP_CLOSE)) + { + expr = new RENode.Group(group, groupType); + } + else + { + throw new SyntaxException("Group not closed "); + } + } + else + { + expr = parseCharacter(); + } + if (expr != null) + { + Quantifier quantifier = parseQuantifier(); + if (quantifier != null) + { + expr.setQuantifier(quantifier); + } + } + return expr; + } + + private static final Pattern QUANTIFIER_PATTERN = Pattern.compile( + "^" + + "(\\?|\\+|\\*)|\\{([0-9]+)(?:(,)([0-9]*))?\\}" + + "$"); + + public Quantifier parseQuantifier() throws SyntaxException + { + if (lexer.next(Kind.QUANTIFIER)) + { + String quantifierToken = lexer.getToken(); + Matcher matcher = QUANTIFIER_PATTERN.matcher(quantifierToken); + if (!matcher.matches()) + { + throw new AssertionError("The quantifier token " + quantifierToken + " is not valid"); + } + Quantifier.Range range; + if (matcher.group(1) != null) + { + switch (quantifierToken.charAt(0)) + { + case '*': + range = Quantifier.Range.zeroOrMore(); + break; + case '+': + range = Quantifier.Range.oneOrMore(); + break; + case '?': + range = Quantifier.Range.onceOrNotAtAll(); + break; + default: + throw new AssertionError(); + } + } + else + { + int min = Integer.parseInt(matcher.group(2)); + Integer max; + if (matcher.group(3) != null) + { + max = matcher.group(4).isEmpty() ? null : Integer.parseInt(matcher.group(4)); + } + else + { + max = min; + } + range = new Quantifier.Range(min, max); + } + Quantifier.Mode mode; + if (lexer.next(Kind.QUANTIFIER_MODE)) + { + switch (lexer.getToken().charAt(0)) + { + case '?': + mode = Quantifier.Mode.RELUCTANT; + break; + case '+': + mode = Quantifier.Mode.POSSESSIVE; + break; + default: + throw new AssertionError(); + } + } + else + { + mode = Quantifier.Mode.GREEDY; + } + return new Quantifier(mode, range); + } + else + { + return null; + } + } + + public RENode.Atom parseCharacter() throws SyntaxException + { + if (lexer.next(Kind.ANY)) + { + return new RENode.Any(); + } + else + { + RENode.Atom atom = parseCharacterLiteral(); + if (atom == null) + { + atom = parseCharacterClass(); + } + return atom; + } + } + + public RENode.Char parseCharacterLiteral() throws SyntaxException + { + if (lexer.next(Kind.LITERAL)) + { + return new RENode.Char(lexer.getToken().charAt(0)); + } + else + { + return null; + } + } + + public RENode.CharacterClass parseCharacterClass() throws SyntaxException + { + RENode.CharacterClassExpr cce = _parseCharacterClass(); + if (cce != null) + { + return new RENode.CharacterClass(cce); + } + else + { + return null; + } + } + + private RENode.CharacterClassExpr _parseCharacterClass() throws SyntaxException + { + if (lexer.next(Kind.CC_OPEN)) + { + boolean negated = lexer.getToken().length() > 1; + RENode.CharacterClassExpr expr = parseCharacterClassExpression(); + if (expr != null) + { + if (lexer.next(Kind.CC_CLOSE)) + { + return negated ? new RENode.CharacterClassExpr.Not(expr) : expr; + } + else + { + throw new SyntaxException(""); + } + } + else + { + throw new SyntaxException(""); + } + } + else + { + return null; + } + } + + public RENode.CharacterClassExpr parseCharacterClassExpression() throws SyntaxException + { + RENode.CharacterClassExpr left = parseCharacterClassTerm(); + if (left != null) + { + boolean and = lexer.next(Kind.CC_AND); + RENode.CharacterClassExpr right = parseCharacterClassExpression(); + if (right != null) + { + if (and) + { + return new RENode.CharacterClassExpr.And(left, right); + } + else + { + return new RENode.CharacterClassExpr.Or(left, right); + } + } + else + { + return left; + } + } + else + { + return null; + } + } + + public RENode.CharacterClassExpr parseCharacterClassTerm() throws SyntaxException + { + RENode.CharacterClassExpr expr = _parseCharacterClass(); + if (expr == null) + { + RENode.CharacterClassExpr.Char c = parseCharacterClassLiteral(); + if (c != null) + { + if (lexer.next(Kind.HYPHEN)) + { + RENode.CharacterClassExpr.Char to = parseCharacterClassLiteral(); + if (to != null) + { + expr = new RENode.CharacterClassExpr.Range(c, to); + } + else + { + throw new SyntaxException(); + } + } + else + { + expr = c; + } + } + else if (lexer.next(Kind.ANY)) + { + // NOT SURE THIS IS CORRECT + expr = new RENode.CharacterClassExpr.Char('.'); + } + else if (lexer.next(Kind.BEGIN)) + { + // NOT SURE THIS IS CORRECT + expr = new RENode.CharacterClassExpr.Char('^'); + } + else if (lexer.next(Kind.END)) + { + // NOT SURE THIS IS CORRECT + expr = new RENode.CharacterClassExpr.Char('$'); + } + } + return expr; + } + + public RENode.CharacterClassExpr.Char parseCharacterClassLiteral() throws SyntaxException + { + if (lexer.next(Kind.LITERAL)) + { + return new RENode.CharacterClassExpr.Char(lexer.getToken().charAt(0)); + } + else + { + return null; + } + } +} Copied: portal/trunk/component/web/controller/src/main/java/org/exoplatform/web/controller/regexp/RERenderer.java (from rev 7117, portal/trunk/component/web/controller/src/main/java/org/exoplatform/web/controller/regexp/RegExpRenderer.java) =================================================================== --- portal/trunk/component/web/controller/src/main/java/org/exoplatform/web/controller/regexp/RERenderer.java (rev 0) +++ portal/trunk/component/web/controller/src/main/java/org/exoplatform/web/controller/regexp/RERenderer.java 2011-08-14 20:46:07 UTC (rev 7119) @@ -0,0 +1,304 @@ +/* + * Copyright (C) 2010 eXo Platform SAS. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ + +package org.exoplatform.web.controller.regexp; + +import java.io.IOException; + +/** + * Renders a {@link RENode} to its pattern representation. + * + * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> + * @version $Revision$ + */ +public class RERenderer +{ + + public final <A extends Appendable> A render(RENode re, A appendable) throws IOException, NullPointerException + { + if (re == null) + { + throw new NullPointerException("No null disjunction accepted"); + } + if (appendable == null) + { + throw new NullPointerException("No null appendable accepted"); + } + + // + doRender(re, appendable); + + // + return appendable; + } + + protected void doRender(RENode re, Appendable appendable) throws IOException + { + if (re instanceof RENode.Disjunction) + { + doRender((RENode.Disjunction) re, appendable); + } + else if (re instanceof RENode.Alternative) + { + doRender((RENode.Alternative) re, appendable); + } + else if (re instanceof RENode.Expr) + { + doRender((RENode.Expr) re, appendable); + } + else + { + throw new AssertionError("Was not expecting node " + re); + } + } + + protected void doRender(RENode.Disjunction disjunction, Appendable appendable) throws IOException, NullPointerException + { + RENode.Alternative alternative = disjunction.getAlternative(); + RENode.Disjunction next = disjunction.getNext(); + if (alternative != null) + { + doRender(alternative, appendable); + if (next != null) + { + appendable.append('|'); + doRender(next, appendable); + } + } + else if (next != null) + { + doRender(next, appendable); + } + } + + protected void doRender(RENode.Alternative alternative, Appendable appendable) throws IOException, NullPointerException + { + doRender(alternative.getExp(), appendable); + RENode.Alternative next = alternative.getNext(); + if (next != null) + { + doRender(next, appendable); + } + } + + protected void doRender(RENode.Expr expr, Appendable appendable) throws IOException, NullPointerException + { + if (expr instanceof RENode.Atom) + { + doRender((RENode.Atom) expr, appendable); + } + else if (expr instanceof RENode.Group) + { + doRender((RENode.Group)expr, appendable); + } + else if (expr instanceof RENode.Assertion) + { + doRender((RENode.Assertion)expr, appendable); + } + else + { + throw new AssertionError("Was not expecting node " + expr); + } + } + + protected void doRender(Quantifier quantifier, Appendable appendable) throws IOException + { + quantifier.toString(appendable); + } + + protected void doRender(RENode.Assertion assertion, Appendable appendable) throws IOException + { + if (assertion instanceof RENode.Assertion.Begin) + { + doRender((RENode.Assertion.Begin)assertion, appendable); + } + else if (assertion instanceof RENode.Assertion.End) + { + doRender((RENode.Assertion.End)assertion, appendable); + } + else + { + throw new AssertionError("Was not expecting node " + assertion); + } + } + + protected void doRender(RENode.Assertion.Begin expr, Appendable appendable) throws IOException + { + appendable.append('^'); + if (expr.getQuantifier() != null) + { + doRender(expr.getQuantifier(), appendable); + } + } + + protected void doRender(RENode.Assertion.End expr, Appendable appendable) throws IOException + { + appendable.append('$'); + if (expr.getQuantifier() != null) + { + doRender(expr.getQuantifier(), appendable); + } + } + + protected void doRender(RENode.Group expr, Appendable appendable) throws IOException + { + appendable.append(expr.getType().getOpen()); + this.doRender(expr.getDisjunction(), appendable); + appendable.append(expr.getType().getClose()); + if (expr.getQuantifier() != null) + { + doRender(expr.getQuantifier(), appendable); + } + } + + protected void doRender(RENode.Atom atom, Appendable appendable) throws IOException + { + if (atom instanceof RENode.Any) + { + doRender((RENode.Any) atom, appendable); + } + else if (atom instanceof RENode.Char) + { + doRender((RENode.Char)atom, appendable); + } + else if (atom instanceof RENode.CharacterClass) + { + doRender((RENode.CharacterClass)atom, appendable); + } + else + { + throw new AssertionError("Was not expecting node " + atom); + } + } + + protected void doRender(RENode.Char expr, Appendable appendable) throws IOException + { + Literal.escapeTo(expr.getValue(), appendable); + if (expr.getQuantifier() != null) + { + doRender(expr.getQuantifier(), appendable); + } + } + + protected void doRender(RENode.Any expr, Appendable appendable) throws IOException + { + appendable.append('.'); + if (expr.getQuantifier() != null) + { + doRender(expr.getQuantifier(), appendable); + } + } + + protected void doRender(RENode.CharacterClass expr, Appendable appendable) throws IOException + { + appendable.append("["); + doRender(expr.getExpr(), appendable); + appendable.append("]"); + if (expr.getQuantifier() != null) + { + doRender(expr.getQuantifier(), appendable); + } + } + + protected void doRender(RENode.CharacterClassExpr expr, Appendable appendable) throws IOException, NullPointerException + { + if (expr instanceof RENode.CharacterClassExpr.Char) + { + doRender((RENode.CharacterClassExpr.Char) expr, appendable); + } + else if (expr instanceof RENode.CharacterClass.CharacterClassExpr.Range) + { + doRender((RENode.CharacterClassExpr.Range) expr, appendable); + } + else if (expr instanceof RENode.CharacterClass.CharacterClassExpr.And) + { + doRender((RENode.CharacterClassExpr.And) expr, appendable); + } + else if (expr instanceof RENode.CharacterClass.CharacterClassExpr.Or) + { + doRender((RENode.CharacterClassExpr.Or) expr, appendable); + } + else if (expr instanceof RENode.CharacterClass.CharacterClassExpr.Not) + { + doRender((RENode.CharacterClassExpr.Not) expr, appendable); + } + else + { + throw new AssertionError(); + } + } + + protected void doRender(RENode.CharacterClassExpr.Not expr, Appendable appendable) throws IOException + { + boolean needBrace = false; + for (RENode current = expr.getParent();current != null;current = current.getParent()) + { + if (current instanceof RENode.CharacterClassExpr.Or) + { + needBrace = true; + break; + } + else if (current instanceof RENode.CharacterClassExpr.And) + { + needBrace = true; + break; + } + else if (current instanceof RENode.CharacterClassExpr.Not) + { + needBrace = true; + break; + } + } + if (needBrace) + { + appendable.append("["); + } + appendable.append("^"); + doRender(expr.getNegated(), appendable); + if (needBrace) + { + appendable.append(']'); + } + } + + protected void doRender(RENode.CharacterClassExpr.Or expr, Appendable appendable) throws IOException + { + doRender(expr.getLeft(), appendable); + doRender(expr.getRight(), appendable); + } + + protected void doRender(RENode.CharacterClassExpr.And expr, Appendable appendable) throws IOException + { + doRender(expr.getLeft(), appendable); + appendable.append("&&"); + doRender(expr.getRight(), appendable); + } + + protected void doRender(RENode.CharacterClassExpr.Range expr, Appendable appendable) throws IOException + { + doRender(expr.getFrom(), appendable); + appendable.append('-'); + doRender(expr.getTo(), appendable); + } + + protected void doRender(RENode.CharacterClassExpr.Char expr, Appendable appendable) throws IOException + { + Literal.escapeTo(expr.getValue(), appendable); + } +} Deleted: portal/trunk/component/web/controller/src/main/java/org/exoplatform/web/controller/regexp/RegExpParser.java =================================================================== --- portal/trunk/component/web/controller/src/main/java/org/exoplatform/web/controller/regexp/RegExpParser.java 2011-08-14 20:35:39 UTC (rev 7118) +++ portal/trunk/component/web/controller/src/main/java/org/exoplatform/web/controller/regexp/RegExpParser.java 2011-08-14 20:46:07 UTC (rev 7119) @@ -1,375 +0,0 @@ -/* - * Copyright (C) 2011 eXo Platform SAS. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ - -package org.exoplatform.web.controller.regexp; - -import java.util.regex.Matcher; -import java.util.regex.Pattern; - -/** - * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> - * @version $Revision$ - */ -public class RegExpParser -{ - - /** . */ - private final Lexer lexer; - - public RegExpParser(CharSequence seq) - { - this.lexer = new Lexer(seq); - } - - public RegExpParser(Lexer lexer) - { - this.lexer = lexer; - } - - public void reset() - { - lexer.reset(); - } - - public int getIndex() - { - return lexer.getIndex(); - } - - public RENode parse() throws SyntaxException - { - return parseDisjunction(); - } - - public boolean isDone() - { - return lexer.isDone(); - } - - public RENode.Disjunction parseDisjunction() throws SyntaxException - { - RENode.Alternative alternative = parseAlternative(); - if (alternative != null) - { - if (lexer.next(Kind.OR)) - { - RENode.Disjunction next = parseDisjunction(); - return new RENode.Disjunction(alternative, next); - } - else - { - return new RENode.Disjunction(alternative); - } - } - else - { - if (lexer.next(Kind.OR)) - { - RENode.Disjunction next = parseDisjunction(); - return new RENode.Disjunction(null, next); - } - else - { - return null; - } - } - } - - public RENode.Alternative parseAlternative() throws SyntaxException - { - RENode.Expr expr = parseExpression(); - if (expr != null) - { - RENode.Alternative next = parseAlternative(); - return new RENode.Alternative(expr, next); - } - else - { - return null; - } - } - - public RENode.Expr parseExpression() throws SyntaxException - { - RENode.Expr expr; - if (lexer.next(Kind.BEGIN)) - { - expr = new RENode.Assertion.Begin(); - } - else if (lexer.next(Kind.END)) - { - expr = new RENode.Assertion.End(); - } - else if (lexer.next(Kind.GROUP_OPEN)) - { - GroupType groupType = GroupType.forPrefix(lexer.getToken()); - RENode.Disjunction group = parseDisjunction(); - if (lexer.next(Kind.GROUP_CLOSE)) - { - expr = new RENode.Group(group, groupType); - } - else - { - throw new SyntaxException("Group not closed "); - } - } - else - { - expr = parseCharacter(); - } - if (expr != null) - { - Quantifier quantifier = parseQuantifier(); - if (quantifier != null) - { - expr.setQuantifier(quantifier); - } - } - return expr; - } - - private static final Pattern QUANTIFIER_PATTERN = Pattern.compile( - "^" + - "(\\?|\\+|\\*)|\\{([0-9]+)(?:(,)([0-9]*))?\\}" + - "$"); - - public Quantifier parseQuantifier() throws SyntaxException - { - if (lexer.next(Kind.QUANTIFIER)) - { - String quantifierToken = lexer.getToken(); - Matcher matcher = QUANTIFIER_PATTERN.matcher(quantifierToken); - if (!matcher.matches()) - { - throw new AssertionError("The quantifier token " + quantifierToken + " is not valid"); - } - Quantifier.Range range; - if (matcher.group(1) != null) - { - switch (quantifierToken.charAt(0)) - { - case '*': - range = Quantifier.Range.zeroOrMore(); - break; - case '+': - range = Quantifier.Range.oneOrMore(); - break; - case '?': - range = Quantifier.Range.onceOrNotAtAll(); - break; - default: - throw new AssertionError(); - } - } - else - { - int min = Integer.parseInt(matcher.group(2)); - Integer max; - if (matcher.group(3) != null) - { - max = matcher.group(4).isEmpty() ? null : Integer.parseInt(matcher.group(4)); - } - else - { - max = min; - } - range = new Quantifier.Range(min, max); - } - Quantifier.Mode mode; - if (lexer.next(Kind.QUANTIFIER_MODE)) - { - switch (lexer.getToken().charAt(0)) - { - case '?': - mode = Quantifier.Mode.RELUCTANT; - break; - case '+': - mode = Quantifier.Mode.POSSESSIVE; - break; - default: - throw new AssertionError(); - } - } - else - { - mode = Quantifier.Mode.GREEDY; - } - return new Quantifier(mode, range); - } - else - { - return null; - } - } - - public RENode.Atom parseCharacter() throws SyntaxException - { - if (lexer.next(Kind.ANY)) - { - return new RENode.Any(); - } - else - { - RENode.Atom atom = parseCharacterLiteral(); - if (atom == null) - { - atom = parseCharacterClass(); - } - return atom; - } - } - - public RENode.Char parseCharacterLiteral() throws SyntaxException - { - if (lexer.next(Kind.LITERAL)) - { - return new RENode.Char(lexer.getToken().charAt(0)); - } - else - { - return null; - } - } - - public RENode.CharacterClass parseCharacterClass() throws SyntaxException - { - RENode.CharacterClassExpr cce = _parseCharacterClass(); - if (cce != null) - { - return new RENode.CharacterClass(cce); - } - else - { - return null; - } - } - - private RENode.CharacterClassExpr _parseCharacterClass() throws SyntaxException - { - if (lexer.next(Kind.CC_OPEN)) - { - boolean negated = lexer.getToken().length() > 1; - RENode.CharacterClassExpr expr = parseCharacterClassExpression(); - if (expr != null) - { - if (lexer.next(Kind.CC_CLOSE)) - { - return negated ? new RENode.CharacterClassExpr.Not(expr) : expr; - } - else - { - throw new SyntaxException(""); - } - } - else - { - throw new SyntaxException(""); - } - } - else - { - return null; - } - } - - public RENode.CharacterClassExpr parseCharacterClassExpression() throws SyntaxException - { - RENode.CharacterClassExpr left = parseCharacterClassTerm(); - if (left != null) - { - boolean and = lexer.next(Kind.CC_AND); - RENode.CharacterClassExpr right = parseCharacterClassExpression(); - if (right != null) - { - if (and) - { - return new RENode.CharacterClassExpr.And(left, right); - } - else - { - return new RENode.CharacterClassExpr.Or(left, right); - } - } - else - { - return left; - } - } - else - { - return null; - } - } - - public RENode.CharacterClassExpr parseCharacterClassTerm() throws SyntaxException - { - RENode.CharacterClassExpr expr = _parseCharacterClass(); - if (expr == null) - { - RENode.CharacterClassExpr.Char c = parseCharacterClassLiteral(); - if (c != null) - { - if (lexer.next(Kind.HYPHEN)) - { - RENode.CharacterClassExpr.Char to = parseCharacterClassLiteral(); - if (to != null) - { - expr = new RENode.CharacterClassExpr.Range(c, to); - } - else - { - throw new SyntaxException(); - } - } - else - { - expr = c; - } - } - else if (lexer.next(Kind.ANY)) - { - // NOT SURE THIS IS CORRECT - expr = new RENode.CharacterClassExpr.Char('.'); - } - else if (lexer.next(Kind.BEGIN)) - { - // NOT SURE THIS IS CORRECT - expr = new RENode.CharacterClassExpr.Char('^'); - } - else if (lexer.next(Kind.END)) - { - // NOT SURE THIS IS CORRECT - expr = new RENode.CharacterClassExpr.Char('$'); - } - } - return expr; - } - - public RENode.CharacterClassExpr.Char parseCharacterClassLiteral() throws SyntaxException - { - if (lexer.next(Kind.LITERAL)) - { - return new RENode.CharacterClassExpr.Char(lexer.getToken().charAt(0)); - } - else - { - return null; - } - } -} Deleted: portal/trunk/component/web/controller/src/main/java/org/exoplatform/web/controller/regexp/RegExpRenderer.java =================================================================== --- portal/trunk/component/web/controller/src/main/java/org/exoplatform/web/controller/regexp/RegExpRenderer.java 2011-08-14 20:35:39 UTC (rev 7118) +++ portal/trunk/component/web/controller/src/main/java/org/exoplatform/web/controller/regexp/RegExpRenderer.java 2011-08-14 20:46:07 UTC (rev 7119) @@ -1,304 +0,0 @@ -/* - * Copyright (C) 2010 eXo Platform SAS. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ - -package org.exoplatform.web.controller.regexp; - -import java.io.IOException; - -/** - * Renders a {@link RENode} to its pattern representation. - * - * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> - * @version $Revision$ - */ -public class RegExpRenderer -{ - - public final <A extends Appendable> A render(RENode re, A appendable) throws IOException, NullPointerException - { - if (re == null) - { - throw new NullPointerException("No null disjunction accepted"); - } - if (appendable == null) - { - throw new NullPointerException("No null appendable accepted"); - } - - // - doRender(re, appendable); - - // - return appendable; - } - - protected void doRender(RENode re, Appendable appendable) throws IOException - { - if (re instanceof RENode.Disjunction) - { - doRender((RENode.Disjunction) re, appendable); - } - else if (re instanceof RENode.Alternative) - { - doRender((RENode.Alternative) re, appendable); - } - else if (re instanceof RENode.Expr) - { - doRender((RENode.Expr) re, appendable); - } - else - { - throw new AssertionError("Was not expecting node " + re); - } - } - - protected void doRender(RENode.Disjunction disjunction, Appendable appendable) throws IOException, NullPointerException - { - RENode.Alternative alternative = disjunction.getAlternative(); - RENode.Disjunction next = disjunction.getNext(); - if (alternative != null) - { - doRender(alternative, appendable); - if (next != null) - { - appendable.append('|'); - doRender(next, appendable); - } - } - else if (next != null) - { - doRender(next, appendable); - } - } - - protected void doRender(RENode.Alternative alternative, Appendable appendable) throws IOException, NullPointerException - { - doRender(alternative.getExp(), appendable); - RENode.Alternative next = alternative.getNext(); - if (next != null) - { - doRender(next, appendable); - } - } - - protected void doRender(RENode.Expr expr, Appendable appendable) throws IOException, NullPointerException - { - if (expr instanceof RENode.Atom) - { - doRender((RENode.Atom) expr, appendable); - } - else if (expr instanceof RENode.Group) - { - doRender((RENode.Group)expr, appendable); - } - else if (expr instanceof RENode.Assertion) - { - doRender((RENode.Assertion)expr, appendable); - } - else - { - throw new AssertionError("Was not expecting node " + expr); - } - } - - protected void doRender(Quantifier quantifier, Appendable appendable) throws IOException - { - quantifier.toString(appendable); - } - - protected void doRender(RENode.Assertion assertion, Appendable appendable) throws IOException - { - if (assertion instanceof RENode.Assertion.Begin) - { - doRender((RENode.Assertion.Begin)assertion, appendable); - } - else if (assertion instanceof RENode.Assertion.End) - { - doRender((RENode.Assertion.End)assertion, appendable); - } - else - { - throw new AssertionError("Was not expecting node " + assertion); - } - } - - protected void doRender(RENode.Assertion.Begin expr, Appendable appendable) throws IOException - { - appendable.append('^'); - if (expr.getQuantifier() != null) - { - doRender(expr.getQuantifier(), appendable); - } - } - - protected void doRender(RENode.Assertion.End expr, Appendable appendable) throws IOException - { - appendable.append('$'); - if (expr.getQuantifier() != null) - { - doRender(expr.getQuantifier(), appendable); - } - } - - protected void doRender(RENode.Group expr, Appendable appendable) throws IOException - { - appendable.append(expr.getType().getOpen()); - this.doRender(expr.getDisjunction(), appendable); - appendable.append(expr.getType().getClose()); - if (expr.getQuantifier() != null) - { - doRender(expr.getQuantifier(), appendable); - } - } - - protected void doRender(RENode.Atom atom, Appendable appendable) throws IOException - { - if (atom instanceof RENode.Any) - { - doRender((RENode.Any) atom, appendable); - } - else if (atom instanceof RENode.Char) - { - doRender((RENode.Char)atom, appendable); - } - else if (atom instanceof RENode.CharacterClass) - { - doRender((RENode.CharacterClass)atom, appendable); - } - else - { - throw new AssertionError("Was not expecting node " + atom); - } - } - - protected void doRender(RENode.Char expr, Appendable appendable) throws IOException - { - Literal.escapeTo(expr.getValue(), appendable); - if (expr.getQuantifier() != null) - { - doRender(expr.getQuantifier(), appendable); - } - } - - protected void doRender(RENode.Any expr, Appendable appendable) throws IOException - { - appendable.append('.'); - if (expr.getQuantifier() != null) - { - doRender(expr.getQuantifier(), appendable); - } - } - - protected void doRender(RENode.CharacterClass expr, Appendable appendable) throws IOException - { - appendable.append("["); - doRender(expr.getExpr(), appendable); - appendable.append("]"); - if (expr.getQuantifier() != null) - { - doRender(expr.getQuantifier(), appendable); - } - } - - protected void doRender(RENode.CharacterClassExpr expr, Appendable appendable) throws IOException, NullPointerException - { - if (expr instanceof RENode.CharacterClassExpr.Char) - { - doRender((RENode.CharacterClassExpr.Char) expr, appendable); - } - else if (expr instanceof RENode.CharacterClass.CharacterClassExpr.Range) - { - doRender((RENode.CharacterClassExpr.Range) expr, appendable); - } - else if (expr instanceof RENode.CharacterClass.CharacterClassExpr.And) - { - doRender((RENode.CharacterClassExpr.And) expr, appendable); - } - else if (expr instanceof RENode.CharacterClass.CharacterClassExpr.Or) - { - doRender((RENode.CharacterClassExpr.Or) expr, appendable); - } - else if (expr instanceof RENode.CharacterClass.CharacterClassExpr.Not) - { - doRender((RENode.CharacterClassExpr.Not) expr, appendable); - } - else - { - throw new AssertionError(); - } - } - - protected void doRender(RENode.CharacterClassExpr.Not expr, Appendable appendable) throws IOException - { - boolean needBrace = false; - for (RENode current = expr.getParent();current != null;current = current.getParent()) - { - if (current instanceof RENode.CharacterClassExpr.Or) - { - needBrace = true; - break; - } - else if (current instanceof RENode.CharacterClassExpr.And) - { - needBrace = true; - break; - } - else if (current instanceof RENode.CharacterClassExpr.Not) - { - needBrace = true; - break; - } - } - if (needBrace) - { - appendable.append("["); - } - appendable.append("^"); - doRender(expr.getNegated(), appendable); - if (needBrace) - { - appendable.append(']'); - } - } - - protected void doRender(RENode.CharacterClassExpr.Or expr, Appendable appendable) throws IOException - { - doRender(expr.getLeft(), appendable); - doRender(expr.getRight(), appendable); - } - - protected void doRender(RENode.CharacterClassExpr.And expr, Appendable appendable) throws IOException - { - doRender(expr.getLeft(), appendable); - appendable.append("&&"); - doRender(expr.getRight(), appendable); - } - - protected void doRender(RENode.CharacterClassExpr.Range expr, Appendable appendable) throws IOException - { - doRender(expr.getFrom(), appendable); - appendable.append('-'); - doRender(expr.getTo(), appendable); - } - - protected void doRender(RENode.CharacterClassExpr.Char expr, Appendable appendable) throws IOException - { - Literal.escapeTo(expr.getValue(), appendable); - } -} Deleted: portal/trunk/component/web/controller/src/main/java/org/exoplatform/web/controller/regexp/SubCharSequence.java =================================================================== --- portal/trunk/component/web/controller/src/main/java/org/exoplatform/web/controller/regexp/SubCharSequence.java 2011-08-14 20:35:39 UTC (rev 7118) +++ portal/trunk/component/web/controller/src/main/java/org/exoplatform/web/controller/regexp/SubCharSequence.java 2011-08-14 20:46:07 UTC (rev 7119) @@ -1,111 +0,0 @@ -/* - * Copyright (C) 2010 eXo Platform SAS. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ - -package org.exoplatform.web.controller.regexp; - -/** - * Should make it to org.gatein.common somehow. - * - * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> - * @version $Revision$ - */ -public class SubCharSequence implements CharSequence -{ - - /** . */ - private final CharSequence s; - - /** . */ - private final int from; - - /** . */ - private final int to; - - public SubCharSequence(CharSequence s, int from, int to) - { - if (s == null) - { - throw new NullPointerException("No null string accepted"); - } - if (from < 0) - { - throw new IllegalArgumentException("No negative lower bound accepted"); - } - if (to > s.length()) - { - throw new IllegalArgumentException("Upper bound cannot be greater than the sequence length"); - } - if (from > to) - { - throw new IllegalArgumentException("Upper bound cannot be lesser than the lower bound"); - } - - // - this.s = s; - this.from = from; - this.to = to; - } - - public int length() - { - return to - from; - } - - public char charAt(int index) - { - if (index < 0) - { - throw new IndexOutOfBoundsException("Index cannot be negative"); - } - index += from; - if (index >= to) - { - throw new IndexOutOfBoundsException("Index cannot be negative"); - } - return s.charAt(index); - } - - public CharSequence subSequence(int start, int end) - { - if (start < 0) - { - throw new IndexOutOfBoundsException("The start argument cannot be negative"); - } - if (end < 0) - { - throw new IndexOutOfBoundsException("The start argument cannot be negative"); - } - if (start > end) - { - throw new IndexOutOfBoundsException("The start argument cannot greater than the end argument"); - } - end += from; - if (end > to) - { - throw new IndexOutOfBoundsException("The end argument cannot greater than the length"); - } - return new SubCharSequence(s, from + start, end); - } - - @Override - public String toString() - { - return s.subSequence(from, to).toString(); - } -} Modified: portal/trunk/component/web/controller/src/main/java/org/exoplatform/web/controller/router/PathParam.java =================================================================== --- portal/trunk/component/web/controller/src/main/java/org/exoplatform/web/controller/router/PathParam.java 2011-08-14 20:35:39 UTC (rev 7118) +++ portal/trunk/component/web/controller/src/main/java/org/exoplatform/web/controller/router/PathParam.java 2011-08-14 20:46:07 UTC (rev 7119) @@ -22,8 +22,8 @@ import org.exoplatform.web.controller.QualifiedName; import org.exoplatform.web.controller.metadata.PathParamDescriptor; import org.exoplatform.web.controller.regexp.RENode; -import org.exoplatform.web.controller.regexp.RegExpParser; -import org.exoplatform.web.controller.regexp.RegExpRenderer; +import org.exoplatform.web.controller.regexp.REParser; +import org.exoplatform.web.controller.regexp.RERenderer; import org.exoplatform.web.controller.regexp.SyntaxException; import java.io.IOException; @@ -75,7 +75,7 @@ StringBuilder routingRegex = new StringBuilder(); try { - RegExpParser parser = new RegExpParser(regex); + REParser parser = new REParser(regex); // RENode.Disjunction routingDisjunction = parser.parseDisjunction(); @@ -84,13 +84,13 @@ RouteEscaper escaper = new RouteEscaper('/', '_'); escaper.visit(routingDisjunction); } - new RegExpRenderer().render(routingDisjunction, routingRegex); + new RERenderer().render(routingDisjunction, routingRegex); // parser.reset(); RENode.Disjunction renderingDisjunction = parser.parseDisjunction(); renderingRegex.append("^"); - new RegExpRenderer().render(renderingDisjunction, renderingRegex); + new RERenderer().render(renderingDisjunction, renderingRegex); renderingRegex.append("$"); } catch (IOException e) Modified: portal/trunk/component/web/controller/src/test/java/org/exoplatform/web/controller/regexp/TestParser.java =================================================================== --- portal/trunk/component/web/controller/src/test/java/org/exoplatform/web/controller/regexp/TestParser.java 2011-08-14 20:35:39 UTC (rev 7118) +++ portal/trunk/component/web/controller/src/test/java/org/exoplatform/web/controller/regexp/TestParser.java 2011-08-14 20:46:07 UTC (rev 7119) @@ -41,10 +41,10 @@ private static class ParserTester { - private final RegExpParser parser; + private final REParser parser; private ParserTester(CharSequence s) { - this.parser = new RegExpParser(s); + this.parser = new REParser(s); } ParserTester assertParseCharacterClass(String expectedValue) { Modified: portal/trunk/component/web/controller/src/test/java/org/exoplatform/web/controller/regexp/TestRegExpAnalyser.java =================================================================== --- portal/trunk/component/web/controller/src/test/java/org/exoplatform/web/controller/regexp/TestRegExpAnalyser.java 2011-08-14 20:35:39 UTC (rev 7118) +++ portal/trunk/component/web/controller/src/test/java/org/exoplatform/web/controller/regexp/TestRegExpAnalyser.java 2011-08-14 20:46:07 UTC (rev 7119) @@ -29,13 +29,13 @@ { /** . */ - private RegExpRenderer renderer = new RegExpRenderer(); + private RERenderer renderer = new RERenderer(); private void assertAnalyse(String expectedPattern, String pattern) { try { - RENode.Disjunction disjunction = new RegExpParser(pattern).parseDisjunction(); + RENode.Disjunction disjunction = new REParser(pattern).parseDisjunction(); assertEquals(expectedPattern, renderer.render(disjunction, new StringBuilder()).toString()); } catch (Exception e) Modified: portal/trunk/component/web/controller/src/test/java/org/exoplatform/web/controller/regexp/TestRegExpParser.java =================================================================== --- portal/trunk/component/web/controller/src/test/java/org/exoplatform/web/controller/regexp/TestRegExpParser.java 2011-08-14 20:35:39 UTC (rev 7118) +++ portal/trunk/component/web/controller/src/test/java/org/exoplatform/web/controller/regexp/TestRegExpParser.java 2011-08-14 20:46:07 UTC (rev 7119) @@ -279,7 +279,7 @@ { Stream stream = new Stream(s); Lexer lexer = new Lexer(stream); - RegExpParser parser = new RegExpParser(lexer); + REParser parser = new REParser(lexer); parser.parse(); assertEquals(s.length(), stream.getIndex()); if (lexer.hasNext()) Modified: portal/trunk/component/web/controller/src/test/java/org/exoplatform/web/controller/regexp/TestRegExpRenderer.java =================================================================== --- portal/trunk/component/web/controller/src/test/java/org/exoplatform/web/controller/regexp/TestRegExpRenderer.java 2011-08-14 20:35:39 UTC (rev 7118) +++ portal/trunk/component/web/controller/src/test/java/org/exoplatform/web/controller/regexp/TestRegExpRenderer.java 2011-08-14 20:46:07 UTC (rev 7119) @@ -37,7 +37,7 @@ String rendered; if (re != null) { - RegExpRenderer renderer = new RegExpRenderer(); + RERenderer renderer = new RERenderer(); rendered = renderer.render(re, new StringBuilder()).toString(); } else @@ -58,7 +58,7 @@ { try { - RegExpParser parser = new RegExpParser(regexp); + REParser parser = new REParser(regexp); RENode.Disjunction re = parser.parseDisjunction(); assertTrue(parser.isDone()); return re; @@ -75,7 +75,7 @@ { try { - RegExpParser parser = new RegExpParser(regexp); + REParser parser = new REParser(regexp); RENode.Alternative re = parser.parseAlternative(); assertTrue(parser.isDone()); return re; @@ -92,7 +92,7 @@ { try { - RegExpParser parser = new RegExpParser(regexp); + REParser parser = new REParser(regexp); RENode.Expr re = parser.parseExpression(); assertTrue(parser.isDone()); return re; @@ -109,7 +109,7 @@ { try { - RegExpParser parser = new RegExpParser(regexp); + REParser parser = new REParser(regexp); RENode.CharacterClass re = parser.parseCharacterClass(); assertTrue(parser.isDone()); return re; Deleted: portal/trunk/component/web/controller/src/test/java/org/exoplatform/web/controller/regexp/TestSubCharSequence.java =================================================================== --- portal/trunk/component/web/controller/src/test/java/org/exoplatform/web/controller/regexp/TestSubCharSequence.java 2011-08-14 20:35:39 UTC (rev 7118) +++ portal/trunk/component/web/controller/src/test/java/org/exoplatform/web/controller/regexp/TestSubCharSequence.java 2011-08-14 20:46:07 UTC (rev 7119) @@ -1,122 +0,0 @@ -/* - * Copyright (C) 2010 eXo Platform SAS. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ - -package org.exoplatform.web.controller.regexp; - -import junit.framework.TestCase; - -/** - * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> - * @version $Revision$ - */ -public class TestSubCharSequence extends TestCase -{ - - private final CharSequence seq = new SubCharSequence("abcdef", 1, 5); - - public void testState() - { - assertEquals(4, seq.length()); - assertEquals('b', seq.charAt(0)); - assertEquals('c', seq.charAt(1)); - assertEquals('d', seq.charAt(2)); - assertEquals('e', seq.charAt(3)); - assertEquals("bcde", seq.toString()); - } - - public void testSubSequence() - { - CharSequence sub = seq.subSequence(1, 3); - assertEquals(2, sub.length()); - assertEquals('c', sub.charAt(0)); - assertEquals('d', sub.charAt(1)); - assertEquals("cd", sub.toString()); - } - - public void testSubSequenceThrowsIOOBE() - { - assertSubSequenceThrowsIIOBE(-1, 3); - assertSubSequenceThrowsIIOBE(1, 5); - assertSubSequenceThrowsIIOBE(1, -1); - assertSubSequenceThrowsIIOBE(5, 1); - } - - private void assertSubSequenceThrowsIIOBE(int start, int end) - { - try - { - seq.subSequence(start, end); - fail(); - } - catch (IndexOutOfBoundsException e) - { - } - } - - public void testCharAtThrowsIOOBE() - { - try - { - seq.charAt(-1); - fail(); - } - catch (IndexOutOfBoundsException e) - { - } - try - { - seq.charAt(4); - fail(); - } - catch (IndexOutOfBoundsException e) - { - } - } - - public void testCtorThrowsNPE() - { - try - { - new SubCharSequence(null, 1, 5); - fail(); - } - catch (NullPointerException e) - { - } - } - - public void testCtorThrowsIAE() - { - assertCtorThrowsIAE("a", -1, 1); - assertCtorThrowsIAE("a", 0, 2); - assertCtorThrowsIAE("a", 1, 0); - } - - private void assertCtorThrowsIAE(String s, int from, int to) - { - try - { - new SubCharSequence(s, from, to); - fail(); - } - catch (IllegalArgumentException e) - { - } - } -} Modified: portal/trunk/component/web/controller/src/test/java/org/exoplatform/web/controller/router/TestRouteEscaper.java =================================================================== --- portal/trunk/component/web/controller/src/test/java/org/exoplatform/web/controller/router/TestRouteEscaper.java 2011-08-14 20:35:39 UTC (rev 7118) +++ portal/trunk/component/web/controller/src/test/java/org/exoplatform/web/controller/router/TestRouteEscaper.java 2011-08-14 20:46:07 UTC (rev 7119) @@ -20,9 +20,9 @@ package org.exoplatform.web.controller.router; import org.exoplatform.component.test.BaseGateInTest; -import org.exoplatform.web.controller.regexp.RegExpRenderer; +import org.exoplatform.web.controller.regexp.RERenderer; import org.exoplatform.web.controller.regexp.RENode; -import org.exoplatform.web.controller.regexp.RegExpParser; +import org.exoplatform.web.controller.regexp.REParser; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -36,11 +36,11 @@ private void match(String pattern, String test, String expectedValue) throws Exception { - RegExpParser parser = new RegExpParser(pattern); + REParser parser = new REParser(pattern); RouteEscaper escaper = new RouteEscaper('/', '_'); RENode.Disjunction re = parser.parseDisjunction(); escaper.visit(re); - Pattern p = Pattern.compile(new RegExpRenderer().render(re, new StringBuilder()).toString()); + Pattern p = Pattern.compile(new RERenderer().render(re, new StringBuilder()).toString()); Matcher matcher = p.matcher(test); assertTrue(matcher.find()); assertEquals(expectedValue, matcher.group());

13 years, 1 month

1
0
0 / 0

gatein SVN: r7118 - in portal/trunk: component/pc and 5 other directories.

by do-not-reply＠jboss.org

Author: julien_viet Date: 2011-08-14 16:35:39 -0400 (Sun, 14 Aug 2011) New Revision: 7118 Modified: portal/trunk/component/pc/pom.xml portal/trunk/component/pc/src/main/java/org/exoplatform/portal/pc/ExoKernelIntegration.java portal/trunk/component/pc/src/main/java/org/exoplatform/portal/pc/ExoPortletApplicationDeployer.java portal/trunk/component/pc/src/main/java/org/exoplatform/portal/pc/GlobalPortletMetaData.java portal/trunk/packaging/jboss-as5/pkg/pom.xml portal/trunk/packaging/jboss-as6/pkg/pom.xml portal/trunk/packaging/jetty/pkg/pom.xml portal/trunk/packaging/tomcat/pkg/pom.xml portal/trunk/pom.xml Log: GTNPORTAL-2014 : GateIn PC update to 2.3.0-Beta06 Modified: portal/trunk/component/pc/pom.xml =================================================================== --- portal/trunk/component/pc/pom.xml 2011-08-14 18:06:46 UTC (rev 7117) +++ portal/trunk/component/pc/pom.xml 2011-08-14 20:35:39 UTC (rev 7118) @@ -52,10 +52,6 @@ </dependency> <dependency> <groupId>org.gatein.pc</groupId> - <artifactId>pc-mc</artifactId> - </dependency> - <dependency> - <groupId>org.gatein.pc</groupId> <artifactId>pc-federation</artifactId> </dependency> <dependency> Modified: portal/trunk/component/pc/src/main/java/org/exoplatform/portal/pc/ExoKernelIntegration.java =================================================================== --- portal/trunk/component/pc/src/main/java/org/exoplatform/portal/pc/ExoKernelIntegration.java 2011-08-14 18:06:46 UTC (rev 7117) +++ portal/trunk/component/pc/src/main/java/org/exoplatform/portal/pc/ExoKernelIntegration.java 2011-08-14 20:35:39 UTC (rev 7118) @@ -27,7 +27,6 @@ import org.gatein.pc.bridge.BridgeInterceptor; import org.gatein.pc.federation.FederatingPortletInvoker; import org.gatein.pc.federation.impl.FederatingPortletInvokerService; -import org.gatein.pc.mc.PortletApplicationDeployer; import org.gatein.pc.portlet.PortletInvokerInterceptor; import org.gatein.pc.portlet.aspects.CCPPInterceptor; import org.gatein.pc.portlet.aspects.ConsumerCacheInterceptor; @@ -41,6 +40,7 @@ import org.gatein.pc.portlet.aspects.ValveInterceptor; import org.gatein.pc.portlet.container.ContainerPortletDispatcher; import org.gatein.pc.portlet.container.ContainerPortletInvoker; +import org.gatein.pc.portlet.impl.deployment.PortletApplicationDeployer; import org.gatein.pc.portlet.impl.state.StateManagementPolicyService; import org.gatein.pc.portlet.impl.state.producer.PortletStatePersistenceManagerService; import org.gatein.pc.portlet.state.StateConverter; Modified: portal/trunk/component/pc/src/main/java/org/exoplatform/portal/pc/ExoPortletApplicationDeployer.java =================================================================== --- portal/trunk/component/pc/src/main/java/org/exoplatform/portal/pc/ExoPortletApplicationDeployer.java 2011-08-14 18:06:46 UTC (rev 7117) +++ portal/trunk/component/pc/src/main/java/org/exoplatform/portal/pc/ExoPortletApplicationDeployer.java 2011-08-14 20:35:39 UTC (rev 7118) @@ -24,18 +24,17 @@ import org.gatein.api.GateIn; import org.gatein.common.logging.Logger; import org.gatein.common.logging.LoggerFactory; -import org.gatein.pc.mc.PortletApplicationDeployer; +import org.gatein.pc.portlet.impl.deployment.PortletApplicationDeployer; +import org.gatein.pc.portlet.impl.deployment.staxnav.PortletApplicationMetaDataBuilder; import org.gatein.pc.portlet.impl.metadata.PortletApplication10MetaData; import org.gatein.wci.WebApp; -import org.jboss.xb.binding.JBossXBException; import java.io.File; import java.io.FileInputStream; -import java.io.FileNotFoundException; import java.io.InputStream; /** - * Extends the {@link org.gatein.pc.mc.PortletApplicationDeployer} to inject configuration metadata + * Extends the {@link org.gatein.pc.portlet.impl.deployment.PortletApplicationDeployer} to inject configuration metadata * from global portlet.xml and to configure the resource bundle factory of deployed portlet * applications. The resource bundle factory used is {@link org.exoplatform.portal.pc.ExoResourceBundleFactory}. * @@ -44,7 +43,11 @@ */ public class ExoPortletApplicationDeployer extends PortletApplicationDeployer { + + /** . */ private final Logger log = LoggerFactory.getLogger(ExoPortletApplicationDeployer.class); + + /** . */ private GateIn gateIn; @Override @@ -91,17 +94,16 @@ * This method is invoked for each portlet application deployment. That is necessary for the moment * to ensure independence between portlet applications * - * @return - * @throws FileNotFoundException - * @throws JBossXBException + * @return the global meta data + * @throws Exception any exception */ - private GlobalPortletMetaData loadGlobalMetadata(String globalPortletLocation) throws FileNotFoundException, - JBossXBException + private GlobalPortletMetaData loadGlobalMetadata(String globalPortletLocation) throws Exception { //TODO: Avoid using File InputStream in = new FileInputStream(new File(globalPortletLocation)); try { + PortletApplicationMetaDataBuilder builder = new PortletApplicationMetaDataBuilder(); return GlobalPortletMetaData.unmarshalling(in); } finally Modified: portal/trunk/component/pc/src/main/java/org/exoplatform/portal/pc/GlobalPortletMetaData.java =================================================================== --- portal/trunk/component/pc/src/main/java/org/exoplatform/portal/pc/GlobalPortletMetaData.java 2011-08-14 18:06:46 UTC (rev 7117) +++ portal/trunk/component/pc/src/main/java/org/exoplatform/portal/pc/GlobalPortletMetaData.java 2011-08-14 20:35:39 UTC (rev 7118) @@ -18,15 +18,11 @@ */ package org.exoplatform.portal.pc; -import org.gatein.pc.mc.metadata.factory.PortletApplicationModelFactory; -import org.gatein.pc.mc.metadata.impl.ValueTrimmingFilter; +import org.gatein.pc.portlet.impl.deployment.staxnav.PortletApplicationMetaDataBuilder; import org.gatein.pc.portlet.impl.metadata.PortletApplication10MetaData; import org.gatein.pc.portlet.impl.metadata.PortletApplication20MetaData; import org.gatein.pc.portlet.impl.metadata.filter.FilterMappingMetaData; import org.gatein.pc.portlet.impl.metadata.filter.FilterMetaData; -import org.jboss.xb.binding.JBossXBException; -import org.jboss.xb.binding.Unmarshaller; -import org.jboss.xb.binding.UnmarshallerFactory; import java.io.InputStream; import java.util.ArrayList; @@ -135,17 +131,12 @@ //TODO: Wait for the spec of merging public render parameters } - public static GlobalPortletMetaData unmarshalling(InputStream in) throws JBossXBException - { - Unmarshaller unmarshaller = UnmarshallerFactory.newInstance().newUnmarshaller(); - unmarshaller.setNamespaceAware(true); - unmarshaller.setSchemaValidation(false); - unmarshaller.setValidation(false); + /** . */ + private static final PortletApplicationMetaDataBuilder builder = new PortletApplicationMetaDataBuilder(); - PortletApplicationModelFactory factory = new PortletApplicationModelFactory(); - - PortletApplication10MetaData application10MetaData = (PortletApplication10MetaData)unmarshaller.unmarshal(in, new ValueTrimmingFilter(factory), null); - + public static GlobalPortletMetaData unmarshalling(InputStream in) throws Exception + { + PortletApplication10MetaData application10MetaData = builder.build(in); return new GlobalPortletMetaData(application10MetaData); } } Modified: portal/trunk/packaging/jboss-as5/pkg/pom.xml =================================================================== --- portal/trunk/packaging/jboss-as5/pkg/pom.xml 2011-08-14 18:06:46 UTC (rev 7117) +++ portal/trunk/packaging/jboss-as5/pkg/pom.xml 2011-08-14 20:35:39 UTC (rev 7118) @@ -352,10 +352,6 @@ </dependency> <dependency> <groupId>org.gatein.pc</groupId> - <artifactId>pc-mc</artifactId> - </dependency> - <dependency> - <groupId>org.gatein.pc</groupId> <artifactId>pc-bridge</artifactId> </dependency> Modified: portal/trunk/packaging/jboss-as6/pkg/pom.xml =================================================================== --- portal/trunk/packaging/jboss-as6/pkg/pom.xml 2011-08-14 18:06:46 UTC (rev 7117) +++ portal/trunk/packaging/jboss-as6/pkg/pom.xml 2011-08-14 20:35:39 UTC (rev 7118) @@ -336,10 +336,6 @@ </dependency> <dependency> <groupId>org.gatein.pc</groupId> - <artifactId>pc-mc</artifactId> - </dependency> - <dependency> - <groupId>org.gatein.pc</groupId> <artifactId>pc-bridge</artifactId> </dependency> Modified: portal/trunk/packaging/jetty/pkg/pom.xml =================================================================== --- portal/trunk/packaging/jetty/pkg/pom.xml 2011-08-14 18:06:46 UTC (rev 7117) +++ portal/trunk/packaging/jetty/pkg/pom.xml 2011-08-14 20:35:39 UTC (rev 7118) @@ -88,10 +88,6 @@ <artifactId>jboss-common-core</artifactId> </dependency> <dependency> - <groupId>org.jboss</groupId> - <artifactId>jbossxb</artifactId> - </dependency> - <dependency> <groupId>org.jboss.logging</groupId> <artifactId>jboss-logging-spi</artifactId> </dependency> @@ -335,10 +331,6 @@ </dependency> <dependency> <groupId>org.gatein.pc</groupId> - <artifactId>pc-mc</artifactId> - </dependency> - <dependency> - <groupId>org.gatein.pc</groupId> <artifactId>pc-bridge</artifactId> </dependency> Modified: portal/trunk/packaging/tomcat/pkg/pom.xml =================================================================== --- portal/trunk/packaging/tomcat/pkg/pom.xml 2011-08-14 18:06:46 UTC (rev 7117) +++ portal/trunk/packaging/tomcat/pkg/pom.xml 2011-08-14 20:35:39 UTC (rev 7118) @@ -84,10 +84,6 @@ <artifactId>jboss-common-core</artifactId> </dependency> <dependency> - <groupId>org.jboss</groupId> - <artifactId>jbossxb</artifactId> - </dependency> - <dependency> <groupId>org.jboss.logging</groupId> <artifactId>jboss-logging-spi</artifactId> </dependency> @@ -327,10 +323,6 @@ </dependency> <dependency> <groupId>org.gatein.pc</groupId> - <artifactId>pc-mc</artifactId> - </dependency> - <dependency> - <groupId>org.gatein.pc</groupId> <artifactId>pc-bridge</artifactId> </dependency> Modified: portal/trunk/pom.xml =================================================================== --- portal/trunk/pom.xml 2011-08-14 18:06:46 UTC (rev 7117) +++ portal/trunk/pom.xml 2011-08-14 20:35:39 UTC (rev 7118) @@ -45,7 +45,7 @@ <nl.captcha.simplecaptcha.version>1.1.1-GA-Patch01</nl.captcha.simplecaptcha.version> <org.gatein.common.version>2.0.4-Beta03</org.gatein.common.version> <org.gatein.wci.version>2.1.0-Beta06</org.gatein.wci.version> - <org.gatein.pc.version>2.3.0-Beta04</org.gatein.pc.version> + <org.gatein.pc.version>2.3.0-Beta05</org.gatein.pc.version> <org.picketlink.idm>1.3.0.Alpha03</org.picketlink.idm> <org.gatein.wsrp.version>2.1.0-Beta04</org.gatein.wsrp.version> <org.gatein.mop.version>1.1.0-Beta05</org.gatein.mop.version> @@ -292,11 +292,6 @@ </dependency> <dependency> <groupId>org.gatein.pc</groupId> - <artifactId>pc-mc</artifactId> - <version>${org.gatein.pc.version}</version> - </dependency> - <dependency> - <groupId>org.gatein.pc</groupId> <artifactId>pc-portlet</artifactId> <version>${org.gatein.pc.version}</version> </dependency>

13 years, 1 month

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

gatein-commits August 2011