gatein SVN: r641 - in portal/trunk: webui/portal/src/main/java/org/exoplatform/portal/webui/portal and 1 other directory.
by do-not-reply＠jboss.org
Author: hoang_to
Date: 2009-11-18 06:03:59 -0500 (Wed, 18 Nov 2009)
New Revision: 641
Modified:
portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/container/UIContainer.gtmpl
portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/container/UITabContainer.gtmpl
portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/container/UITableColumnContainer.gtmpl
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalComponentActionListener.java
Log:
GTNPORTAL-202: Fix the problem with tab container
Modified: portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/container/UIContainer.gtmpl
===================================================================
--- portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/container/UIContainer.gtmpl 2009-11-18 11:03:24 UTC (rev 640)
+++ portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/container/UIContainer.gtmpl 2009-11-18 11:03:59 UTC (rev 641)
@@ -17,6 +17,11 @@
if(uiComponentHeight != null) cssStyle += "height: "+uiComponentHeight+";"
if(cssStyle.length() > 0) cssStyle += "\"";
+ /** Trim the prefix UIContainer- if any, this hardcoded part is needed to update nested container via Ajax */
+ String componentId = uicomponent.getId();
+ if(componentId.startsWith("UIContainer-")){
+ uicomponent.setId(componentId.substring("UIContainer-".length()));
+ }
%>
<div class="UIContainer <%=uiPortalApp.isEditting()?"EdittingContainer":""%>" id="UIContainer-${uicomponent.id}" ${cssStyle} onmouseover="eXo.portal.UIPortal.blockOnMouseOver(event, this, true);" onmouseout="eXo.portal.UIPortal.blockOnMouseOver(event, this, false);">
Modified: portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/container/UITabContainer.gtmpl
===================================================================
--- portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/container/UITabContainer.gtmpl 2009-11-18 11:03:24 UTC (rev 640)
+++ portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/container/UITabContainer.gtmpl 2009-11-18 11:03:59 UTC (rev 641)
@@ -5,6 +5,13 @@
def rcontext = _ctx.getRequestContext();
ResourceBundle res = rcontext.getApplicationResourceBundle();
JavascriptManager jsmanager = rcontext.getJavascriptManager();
+
+ /** Trim the prefix UIContainer- if any, this hardcoded part is needed to update nested container via Ajax */
+ String componentId = uicomponent.getId();
+ if(componentId.startsWith("UIContainer-")){
+ uicomponent.setId(componentId.substring("UIContainer-".length()));
+ }
+
ArrayList children = uicomponent.getChildren();
if(children != null && children.size > 0){
Modified: portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/container/UITableColumnContainer.gtmpl
===================================================================
--- portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/container/UITableColumnContainer.gtmpl 2009-11-18 11:03:24 UTC (rev 640)
+++ portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/container/UITableColumnContainer.gtmpl 2009-11-18 11:03:59 UTC (rev 641)
@@ -8,6 +8,12 @@
UIPortalApplication uiPortalApp = rcontext.getUIApplication();
if(!uiPortalApp.isEditting() && !uicomponent.hasPermission()) return;
+ /** Trim the prefix UIContainer- if any, this hardcoded part is needed to update nested container via Ajax */
+ String componentId = uicomponent.getId();
+ if(componentId.startsWith("UIContainer-")){
+ uicomponent.setId(componentId.substring("UIContainer-".length()));
+ }
+
%>
<div class="UIContainer <%=uiPortalApp.isEditting()?"EdittingContainer":""%>" id="UIContainer-${uicomponent.id}" onmouseover="eXo.portal.UIPortal.blockOnMouseOver(event, this, true);" onmouseout="eXo.portal.UIPortal.blockOnMouseOver(event, this, false);">
<div class="NormalContainerBlock">
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 2009-11-18 11:03:24 UTC (rev 640)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalComponentActionListener.java 2009-11-18 11:03:59 UTC (rev 641)
@@ -151,19 +151,31 @@
}
Util.showComponentLayoutMode(uiRemoveComponent.getClass());
+ PortalRequestContext pcontext = (PortalRequestContext)event.getRequestContext();
String componentType = null;
if (uiComponent instanceof UIPortlet)
{
componentType = UI_PORTLET;
}
- else if (uiComponent instanceof UIContainer)
+ else if (uiComponent instanceof org.exoplatform.portal.webui.container.UIContainer)
{
componentType = UI_CONTAINER;
+ org.exoplatform.portal.webui.container.UIContainer topAncestor = getTopBlockContainer((org.exoplatform.portal.webui.container.UIContainer)uiParent);
+
+ //Case of nested container like tab container, mixed container
+ if(topAncestor != null){
+ String topAncestorId = topAncestor.getId();
+ //Add UIContainer- prefix to the id as it is required to be updated by Ajax
+ if(!topAncestorId.startsWith("UIContainer-")){
+ topAncestor.setId("UIContainer-" + topAncestorId);
+ }
+ pcontext.addUIComponentToUpdateByAjax(topAncestor);
+ return;
+ }
}
if (componentType != null)
{
- PortalRequestContext pcontext = (PortalRequestContext)event.getRequestContext();
JavascriptManager jsManager = pcontext.getJavascriptManager();
jsManager.addJavascript(scriptRemovingComponent(id, componentType));
jsManager.addJavascript("eXo.portal.UIPortal.changeComposerSaveButton();");
@@ -180,6 +192,35 @@
buffer.append("');");
return buffer.toString();
}
+
+ /**
+ * Returns the top ancestor( of type
+ * org.exoplatform.portal.webui.container.UIContainer but not of type
+ * UIPortal) of a given container
+ */
+ private static org.exoplatform.portal.webui.container.UIContainer getTopBlockContainer(
+ org.exoplatform.portal.webui.container.UIContainer container)
+ {
+ if(container instanceof UIPortal){
+ return null;
+ }
+ org.exoplatform.portal.webui.container.UIContainer topAncestor = container;
+ org.exoplatform.portal.webui.container.UIContainer intermediateCont;
+ try
+ {
+ intermediateCont = topAncestor.getParent();
+ while (intermediateCont != null && !(intermediateCont instanceof UIPortal))
+ {
+ topAncestor = intermediateCont;
+ intermediateCont = topAncestor.getParent();
+ }
+ }
+ catch (ClassCastException ex)
+ {
+
+ }
+ return topAncestor;
+ }
}
static public class MoveChildActionListener extends EventListener<UIContainer>
15 years, 1 month
- 1
- 0
gatein SVN: r640 - portal/trunk/packaging.
by do-not-reply＠jboss.org
Author: thomas.heute(a)jboss.com
Date: 2009-11-18 06:03:24 -0500 (Wed, 18 Nov 2009)
New Revision: 640
Modified:
portal/trunk/packaging/pom.xml
Log:
Renamed 3.0.0-CR01-SNAPSHOT -> 3.0.0-Beta03-SNAPSHOT
Modified: portal/trunk/packaging/pom.xml
===================================================================
--- portal/trunk/packaging/pom.xml 2009-11-18 10:32:01 UTC (rev 639)
+++ portal/trunk/packaging/pom.xml 2009-11-18 11:03:24 UTC (rev 640)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.0.0-CR01-SNAPSHOT</version>
+ <version>3.0.0-Beta03-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
15 years, 1 month
- 1
- 0
gatein SVN: r639 - in portal/trunk: component and 54 other directories.
by do-not-reply＠jboss.org
Author: thomas.heute(a)jboss.com
Date: 2009-11-18 05:32:01 -0500 (Wed, 18 Nov 2009)
New Revision: 639
Modified:
portal/trunk/component/application-registry/pom.xml
portal/trunk/component/common/pom.xml
portal/trunk/component/dashboard/pom.xml
portal/trunk/component/identity/pom.xml
portal/trunk/component/pc/pom.xml
portal/trunk/component/pom.xml
portal/trunk/component/portal/pom.xml
portal/trunk/component/resources/pom.xml
portal/trunk/component/scripting/pom.xml
portal/trunk/component/web/pom.xml
portal/trunk/component/wsrp/pom.xml
portal/trunk/component/xml-parser/pom.xml
portal/trunk/gadgets/core/pom.xml
portal/trunk/gadgets/eXoGadgets/pom.xml
portal/trunk/gadgets/pom.xml
portal/trunk/gadgets/server/pom.xml
portal/trunk/packaging/module/pom.xml
portal/trunk/packaging/pkg/pom.xml
portal/trunk/packaging/product/pom.xml
portal/trunk/packaging/reports/pom.xml
portal/trunk/pom.xml
portal/trunk/portlet/dashboard/pom.xml
portal/trunk/portlet/exoadmin/pom.xml
portal/trunk/portlet/pom.xml
portal/trunk/portlet/web/pom.xml
portal/trunk/sample/extension/config/pom.xml
portal/trunk/sample/extension/ear/pom.xml
portal/trunk/sample/extension/jar/pom.xml
portal/trunk/sample/extension/pom.xml
portal/trunk/sample/extension/war/pom.xml
portal/trunk/sample/pom.xml
portal/trunk/sample/portal/config/pom.xml
portal/trunk/sample/portal/ear/pom.xml
portal/trunk/sample/portal/jar/pom.xml
portal/trunk/sample/portal/pom.xml
portal/trunk/sample/portal/rest-war/pom.xml
portal/trunk/sample/portal/war/pom.xml
portal/trunk/server/jboss/patch-ear/pom.xml
portal/trunk/server/jboss/patch/pom.xml
portal/trunk/server/jboss/plugin/pom.xml
portal/trunk/server/jboss/pom.xml
portal/trunk/server/pom.xml
portal/trunk/server/tomcat/patch/pom.xml
portal/trunk/server/tomcat/plugin/pom.xml
portal/trunk/server/tomcat/pom.xml
portal/trunk/starter/ear/pom.xml
portal/trunk/starter/pom.xml
portal/trunk/starter/war/pom.xml
portal/trunk/web/eXoResources/pom.xml
portal/trunk/web/pom.xml
portal/trunk/web/portal/pom.xml
portal/trunk/web/rest/pom.xml
portal/trunk/webui/core/pom.xml
portal/trunk/webui/eXo/pom.xml
portal/trunk/webui/pom.xml
portal/trunk/webui/portal/pom.xml
Log:
Renamed 3.0.0-CR01-SNAPSHOT -> 3.0.0-Beta03-SNAPSHOT
Modified: portal/trunk/component/application-registry/pom.xml
===================================================================
--- portal/trunk/component/application-registry/pom.xml 2009-11-18 10:20:37 UTC (rev 638)
+++ portal/trunk/component/application-registry/pom.xml 2009-11-18 10:32:01 UTC (rev 639)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component</artifactId>
- <version>3.0.0-CR01-SNAPSHOT</version>
+ <version>3.0.0-Beta03-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -51,7 +51,7 @@
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.portal</artifactId>
- <version>3.0.0-CR01-SNAPSHOT</version>
+ <version>3.0.0-Beta03-SNAPSHOT</version>
</dependency>
<dependency>
Modified: portal/trunk/component/common/pom.xml
===================================================================
--- portal/trunk/component/common/pom.xml 2009-11-18 10:20:37 UTC (rev 638)
+++ portal/trunk/component/common/pom.xml 2009-11-18 10:32:01 UTC (rev 639)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component</artifactId>
- <version>3.0.0-CR01-SNAPSHOT</version>
+ <version>3.0.0-Beta03-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>exo.portal.component.common</artifactId>
Modified: portal/trunk/component/dashboard/pom.xml
===================================================================
--- portal/trunk/component/dashboard/pom.xml 2009-11-18 10:20:37 UTC (rev 638)
+++ portal/trunk/component/dashboard/pom.xml 2009-11-18 10:32:01 UTC (rev 639)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component</artifactId>
- <version>3.0.0-CR01-SNAPSHOT</version>
+ <version>3.0.0-Beta03-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -35,14 +35,14 @@
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.webui.portal</artifactId>
- <version>3.0.0-CR01-SNAPSHOT</version>
+ <version>3.0.0-Beta03-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.webui.eXo</artifactId>
- <version>3.0.0-CR01-SNAPSHOT</version>
+ <version>3.0.0-Beta03-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
</dependencies>
Modified: portal/trunk/component/identity/pom.xml
===================================================================
--- portal/trunk/component/identity/pom.xml 2009-11-18 10:20:37 UTC (rev 638)
+++ portal/trunk/component/identity/pom.xml 2009-11-18 10:32:01 UTC (rev 639)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component</artifactId>
- <version>3.0.0-CR01-SNAPSHOT</version>
+ <version>3.0.0-Beta03-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: portal/trunk/component/pc/pom.xml
===================================================================
--- portal/trunk/component/pc/pom.xml 2009-11-18 10:20:37 UTC (rev 638)
+++ portal/trunk/component/pc/pom.xml 2009-11-18 10:32:01 UTC (rev 639)
@@ -23,13 +23,13 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component</artifactId>
- <version>3.0.0-CR01-SNAPSHOT</version>
+ <version>3.0.0-Beta03-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>exo.portal.component.pc</artifactId>
<packaging>jar</packaging>
- <version>3.0.0-CR01-SNAPSHOT</version>
+ <version>3.0.0-Beta03-SNAPSHOT</version>
<name>GateIn Portal Component PC integration</name>
<dependencies>
@@ -37,7 +37,7 @@
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.resources</artifactId>
- <version>3.0.0-CR01-SNAPSHOT</version>
+ <version>3.0.0-Beta03-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.gatein.common</groupId>
Modified: portal/trunk/component/pom.xml
===================================================================
--- portal/trunk/component/pom.xml 2009-11-18 10:20:37 UTC (rev 638)
+++ portal/trunk/component/pom.xml 2009-11-18 10:32:01 UTC (rev 639)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.0.0-CR01-SNAPSHOT</version>
+ <version>3.0.0-Beta03-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.component</artifactId>
Modified: portal/trunk/component/portal/pom.xml
===================================================================
--- portal/trunk/component/portal/pom.xml 2009-11-18 10:20:37 UTC (rev 638)
+++ portal/trunk/component/portal/pom.xml 2009-11-18 10:32:01 UTC (rev 639)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component</artifactId>
- <version>3.0.0-CR01-SNAPSHOT</version>
+ <version>3.0.0-Beta03-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -48,19 +48,19 @@
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.web</artifactId>
- <version>3.0.0-CR01-SNAPSHOT</version>
+ <version>3.0.0-Beta03-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.pc</artifactId>
- <version>3.0.0-CR01-SNAPSHOT</version>
+ <version>3.0.0-Beta03-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.identity</artifactId>
- <version>3.0.0-CR01-SNAPSHOT</version>
+ <version>3.0.0-Beta03-SNAPSHOT</version>
</dependency>
<dependency>
Modified: portal/trunk/component/resources/pom.xml
===================================================================
--- portal/trunk/component/resources/pom.xml 2009-11-18 10:20:37 UTC (rev 638)
+++ portal/trunk/component/resources/pom.xml 2009-11-18 10:32:01 UTC (rev 639)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component</artifactId>
- <version>3.0.0-CR01-SNAPSHOT</version>
+ <version>3.0.0-Beta03-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -84,7 +84,7 @@
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.common</artifactId>
- <version>3.0.0-CR01-SNAPSHOT</version>
+ <version>3.0.0-Beta03-SNAPSHOT</version>
</dependency>
<dependency>
Modified: portal/trunk/component/scripting/pom.xml
===================================================================
--- portal/trunk/component/scripting/pom.xml 2009-11-18 10:20:37 UTC (rev 638)
+++ portal/trunk/component/scripting/pom.xml 2009-11-18 10:32:01 UTC (rev 639)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component</artifactId>
- <version>3.0.0-CR01-SNAPSHOT</version>
+ <version>3.0.0-Beta03-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -41,13 +41,13 @@
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.common</artifactId>
- <version>3.0.0-CR01-SNAPSHOT</version>
+ <version>3.0.0-Beta03-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.xml-parser</artifactId>
- <version>3.0.0-CR01-SNAPSHOT</version>
+ <version>3.0.0-Beta03-SNAPSHOT</version>
</dependency>
<dependency>
Modified: portal/trunk/component/web/pom.xml
===================================================================
--- portal/trunk/component/web/pom.xml 2009-11-18 10:20:37 UTC (rev 638)
+++ portal/trunk/component/web/pom.xml 2009-11-18 10:32:01 UTC (rev 639)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component</artifactId>
- <version>3.0.0-CR01-SNAPSHOT</version>
+ <version>3.0.0-Beta03-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -51,13 +51,13 @@
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.common</artifactId>
- <version>3.0.0-CR01-SNAPSHOT</version>
+ <version>3.0.0-Beta03-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.resources</artifactId>
- <version>3.0.0-CR01-SNAPSHOT</version>
+ <version>3.0.0-Beta03-SNAPSHOT</version>
</dependency>
<dependency>
@@ -133,7 +133,7 @@
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.scripting</artifactId>
- <version>3.0.0-CR01-SNAPSHOT</version>
+ <version>3.0.0-Beta03-SNAPSHOT</version>
</dependency>
<dependency>
Modified: portal/trunk/component/wsrp/pom.xml
===================================================================
--- portal/trunk/component/wsrp/pom.xml 2009-11-18 10:20:37 UTC (rev 638)
+++ portal/trunk/component/wsrp/pom.xml 2009-11-18 10:32:01 UTC (rev 639)
@@ -26,13 +26,13 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component</artifactId>
- <version>3.0.0-CR01-SNAPSHOT</version>
+ <version>3.0.0-Beta03-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>exo.portal.component.wsrp</artifactId>
<packaging>jar</packaging>
- <version>3.0.0-CR01-SNAPSHOT</version>
+ <version>3.0.0-Beta03-SNAPSHOT</version>
<name>GateIn Portal Component WSRP integration</name>
<dependencies>
Modified: portal/trunk/component/xml-parser/pom.xml
===================================================================
--- portal/trunk/component/xml-parser/pom.xml 2009-11-18 10:20:37 UTC (rev 638)
+++ portal/trunk/component/xml-parser/pom.xml 2009-11-18 10:32:01 UTC (rev 639)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component</artifactId>
- <version>3.0.0-CR01-SNAPSHOT</version>
+ <version>3.0.0-Beta03-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: portal/trunk/gadgets/core/pom.xml
===================================================================
--- portal/trunk/gadgets/core/pom.xml 2009-11-18 10:20:37 UTC (rev 638)
+++ portal/trunk/gadgets/core/pom.xml 2009-11-18 10:32:01 UTC (rev 639)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.gadgets</artifactId>
- <version>3.0.0-CR01-SNAPSHOT</version>
+ <version>3.0.0-Beta03-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.gadgets-core</artifactId>
@@ -82,7 +82,7 @@
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.web</artifactId>
- <version>3.0.0-CR01-SNAPSHOT</version>
+ <version>3.0.0-Beta03-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
Modified: portal/trunk/gadgets/eXoGadgets/pom.xml
===================================================================
--- portal/trunk/gadgets/eXoGadgets/pom.xml 2009-11-18 10:20:37 UTC (rev 638)
+++ portal/trunk/gadgets/eXoGadgets/pom.xml 2009-11-18 10:32:01 UTC (rev 639)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.gadgets</artifactId>
- <version>3.0.0-CR01-SNAPSHOT</version>
+ <version>3.0.0-Beta03-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -39,14 +39,14 @@
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.web</artifactId>
- <version>3.0.0-CR01-SNAPSHOT</version>
+ <version>3.0.0-Beta03-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.webui.portal</artifactId>
- <version>3.0.0-CR01-SNAPSHOT</version>
+ <version>3.0.0-Beta03-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
Modified: portal/trunk/gadgets/pom.xml
===================================================================
--- portal/trunk/gadgets/pom.xml 2009-11-18 10:20:37 UTC (rev 638)
+++ portal/trunk/gadgets/pom.xml 2009-11-18 10:32:01 UTC (rev 639)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.0.0-CR01-SNAPSHOT</version>
+ <version>3.0.0-Beta03-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.gadgets</artifactId>
Modified: portal/trunk/gadgets/server/pom.xml
===================================================================
--- portal/trunk/gadgets/server/pom.xml 2009-11-18 10:20:37 UTC (rev 638)
+++ portal/trunk/gadgets/server/pom.xml 2009-11-18 10:32:01 UTC (rev 639)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.gadgets</artifactId>
- <version>3.0.0-CR01-SNAPSHOT</version>
+ <version>3.0.0-Beta03-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.gadgets-server</artifactId>
Modified: portal/trunk/packaging/module/pom.xml
===================================================================
--- portal/trunk/packaging/module/pom.xml 2009-11-18 10:20:37 UTC (rev 638)
+++ portal/trunk/packaging/module/pom.xml 2009-11-18 10:32:01 UTC (rev 639)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.packaging</artifactId>
- <version>3.0.0-CR01-SNAPSHOT</version>
+ <version>3.0.0-Beta03-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: portal/trunk/packaging/pkg/pom.xml
===================================================================
--- portal/trunk/packaging/pkg/pom.xml 2009-11-18 10:20:37 UTC (rev 638)
+++ portal/trunk/packaging/pkg/pom.xml 2009-11-18 10:32:01 UTC (rev 639)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.packaging</artifactId>
- <version>3.0.0-CR01-SNAPSHOT</version>
+ <version>3.0.0-Beta03-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -67,13 +67,13 @@
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>portal.packaging.module</artifactId>
- <version>3.0.0-CR01-SNAPSHOT</version>
+ <version>3.0.0-Beta03-SNAPSHOT</version>
<type>js</type>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>portal.packaging.product</artifactId>
- <version>3.0.0-CR01-SNAPSHOT</version>
+ <version>3.0.0-Beta03-SNAPSHOT</version>
<type>js</type>
</dependency>
</dependencies>
Modified: portal/trunk/packaging/product/pom.xml
===================================================================
--- portal/trunk/packaging/product/pom.xml 2009-11-18 10:20:37 UTC (rev 638)
+++ portal/trunk/packaging/product/pom.xml 2009-11-18 10:32:01 UTC (rev 639)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.packaging</artifactId>
- <version>3.0.0-CR01-SNAPSHOT</version>
+ <version>3.0.0-Beta03-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: portal/trunk/packaging/reports/pom.xml
===================================================================
--- portal/trunk/packaging/reports/pom.xml 2009-11-18 10:20:37 UTC (rev 638)
+++ portal/trunk/packaging/reports/pom.xml 2009-11-18 10:32:01 UTC (rev 639)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.packaging</artifactId>
- <version>3.0.0-CR01-SNAPSHOT</version>
+ <version>3.0.0-Beta03-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: portal/trunk/pom.xml
===================================================================
--- portal/trunk/pom.xml 2009-11-18 10:20:37 UTC (rev 638)
+++ portal/trunk/pom.xml 2009-11-18 10:32:01 UTC (rev 639)
@@ -31,7 +31,7 @@
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.0.0-CR01-SNAPSHOT</version>
+ <version>3.0.0-Beta03-SNAPSHOT</version>
<packaging>pom</packaging>
<name>GateIn Portal</name>
Modified: portal/trunk/portlet/dashboard/pom.xml
===================================================================
--- portal/trunk/portlet/dashboard/pom.xml 2009-11-18 10:20:37 UTC (rev 638)
+++ portal/trunk/portlet/dashboard/pom.xml 2009-11-18 10:32:01 UTC (rev 639)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.portlet</artifactId>
- <version>3.0.0-CR01-SNAPSHOT</version>
+ <version>3.0.0-Beta03-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -35,20 +35,20 @@
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.webui.portal</artifactId>
- <version>3.0.0-CR01-SNAPSHOT</version>
+ <version>3.0.0-Beta03-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.webui.eXo</artifactId>
- <version>3.0.0-CR01-SNAPSHOT</version>
+ <version>3.0.0-Beta03-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.dashboard</artifactId>
- <version>3.0.0-CR01-SNAPSHOT</version>
+ <version>3.0.0-Beta03-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
</dependencies>
Modified: portal/trunk/portlet/exoadmin/pom.xml
===================================================================
--- portal/trunk/portlet/exoadmin/pom.xml 2009-11-18 10:20:37 UTC (rev 638)
+++ portal/trunk/portlet/exoadmin/pom.xml 2009-11-18 10:32:01 UTC (rev 639)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.portlet</artifactId>
- <version>3.0.0-CR01-SNAPSHOT</version>
+ <version>3.0.0-Beta03-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -35,14 +35,14 @@
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.webui.portal</artifactId>
- <version>3.0.0-CR01-SNAPSHOT</version>
+ <version>3.0.0-Beta03-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.webui.eXo</artifactId>
- <version>3.0.0-CR01-SNAPSHOT</version>
+ <version>3.0.0-Beta03-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
</dependencies>
Modified: portal/trunk/portlet/pom.xml
===================================================================
--- portal/trunk/portlet/pom.xml 2009-11-18 10:20:37 UTC (rev 638)
+++ portal/trunk/portlet/pom.xml 2009-11-18 10:32:01 UTC (rev 639)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.0.0-CR01-SNAPSHOT</version>
+ <version>3.0.0-Beta03-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.portlet</artifactId>
Modified: portal/trunk/portlet/web/pom.xml
===================================================================
--- portal/trunk/portlet/web/pom.xml 2009-11-18 10:20:37 UTC (rev 638)
+++ portal/trunk/portlet/web/pom.xml 2009-11-18 10:32:01 UTC (rev 639)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.portlet</artifactId>
- <version>3.0.0-CR01-SNAPSHOT</version>
+ <version>3.0.0-Beta03-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -35,7 +35,7 @@
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.webui.portal</artifactId>
- <version>3.0.0-CR01-SNAPSHOT</version>
+ <version>3.0.0-Beta03-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
</dependencies>
Modified: portal/trunk/sample/extension/config/pom.xml
===================================================================
--- portal/trunk/sample/extension/config/pom.xml 2009-11-18 10:20:37 UTC (rev 638)
+++ portal/trunk/sample/extension/config/pom.xml 2009-11-18 10:32:01 UTC (rev 639)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.0.0-CR01-SNAPSHOT</version>
+ <version>3.0.0-Beta03-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: portal/trunk/sample/extension/ear/pom.xml
===================================================================
--- portal/trunk/sample/extension/ear/pom.xml 2009-11-18 10:20:37 UTC (rev 638)
+++ portal/trunk/sample/extension/ear/pom.xml 2009-11-18 10:32:01 UTC (rev 639)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.0.0-CR01-SNAPSHOT</version>
+ <version>3.0.0-Beta03-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -37,23 +37,23 @@
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.sample.extension.config</artifactId>
- <version>3.0.0-CR01-SNAPSHOT</version>
+ <version>3.0.0-Beta03-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.sample.extension.jar</artifactId>
- <version>3.0.0-CR01-SNAPSHOT</version>
+ <version>3.0.0-Beta03-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.web</artifactId>
- <version>3.0.0-CR01-SNAPSHOT</version>
+ <version>3.0.0-Beta03-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.sample.extension.war</artifactId>
- <version>3.0.0-CR01-SNAPSHOT</version>
+ <version>3.0.0-Beta03-SNAPSHOT</version>
<type>war</type>
</dependency>
</dependencies>
Modified: portal/trunk/sample/extension/jar/pom.xml
===================================================================
--- portal/trunk/sample/extension/jar/pom.xml 2009-11-18 10:20:37 UTC (rev 638)
+++ portal/trunk/sample/extension/jar/pom.xml 2009-11-18 10:32:01 UTC (rev 639)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.0.0-CR01-SNAPSHOT</version>
+ <version>3.0.0-Beta03-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -37,7 +37,7 @@
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.web</artifactId>
- <version>3.0.0-CR01-SNAPSHOT</version>
+ <version>3.0.0-Beta03-SNAPSHOT</version>
</dependency>
</dependencies>
</project>
Modified: portal/trunk/sample/extension/pom.xml
===================================================================
--- portal/trunk/sample/extension/pom.xml 2009-11-18 10:20:37 UTC (rev 638)
+++ portal/trunk/sample/extension/pom.xml 2009-11-18 10:32:01 UTC (rev 639)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.0.0-CR01-SNAPSHOT</version>
+ <version>3.0.0-Beta03-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.sample.extension.root</artifactId>
Modified: portal/trunk/sample/extension/war/pom.xml
===================================================================
--- portal/trunk/sample/extension/war/pom.xml 2009-11-18 10:20:37 UTC (rev 638)
+++ portal/trunk/sample/extension/war/pom.xml 2009-11-18 10:32:01 UTC (rev 639)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.0.0-CR01-SNAPSHOT</version>
+ <version>3.0.0-Beta03-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: portal/trunk/sample/pom.xml
===================================================================
--- portal/trunk/sample/pom.xml 2009-11-18 10:20:37 UTC (rev 638)
+++ portal/trunk/sample/pom.xml 2009-11-18 10:32:01 UTC (rev 639)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.0.0-CR01-SNAPSHOT</version>
+ <version>3.0.0-Beta03-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.sample</artifactId>
Modified: portal/trunk/sample/portal/config/pom.xml
===================================================================
--- portal/trunk/sample/portal/config/pom.xml 2009-11-18 10:20:37 UTC (rev 638)
+++ portal/trunk/sample/portal/config/pom.xml 2009-11-18 10:32:01 UTC (rev 639)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.0.0-CR01-SNAPSHOT</version>
+ <version>3.0.0-Beta03-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: portal/trunk/sample/portal/ear/pom.xml
===================================================================
--- portal/trunk/sample/portal/ear/pom.xml 2009-11-18 10:20:37 UTC (rev 638)
+++ portal/trunk/sample/portal/ear/pom.xml 2009-11-18 10:32:01 UTC (rev 639)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.0.0-CR01-SNAPSHOT</version>
+ <version>3.0.0-Beta03-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -37,29 +37,29 @@
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.sample.portal.config</artifactId>
- <version>3.0.0-CR01-SNAPSHOT</version>
+ <version>3.0.0-Beta03-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.sample.portal.jar</artifactId>
- <version>3.0.0-CR01-SNAPSHOT</version>
+ <version>3.0.0-Beta03-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.web</artifactId>
- <version>3.0.0-CR01-SNAPSHOT</version>
+ <version>3.0.0-Beta03-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.sample.portal.war</artifactId>
- <version>3.0.0-CR01-SNAPSHOT</version>
+ <version>3.0.0-Beta03-SNAPSHOT</version>
<type>war</type>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.sample.portal.rest-war</artifactId>
- <version>3.0.0-CR01-SNAPSHOT</version>
+ <version>3.0.0-Beta03-SNAPSHOT</version>
<type>war</type>
</dependency>
</dependencies>
Modified: portal/trunk/sample/portal/jar/pom.xml
===================================================================
--- portal/trunk/sample/portal/jar/pom.xml 2009-11-18 10:20:37 UTC (rev 638)
+++ portal/trunk/sample/portal/jar/pom.xml 2009-11-18 10:32:01 UTC (rev 639)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.0.0-CR01-SNAPSHOT</version>
+ <version>3.0.0-Beta03-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -37,7 +37,7 @@
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.web</artifactId>
- <version>3.0.0-CR01-SNAPSHOT</version>
+ <version>3.0.0-Beta03-SNAPSHOT</version>
</dependency>
</dependencies>
</project>
Modified: portal/trunk/sample/portal/pom.xml
===================================================================
--- portal/trunk/sample/portal/pom.xml 2009-11-18 10:20:37 UTC (rev 638)
+++ portal/trunk/sample/portal/pom.xml 2009-11-18 10:32:01 UTC (rev 639)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.0.0-CR01-SNAPSHOT</version>
+ <version>3.0.0-Beta03-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.sample.portal.root</artifactId>
Modified: portal/trunk/sample/portal/rest-war/pom.xml
===================================================================
--- portal/trunk/sample/portal/rest-war/pom.xml 2009-11-18 10:20:37 UTC (rev 638)
+++ portal/trunk/sample/portal/rest-war/pom.xml 2009-11-18 10:32:01 UTC (rev 639)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.0.0-CR01-SNAPSHOT</version>
+ <version>3.0.0-Beta03-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: portal/trunk/sample/portal/war/pom.xml
===================================================================
--- portal/trunk/sample/portal/war/pom.xml 2009-11-18 10:20:37 UTC (rev 638)
+++ portal/trunk/sample/portal/war/pom.xml 2009-11-18 10:32:01 UTC (rev 639)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.0.0-CR01-SNAPSHOT</version>
+ <version>3.0.0-Beta03-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: portal/trunk/server/jboss/patch/pom.xml
===================================================================
--- portal/trunk/server/jboss/patch/pom.xml 2009-11-18 10:20:37 UTC (rev 638)
+++ portal/trunk/server/jboss/patch/pom.xml 2009-11-18 10:32:01 UTC (rev 639)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.server.jboss</artifactId>
- <version>3.0.0-CR01-SNAPSHOT</version>
+ <version>3.0.0-Beta03-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: portal/trunk/server/jboss/patch-ear/pom.xml
===================================================================
--- portal/trunk/server/jboss/patch-ear/pom.xml 2009-11-18 10:20:37 UTC (rev 638)
+++ portal/trunk/server/jboss/patch-ear/pom.xml 2009-11-18 10:32:01 UTC (rev 639)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.server.jboss</artifactId>
- <version>3.0.0-CR01-SNAPSHOT</version>
+ <version>3.0.0-Beta03-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: portal/trunk/server/jboss/plugin/pom.xml
===================================================================
--- portal/trunk/server/jboss/plugin/pom.xml 2009-11-18 10:20:37 UTC (rev 638)
+++ portal/trunk/server/jboss/plugin/pom.xml 2009-11-18 10:32:01 UTC (rev 639)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.server.jboss</artifactId>
- <version>3.0.0-CR01-SNAPSHOT</version>
+ <version>3.0.0-Beta03-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: portal/trunk/server/jboss/pom.xml
===================================================================
--- portal/trunk/server/jboss/pom.xml 2009-11-18 10:20:37 UTC (rev 638)
+++ portal/trunk/server/jboss/pom.xml 2009-11-18 10:32:01 UTC (rev 639)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.server</artifactId>
- <version>3.0.0-CR01-SNAPSHOT</version>
+ <version>3.0.0-Beta03-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.server.jboss</artifactId>
Modified: portal/trunk/server/pom.xml
===================================================================
--- portal/trunk/server/pom.xml 2009-11-18 10:20:37 UTC (rev 638)
+++ portal/trunk/server/pom.xml 2009-11-18 10:32:01 UTC (rev 639)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.0.0-CR01-SNAPSHOT</version>
+ <version>3.0.0-Beta03-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.server</artifactId>
Modified: portal/trunk/server/tomcat/patch/pom.xml
===================================================================
--- portal/trunk/server/tomcat/patch/pom.xml 2009-11-18 10:20:37 UTC (rev 638)
+++ portal/trunk/server/tomcat/patch/pom.xml 2009-11-18 10:32:01 UTC (rev 639)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.server.tomcat</artifactId>
- <version>3.0.0-CR01-SNAPSHOT</version>
+ <version>3.0.0-Beta03-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: portal/trunk/server/tomcat/plugin/pom.xml
===================================================================
--- portal/trunk/server/tomcat/plugin/pom.xml 2009-11-18 10:20:37 UTC (rev 638)
+++ portal/trunk/server/tomcat/plugin/pom.xml 2009-11-18 10:32:01 UTC (rev 639)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.server.tomcat</artifactId>
- <version>3.0.0-CR01-SNAPSHOT</version>
+ <version>3.0.0-Beta03-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: portal/trunk/server/tomcat/pom.xml
===================================================================
--- portal/trunk/server/tomcat/pom.xml 2009-11-18 10:20:37 UTC (rev 638)
+++ portal/trunk/server/tomcat/pom.xml 2009-11-18 10:32:01 UTC (rev 639)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.server</artifactId>
- <version>3.0.0-CR01-SNAPSHOT</version>
+ <version>3.0.0-Beta03-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.server.tomcat</artifactId>
Modified: portal/trunk/starter/ear/pom.xml
===================================================================
--- portal/trunk/starter/ear/pom.xml 2009-11-18 10:20:37 UTC (rev 638)
+++ portal/trunk/starter/ear/pom.xml 2009-11-18 10:32:01 UTC (rev 639)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.0.0-CR01-SNAPSHOT</version>
+ <version>3.0.0-Beta03-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -37,7 +37,7 @@
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.starter.war</artifactId>
- <version>3.0.0-CR01-SNAPSHOT</version>
+ <version>3.0.0-Beta03-SNAPSHOT</version>
<type>war</type>
</dependency>
</dependencies>
Modified: portal/trunk/starter/pom.xml
===================================================================
--- portal/trunk/starter/pom.xml 2009-11-18 10:20:37 UTC (rev 638)
+++ portal/trunk/starter/pom.xml 2009-11-18 10:32:01 UTC (rev 639)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.0.0-CR01-SNAPSHOT</version>
+ <version>3.0.0-Beta03-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.starter.root</artifactId>
Modified: portal/trunk/starter/war/pom.xml
===================================================================
--- portal/trunk/starter/war/pom.xml 2009-11-18 10:20:37 UTC (rev 638)
+++ portal/trunk/starter/war/pom.xml 2009-11-18 10:32:01 UTC (rev 639)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.0.0-CR01-SNAPSHOT</version>
+ <version>3.0.0-Beta03-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: portal/trunk/web/eXoResources/pom.xml
===================================================================
--- portal/trunk/web/eXoResources/pom.xml 2009-11-18 10:20:37 UTC (rev 638)
+++ portal/trunk/web/eXoResources/pom.xml 2009-11-18 10:32:01 UTC (rev 639)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.web</artifactId>
- <version>3.0.0-CR01-SNAPSHOT</version>
+ <version>3.0.0-Beta03-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: portal/trunk/web/pom.xml
===================================================================
--- portal/trunk/web/pom.xml 2009-11-18 10:20:37 UTC (rev 638)
+++ portal/trunk/web/pom.xml 2009-11-18 10:32:01 UTC (rev 639)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.0.0-CR01-SNAPSHOT</version>
+ <version>3.0.0-Beta03-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.web</artifactId>
Modified: portal/trunk/web/portal/pom.xml
===================================================================
--- portal/trunk/web/portal/pom.xml 2009-11-18 10:20:37 UTC (rev 638)
+++ portal/trunk/web/portal/pom.xml 2009-11-18 10:32:01 UTC (rev 639)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.web</artifactId>
- <version>3.0.0-CR01-SNAPSHOT</version>
+ <version>3.0.0-Beta03-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: portal/trunk/web/rest/pom.xml
===================================================================
--- portal/trunk/web/rest/pom.xml 2009-11-18 10:20:37 UTC (rev 638)
+++ portal/trunk/web/rest/pom.xml 2009-11-18 10:32:01 UTC (rev 639)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.web</artifactId>
- <version>3.0.0-CR01-SNAPSHOT</version>
+ <version>3.0.0-Beta03-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: portal/trunk/webui/core/pom.xml
===================================================================
--- portal/trunk/webui/core/pom.xml 2009-11-18 10:20:37 UTC (rev 638)
+++ portal/trunk/webui/core/pom.xml 2009-11-18 10:32:01 UTC (rev 639)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.webui</artifactId>
- <version>3.0.0-CR01-SNAPSHOT</version>
+ <version>3.0.0-Beta03-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -39,7 +39,7 @@
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.web</artifactId>
- <version>3.0.0-CR01-SNAPSHOT</version>
+ <version>3.0.0-Beta03-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.gatein.common</groupId>
Modified: portal/trunk/webui/eXo/pom.xml
===================================================================
--- portal/trunk/webui/eXo/pom.xml 2009-11-18 10:20:37 UTC (rev 638)
+++ portal/trunk/webui/eXo/pom.xml 2009-11-18 10:32:01 UTC (rev 639)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.webui</artifactId>
- <version>3.0.0-CR01-SNAPSHOT</version>
+ <version>3.0.0-Beta03-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -35,13 +35,13 @@
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.webui.core</artifactId>
- <version>3.0.0-CR01-SNAPSHOT</version>
+ <version>3.0.0-Beta03-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.application-registry</artifactId>
- <version>3.0.0-CR01-SNAPSHOT</version>
+ <version>3.0.0-Beta03-SNAPSHOT</version>
</dependency>
</dependencies>
</project>
Modified: portal/trunk/webui/pom.xml
===================================================================
--- portal/trunk/webui/pom.xml 2009-11-18 10:20:37 UTC (rev 638)
+++ portal/trunk/webui/pom.xml 2009-11-18 10:32:01 UTC (rev 639)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.0.0-CR01-SNAPSHOT</version>
+ <version>3.0.0-Beta03-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.webui</artifactId>
Modified: portal/trunk/webui/portal/pom.xml
===================================================================
--- portal/trunk/webui/portal/pom.xml 2009-11-18 10:20:37 UTC (rev 638)
+++ portal/trunk/webui/portal/pom.xml 2009-11-18 10:32:01 UTC (rev 639)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.webui</artifactId>
- <version>3.0.0-CR01-SNAPSHOT</version>
+ <version>3.0.0-Beta03-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -47,37 +47,37 @@
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.resources</artifactId>
- <version>3.0.0-CR01-SNAPSHOT</version>
+ <version>3.0.0-Beta03-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.webui.core</artifactId>
- <version>3.0.0-CR01-SNAPSHOT</version>
+ <version>3.0.0-Beta03-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.webui.eXo</artifactId>
- <version>3.0.0-CR01-SNAPSHOT</version>
+ <version>3.0.0-Beta03-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.portal</artifactId>
- <version>3.0.0-CR01-SNAPSHOT</version>
+ <version>3.0.0-Beta03-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.application-registry</artifactId>
- <version>3.0.0-CR01-SNAPSHOT</version>
+ <version>3.0.0-Beta03-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.pc</artifactId>
- <version>3.0.0-CR01-SNAPSHOT</version>
+ <version>3.0.0-Beta03-SNAPSHOT</version>
</dependency>
<dependency>
@@ -94,7 +94,7 @@
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.gadgets-core</artifactId>
- <version>3.0.0-CR01-SNAPSHOT</version>
+ <version>3.0.0-Beta03-SNAPSHOT</version>
</dependency>
</dependencies>
</project>
15 years, 1 month
- 1
- 0
gatein SVN: r638 - portal/trunk.
by do-not-reply＠jboss.org
Author: thomas.heute(a)jboss.com
Date: 2009-11-18 05:20:37 -0500 (Wed, 18 Nov 2009)
New Revision: 638
Modified:
portal/trunk/README.txt
portal/trunk/pom.xml
Log:
Renamed exo.projects.directory.src to gatein.checkout.dir
Modified: portal/trunk/README.txt
===================================================================
--- portal/trunk/README.txt 2009-11-18 10:05:42 UTC (rev 637)
+++ portal/trunk/README.txt 2009-11-18 10:20:37 UTC (rev 638)
@@ -7,8 +7,8 @@
* COMPILATION
*****************
-* mvn install -Dexo.projects.directory.src=//Full Path to the the root of gatein portal
-For example: mvn install -Dexo.projects.directory.src=$PWD on Linux
+* mvn install -Dgatein.checkout.dir=//Full Path to the the root of gatein portal sourcess
+For example: mvn install -Dgatein.checkout.dir=$PWD on Linux
**********************
* MAVEN CONFIGURATION:
@@ -28,11 +28,11 @@
* PACKAGING:
*****************
-* mvn install -Ppkg-tomcat -Dexo.projects.directory.src=//Full Path to the the root of gatein portal
+* mvn install -Ppkg-tomcat -Dgatein.checkout.dir=//Full Path to the the root of gatein portal sources
** Creates a Tomcat delivery in packaging/pkg/target/tomcat/
** Creates compressed archives in packaging/pkg/target/target
-* mvn install -Ppkg-jbossas -Dexo.projects.directory.src=//Full Path to the the root of gatein portal
+* mvn install -Ppkg-jbossas -Dgatein.checkout.dir=//Full Path to the the root of gatein portal sources
** Creates a JBossAS delivery in packaging/pkg/target/jboss/
** Creates compressed archives in packaging/pkg/target/target
Modified: portal/trunk/pom.xml
===================================================================
--- portal/trunk/pom.xml 2009-11-18 10:05:42 UTC (rev 637)
+++ portal/trunk/pom.xml 2009-11-18 10:20:37 UTC (rev 638)
@@ -128,7 +128,7 @@
<systemProperties>
<property>
<name>mock.portal.dir</name>
- <value>${exo.projects.directory.src}/web/portal/src/main/webapp</value>
+ <value>${gatein.checkout.dir}/web/portal/src/main/webapp</value>
</property>
<property>
<name>org.apache.commons.logging.Log</name>
@@ -168,14 +168,14 @@
<configuration>
<rules>
<requireProperty>
- <property>exo.projects.directory.src</property>
- <message>"You must define the property exo.projects.directory.src to give the path of the root of your working area"</message>
+ <property>gatein.checkout.dir</property>
+ <message>"You must define the property gatein.checkout.dir to give the path of the root of your working area"</message>
</requireProperty>
<requireFilesExist>
<files>
- <file>${exo.projects.directory.src}/web/portal/src/main/webapp</file>
+ <file>${gatein.checkout.dir}/web/portal/src/main/webapp</file>
</files>
- <message>"The following directory doesn't exist : ${exo.projects.directory.src}/web/portal/src/main/webapp"</message>
+ <message>"The following directory doesn't exist : ${gatein.checkout.dir}/web/portal/src/main/webapp"</message>
</requireFilesExist>
</rules>
<fail>true</fail>
15 years, 1 month
- 1
- 0
gatein SVN: r637 - in portal/trunk: component/common and 20 other directories.
by do-not-reply＠jboss.org
Author: thomas.heute(a)jboss.com
Date: 2009-11-18 05:05:42 -0500 (Wed, 18 Nov 2009)
New Revision: 637
Modified:
portal/trunk/component/application-registry/
portal/trunk/component/common/
portal/trunk/component/dashboard/
portal/trunk/component/identity/
portal/trunk/component/resources/
portal/trunk/component/web/
portal/trunk/component/wsrp/
portal/trunk/component/xml-parser/
portal/trunk/gadgets/core/
portal/trunk/gadgets/eXoGadgets/
portal/trunk/gadgets/server/
portal/trunk/server/jboss/patch-ear/
portal/trunk/server/jboss/patch/
portal/trunk/server/jboss/plugin/
portal/trunk/server/tomcat/patch/
portal/trunk/server/tomcat/plugin/
portal/trunk/web/eXoResources/
portal/trunk/web/portal/
portal/trunk/web/rest/
portal/trunk/webui/core/
portal/trunk/webui/eXo/
portal/trunk/webui/portal/
Log:
SVN ignore target directories
Property changes on: portal/trunk/component/application-registry
___________________________________________________________________
Name: svn:ignore
- *.iml
.idea
+ *.iml
.idea
target
Property changes on: portal/trunk/component/common
___________________________________________________________________
Name: svn:ignore
- *.iml
.idea
+ *.iml
.idea
target
Property changes on: portal/trunk/component/dashboard
___________________________________________________________________
Name: svn:ignore
- *.iml
.idea
+ *.iml
.idea
target
Property changes on: portal/trunk/component/identity
___________________________________________________________________
Name: svn:ignore
- *.iml
.idea
+ *.iml
.idea
target
Property changes on: portal/trunk/component/resources
___________________________________________________________________
Name: svn:ignore
- *.iml
.idea
+ *.iml
.idea
target
Property changes on: portal/trunk/component/web
___________________________________________________________________
Name: svn:ignore
- *.iml
.idea
+ *.iml
.idea
target
Property changes on: portal/trunk/component/wsrp
___________________________________________________________________
Name: svn:ignore
- *.iml
.idea
+ *.iml
.idea
target
Property changes on: portal/trunk/component/xml-parser
___________________________________________________________________
Name: svn:ignore
- *.iml
.idea
+ *.iml
.idea
target
Property changes on: portal/trunk/gadgets/core
___________________________________________________________________
Name: svn:ignore
- *.iml
.idea
+ *.iml
.idea
target
Property changes on: portal/trunk/gadgets/eXoGadgets
___________________________________________________________________
Name: svn:ignore
- *.iml
.idea
+ *.iml
.idea
target
Property changes on: portal/trunk/gadgets/server
___________________________________________________________________
Name: svn:ignore
- *.iml
.idea
+ *.iml
.idea
target
Property changes on: portal/trunk/server/jboss/patch
___________________________________________________________________
Name: svn:ignore
- *.iml
.idea
+ *.iml
.idea
target
Property changes on: portal/trunk/server/jboss/patch-ear
___________________________________________________________________
Name: svn:ignore
- *.iml
.idea
+ *.iml
.idea
target
Property changes on: portal/trunk/server/jboss/plugin
___________________________________________________________________
Name: svn:ignore
- *.iml
.idea
+ *.iml
.idea
target
Property changes on: portal/trunk/server/tomcat/patch
___________________________________________________________________
Name: svn:ignore
- *.iml
.idea
+ *.iml
.idea
target
Property changes on: portal/trunk/server/tomcat/plugin
___________________________________________________________________
Name: svn:ignore
- *.iml
.idea
+ *.iml
.idea
target
Property changes on: portal/trunk/web/eXoResources
___________________________________________________________________
Name: svn:ignore
- *.iml
.idea
+ *.iml
.idea
target
Property changes on: portal/trunk/web/portal
___________________________________________________________________
Name: svn:ignore
- *.iml
.idea
+ *.iml
.idea
target
Property changes on: portal/trunk/web/rest
___________________________________________________________________
Name: svn:ignore
- *.iml
.idea
+ *.iml
.idea
target
Property changes on: portal/trunk/webui/core
___________________________________________________________________
Name: svn:ignore
- *.iml
.idea
+ *.iml
.idea
target
Property changes on: portal/trunk/webui/eXo
___________________________________________________________________
Name: svn:ignore
- *.iml
.idea
+ *.iml
.idea
target
Property changes on: portal/trunk/webui/portal
___________________________________________________________________
Name: svn:ignore
- *.iml
.idea
+ *.iml
.idea
target
15 years, 1 month
- 1
- 0
gatein SVN: r636 - portal/trunk.
by do-not-reply＠jboss.org
Author: thomas.heute(a)jboss.com
Date: 2009-11-18 04:53:05 -0500 (Wed, 18 Nov 2009)
New Revision: 636
Modified:
portal/trunk/README.txt
portal/trunk/pom.xml
Log:
Don't force someone who would build GateIn Portal to have a particular directory structure
Modified: portal/trunk/README.txt
===================================================================
--- portal/trunk/README.txt 2009-11-18 09:24:26 UTC (rev 635)
+++ portal/trunk/README.txt 2009-11-18 09:53:05 UTC (rev 636)
@@ -1,4 +1,4 @@
-Welcome to gatein codebase:
+Welcome to GateIn:
===========================
This will explain you how to build a package of GateIn with Tomcat or JBoss.
@@ -7,7 +7,8 @@
* COMPILATION
*****************
-* mvn install
+* mvn install -Dexo.projects.directory.src=//Full Path to the the root of gatein portal
+For example: mvn install -Dexo.projects.directory.src=$PWD on Linux
**********************
* MAVEN CONFIGURATION:
@@ -27,11 +28,11 @@
* PACKAGING:
*****************
-* mvn install -Ppkg-tomcat
+* mvn install -Ppkg-tomcat -Dexo.projects.directory.src=//Full Path to the the root of gatein portal
** Creates a Tomcat delivery in packaging/pkg/target/tomcat/
** Creates compressed archives in packaging/pkg/target/target
-* mvn install -Ppkg-jbossas
+* mvn install -Ppkg-jbossas -Dexo.projects.directory.src=//Full Path to the the root of gatein portal
** Creates a JBossAS delivery in packaging/pkg/target/jboss/
** Creates compressed archives in packaging/pkg/target/target
Modified: portal/trunk/pom.xml
===================================================================
--- portal/trunk/pom.xml 2009-11-18 09:24:26 UTC (rev 635)
+++ portal/trunk/pom.xml 2009-11-18 09:53:05 UTC (rev 636)
@@ -128,7 +128,7 @@
<systemProperties>
<property>
<name>mock.portal.dir</name>
- <value>${exo.projects.directory.src}/gatein/portal/trunk/web/portal/src/main/webapp</value>
+ <value>${exo.projects.directory.src}/web/portal/src/main/webapp</value>
</property>
<property>
<name>org.apache.commons.logging.Log</name>
@@ -173,9 +173,9 @@
</requireProperty>
<requireFilesExist>
<files>
- <file>${exo.projects.directory.src}/gatein/portal/trunk/web/portal/src/main/webapp</file>
+ <file>${exo.projects.directory.src}/web/portal/src/main/webapp</file>
</files>
- <message>"The following directory doesn't exist : ${exo.projects.directory.src}/gatein/portal/trunk/web/portal/src/main/webapp"</message>
+ <message>"The following directory doesn't exist : ${exo.projects.directory.src}/web/portal/src/main/webapp"</message>
</requireFilesExist>
</rules>
<fail>true</fail>
15 years, 1 month
- 1
- 0
gatein SVN: r635 - portal/trunk/portlet/exoadmin/src/main/webapp/skin/navigation/webui/component.
by do-not-reply＠jboss.org
Author: thanh.do
Date: 2009-11-18 04:24:26 -0500 (Wed, 18 Nov 2009)
New Revision: 635
Modified:
portal/trunk/portlet/exoadmin/src/main/webapp/skin/navigation/webui/component/DefaultStylesheet.css
Log:
GTNPORTAL-259:Error displaying in UISiteManagement when change some languages
Modified: portal/trunk/portlet/exoadmin/src/main/webapp/skin/navigation/webui/component/DefaultStylesheet.css
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/webapp/skin/navigation/webui/component/DefaultStylesheet.css 2009-11-18 08:53:47 UTC (rev 634)
+++ portal/trunk/portlet/exoadmin/src/main/webapp/skin/navigation/webui/component/DefaultStylesheet.css 2009-11-18 09:24:26 UTC (rev 635)
@@ -25,17 +25,15 @@
.UIManagement .ManagementBlock {
background: url('background/BgEvenRow.gif') repeat-x left top;
- height: 54px;
margin-bottom: 1px;
- _width: 97%;
}
.UIManagement .EvenRow {
- background: url('background/BgEvenRow.gif') repeat-x left top;
+ background: #f8f8f8 url('background/BgEvenRow.gif') repeat-x left top;
}
.UIManagement .OddRow {
- background: url('background/BgOddRow.gif') repeat-x left top;
+ background: #eaeaea url('background/BgOddRow.gif') repeat-x left top;
}
.UIManagement table.ManagementBlock td {
@@ -47,16 +45,20 @@
vertical-align: middle;
background: url('background/LineBg.gif') no-repeat right center; /* orientation=lt */
background: url('background/LineBg-rt.gif') no-repeat left center; /* orientation=rt */
- padding: 0px 15px;
+ padding: 5px 15px;
width: 27%;
overflow: hidden;
white-space: normal;
}
.UIPortalNavigationPortlet .UIManagement table.ManagementBlock td.Content {
- width: 27%;
+ width: 23%;
}
+.UIPortalNavigationPortlet .UIManagement table.ManagementBlock td.ActionBlock {
+ width: 65%;
+}
+
.UIManagement table.ManagementBlock td.Content strong {
margin-right: 7px; /* orientation=lt */
margin-left: 7px; /* orientation=rt */
@@ -64,13 +66,14 @@
.UIManagement .ManagementBlock .Image {
_width: 8%;
- line-height: 54px;
- padding-left: 20px; /* orientation=lt */
- padding-right: 20px; /* orientation=rt */
+ line-height: 41px;
+ padding: 5px 0px 6px 20px; /* orientation=lt */
+ padding: 5px 20px 6px 0px; /* orientation=rt */
}
.UIManagement .ManagementBlock .Image img {
width: 41px;
+ height: 41px;
}
.UIManagement .ManagementBlock .Label {
@@ -79,18 +82,22 @@
}
.UIManagement .ManagementBlock .ActionBlock {
- padding-left: 30px; /* orientation=lt */
- padding-right: 30px; /* orientation=rt */
+ padding-left: 20px; /* orientation=lt */
+ padding-right: 20px; /* orientation=rt */
width: 60%;
}
.UIManagement .ManagementBlock .ActionBlock a {
line-height: 16px;
- width: auto;
- padding: 1px 0px 2px 25px; /* orientation=lt */
- padding: 1px 25px 2px 0px; /* orientation=rt */
- margin: 0px 35px 0px 0px; /* orientation=lt */
- margin: 0px 0px 0px 35px; /* orientation=rt */
+ width: 110px;
+ display: block;
+ float: left; /* orientation=lt */
+ float: right; /* orientation=rt */
+ padding-left: 25px; /* orientation=lt */
+ padding-right: 25px; /* orientation=rt */
+ margin-right: 15px; /* orientation=lt */
+ margin-left: 15px; /* orientation=rt */
+ white-space: normal;
}
.UIManagement .ManagementBlock .ActionBlock a:hover {
@@ -98,23 +105,23 @@
}
.UIManagement .ManagementBlock .EditLayoutIcon {
- background: url('background/MiniIcon.gif') no-repeat left 0px; /* orientation=lt */
- background: url('background/MiniIcon-rt.gif') no-repeat right 0px; /* orientation=rt */
+ background: url('background/MiniIcon.gif') no-repeat left 2px; /* orientation=lt */
+ background: url('background/MiniIcon-rt.gif') no-repeat right 2px; /* orientation=rt */
}
.UIManagement .ManagementBlock .EditNavIcon {
- background: url('background/MiniIcon.gif') no-repeat left -25px; /* orientation=lt */
- background: url('background/MiniIcon-rt.gif') no-repeat right -25px; /* orientation=rt */
+ background: url('background/MiniIcon.gif') no-repeat left -48px; /* orientation=lt */
+ background: url('background/MiniIcon-rt.gif') no-repeat right -48px; /* orientation=rt */
}
.UIManagement .ManagementBlock .DeleteIcon {
- background: url('background/MiniIcon.gif') no-repeat left -50px; /* orientation=lt */
- background: url('background/MiniIcon-rt.gif') no-repeat right -50px; /* orientation=rt */
+ background: url('background/MiniIcon.gif') no-repeat left -98px; /* orientation=lt */
+ background: url('background/MiniIcon-rt.gif') no-repeat right -98px; /* orientation=rt */
}
.UIManagement .ManagementBlock .EditProIcon{
- background: url('background/MiniIcon.gif') no-repeat left 0px; /* orientation=lt */
- background: url('background/MiniIcon-rt.gif') no-repeat right 0px; /* orientation=rt */
+ background: url('background/MiniIcon.gif') no-repeat left 2px; /* orientation=lt */
+ background: url('background/MiniIcon-rt.gif') no-repeat right 2px; /* orientation=rt */
}
.UIManagement .UIAction .ButtonLeft {
15 years, 1 month
- 1
- 0
gatein SVN: r634 - portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation.
by do-not-reply＠jboss.org
Author: truong.le
Date: 2009-11-18 03:53:47 -0500 (Wed, 18 Nov 2009)
New Revision: 634
Modified:
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UINavigationNodeSelector.java
Log:
GTNPORTAL-110: Problem when user has no edit right on page but can edit the page
doesn't check edit permission when editing node's page.
Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UINavigationNodeSelector.java
===================================================================
--- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UINavigationNodeSelector.java 2009-11-18 07:41:24 UTC (rev 633)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UINavigationNodeSelector.java 2009-11-18 08:53:47 UTC (rev 634)
@@ -460,7 +460,7 @@
if (selectPage != null)
{
UserACL userACL = uiApp.getApplicationComponent(UserACL.class);
- if (!userACL.hasPermission(selectPage))
+ if (!userACL.hasEditPermission(selectPage))
{
uiApp.addMessage(new ApplicationMessage("UIPageBrowser.msg.UserNotPermission", new String[]{pageId}, 1));
return;
15 years, 1 month
- 1
- 0
gatein SVN: r633 - in portal/trunk: web/portal/src/main/webapp/groovy/webui/form and 1 other directory.
by do-not-reply＠jboss.org
Author: hoang_to
Date: 2009-11-18 02:41:24 -0500 (Wed, 18 Nov 2009)
New Revision: 633
Modified:
portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/account/webui/component/UIRegisterForm.java
portal/trunk/web/portal/src/main/webapp/groovy/webui/form/UIFormWithTitle.gtmpl
Log:
GTNPORTAL-244: Switch from UIForm.gtmpl to UIFormWithTitle.gtmpl
Modified: portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/account/webui/component/UIRegisterForm.java
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/account/webui/component/UIRegisterForm.java 2009-11-18 07:34:41 UTC (rev 632)
+++ portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/account/webui/component/UIRegisterForm.java 2009-11-18 07:41:24 UTC (rev 633)
@@ -46,7 +46,7 @@
@ComponentConfig(
lifecycle = UIFormLifecycle.class,
- template = "system:/groovy/webui/form/UIForm.gtmpl",
+ template = "system:/groovy/webui/form/UIFormWithTitle.gtmpl",
events = {
@EventConfig( listeners = UIRegisterForm.SubscribeActionListener.class),
@EventConfig( listeners = UIRegisterForm.ResetActionListener.class, phase = Phase.DECODE),
Modified: portal/trunk/web/portal/src/main/webapp/groovy/webui/form/UIFormWithTitle.gtmpl
===================================================================
--- portal/trunk/web/portal/src/main/webapp/groovy/webui/form/UIFormWithTitle.gtmpl 2009-11-18 07:34:41 UTC (rev 632)
+++ portal/trunk/web/portal/src/main/webapp/groovy/webui/form/UIFormWithTitle.gtmpl 2009-11-18 07:41:24 UTC (rev 633)
@@ -1,4 +1,7 @@
-<% String fieldName; %>
+<%
+ import org.exoplatform.webui.form.UIFormInputBase;
+
+ String fieldName; %>
<div class="UIFormWithTitle $uicomponent.id" onkeypress="javascript:SubmitAction.call(this, event);">
<div class="TitleBar"><%=_ctx.appRes(uicomponent.getName() + ".title")%></div>
<% uiform.begin() %>
@@ -11,13 +14,13 @@
%>
<tr>
<%fieldName = uicomponent.getLabel(field.getName());%>
- <%if(!fieldName.equals(uicomponent.getId())) { %>
+ <%if(field instanceof UIFormInputBase && !fieldName.equals(uicomponent.getId())) { %>
<td class="FieldLabel">
<%if(fieldName != null && fieldName.length() > 0) {%>
<%=uicomponent.getLabel(field.getName()) %>
<%}%>
</td>
- <% if(field.isEditable()) { %>
+ <% if(field instanceof UIFormInputBase && field.isEditable()) { %>
<td class="FieldComponent"><% uiform.renderField(field) %></td>
<% }else { %>
<td class="NonEditableField"><% uiform.renderField(field) %></td>
15 years, 1 month
- 1
- 0
gatein SVN: r631 - in portal/trunk/portlet/exoadmin/src/main/webapp: skin/navigation/webui/component and 1 other directory.
by do-not-reply＠jboss.org
Author: thanh.do
Date: 2009-11-17 22:12:34 -0500 (Tue, 17 Nov 2009)
New Revision: 631
Modified:
portal/trunk/portlet/exoadmin/src/main/webapp/groovy/navigation/webui/component/UINavigationGrid.gtmpl
portal/trunk/portlet/exoadmin/src/main/webapp/skin/navigation/webui/component/DefaultStylesheet.css
Log:
GTNPORTAL-181: Redesign the Site and Group site page taking space
Modified: portal/trunk/portlet/exoadmin/src/main/webapp/groovy/navigation/webui/component/UINavigationGrid.gtmpl
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/webapp/groovy/navigation/webui/component/UINavigationGrid.gtmpl 2009-11-17 21:25:51 UTC (rev 630)
+++ portal/trunk/portlet/exoadmin/src/main/webapp/groovy/navigation/webui/component/UINavigationGrid.gtmpl 2009-11-18 03:12:34 UTC (rev 631)
@@ -8,24 +8,26 @@
%>
<div id="$uicomponent.id" class="FeedBox">
- <% for(navigation in navigations) {
+ <%
+ boolean isEvenRow = true;
+ for(navigation in navigations) {
description = (navigation.getDescription()==null)? "" : navigation.getDescription();
deleteLink = parent.event("DeleteNavigation",String.valueOf(navigation.getId()));
editProperties = parent.event("EditProperties",String.valueOf(navigation.getId()));
editLink = parent.event("EditNavigation",String.valueOf(navigation.getId()));%>
- <table class="ManagementBlock" style="table-layout: fixed">
+ <table class="ManagementBlock <%=isEvenRow ? "EvenRow":"OddRow"%>" style="table-layout: fixed">
<tr>
<td class="Image"><img src="/exoadmin/skin/navigation/webui/component/background/GroupImage.png" alt="" /></td>
<td class="Content">
<div class="Label" title="$navigation.ownerId"><%= OrganizationUtils.getGroupLabel(navigation.ownerId) %></div>
- <div><strong>Description: <%= description%></strong></div>
+ <div>Description: <%= description%></div>
</td>
<td class="ActionBlock">
<a href="<%=editLink%>" class="EditNavIcon">Edit Navigation</a>
- <a href="<%=editProperties%>" class="EditNavIcon">Edit Properties</a>
+ <a href="<%=editProperties%>" class="EditProIcon">Edit Properties</a>
<a href="<%=deleteLink%>" class="DeleteIcon">Delete Navigation</a>
</td>
</tr>
</table>
- <% } %>
+ <% isEvenRow = !isEvenRow;} %>
</div>
Modified: portal/trunk/portlet/exoadmin/src/main/webapp/skin/navigation/webui/component/DefaultStylesheet.css
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/webapp/skin/navigation/webui/component/DefaultStylesheet.css 2009-11-17 21:25:51 UTC (rev 630)
+++ portal/trunk/portlet/exoadmin/src/main/webapp/skin/navigation/webui/component/DefaultStylesheet.css 2009-11-18 03:12:34 UTC (rev 631)
@@ -24,11 +24,20 @@
}
.UIManagement .ManagementBlock {
- height: 75px;
- background: white url('background/ContentBg.gif') repeat-x bottom;
+ background: url('background/BgEvenRow.gif') repeat-x left top;
+ height: 54px;
+ margin-bottom: 1px;
_width: 97%;
}
+.UIManagement .EvenRow {
+ background: url('background/BgEvenRow.gif') repeat-x left top;
+}
+
+.UIManagement .OddRow {
+ background: url('background/BgOddRow.gif') repeat-x left top;
+}
+
.UIManagement table.ManagementBlock td {
vertical-align: middle;
white-space: nowrap;
@@ -39,13 +48,13 @@
background: url('background/LineBg.gif') no-repeat right center; /* orientation=lt */
background: url('background/LineBg-rt.gif') no-repeat left center; /* orientation=rt */
padding: 0px 15px;
- width: 30%;
+ width: 27%;
overflow: hidden;
white-space: normal;
}
.UIPortalNavigationPortlet .UIManagement table.ManagementBlock td.Content {
- width: 14%;
+ width: 27%;
}
.UIManagement table.ManagementBlock td.Content strong {
@@ -54,18 +63,18 @@
}
.UIManagement .ManagementBlock .Image {
- width: 90px;
- line-height: 75px;
+ _width: 8%;
+ line-height: 54px;
padding-left: 20px; /* orientation=lt */
padding-right: 20px; /* orientation=rt */
}
.UIManagement .ManagementBlock .Image img {
- width: 80px;
+ width: 41px;
}
.UIManagement .ManagementBlock .Label {
- color: #0077d4;
+ color: #000;
font-weight: bold;
}
@@ -84,21 +93,56 @@
margin: 0px 0px 0px 35px; /* orientation=rt */
}
+.UIManagement .ManagementBlock .ActionBlock a:hover {
+ color: #9b9b9b;
+}
+
.UIManagement .ManagementBlock .EditLayoutIcon {
background: url('background/MiniIcon.gif') no-repeat left 0px; /* orientation=lt */
background: url('background/MiniIcon-rt.gif') no-repeat right 0px; /* orientation=rt */
}
.UIManagement .ManagementBlock .EditNavIcon {
- background: url('background/MiniIcon.gif') no-repeat left -17px; /* orientation=lt */
- background: url('background/MiniIcon-rt.gif') no-repeat right -17px; /* orientation=rt */
+ background: url('background/MiniIcon.gif') no-repeat left -25px; /* orientation=lt */
+ background: url('background/MiniIcon-rt.gif') no-repeat right -25px; /* orientation=rt */
}
.UIManagement .ManagementBlock .DeleteIcon {
- background: url('background/MiniIcon.gif') no-repeat left -34px; /* orientation=lt */
- background: url('background/MiniIcon-rt.gif') no-repeat right -34px; /* orientation=rt */
+ background: url('background/MiniIcon.gif') no-repeat left -50px; /* orientation=lt */
+ background: url('background/MiniIcon-rt.gif') no-repeat right -50px; /* orientation=rt */
}
+.UIManagement .ManagementBlock .EditProIcon{
+ background: url('background/MiniIcon.gif') no-repeat left 0px; /* orientation=lt */
+ background: url('background/MiniIcon-rt.gif') no-repeat right 0px; /* orientation=rt */
+}
+
+.UIManagement .UIAction .ButtonLeft {
+ background: url('background/Button.gif') no-repeat left top;
+ padding-left: 5px;
+}
+
+.UIManagement .UIAction .ButtonRight {
+ background: url('background/Button.gif') no-repeat right top;
+ padding-right: 5px;
+}
+
+.UIManagement .UIAction .ButtonMiddle {
+ background: url('background/Button.gif') repeat-x left -24px;
+ font-size: 11px;
+ line-height: 24px;
+ padding: 0px 10px;
+}
+
+.UIManagement .UIAction .ButtonMiddle a {
+ font-weight: normal;
+}
+
+.UIManagement .UIAction .ButtonMiddle a:hover {
+ color: #9b9b9b;
+}
+
+
/***********************UIAddGroupNavigation************************/
.UIAddGroupNavigation {
15 years, 1 month
- 1
- 0