[gatein-commits] gatein SVN: r5395 - in exo/portal/branches/webos-gatein-branch: component and 91 other directories.
do-not-reply at jboss.org
do-not-reply at jboss.org
Tue Nov 30 23:25:32 EST 2010
Author: trong.tran
Date: 2010-11-30 23:25:29 -0500 (Tue, 30 Nov 2010)
New Revision: 5395
Removed:
exo/portal/branches/webos-gatein-branch/web/portal/src/main/webapp/groovy/portal/webui/application/UIAddNewApplication.gtmpl
exo/portal/branches/webos-gatein-branch/web/portal/src/main/webapp/groovy/portal/webui/page/UIDesktopPage.gtmpl
exo/portal/branches/webos-gatein-branch/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIAddNewApplication.java
exo/portal/branches/webos-gatein-branch/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIDesktopPage.java
Modified:
exo/portal/branches/webos-gatein-branch/component/application-registry/pom.xml
exo/portal/branches/webos-gatein-branch/component/common/pom.xml
exo/portal/branches/webos-gatein-branch/component/identity/pom.xml
exo/portal/branches/webos-gatein-branch/component/management/pom.xml
exo/portal/branches/webos-gatein-branch/component/pc/pom.xml
exo/portal/branches/webos-gatein-branch/component/pom.xml
exo/portal/branches/webos-gatein-branch/component/portal/pom.xml
exo/portal/branches/webos-gatein-branch/component/portal/src/main/java/org/exoplatform/portal/config/model/Page.java
exo/portal/branches/webos-gatein-branch/component/resources/pom.xml
exo/portal/branches/webos-gatein-branch/component/scripting/pom.xml
exo/portal/branches/webos-gatein-branch/component/test/core/pom.xml
exo/portal/branches/webos-gatein-branch/component/test/jcr/pom.xml
exo/portal/branches/webos-gatein-branch/component/test/organization/pom.xml
exo/portal/branches/webos-gatein-branch/component/test/pom.xml
exo/portal/branches/webos-gatein-branch/component/web/api/pom.xml
exo/portal/branches/webos-gatein-branch/component/web/controller/pom.xml
exo/portal/branches/webos-gatein-branch/component/web/pom.xml
exo/portal/branches/webos-gatein-branch/component/web/resources/pom.xml
exo/portal/branches/webos-gatein-branch/component/web/security/pom.xml
exo/portal/branches/webos-gatein-branch/component/web/server/pom.xml
exo/portal/branches/webos-gatein-branch/component/wsrp/pom.xml
exo/portal/branches/webos-gatein-branch/examples/extension/config/pom.xml
exo/portal/branches/webos-gatein-branch/examples/extension/ear/pom.xml
exo/portal/branches/webos-gatein-branch/examples/extension/jar/pom.xml
exo/portal/branches/webos-gatein-branch/examples/extension/pom.xml
exo/portal/branches/webos-gatein-branch/examples/extension/war/pom.xml
exo/portal/branches/webos-gatein-branch/examples/pom.xml
exo/portal/branches/webos-gatein-branch/examples/portal/config/pom.xml
exo/portal/branches/webos-gatein-branch/examples/portal/ear/pom.xml
exo/portal/branches/webos-gatein-branch/examples/portal/jar/pom.xml
exo/portal/branches/webos-gatein-branch/examples/portal/pom.xml
exo/portal/branches/webos-gatein-branch/examples/portal/rest-war/pom.xml
exo/portal/branches/webos-gatein-branch/examples/portal/war/pom.xml
exo/portal/branches/webos-gatein-branch/examples/portlets/api/pom.xml
exo/portal/branches/webos-gatein-branch/examples/portlets/jsfhellouser/pom.xml
exo/portal/branches/webos-gatein-branch/examples/portlets/jsphellouser/pom.xml
exo/portal/branches/webos-gatein-branch/examples/portlets/pom.xml
exo/portal/branches/webos-gatein-branch/examples/portlets/simplesthelloworld/pom.xml
exo/portal/branches/webos-gatein-branch/examples/portlets/struts-jpetstore/pom.xml
exo/portal/branches/webos-gatein-branch/examples/skins/pom.xml
exo/portal/branches/webos-gatein-branch/examples/skins/simpleskin/pom.xml
exo/portal/branches/webos-gatein-branch/gadgets/core/pom.xml
exo/portal/branches/webos-gatein-branch/gadgets/eXoGadgets/pom.xml
exo/portal/branches/webos-gatein-branch/gadgets/pom.xml
exo/portal/branches/webos-gatein-branch/gadgets/server/pom.xml
exo/portal/branches/webos-gatein-branch/packaging/jboss-as/ear/pom.xml
exo/portal/branches/webos-gatein-branch/packaging/jboss-as/integration.war/pom.xml
exo/portal/branches/webos-gatein-branch/packaging/jboss-as/pkg/pom.xml
exo/portal/branches/webos-gatein-branch/packaging/jboss-as/pom.xml
exo/portal/branches/webos-gatein-branch/packaging/module/pom.xml
exo/portal/branches/webos-gatein-branch/packaging/pkg/pom.xml
exo/portal/branches/webos-gatein-branch/packaging/pom.xml
exo/portal/branches/webos-gatein-branch/packaging/product/pom.xml
exo/portal/branches/webos-gatein-branch/packaging/reports/pom.xml
exo/portal/branches/webos-gatein-branch/pom.xml
exo/portal/branches/webos-gatein-branch/portlet/dashboard/pom.xml
exo/portal/branches/webos-gatein-branch/portlet/exoadmin/pom.xml
exo/portal/branches/webos-gatein-branch/portlet/exoadmin/src/main/java/org/exoplatform/toolbar/webui/component/UIAdminToolbarPortlet.java
exo/portal/branches/webos-gatein-branch/portlet/exoadmin/src/main/webapp/WEB-INF/portlet.xml
exo/portal/branches/webos-gatein-branch/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIAdminToolbarPortlet.gtmpl
exo/portal/branches/webos-gatein-branch/portlet/pom.xml
exo/portal/branches/webos-gatein-branch/portlet/web/pom.xml
exo/portal/branches/webos-gatein-branch/server/jboss/patch-ear/pom.xml
exo/portal/branches/webos-gatein-branch/server/jboss/plugin/pom.xml
exo/portal/branches/webos-gatein-branch/server/jboss/pom.xml
exo/portal/branches/webos-gatein-branch/server/pom.xml
exo/portal/branches/webos-gatein-branch/server/tomcat/patch/pom.xml
exo/portal/branches/webos-gatein-branch/server/tomcat/plugin/pom.xml
exo/portal/branches/webos-gatein-branch/server/tomcat/pom.xml
exo/portal/branches/webos-gatein-branch/starter/ear/pom.xml
exo/portal/branches/webos-gatein-branch/starter/pom.xml
exo/portal/branches/webos-gatein-branch/starter/war/pom.xml
exo/portal/branches/webos-gatein-branch/testsuite/pom.xml
exo/portal/branches/webos-gatein-branch/testsuite/selenium-snifftests/pom.xml
exo/portal/branches/webos-gatein-branch/testsuite/webuibasedsamples/pom.xml
exo/portal/branches/webos-gatein-branch/web/eXoResources/pom.xml
exo/portal/branches/webos-gatein-branch/web/pom.xml
exo/portal/branches/webos-gatein-branch/web/portal/pom.xml
exo/portal/branches/webos-gatein-branch/web/rest/pom.xml
exo/portal/branches/webos-gatein-branch/webui/core/pom.xml
exo/portal/branches/webos-gatein-branch/webui/dashboard/pom.xml
exo/portal/branches/webos-gatein-branch/webui/eXo/pom.xml
exo/portal/branches/webos-gatein-branch/webui/framework/pom.xml
exo/portal/branches/webos-gatein-branch/webui/pom.xml
exo/portal/branches/webos-gatein-branch/webui/portal/pom.xml
exo/portal/branches/webos-gatein-branch/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageBody.java
exo/portal/branches/webos-gatein-branch/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageCreationWizard.java
exo/portal/branches/webos-gatein-branch/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalForm.java
exo/portal/branches/webos-gatein-branch/webui/portal/src/main/java/org/exoplatform/portal/webui/util/Util.java
exo/portal/branches/webos-gatein-branch/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIMainActionListener.java
exo/portal/branches/webos-gatein-branch/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIWorkingWorkspace.java
exo/portal/branches/webos-gatein-branch/webui/portlet/pom.xml
Log:
Commit the work that has been done following the WebOS spec
Modified: exo/portal/branches/webos-gatein-branch/component/application-registry/pom.xml
===================================================================
--- exo/portal/branches/webos-gatein-branch/component/application-registry/pom.xml 2010-12-01 03:22:48 UTC (rev 5394)
+++ exo/portal/branches/webos-gatein-branch/component/application-registry/pom.xml 2010-12-01 04:25:29 UTC (rev 5395)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component</artifactId>
- <version>3.2.0-Beta01-SNAPSHOT</version>
+ <version>3.2.0-Beta02-webos</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/webos-gatein-branch/component/common/pom.xml
===================================================================
--- exo/portal/branches/webos-gatein-branch/component/common/pom.xml 2010-12-01 03:22:48 UTC (rev 5394)
+++ exo/portal/branches/webos-gatein-branch/component/common/pom.xml 2010-12-01 04:25:29 UTC (rev 5395)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component</artifactId>
- <version>3.2.0-Beta01-SNAPSHOT</version>
+ <version>3.2.0-Beta02-webos</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>exo.portal.component.common</artifactId>
Modified: exo/portal/branches/webos-gatein-branch/component/identity/pom.xml
===================================================================
--- exo/portal/branches/webos-gatein-branch/component/identity/pom.xml 2010-12-01 03:22:48 UTC (rev 5394)
+++ exo/portal/branches/webos-gatein-branch/component/identity/pom.xml 2010-12-01 04:25:29 UTC (rev 5395)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component</artifactId>
- <version>3.2.0-Beta01-SNAPSHOT</version>
+ <version>3.2.0-Beta02-webos</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/webos-gatein-branch/component/management/pom.xml
===================================================================
--- exo/portal/branches/webos-gatein-branch/component/management/pom.xml 2010-12-01 03:22:48 UTC (rev 5394)
+++ exo/portal/branches/webos-gatein-branch/component/management/pom.xml 2010-12-01 04:25:29 UTC (rev 5395)
@@ -21,7 +21,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component</artifactId>
- <version>3.2.0-Beta01-SNAPSHOT</version>
+ <version>3.2.0-Beta02-webos</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/webos-gatein-branch/component/pc/pom.xml
===================================================================
--- exo/portal/branches/webos-gatein-branch/component/pc/pom.xml 2010-12-01 03:22:48 UTC (rev 5394)
+++ exo/portal/branches/webos-gatein-branch/component/pc/pom.xml 2010-12-01 04:25:29 UTC (rev 5395)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component</artifactId>
- <version>3.2.0-Beta01-SNAPSHOT</version>
+ <version>3.2.0-Beta02-webos</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/webos-gatein-branch/component/pom.xml
===================================================================
--- exo/portal/branches/webos-gatein-branch/component/pom.xml 2010-12-01 03:22:48 UTC (rev 5394)
+++ exo/portal/branches/webos-gatein-branch/component/pom.xml 2010-12-01 04:25:29 UTC (rev 5395)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.2.0-Beta01-SNAPSHOT</version>
+ <version>3.2.0-Beta02-webos</version>
</parent>
<artifactId>exo.portal.component</artifactId>
Modified: exo/portal/branches/webos-gatein-branch/component/portal/pom.xml
===================================================================
--- exo/portal/branches/webos-gatein-branch/component/portal/pom.xml 2010-12-01 03:22:48 UTC (rev 5394)
+++ exo/portal/branches/webos-gatein-branch/component/portal/pom.xml 2010-12-01 04:25:29 UTC (rev 5395)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component</artifactId>
- <version>3.2.0-Beta01-SNAPSHOT</version>
+ <version>3.2.0-Beta02-webos</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/webos-gatein-branch/component/portal/src/main/java/org/exoplatform/portal/config/model/Page.java
===================================================================
--- exo/portal/branches/webos-gatein-branch/component/portal/src/main/java/org/exoplatform/portal/config/model/Page.java 2010-12-01 03:22:48 UTC (rev 5394)
+++ exo/portal/branches/webos-gatein-branch/component/portal/src/main/java/org/exoplatform/portal/config/model/Page.java 2010-12-01 04:25:29 UTC (rev 5395)
@@ -197,4 +197,18 @@
{
return "Page[ownerType=" + ownerType + ",ownerId=" + ownerId + ",name=" + name + "]";
}
+
+ @Override
+ public final String getFactoryId()
+ {
+ String factoryId = super.getFactoryId();
+ if (factoryId != null)
+ {
+ return factoryId;
+ }
+ else
+ {
+ return "org.exoplatform.portal.webui.page.UIPage";
+ }
+ }
}
\ No newline at end of file
Modified: exo/portal/branches/webos-gatein-branch/component/resources/pom.xml
===================================================================
--- exo/portal/branches/webos-gatein-branch/component/resources/pom.xml 2010-12-01 03:22:48 UTC (rev 5394)
+++ exo/portal/branches/webos-gatein-branch/component/resources/pom.xml 2010-12-01 04:25:29 UTC (rev 5395)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component</artifactId>
- <version>3.2.0-Beta01-SNAPSHOT</version>
+ <version>3.2.0-Beta02-webos</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/webos-gatein-branch/component/scripting/pom.xml
===================================================================
--- exo/portal/branches/webos-gatein-branch/component/scripting/pom.xml 2010-12-01 03:22:48 UTC (rev 5394)
+++ exo/portal/branches/webos-gatein-branch/component/scripting/pom.xml 2010-12-01 04:25:29 UTC (rev 5395)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component</artifactId>
- <version>3.2.0-Beta01-SNAPSHOT</version>
+ <version>3.2.0-Beta02-webos</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/webos-gatein-branch/component/test/core/pom.xml
===================================================================
--- exo/portal/branches/webos-gatein-branch/component/test/core/pom.xml 2010-12-01 03:22:48 UTC (rev 5394)
+++ exo/portal/branches/webos-gatein-branch/component/test/core/pom.xml 2010-12-01 04:25:29 UTC (rev 5395)
@@ -22,7 +22,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.test</artifactId>
- <version>3.2.0-Beta01-SNAPSHOT</version>
+ <version>3.2.0-Beta02-webos</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/webos-gatein-branch/component/test/jcr/pom.xml
===================================================================
--- exo/portal/branches/webos-gatein-branch/component/test/jcr/pom.xml 2010-12-01 03:22:48 UTC (rev 5394)
+++ exo/portal/branches/webos-gatein-branch/component/test/jcr/pom.xml 2010-12-01 04:25:29 UTC (rev 5395)
@@ -22,7 +22,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.test</artifactId>
- <version>3.2.0-Beta01-SNAPSHOT</version>
+ <version>3.2.0-Beta02-webos</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/webos-gatein-branch/component/test/organization/pom.xml
===================================================================
--- exo/portal/branches/webos-gatein-branch/component/test/organization/pom.xml 2010-12-01 03:22:48 UTC (rev 5394)
+++ exo/portal/branches/webos-gatein-branch/component/test/organization/pom.xml 2010-12-01 04:25:29 UTC (rev 5395)
@@ -22,7 +22,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.test</artifactId>
- <version>3.2.0-Beta01-SNAPSHOT</version>
+ <version>3.2.0-Beta02-webos</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/webos-gatein-branch/component/test/pom.xml
===================================================================
--- exo/portal/branches/webos-gatein-branch/component/test/pom.xml 2010-12-01 03:22:48 UTC (rev 5394)
+++ exo/portal/branches/webos-gatein-branch/component/test/pom.xml 2010-12-01 04:25:29 UTC (rev 5395)
@@ -22,7 +22,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component</artifactId>
- <version>3.2.0-Beta01-SNAPSHOT</version>
+ <version>3.2.0-Beta02-webos</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/webos-gatein-branch/component/web/api/pom.xml
===================================================================
--- exo/portal/branches/webos-gatein-branch/component/web/api/pom.xml 2010-12-01 03:22:48 UTC (rev 5394)
+++ exo/portal/branches/webos-gatein-branch/component/web/api/pom.xml 2010-12-01 04:25:29 UTC (rev 5395)
@@ -21,7 +21,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.web</artifactId>
- <version>3.2.0-Beta01-SNAPSHOT</version>
+ <version>3.2.0-Beta02-webos</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/webos-gatein-branch/component/web/controller/pom.xml
===================================================================
--- exo/portal/branches/webos-gatein-branch/component/web/controller/pom.xml 2010-12-01 03:22:48 UTC (rev 5394)
+++ exo/portal/branches/webos-gatein-branch/component/web/controller/pom.xml 2010-12-01 04:25:29 UTC (rev 5395)
@@ -21,7 +21,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.web</artifactId>
- <version>3.2.0-Beta01-SNAPSHOT</version>
+ <version>3.2.0-Beta02-webos</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/webos-gatein-branch/component/web/pom.xml
===================================================================
--- exo/portal/branches/webos-gatein-branch/component/web/pom.xml 2010-12-01 03:22:48 UTC (rev 5394)
+++ exo/portal/branches/webos-gatein-branch/component/web/pom.xml 2010-12-01 04:25:29 UTC (rev 5395)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component</artifactId>
- <version>3.2.0-Beta01-SNAPSHOT</version>
+ <version>3.2.0-Beta02-webos</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/webos-gatein-branch/component/web/resources/pom.xml
===================================================================
--- exo/portal/branches/webos-gatein-branch/component/web/resources/pom.xml 2010-12-01 03:22:48 UTC (rev 5394)
+++ exo/portal/branches/webos-gatein-branch/component/web/resources/pom.xml 2010-12-01 04:25:29 UTC (rev 5395)
@@ -21,7 +21,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.web</artifactId>
- <version>3.2.0-Beta01-SNAPSHOT</version>
+ <version>3.2.0-Beta02-webos</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/webos-gatein-branch/component/web/security/pom.xml
===================================================================
--- exo/portal/branches/webos-gatein-branch/component/web/security/pom.xml 2010-12-01 03:22:48 UTC (rev 5394)
+++ exo/portal/branches/webos-gatein-branch/component/web/security/pom.xml 2010-12-01 04:25:29 UTC (rev 5395)
@@ -21,7 +21,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.web</artifactId>
- <version>3.2.0-Beta01-SNAPSHOT</version>
+ <version>3.2.0-Beta02-webos</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/webos-gatein-branch/component/web/server/pom.xml
===================================================================
--- exo/portal/branches/webos-gatein-branch/component/web/server/pom.xml 2010-12-01 03:22:48 UTC (rev 5394)
+++ exo/portal/branches/webos-gatein-branch/component/web/server/pom.xml 2010-12-01 04:25:29 UTC (rev 5395)
@@ -21,7 +21,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.web</artifactId>
- <version>3.2.0-Beta01-SNAPSHOT</version>
+ <version>3.2.0-Beta02-webos</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/webos-gatein-branch/component/wsrp/pom.xml
===================================================================
--- exo/portal/branches/webos-gatein-branch/component/wsrp/pom.xml 2010-12-01 03:22:48 UTC (rev 5394)
+++ exo/portal/branches/webos-gatein-branch/component/wsrp/pom.xml 2010-12-01 04:25:29 UTC (rev 5395)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component</artifactId>
- <version>3.2.0-Beta01-SNAPSHOT</version>
+ <version>3.2.0-Beta02-webos</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/webos-gatein-branch/examples/extension/config/pom.xml
===================================================================
--- exo/portal/branches/webos-gatein-branch/examples/extension/config/pom.xml 2010-12-01 03:22:48 UTC (rev 5394)
+++ exo/portal/branches/webos-gatein-branch/examples/extension/config/pom.xml 2010-12-01 04:25:29 UTC (rev 5395)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.2.0-Beta01-SNAPSHOT</version>
+ <version>3.2.0-Beta02-webos</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/webos-gatein-branch/examples/extension/ear/pom.xml
===================================================================
--- exo/portal/branches/webos-gatein-branch/examples/extension/ear/pom.xml 2010-12-01 03:22:48 UTC (rev 5394)
+++ exo/portal/branches/webos-gatein-branch/examples/extension/ear/pom.xml 2010-12-01 04:25:29 UTC (rev 5395)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.2.0-Beta01-SNAPSHOT</version>
+ <version>3.2.0-Beta02-webos</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.2.0-Beta01-SNAPSHOT</version>
+ <version>3.2.0-Beta02-webos</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.sample.extension.jar</artifactId>
- <version>3.2.0-Beta01-SNAPSHOT</version>
+ <version>3.2.0-Beta02-webos</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.web.api</artifactId>
- <version>3.2.0-Beta01-SNAPSHOT</version>
+ <version>3.2.0-Beta02-webos</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.sample.extension.war</artifactId>
- <version>3.2.0-Beta01-SNAPSHOT</version>
+ <version>3.2.0-Beta02-webos</version>
<type>war</type>
</dependency>
</dependencies>
Modified: exo/portal/branches/webos-gatein-branch/examples/extension/jar/pom.xml
===================================================================
--- exo/portal/branches/webos-gatein-branch/examples/extension/jar/pom.xml 2010-12-01 03:22:48 UTC (rev 5394)
+++ exo/portal/branches/webos-gatein-branch/examples/extension/jar/pom.xml 2010-12-01 04:25:29 UTC (rev 5395)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.2.0-Beta01-SNAPSHOT</version>
+ <version>3.2.0-Beta02-webos</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/webos-gatein-branch/examples/extension/pom.xml
===================================================================
--- exo/portal/branches/webos-gatein-branch/examples/extension/pom.xml 2010-12-01 03:22:48 UTC (rev 5394)
+++ exo/portal/branches/webos-gatein-branch/examples/extension/pom.xml 2010-12-01 04:25:29 UTC (rev 5395)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.2.0-Beta01-SNAPSHOT</version>
+ <version>3.2.0-Beta02-webos</version>
</parent>
<artifactId>exo.portal.sample.extension.root</artifactId>
Modified: exo/portal/branches/webos-gatein-branch/examples/extension/war/pom.xml
===================================================================
--- exo/portal/branches/webos-gatein-branch/examples/extension/war/pom.xml 2010-12-01 03:22:48 UTC (rev 5394)
+++ exo/portal/branches/webos-gatein-branch/examples/extension/war/pom.xml 2010-12-01 04:25:29 UTC (rev 5395)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.2.0-Beta01-SNAPSHOT</version>
+ <version>3.2.0-Beta02-webos</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/webos-gatein-branch/examples/pom.xml
===================================================================
--- exo/portal/branches/webos-gatein-branch/examples/pom.xml 2010-12-01 03:22:48 UTC (rev 5394)
+++ exo/portal/branches/webos-gatein-branch/examples/pom.xml 2010-12-01 04:25:29 UTC (rev 5395)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.2.0-Beta01-SNAPSHOT</version>
+ <version>3.2.0-Beta02-webos</version>
</parent>
<artifactId>exo.portal.sample</artifactId>
Modified: exo/portal/branches/webos-gatein-branch/examples/portal/config/pom.xml
===================================================================
--- exo/portal/branches/webos-gatein-branch/examples/portal/config/pom.xml 2010-12-01 03:22:48 UTC (rev 5394)
+++ exo/portal/branches/webos-gatein-branch/examples/portal/config/pom.xml 2010-12-01 04:25:29 UTC (rev 5395)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.2.0-Beta01-SNAPSHOT</version>
+ <version>3.2.0-Beta02-webos</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/webos-gatein-branch/examples/portal/ear/pom.xml
===================================================================
--- exo/portal/branches/webos-gatein-branch/examples/portal/ear/pom.xml 2010-12-01 03:22:48 UTC (rev 5394)
+++ exo/portal/branches/webos-gatein-branch/examples/portal/ear/pom.xml 2010-12-01 04:25:29 UTC (rev 5395)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.2.0-Beta01-SNAPSHOT</version>
+ <version>3.2.0-Beta02-webos</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.2.0-Beta01-SNAPSHOT</version>
+ <version>3.2.0-Beta02-webos</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.sample.portal.jar</artifactId>
- <version>3.2.0-Beta01-SNAPSHOT</version>
+ <version>3.2.0-Beta02-webos</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.web.api</artifactId>
- <version>3.2.0-Beta01-SNAPSHOT</version>
+ <version>3.2.0-Beta02-webos</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.sample.portal.war</artifactId>
- <version>3.2.0-Beta01-SNAPSHOT</version>
+ <version>3.2.0-Beta02-webos</version>
<type>war</type>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.sample.portal.rest-war</artifactId>
- <version>3.2.0-Beta01-SNAPSHOT</version>
+ <version>3.2.0-Beta02-webos</version>
<type>war</type>
</dependency>
</dependencies>
Modified: exo/portal/branches/webos-gatein-branch/examples/portal/jar/pom.xml
===================================================================
--- exo/portal/branches/webos-gatein-branch/examples/portal/jar/pom.xml 2010-12-01 03:22:48 UTC (rev 5394)
+++ exo/portal/branches/webos-gatein-branch/examples/portal/jar/pom.xml 2010-12-01 04:25:29 UTC (rev 5395)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.2.0-Beta01-SNAPSHOT</version>
+ <version>3.2.0-Beta02-webos</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/webos-gatein-branch/examples/portal/pom.xml
===================================================================
--- exo/portal/branches/webos-gatein-branch/examples/portal/pom.xml 2010-12-01 03:22:48 UTC (rev 5394)
+++ exo/portal/branches/webos-gatein-branch/examples/portal/pom.xml 2010-12-01 04:25:29 UTC (rev 5395)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.2.0-Beta01-SNAPSHOT</version>
+ <version>3.2.0-Beta02-webos</version>
</parent>
<artifactId>exo.portal.sample.portal.root</artifactId>
Modified: exo/portal/branches/webos-gatein-branch/examples/portal/rest-war/pom.xml
===================================================================
--- exo/portal/branches/webos-gatein-branch/examples/portal/rest-war/pom.xml 2010-12-01 03:22:48 UTC (rev 5394)
+++ exo/portal/branches/webos-gatein-branch/examples/portal/rest-war/pom.xml 2010-12-01 04:25:29 UTC (rev 5395)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.2.0-Beta01-SNAPSHOT</version>
+ <version>3.2.0-Beta02-webos</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/webos-gatein-branch/examples/portal/war/pom.xml
===================================================================
--- exo/portal/branches/webos-gatein-branch/examples/portal/war/pom.xml 2010-12-01 03:22:48 UTC (rev 5394)
+++ exo/portal/branches/webos-gatein-branch/examples/portal/war/pom.xml 2010-12-01 04:25:29 UTC (rev 5395)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.2.0-Beta01-SNAPSHOT</version>
+ <version>3.2.0-Beta02-webos</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/webos-gatein-branch/examples/portlets/api/pom.xml
===================================================================
--- exo/portal/branches/webos-gatein-branch/examples/portlets/api/pom.xml 2010-12-01 03:22:48 UTC (rev 5394)
+++ exo/portal/branches/webos-gatein-branch/examples/portlets/api/pom.xml 2010-12-01 04:25:29 UTC (rev 5395)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.gatein.portal.examples.portlets</groupId>
<artifactId>parent</artifactId>
- <version>3.2.0-Beta01-SNAPSHOT</version>
+ <version>3.2.0-Beta02-webos</version>
</parent>
<artifactId>gatein-api</artifactId>
Modified: exo/portal/branches/webos-gatein-branch/examples/portlets/jsfhellouser/pom.xml
===================================================================
--- exo/portal/branches/webos-gatein-branch/examples/portlets/jsfhellouser/pom.xml 2010-12-01 03:22:48 UTC (rev 5394)
+++ exo/portal/branches/webos-gatein-branch/examples/portlets/jsfhellouser/pom.xml 2010-12-01 04:25:29 UTC (rev 5395)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.gatein.portal.examples.portlets</groupId>
<artifactId>parent</artifactId>
- <version>3.2.0-Beta01-SNAPSHOT</version>
+ <version>3.2.0-Beta02-webos</version>
</parent>
<artifactId>gatein-jsf-hellouser</artifactId>
Modified: exo/portal/branches/webos-gatein-branch/examples/portlets/jsphellouser/pom.xml
===================================================================
--- exo/portal/branches/webos-gatein-branch/examples/portlets/jsphellouser/pom.xml 2010-12-01 03:22:48 UTC (rev 5394)
+++ exo/portal/branches/webos-gatein-branch/examples/portlets/jsphellouser/pom.xml 2010-12-01 04:25:29 UTC (rev 5395)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.gatein.portal.examples.portlets</groupId>
<artifactId>parent</artifactId>
- <version>3.2.0-Beta01-SNAPSHOT</version>
+ <version>3.2.0-Beta02-webos</version>
</parent>
<artifactId>gatein-jsp-hellouser</artifactId>
Modified: exo/portal/branches/webos-gatein-branch/examples/portlets/pom.xml
===================================================================
--- exo/portal/branches/webos-gatein-branch/examples/portlets/pom.xml 2010-12-01 03:22:48 UTC (rev 5394)
+++ exo/portal/branches/webos-gatein-branch/examples/portlets/pom.xml 2010-12-01 04:25:29 UTC (rev 5395)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.2.0-Beta01-SNAPSHOT</version>
+ <version>3.2.0-Beta02-webos</version>
</parent>
<groupId>org.gatein.portal.examples.portlets</groupId>
Modified: exo/portal/branches/webos-gatein-branch/examples/portlets/simplesthelloworld/pom.xml
===================================================================
--- exo/portal/branches/webos-gatein-branch/examples/portlets/simplesthelloworld/pom.xml 2010-12-01 03:22:48 UTC (rev 5394)
+++ exo/portal/branches/webos-gatein-branch/examples/portlets/simplesthelloworld/pom.xml 2010-12-01 04:25:29 UTC (rev 5395)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.gatein.portal.examples.portlets</groupId>
<artifactId>parent</artifactId>
- <version>3.2.0-Beta01-SNAPSHOT</version>
+ <version>3.2.0-Beta02-webos</version>
</parent>
<artifactId>gatein-simplest-helloworld</artifactId>
Modified: exo/portal/branches/webos-gatein-branch/examples/portlets/struts-jpetstore/pom.xml
===================================================================
--- exo/portal/branches/webos-gatein-branch/examples/portlets/struts-jpetstore/pom.xml 2010-12-01 03:22:48 UTC (rev 5394)
+++ exo/portal/branches/webos-gatein-branch/examples/portlets/struts-jpetstore/pom.xml 2010-12-01 04:25:29 UTC (rev 5395)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.gatein.portal.examples.portlets</groupId>
<artifactId>parent</artifactId>
- <version>3.2.0-Beta01-SNAPSHOT</version>
+ <version>3.2.0-Beta02-webos</version>
</parent>
<artifactId>struts-jpetstore</artifactId>
Modified: exo/portal/branches/webos-gatein-branch/examples/skins/pom.xml
===================================================================
--- exo/portal/branches/webos-gatein-branch/examples/skins/pom.xml 2010-12-01 03:22:48 UTC (rev 5394)
+++ exo/portal/branches/webos-gatein-branch/examples/skins/pom.xml 2010-12-01 04:25:29 UTC (rev 5395)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.2.0-Beta01-SNAPSHOT</version>
+ <version>3.2.0-Beta02-webos</version>
</parent>
<groupId>org.gatein.portal.examples.skins</groupId>
Modified: exo/portal/branches/webos-gatein-branch/examples/skins/simpleskin/pom.xml
===================================================================
--- exo/portal/branches/webos-gatein-branch/examples/skins/simpleskin/pom.xml 2010-12-01 03:22:48 UTC (rev 5394)
+++ exo/portal/branches/webos-gatein-branch/examples/skins/simpleskin/pom.xml 2010-12-01 04:25:29 UTC (rev 5395)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.portal.examples.skins</groupId>
<artifactId>parent</artifactId>
- <version>3.2.0-Beta01-SNAPSHOT</version>
+ <version>3.2.0-Beta02-webos</version>
</parent>
<artifactId>gatein-sample-skin</artifactId>
Modified: exo/portal/branches/webos-gatein-branch/gadgets/core/pom.xml
===================================================================
--- exo/portal/branches/webos-gatein-branch/gadgets/core/pom.xml 2010-12-01 03:22:48 UTC (rev 5394)
+++ exo/portal/branches/webos-gatein-branch/gadgets/core/pom.xml 2010-12-01 04:25:29 UTC (rev 5395)
@@ -14,7 +14,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.gadgets</artifactId>
- <version>3.2.0-Beta01-SNAPSHOT</version>
+ <version>3.2.0-Beta02-webos</version>
</parent>
<artifactId>exo.portal.gadgets-core</artifactId>
Modified: exo/portal/branches/webos-gatein-branch/gadgets/eXoGadgets/pom.xml
===================================================================
--- exo/portal/branches/webos-gatein-branch/gadgets/eXoGadgets/pom.xml 2010-12-01 03:22:48 UTC (rev 5394)
+++ exo/portal/branches/webos-gatein-branch/gadgets/eXoGadgets/pom.xml 2010-12-01 04:25:29 UTC (rev 5395)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.gadgets</artifactId>
- <version>3.2.0-Beta01-SNAPSHOT</version>
+ <version>3.2.0-Beta02-webos</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/webos-gatein-branch/gadgets/pom.xml
===================================================================
--- exo/portal/branches/webos-gatein-branch/gadgets/pom.xml 2010-12-01 03:22:48 UTC (rev 5394)
+++ exo/portal/branches/webos-gatein-branch/gadgets/pom.xml 2010-12-01 04:25:29 UTC (rev 5395)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.2.0-Beta01-SNAPSHOT</version>
+ <version>3.2.0-Beta02-webos</version>
</parent>
<artifactId>exo.portal.gadgets</artifactId>
Modified: exo/portal/branches/webos-gatein-branch/gadgets/server/pom.xml
===================================================================
--- exo/portal/branches/webos-gatein-branch/gadgets/server/pom.xml 2010-12-01 03:22:48 UTC (rev 5394)
+++ exo/portal/branches/webos-gatein-branch/gadgets/server/pom.xml 2010-12-01 04:25:29 UTC (rev 5395)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.gadgets</artifactId>
- <version>3.2.0-Beta01-SNAPSHOT</version>
+ <version>3.2.0-Beta02-webos</version>
</parent>
<artifactId>exo.portal.gadgets-server</artifactId>
Modified: exo/portal/branches/webos-gatein-branch/packaging/jboss-as/ear/pom.xml
===================================================================
--- exo/portal/branches/webos-gatein-branch/packaging/jboss-as/ear/pom.xml 2010-12-01 03:22:48 UTC (rev 5394)
+++ exo/portal/branches/webos-gatein-branch/packaging/jboss-as/ear/pom.xml 2010-12-01 04:25:29 UTC (rev 5395)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.2.0-Beta01-SNAPSHOT</version>
+ <version>3.2.0-Beta02-webos</version>
</parent>
<artifactId>exo.portal.packaging.jboss-as.ear</artifactId>
<packaging>ear</packaging>
Modified: exo/portal/branches/webos-gatein-branch/packaging/jboss-as/integration.war/pom.xml
===================================================================
--- exo/portal/branches/webos-gatein-branch/packaging/jboss-as/integration.war/pom.xml 2010-12-01 03:22:48 UTC (rev 5394)
+++ exo/portal/branches/webos-gatein-branch/packaging/jboss-as/integration.war/pom.xml 2010-12-01 04:25:29 UTC (rev 5395)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.2.0-Beta01-SNAPSHOT</version>
+ <version>3.2.0-Beta02-webos</version>
</parent>
<artifactId>exo.portal.packaging.jboss-as.integration</artifactId>
<packaging>war</packaging>
Modified: exo/portal/branches/webos-gatein-branch/packaging/jboss-as/pkg/pom.xml
===================================================================
--- exo/portal/branches/webos-gatein-branch/packaging/jboss-as/pkg/pom.xml 2010-12-01 03:22:48 UTC (rev 5394)
+++ exo/portal/branches/webos-gatein-branch/packaging/jboss-as/pkg/pom.xml 2010-12-01 04:25:29 UTC (rev 5395)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.2.0-Beta01-SNAPSHOT</version>
+ <version>3.2.0-Beta02-webos</version>
</parent>
<artifactId>exo.portal.packaging.jboss-as.pkg</artifactId>
<packaging>pom</packaging>
Modified: exo/portal/branches/webos-gatein-branch/packaging/jboss-as/pom.xml
===================================================================
--- exo/portal/branches/webos-gatein-branch/packaging/jboss-as/pom.xml 2010-12-01 03:22:48 UTC (rev 5394)
+++ exo/portal/branches/webos-gatein-branch/packaging/jboss-as/pom.xml 2010-12-01 04:25:29 UTC (rev 5395)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.2.0-Beta01-SNAPSHOT</version>
+ <version>3.2.0-Beta02-webos</version>
</parent>
<artifactId>exo.portal.packaging.jboss-as</artifactId>
<packaging>pom</packaging>
Modified: exo/portal/branches/webos-gatein-branch/packaging/module/pom.xml
===================================================================
--- exo/portal/branches/webos-gatein-branch/packaging/module/pom.xml 2010-12-01 03:22:48 UTC (rev 5394)
+++ exo/portal/branches/webos-gatein-branch/packaging/module/pom.xml 2010-12-01 04:25:29 UTC (rev 5395)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.packaging</artifactId>
- <version>3.2.0-Beta01-SNAPSHOT</version>
+ <version>3.2.0-Beta02-webos</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/webos-gatein-branch/packaging/pkg/pom.xml
===================================================================
--- exo/portal/branches/webos-gatein-branch/packaging/pkg/pom.xml 2010-12-01 03:22:48 UTC (rev 5394)
+++ exo/portal/branches/webos-gatein-branch/packaging/pkg/pom.xml 2010-12-01 04:25:29 UTC (rev 5395)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.packaging</artifactId>
- <version>3.2.0-Beta01-SNAPSHOT</version>
+ <version>3.2.0-Beta02-webos</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -67,13 +67,13 @@
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>portal.packaging.module</artifactId>
- <version>3.2.0-Beta01-SNAPSHOT</version>
+ <version>3.2.0-Beta02-webos</version>
<type>js</type>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>portal.packaging.product</artifactId>
- <version>3.2.0-Beta01-SNAPSHOT</version>
+ <version>3.2.0-Beta02-webos</version>
<type>js</type>
</dependency>
</dependencies>
Modified: exo/portal/branches/webos-gatein-branch/packaging/pom.xml
===================================================================
--- exo/portal/branches/webos-gatein-branch/packaging/pom.xml 2010-12-01 03:22:48 UTC (rev 5394)
+++ exo/portal/branches/webos-gatein-branch/packaging/pom.xml 2010-12-01 04:25:29 UTC (rev 5395)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.2.0-Beta01-SNAPSHOT</version>
+ <version>3.2.0-Beta02-webos</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/webos-gatein-branch/packaging/product/pom.xml
===================================================================
--- exo/portal/branches/webos-gatein-branch/packaging/product/pom.xml 2010-12-01 03:22:48 UTC (rev 5394)
+++ exo/portal/branches/webos-gatein-branch/packaging/product/pom.xml 2010-12-01 04:25:29 UTC (rev 5395)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.packaging</artifactId>
- <version>3.2.0-Beta01-SNAPSHOT</version>
+ <version>3.2.0-Beta02-webos</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/webos-gatein-branch/packaging/reports/pom.xml
===================================================================
--- exo/portal/branches/webos-gatein-branch/packaging/reports/pom.xml 2010-12-01 03:22:48 UTC (rev 5394)
+++ exo/portal/branches/webos-gatein-branch/packaging/reports/pom.xml 2010-12-01 04:25:29 UTC (rev 5395)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.packaging</artifactId>
- <version>3.2.0-Beta01-SNAPSHOT</version>
+ <version>3.2.0-Beta02-webos</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/webos-gatein-branch/pom.xml
===================================================================
--- exo/portal/branches/webos-gatein-branch/pom.xml 2010-12-01 03:22:48 UTC (rev 5394)
+++ exo/portal/branches/webos-gatein-branch/pom.xml 2010-12-01 04:25:29 UTC (rev 5395)
@@ -31,7 +31,7 @@
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.2.0-Beta01-SNAPSHOT</version>
+ <version>3.2.0-Beta02-webos</version>
<packaging>pom</packaging>
<name>GateIn - Portal</name>
@@ -362,68 +362,68 @@
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.common</artifactId>
- <version>3.2.0-Beta01-SNAPSHOT</version>
+ <version>3.2.0-Beta02-webos</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.web</artifactId>
- <version>3.2.0-Beta01-SNAPSHOT</version>
+ <version>3.2.0-Beta02-webos</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.web.controller</artifactId>
- <version>3.2.0-Beta01-SNAPSHOT</version>
+ <version>3.2.0-Beta02-webos</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.web.security</artifactId>
- <version>3.2.0-Beta01-SNAPSHOT</version>
+ <version>3.2.0-Beta02-webos</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.web.server</artifactId>
- <version>3.2.0-Beta01-SNAPSHOT</version>
+ <version>3.2.0-Beta02-webos</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.web.api</artifactId>
- <version>3.2.0-Beta01-SNAPSHOT</version>
+ <version>3.2.0-Beta02-webos</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.web.resources</artifactId>
- <version>3.2.0-Beta01-SNAPSHOT</version>
+ <version>3.2.0-Beta02-webos</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.portal</artifactId>
- <version>3.2.0-Beta01-SNAPSHOT</version>
+ <version>3.2.0-Beta02-webos</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.portal</artifactId>
- <version>3.2.0-Beta01-SNAPSHOT</version>
+ <version>3.2.0-Beta02-webos</version>
<type>test-jar</type>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.pc</artifactId>
- <version>3.2.0-Beta01-SNAPSHOT</version>
+ <version>3.2.0-Beta02-webos</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.identity</artifactId>
- <version>3.2.0-Beta01-SNAPSHOT</version>
+ <version>3.2.0-Beta02-webos</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.resources</artifactId>
- <version>3.2.0-Beta01-SNAPSHOT</version>
+ <version>3.2.0-Beta02-webos</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.application-registry</artifactId>
- <version>3.2.0-Beta01-SNAPSHOT</version>
+ <version>3.2.0-Beta02-webos</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
@@ -433,95 +433,95 @@
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.scripting</artifactId>
- <version>3.2.0-Beta01-SNAPSHOT</version>
+ <version>3.2.0-Beta02-webos</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.management</artifactId>
- <version>3.2.0-Beta01-SNAPSHOT</version>
+ <version>3.2.0-Beta02-webos</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.webui.framework</artifactId>
- <version>3.2.0-Beta01-SNAPSHOT</version>
+ <version>3.2.0-Beta02-webos</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.webui.portlet</artifactId>
- <version>3.2.0-Beta01-SNAPSHOT</version>
+ <version>3.2.0-Beta02-webos</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.webui.portal</artifactId>
- <version>3.2.0-Beta01-SNAPSHOT</version>
+ <version>3.2.0-Beta02-webos</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.webui.eXo</artifactId>
- <version>3.2.0-Beta01-SNAPSHOT</version>
+ <version>3.2.0-Beta02-webos</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.webui.core</artifactId>
- <version>3.2.0-Beta01-SNAPSHOT</version>
+ <version>3.2.0-Beta02-webos</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.webui.dashboard</artifactId>
- <version>3.2.0-Beta01-SNAPSHOT</version>
+ <version>3.2.0-Beta02-webos</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.gadgets-core</artifactId>
- <version>3.2.0-Beta01-SNAPSHOT</version>
+ <version>3.2.0-Beta02-webos</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.test.core</artifactId>
- <version>3.2.0-Beta01-SNAPSHOT</version>
+ <version>3.2.0-Beta02-webos</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.test.core</artifactId>
- <version>3.2.0-Beta01-SNAPSHOT</version>
+ <version>3.2.0-Beta02-webos</version>
<type>test-jar</type>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.test.jcr</artifactId>
- <version>3.2.0-Beta01-SNAPSHOT</version>
+ <version>3.2.0-Beta02-webos</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.test.jcr</artifactId>
- <version>3.2.0-Beta01-SNAPSHOT</version>
+ <version>3.2.0-Beta02-webos</version>
<type>test-jar</type>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.test.organization</artifactId>
- <version>3.2.0-Beta01-SNAPSHOT</version>
+ <version>3.2.0-Beta02-webos</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.test.organization</artifactId>
- <version>3.2.0-Beta01-SNAPSHOT</version>
+ <version>3.2.0-Beta02-webos</version>
<type>test-jar</type>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>gatein.portal.component.wsrp</artifactId>
- <version>3.2.0-Beta01-SNAPSHOT</version>
+ <version>3.2.0-Beta02-webos</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.server.jboss.plugin</artifactId>
- <version>3.2.0-Beta01-SNAPSHOT</version>
+ <version>3.2.0-Beta02-webos</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.server.tomcat.plugin</artifactId>
- <version>3.2.0-Beta01-SNAPSHOT</version>
+ <version>3.2.0-Beta02-webos</version>
</dependency>
<!-- Chromattic -->
Modified: exo/portal/branches/webos-gatein-branch/portlet/dashboard/pom.xml
===================================================================
--- exo/portal/branches/webos-gatein-branch/portlet/dashboard/pom.xml 2010-12-01 03:22:48 UTC (rev 5394)
+++ exo/portal/branches/webos-gatein-branch/portlet/dashboard/pom.xml 2010-12-01 04:25:29 UTC (rev 5395)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.portlet</artifactId>
- <version>3.2.0-Beta01-SNAPSHOT</version>
+ <version>3.2.0-Beta02-webos</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/webos-gatein-branch/portlet/exoadmin/pom.xml
===================================================================
--- exo/portal/branches/webos-gatein-branch/portlet/exoadmin/pom.xml 2010-12-01 03:22:48 UTC (rev 5394)
+++ exo/portal/branches/webos-gatein-branch/portlet/exoadmin/pom.xml 2010-12-01 04:25:29 UTC (rev 5395)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.portlet</artifactId>
- <version>3.2.0-Beta01-SNAPSHOT</version>
+ <version>3.2.0-Beta02-webos</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/webos-gatein-branch/portlet/exoadmin/src/main/java/org/exoplatform/toolbar/webui/component/UIAdminToolbarPortlet.java
===================================================================
--- exo/portal/branches/webos-gatein-branch/portlet/exoadmin/src/main/java/org/exoplatform/toolbar/webui/component/UIAdminToolbarPortlet.java 2010-12-01 03:22:48 UTC (rev 5394)
+++ exo/portal/branches/webos-gatein-branch/portlet/exoadmin/src/main/java/org/exoplatform/toolbar/webui/component/UIAdminToolbarPortlet.java 2010-12-01 04:25:29 UTC (rev 5395)
@@ -40,9 +40,6 @@
@ComponentConfig(lifecycle = UIApplicationLifecycle.class, template = "app:/groovy/admintoolbar/webui/component/UIAdminToolbarPortlet.gtmpl")
public class UIAdminToolbarPortlet extends UIPortletApplication
{
- // Minh Hoang TO
- // TODO: Add a ThreadLocal cache to avoid double invocation of editPermission
- // check ( one in processRender method, and one in Groovy template )
public UIAdminToolbarPortlet() throws Exception
{
Modified: exo/portal/branches/webos-gatein-branch/portlet/exoadmin/src/main/webapp/WEB-INF/portlet.xml
===================================================================
--- exo/portal/branches/webos-gatein-branch/portlet/exoadmin/src/main/webapp/WEB-INF/portlet.xml 2010-12-01 03:22:48 UTC (rev 5394)
+++ exo/portal/branches/webos-gatein-branch/portlet/exoadmin/src/main/webapp/WEB-INF/portlet.xml 2010-12-01 04:25:29 UTC (rev 5395)
@@ -22,6 +22,12 @@
<portlet-app version="1.0" xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd">
+
+ <public-render-parameter>
+ <identifier>navigation_uri</identifier>
+ <qname xmlns:prp='http://www.gatein.org/xml/ns/prp_1_0'>prp:navigation_uri</qname>
+ </public-render-parameter>
+
<portlet>
<description xml:lang="EN">Organization Portlet</description>
<portlet-name>OrganizationPortlet</portlet-name>
@@ -242,6 +248,8 @@
<short-title>Administration Toolbar</short-title>
<keywords>gatein_internal</keywords>
</portlet-info>
+
+ <supported-public-render-parameter>navigation_uri</supported-public-render-parameter>
</portlet>
<portlet>
Modified: exo/portal/branches/webos-gatein-branch/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIAdminToolbarPortlet.gtmpl
===================================================================
--- exo/portal/branches/webos-gatein-branch/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIAdminToolbarPortlet.gtmpl 2010-12-01 03:22:48 UTC (rev 5394)
+++ exo/portal/branches/webos-gatein-branch/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIAdminToolbarPortlet.gtmpl 2010-12-01 04:25:29 UTC (rev 5395)
@@ -5,9 +5,15 @@
import org.exoplatform.services.organization.User;
import org.exoplatform.services.security.ConversationState;
import org.exoplatform.web.CacheUserProfileFilter;
+ import org.exoplatform.webui.application.portlet.PortletRequestContext;
- def rcontext = _ctx.getRequestContext();
+ def rcontext = (PortletRequestContext)_ctx.getRequestContext();
+ java.util.Map<String, String[]> publicRenderParams = rcontext.getRequest().getPublicParameterMap();
+ String[] navigation_uri_properties = publicRenderParams.get("navigation_uri");
+
+ String navigation_uri = (navigation_uri_properties == null)? null : navigation_uri_properties[0];
+
JavascriptManager jsmanager = rcontext.getJavascriptManager();
jsmanager.importJavascript('eXo.portal.UIPortalNavigation');
jsmanager.importJavascript('eXo.portal.UIAdminToolbar');
@@ -52,9 +58,15 @@
<% } %>
<% if(userCouldEditPortal){ %>
- <div class="MenuItem">
- <a href="javascript:ajaxGet(eXo.env.server.createPortalURL('UIWorkingWorkspace', 'EditInline', true))" title="" class="ItemIcon EditSiteIcon">$editSiteLayout</a>
- </div>
+ <% if("classicWebosPage".equals(navigation_uri)){ %>
+ <div class="MenuItem">
+ <a href="javascript:ajaxGet(eXo.env.server.createPortalURL('UIWorkingWorkspace', 'EditBackground', true))" title="" class="ItemIcon EditSiteIcon">Edit Background</a>
+ </div>
+ <% }else{ %>
+ <div class="MenuItem">
+ <a href="javascript:ajaxGet(eXo.env.server.createPortalURL('UIWorkingWorkspace', 'EditInline', true))" title="" class="ItemIcon EditSiteIcon">$editSiteLayout</a>
+ </div>
+ <% } %>
<% } %>
</div>
</div>
Modified: exo/portal/branches/webos-gatein-branch/portlet/pom.xml
===================================================================
--- exo/portal/branches/webos-gatein-branch/portlet/pom.xml 2010-12-01 03:22:48 UTC (rev 5394)
+++ exo/portal/branches/webos-gatein-branch/portlet/pom.xml 2010-12-01 04:25:29 UTC (rev 5395)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.2.0-Beta01-SNAPSHOT</version>
+ <version>3.2.0-Beta02-webos</version>
</parent>
<artifactId>exo.portal.portlet</artifactId>
Modified: exo/portal/branches/webos-gatein-branch/portlet/web/pom.xml
===================================================================
--- exo/portal/branches/webos-gatein-branch/portlet/web/pom.xml 2010-12-01 03:22:48 UTC (rev 5394)
+++ exo/portal/branches/webos-gatein-branch/portlet/web/pom.xml 2010-12-01 04:25:29 UTC (rev 5395)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.portlet</artifactId>
- <version>3.2.0-Beta01-SNAPSHOT</version>
+ <version>3.2.0-Beta02-webos</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/webos-gatein-branch/server/jboss/patch-ear/pom.xml
===================================================================
--- exo/portal/branches/webos-gatein-branch/server/jboss/patch-ear/pom.xml 2010-12-01 03:22:48 UTC (rev 5394)
+++ exo/portal/branches/webos-gatein-branch/server/jboss/patch-ear/pom.xml 2010-12-01 04:25:29 UTC (rev 5395)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.server.jboss</artifactId>
- <version>3.2.0-Beta01-SNAPSHOT</version>
+ <version>3.2.0-Beta02-webos</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/webos-gatein-branch/server/jboss/plugin/pom.xml
===================================================================
--- exo/portal/branches/webos-gatein-branch/server/jboss/plugin/pom.xml 2010-12-01 03:22:48 UTC (rev 5394)
+++ exo/portal/branches/webos-gatein-branch/server/jboss/plugin/pom.xml 2010-12-01 04:25:29 UTC (rev 5395)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.server.jboss</artifactId>
- <version>3.2.0-Beta01-SNAPSHOT</version>
+ <version>3.2.0-Beta02-webos</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/webos-gatein-branch/server/jboss/pom.xml
===================================================================
--- exo/portal/branches/webos-gatein-branch/server/jboss/pom.xml 2010-12-01 03:22:48 UTC (rev 5394)
+++ exo/portal/branches/webos-gatein-branch/server/jboss/pom.xml 2010-12-01 04:25:29 UTC (rev 5395)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.server</artifactId>
- <version>3.2.0-Beta01-SNAPSHOT</version>
+ <version>3.2.0-Beta02-webos</version>
</parent>
<artifactId>exo.portal.server.jboss</artifactId>
Modified: exo/portal/branches/webos-gatein-branch/server/pom.xml
===================================================================
--- exo/portal/branches/webos-gatein-branch/server/pom.xml 2010-12-01 03:22:48 UTC (rev 5394)
+++ exo/portal/branches/webos-gatein-branch/server/pom.xml 2010-12-01 04:25:29 UTC (rev 5395)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.2.0-Beta01-SNAPSHOT</version>
+ <version>3.2.0-Beta02-webos</version>
</parent>
<artifactId>exo.portal.server</artifactId>
Modified: exo/portal/branches/webos-gatein-branch/server/tomcat/patch/pom.xml
===================================================================
--- exo/portal/branches/webos-gatein-branch/server/tomcat/patch/pom.xml 2010-12-01 03:22:48 UTC (rev 5394)
+++ exo/portal/branches/webos-gatein-branch/server/tomcat/patch/pom.xml 2010-12-01 04:25:29 UTC (rev 5395)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.server.tomcat</artifactId>
- <version>3.2.0-Beta01-SNAPSHOT</version>
+ <version>3.2.0-Beta02-webos</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/webos-gatein-branch/server/tomcat/plugin/pom.xml
===================================================================
--- exo/portal/branches/webos-gatein-branch/server/tomcat/plugin/pom.xml 2010-12-01 03:22:48 UTC (rev 5394)
+++ exo/portal/branches/webos-gatein-branch/server/tomcat/plugin/pom.xml 2010-12-01 04:25:29 UTC (rev 5395)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.server.tomcat</artifactId>
- <version>3.2.0-Beta01-SNAPSHOT</version>
+ <version>3.2.0-Beta02-webos</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/webos-gatein-branch/server/tomcat/pom.xml
===================================================================
--- exo/portal/branches/webos-gatein-branch/server/tomcat/pom.xml 2010-12-01 03:22:48 UTC (rev 5394)
+++ exo/portal/branches/webos-gatein-branch/server/tomcat/pom.xml 2010-12-01 04:25:29 UTC (rev 5395)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.server</artifactId>
- <version>3.2.0-Beta01-SNAPSHOT</version>
+ <version>3.2.0-Beta02-webos</version>
</parent>
<artifactId>exo.portal.server.tomcat</artifactId>
Modified: exo/portal/branches/webos-gatein-branch/starter/ear/pom.xml
===================================================================
--- exo/portal/branches/webos-gatein-branch/starter/ear/pom.xml 2010-12-01 03:22:48 UTC (rev 5394)
+++ exo/portal/branches/webos-gatein-branch/starter/ear/pom.xml 2010-12-01 04:25:29 UTC (rev 5395)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.2.0-Beta01-SNAPSHOT</version>
+ <version>3.2.0-Beta02-webos</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.2.0-Beta01-SNAPSHOT</version>
+ <version>3.2.0-Beta02-webos</version>
<type>war</type>
</dependency>
</dependencies>
Modified: exo/portal/branches/webos-gatein-branch/starter/pom.xml
===================================================================
--- exo/portal/branches/webos-gatein-branch/starter/pom.xml 2010-12-01 03:22:48 UTC (rev 5394)
+++ exo/portal/branches/webos-gatein-branch/starter/pom.xml 2010-12-01 04:25:29 UTC (rev 5395)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.2.0-Beta01-SNAPSHOT</version>
+ <version>3.2.0-Beta02-webos</version>
</parent>
<artifactId>exo.portal.starter.root</artifactId>
Modified: exo/portal/branches/webos-gatein-branch/starter/war/pom.xml
===================================================================
--- exo/portal/branches/webos-gatein-branch/starter/war/pom.xml 2010-12-01 03:22:48 UTC (rev 5394)
+++ exo/portal/branches/webos-gatein-branch/starter/war/pom.xml 2010-12-01 04:25:29 UTC (rev 5395)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.2.0-Beta01-SNAPSHOT</version>
+ <version>3.2.0-Beta02-webos</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/webos-gatein-branch/testsuite/pom.xml
===================================================================
--- exo/portal/branches/webos-gatein-branch/testsuite/pom.xml 2010-12-01 03:22:48 UTC (rev 5394)
+++ exo/portal/branches/webos-gatein-branch/testsuite/pom.xml 2010-12-01 04:25:29 UTC (rev 5395)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.2.0-Beta01-SNAPSHOT</version>
+ <version>3.2.0-Beta02-webos</version>
</parent>
<artifactId>exo.portal.testsuite</artifactId>
Modified: exo/portal/branches/webos-gatein-branch/testsuite/selenium-snifftests/pom.xml
===================================================================
--- exo/portal/branches/webos-gatein-branch/testsuite/selenium-snifftests/pom.xml 2010-12-01 03:22:48 UTC (rev 5394)
+++ exo/portal/branches/webos-gatein-branch/testsuite/selenium-snifftests/pom.xml 2010-12-01 04:25:29 UTC (rev 5395)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.testsuite</artifactId>
- <version>3.2.0-Beta01-SNAPSHOT</version>
+ <version>3.2.0-Beta02-webos</version>
</parent>
<artifactId>exo.portal.selenium.snifftests</artifactId>
Modified: exo/portal/branches/webos-gatein-branch/testsuite/webuibasedsamples/pom.xml
===================================================================
--- exo/portal/branches/webos-gatein-branch/testsuite/webuibasedsamples/pom.xml 2010-12-01 03:22:48 UTC (rev 5394)
+++ exo/portal/branches/webos-gatein-branch/testsuite/webuibasedsamples/pom.xml 2010-12-01 04:25:29 UTC (rev 5395)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.testsuite</artifactId>
- <version>3.2.0-Beta01-SNAPSHOT</version>
+ <version>3.2.0-Beta02-webos</version>
</parent>
<artifactId>exo.webui.based.samples</artifactId>
Modified: exo/portal/branches/webos-gatein-branch/web/eXoResources/pom.xml
===================================================================
--- exo/portal/branches/webos-gatein-branch/web/eXoResources/pom.xml 2010-12-01 03:22:48 UTC (rev 5394)
+++ exo/portal/branches/webos-gatein-branch/web/eXoResources/pom.xml 2010-12-01 04:25:29 UTC (rev 5395)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.web</artifactId>
- <version>3.2.0-Beta01-SNAPSHOT</version>
+ <version>3.2.0-Beta02-webos</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/webos-gatein-branch/web/pom.xml
===================================================================
--- exo/portal/branches/webos-gatein-branch/web/pom.xml 2010-12-01 03:22:48 UTC (rev 5394)
+++ exo/portal/branches/webos-gatein-branch/web/pom.xml 2010-12-01 04:25:29 UTC (rev 5395)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.2.0-Beta01-SNAPSHOT</version>
+ <version>3.2.0-Beta02-webos</version>
</parent>
<artifactId>exo.portal.web</artifactId>
Modified: exo/portal/branches/webos-gatein-branch/web/portal/pom.xml
===================================================================
--- exo/portal/branches/webos-gatein-branch/web/portal/pom.xml 2010-12-01 03:22:48 UTC (rev 5394)
+++ exo/portal/branches/webos-gatein-branch/web/portal/pom.xml 2010-12-01 04:25:29 UTC (rev 5395)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.web</artifactId>
- <version>3.2.0-Beta01-SNAPSHOT</version>
+ <version>3.2.0-Beta02-webos</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Deleted: exo/portal/branches/webos-gatein-branch/web/portal/src/main/webapp/groovy/portal/webui/application/UIAddNewApplication.gtmpl
===================================================================
--- exo/portal/branches/webos-gatein-branch/web/portal/src/main/webapp/groovy/portal/webui/application/UIAddNewApplication.gtmpl 2010-12-01 03:22:48 UTC (rev 5394)
+++ exo/portal/branches/webos-gatein-branch/web/portal/src/main/webapp/groovy/portal/webui/application/UIAddNewApplication.gtmpl 2010-12-01 04:25:29 UTC (rev 5395)
@@ -1,152 +0,0 @@
-<%
- import org.exoplatform.web.application.Parameter;
- List appCategories = uicomponent.getApplicationCategories();
-%>
-<div class="UIAddApplication" id="UIAddNewApplication">
- <div class="UIBarStyle">
- <div class="TitleBar">
- <div class="LeftBar">
- <div class="RightBar">
- <div class="MiddleBar"><%=_ctx.appRes("UIAddNewApplication.label.AddApplication")%></div>
- </div>
- </div>
- </div>
- </div>
-
- <div class="ContentContainerDetail">
- <div class="CategoryContainer">
-
- <div class="UITabContentContainer">
- <div class="UITabContent" style="display: block">
- <div class="UIAddPortlet">
- <div class="UIItemSelector">
- <div class="LeftColumnStyle">
- <div class="ItemListContainer">
-
- <div class="ItemListTitle">
- <div class="TitleIcon ItemListIcon"><span></span></div>
- <div class="Title"><%=_ctx.appRes("UIAddNewApplication.label.Categories")%></div>
- <div class="ClearLeft"><span></span></div>
- </div>
- <div class="ItemList">
- <%
- boolean selected = true;
- for(category in appCategories){
- %>
- <div onmouseout="eXo.webui.UIItemSelector.onOver(this, false);" onmouseover="eXo.webui.UIItemSelector.onOver(this, true);" onclick="eXo.webui.UIItemSelector.onClick(this);" class="<%= selected ? "SelectedItem" : "" %> Item" title="<%=category.getDisplayName()%>">
- <div class="LeftItem">
- <div class="RightItem"><div id="<%=category.getName()%>" class="ItemTitle"><div class="CenterItemTitle"><%=category.getDisplayName()%></div></div></div>
- </div>
- </div>
- <%
- selected = false;
- }
- %>
- </div>
-
- </div>
-
- <div class="ItemDetailList">
- <div class="ItemDetailTitle">
- <div class="TitleIcon ViewListIcon"><span></span></div>
- <div class="Title"><%=_ctx.appRes("UIAddNewApplication.label.Select")%></div>
- <div class="ClearLeft"><span></span></div>
- </div>
- <div class="ApplicationListContainer">
- <% if(appCategories==null || appCategories.isEmpty()){ %>
- <div class="ItemDetail" style="display:block">
- <div class="NoneAppsMessage" style="display:block">
- <%=_ctx.appRes("UIAddNewApplication.label.NoneApp")%>
- </div>
- </div>
- <% } %>
- <%
- selected = true;
- for(category in appCategories) {
- List listApplication = category.getApplications();
- %>
- <div class="ItemDetail" style="display: <%= selected ? "block" : "none" %>">
-
- <%
- for(application in listApplication) {
- String srcBG = application.getApplicationGroup() + "/skin/DefaultSkin/portletIcons/" + application.getApplicationName()+ ".png";
- String srcNormalBG = "/eXoResources/skin/sharedImages/Icon80x80/DefaultPortlet.png";
-
- //Create add Application Ajax request URL
- String callingAction = "AddApplication";
- String addApplicationURL = uicomponent.event(callingAction, application.getId());
- String addToStartup = uicomponent.event("AddToStartup", application.getId());
- %>
- <div class="Application">
- <div class="ApplicationDescription">
- <div onclick="$addApplicationURL" title="<%= application.getDisplayName() %>" class="PortletIcon">
- <span><img src="/$srcBG" alt="" onError="src='$srcNormalBG'" /></span>
- </div>
- <div class="ApplicationContent">
- <div class="TitleBarApplication">
- <div class="Title"><%= application.getDisplayName() %></div>
- <div class="ApplicationButton">
- <% if (org.exoplatform.web.application.Application.EXO_PORTLET_TYPE.equals(application.getApplicationType())) { %>
- <div title="<%=_ctx.appRes("UIAddNewApplication.label.AddToStartup")%>" class="AddToStartUp" onclick="$addToStartup" ><span></span></div>
- <%}%>
- <div title="<%=_ctx.appRes("UIAddNewApplication.label.Add")%>" class="AddButton" onclick="$addApplicationURL" ><span></span></div>
- </div>
- </div>
- <div class="ApplicationContentLabel">
- <div class="ContentLabel">
- <span class="LeftLabel"><%=_ctx.appRes("UIAddNewApplication.label.Type")%></span>
- <span class="RightLabel"><%=application.getApplicationType()%></span>
- </div>
- <div class="ContentLabel">
- <span class="LeftLabel"><%=_ctx.appRes("UIAddNewApplication.label.Created")%></span>
- <span class="RightLabel">eXo Platform SAS.</span>
- </div>
- <div class="ContentLabel">
- <span class="LeftLabel"><%=_ctx.appRes("UIAddNewApplication.label.Description")%></span>
- <span class="RightLabel"><%= application.getDescription() %></span>
- </div>
- </div>
- </div>
- </div>
- <div class="ClearRight"><span ></span></div>
- </div>
- <%
- }
- %>
-
- </div>
- <%
- selected = false;
- }
- %>
- </div>
- </div>
- <div class="ClearLeft"><span></span></div>
- </div>
- </div>
- </div>
- </div>
- </div>
-
- </div>
- </div>
-
- <div class="UIAction">
- <table class="ActionContainer">
- <tr>
- <td>
- <div class="ActionButton LightBlueStyle" onclick="<%= uicomponent.event("Close") %>" >
- <div class="ButtonLeft">
- <div class="ButtonRight">
- <div class="ButtonMiddle">
- <a href="javascript:void(0);"><%=_ctx.appRes("UIAddNewApplication.label.Close")%></a>
- </div>
- </div>
- </div>
- </div>
- </td>
- </tr>
- </table>
- </div>
-
-</div>
\ No newline at end of file
Deleted: exo/portal/branches/webos-gatein-branch/web/portal/src/main/webapp/groovy/portal/webui/page/UIDesktopPage.gtmpl
===================================================================
--- exo/portal/branches/webos-gatein-branch/web/portal/src/main/webapp/groovy/portal/webui/page/UIDesktopPage.gtmpl 2010-12-01 03:22:48 UTC (rev 5394)
+++ exo/portal/branches/webos-gatein-branch/web/portal/src/main/webapp/groovy/portal/webui/page/UIDesktopPage.gtmpl 2010-12-01 04:25:29 UTC (rev 5395)
@@ -1,307 +0,0 @@
-<%
- import org.exoplatform.portal.webui.application.UIPortlet;
- import org.exoplatform.web.application.JavascriptManager;
- import org.exoplatform.portal.config.model.PageNavigation;
- import org.exoplatform.portal.config.model.PageNode;
- def rcontext = _ctx.getRequestContext();
- JavascriptManager jsmanager = rcontext.getJavascriptManager();
-
- jsmanager.importJavascript('eXo.desktop.UIDesktop');
- jsmanager.importJavascript('eXo.webui.UIPopupSelectCategory');
- jsmanager.importJavascript('eXo.desktop.UIWindow');
- jsmanager.importJavascript('eXo.webui.UIRightClickPopupMenu');
- jsmanager.addCustomizedOnLoadScript("eXo.gadget.UIGadget.SaveTitle='" + _ctx.appRes("UIDashboardContainer.label.SaveTitle") + "';");
- jsmanager.addCustomizedOnLoadScript("eXo.gadget.UIGadget.CancelTitle='" + _ctx.appRes("UIDashboardContainer.label.CancelTitle") + "';");
- jsmanager.addCustomizedOnLoadScript("eXo.gadget.UIGadget.Cache='" + _ctx.appRes("UIDashboardContainer.label.Cache") + "';");
- jsmanager.addCustomizedOnLoadScript("eXo.gadget.UIGadget.Debug='" + _ctx.appRes("UIDashboardContainer.label.Debug") + "';");
- jsmanager.addCustomizedOnLoadScript('eXo.desktop.UIDockbar.initNav();');
-
- String docBase = rcontext.getRequestContextPath();
- String comId = uicomponent.getId();
- boolean modifiable = uicomponent.isModifiable();
-
- void renderSinglePageNode(PageNavigation nav, PageNode node) {
- String href = uicomponent.event("ChangePage", nav.getId() + "::" + node.getUri());
- String icon = node.getIcon();
- if(icon == null) icon = "DefaultPageIcon";
- print """
- <div class="MenuItem">
- <div class="LabelItem">
- <div class="Icon $icon" style="padding-left: 18px">
- <div class="LabelText"><a href="#" onclick="$href">$node.resolvedLabel</a></div>
- </div>
- </div>
- </div>
- """;
- }
-
- void renderPageNode(PageNavigation nav, PageNode node) {
- String href = uicomponent.event("ChangePage", nav.getId() + "::" + node.getUri());
- String icon = node.getIcon();
- String scrollUpTitle = _ctx.appRes("UIExoStart.tooltip.scrollUp");
- String scrollDownTitle = _ctx.appRes("UIExoStart.tooltip.scrollDown");
- if(icon == null) icon = "DefaultPageIcon";
- print """
- <div class="MenuItem">
- <div class="LabelItem">
- <div class="Icon $icon" style="padding-left: 18px">
- <div class="BlackArrowIcon">
- <div class="LabelText "><a href="#" onclick="$href">$node.resolvedLabel</a></div>
- </div>
- </div>
- </div>
- <div class="MenuItemContainer">
- <div class="StartMenuDecorator">
- <div class="StartMenuTL">
- <div class="StartMenuTR">
- <div class="StartMenuTC"><span></span></div>
- </div>
- </div>
- <div class="StartMenuML">
- <div class="StartMenuMR">
- <div class="StartMenuBG" style="padding-bottom: 6px">
- <div class="TopNavigator" style="display: none;" title="$scrollUpTitle">
- <div class="UpNavigatorIcon"><span></span></div>
- </div>
- <div class="BlockMenu">
- <div class="MenuContainer">
- """;
- for(child in node.getChildren()) {
- if(child.getChildren() != null && child.getChildren().size() > 0) renderPageNode(nav, child);
- else renderSinglePageNode(nav, child);
- }
- print """
- </div>
- </div>
- <div class="BottomNavigator" style="display: none;" title="$scrollDownTitle">
- <div class="DownNavigatorIcon"><span></span></div>
- </div>
- </div>
- </div>
- </div>
- <div class="StartMenuBL">
- <div class="StartMenuBR">
- <div class="StartMenuBC"><span></span></div>
- </div>
- </div>
- </div>
- </div>
- </div>
- """;
- }
-
- void renderPageNavigation(PageNavigation navigation) {
- nodes = navigation.getNodes();
- if(nodes.size() < 1) return;
- String navTitle = _ctx.appRes("UIPageNavigation.label.titleBar");
- navTitle = navTitle.replace("{0}", navigation.ownerId);
- print """
- <div class="PageNavigationBlock">
- <div class="DecoratorBlock">
- <div class="PageOwnerContainer">
- <div class="TitleBar">$navTitle </div>
- """;
- for(node in nodes) {
- if(node.getChildren() != null && node.getChildren().size() > 0) {
- renderPageNode(navigation, node);
- }
- else renderSinglePageNode(navigation, node);
- }
- print """
- </div>
- </div>
- </div>
- """;
- }
-
- void renderNavigations() {
- String label = _ctx.appRes(uicomponent.getId() + ".item.PageNavigation");
- String scrollUpTitle = _ctx.appRes("UIExoStart.tooltip.scrollUp");
- String scrollDownTitle = _ctx.appRes("UIExoStart.tooltip.scrollDown");
- navigations = uicomponent.getNavigations();
- //if (navigations != null && navigations.size() > 0 && navigations.get(0).getNodes().size() > 0) {
- if (navigations != null && navigations.size() > 0) {
- print """
- <div class="MenuItemContainer NavigationContainer" style="position: absolute; top: -450px;">
- <div class="StartMenuDecorator">
- <div class="StartMenuTL">
- <div class="StartMenuTR">
- <div class="StartMenuTC"><span></span></div>
- </div>
- </div>
- <div class="StartMenuML">
- <div class="StartMenuMR">
- <div class="StartMenuBG" style="padding: 5px 0px;">
- <div class="TopNavigator" style="display: none;" title="$scrollUpTitle">
- <div class="UpNavigatorIcon"><span></span></div>
- </div>
- <div class="BlockMenu">
- <div class="MenuContainer">
- """;
- for(navigation in navigations) {
- renderPageNavigation(navigation);
- }
- print """
- </div>
- </div>
- <div class="BottomNavigator" style="display: none;" title="$scrollDownTitle">
- <div class="DownNavigatorIcon"><span></span></div>
- </div>
- </div>
- </div>
- </div>
- <div class="StartMenuBL">
- <div class="StartMenuBR">
- <div class="StartMenuBC"><span></span></div>
- </div>
- </div>
- </div>
- </div>
- """;
- }
- }
-
-%>
-
-
-<div class="UIPage" id="UIPage-${uicomponent.id}">
- <div class="META-DATA-BLOCK" style="display: none">
- <div class="id">$uicomponent.id</div>
- <div class="title"><%=_ctx.appRes("UIPage.label.title")%></div>
- <div class="description"><%=_ctx.appRes("UIPage.label.description")%></div>
- </div>
- <div class="VIEW-PAGE">
- <div id="UIPage">
- <div class="UIPageDesktop" id="UIPageDesktop">
- <%int x = 15; y = 15 %>
- <%for(uiChild in uicomponent.getChildren()) {
- if(!(uiChild instanceof UIPortlet)) {
- uicomponent.renderUIComponent(uiChild);
- continue;
- }
-
- String popupId = uiChild.getId();
- String title = uiChild.getTitle();
- if(title == null || title.trim().length() < 1) {
- title = popupId;
- uiChild.setTitle(title);
- }
- uiChild.setShowInfoBar(true);
- uiChild.setPortletStyle("Window");
- uicomponent.renderUIComponent(uiChild);
-
- String posX = uiChild.getProperties().get("locationX");
- String posY = uiChild.getProperties().get("locationY");
-
- if(posX == null) posX = (String)x;
- if(posY == null) posY = (String)y;
-
- jsmanager.addJavascript("eXo.desktop.UIWindow.init('UIWindow-${popupId}', true, ${posX}, ${posY});");
- %>
- <% x += 10; y += 20;%>
- <%}%>
-
- <%//String containerMouseOver = "eXo.desktop.UIDockbar.containerMouseOver();";%>
- <div class="UIDockBar" id="UIDockBar" onmouseover="eXo.desktop.UIDockbar.startDockBarEvt(event);">
- <div id="DockNavigation" class="UIExoStart" style="position: absolute; display: none; width: 0px;">
- <div class="StartMenuContainer">
- <% renderNavigations(); %>
- </div>
- </div>
- <div class="UIRightClickPopupMenu" id="DockbarContextMenu" onmousedown="event.cancelBubble = true;">
- <div class="UIContextMenuContainer" >
- <div class="TopLeftRightClickPopupMenu">
- <div class="TopRightRightClickPopupMenu">
- <div class="TopCenterRightClickPopupMenu"><span></span></div>
- </div>
- </div>
- <div class="MiddleLeftRightClickPopupMenu">
- <div class="MiddleRightRightClickPopupMenu">
- <div class="UIRightPopupMenuContainer">
- <div class="MenuItem">
- <a href="javascript:eXo.desktop.UIDesktop.removeApp('<%=uicomponent.url("RemoveChild", "_objectid_")%>')" onclick="return eXo.webui.UIRightClickPopupMenu.prepareObjectId(event, this);"
- class="ItemIcon CloseDockBarIcon"><%=_ctx.appRes("UIPageDesktop.action.Close")%></a>
- </div>
- <div class="MenuItem">
- <a class="ItemIcon QuitDockBarIcon" href="javascript:eXo.desktop.UIDesktop.removeWindowContent('_objectid_')" onclick="return eXo.webui.UIRightClickPopupMenu.prepareObjectId(event, this);" ><%=_ctx.appRes("UIPageDesktop.action.Quit")%></a>
- </div>
- <div class="RightClickCustomItem"><%=_ctx.appRes("UIPageDesktop.action.action.Open")%></div>
- </div>
- </div>
- </div>
- <div class="BottomLeftRightClickPopupMenu">
- <div class="BottomRightRightClickPopupMenu">
- <div class="BottomCenterRightClickPopupMenu">
- <div class="ClickCenterBottom"><span></span></div>
- </div>
- </div>
- </div>
- </div>
- </div>
- <div class="DockbarLeft">
- <div class="DockbarRight">
- <div class="DockbarCenter" id="DockbarCenter">
-
- <div class="IconContainer" id="IconContainer" style="text-align: center;">
- <img id="FixBug" alt="" src="/eXoResources/skin/sharedImages/Debug1x32.gif" />
-
- <%if(rcontext.getRemoteUser() == null) {%>
- <img id="SignInIcon" class="Icon" src="/eXoResources/skin/sharedImages/Icon80x80/Signin.png" alt="" title=""
- onclick="<%=uicomponent.event("ShowLoginForm", null);%>" /><span class="Tooltip" style="display: none;"><%=_ctx.appRes("UIPageDesktop.title.SignIn")%></span>
- <%} else {%>
- <img id="SignOutIcon" class="Icon" src="/eXoResources/skin/sharedImages/Icon80x80/Signout.png" alt="" title=""
- onclick="eXo.portal.logout()" /><span class="Tooltip" style="display: none;"><%=_ctx.appRes("UIPageDesktop.title.SignOut")%></span>
- <%} %>
- <img class="Separator" alt="" src="/webosResources/skin/Defaultskin/portal/webui/component/view/UIPageDesktop/background/Separator2x1.png"/>
-
- <% String changeLanguageAction = "if(document.getElementById('UIMaskWorkspace')) ajaxGet(eXo.env.server.createPortalURL('UIPortal', 'ChangeLanguage', true));"; %>
- <img id="ChangeLanguageIcon" class="Icon" src="/eXoResources/skin/sharedImages/Icon80x80/ChangeLanguage.png" alt="" title=""
- onclick="$changeLanguageAction" /><span class="Tooltip" style="display: none;"><%=_ctx.appRes("UIExoStart.item.ChangeLanguage")%></span>
-
- <img class="Icon" src="/eXoResources/skin/sharedImages/Icon80x80/NavigationIcon.png" alt="" title=""
- id="NavigationIcon"
- onclick="eXo.desktop.UIDockbar.showNavigation(event)"/><span class="Tooltip" style="display: none"><%=_ctx.appRes("UIPageDesktop.title.pageNavigation")%></span>
-
- <%if(modifiable) {%>
- <img class="Icon" src="/eXoResources/skin/sharedImages/Icon80x80/AddPortlet.png" alt="" title=""
- id="UIAddApplicationIcon"
- onclick="<%=uicomponent.event("ShowAddNewApplication")%>"/><span class="Tooltip" style="display: none"><%=_ctx.appRes("UIPageDesktop.title.AddApplication")%></span>
- <%}%>
- <img class="Separator" alt="" src="/webosResources/skin/Defaultskin/portal/webui/component/view/UIPageDesktop/background/Separator2x1.png"/>
- <%
- def res = rcontext.getApplicationResourceBundle();
- String skin = rcontext.getUIApplication().getSkin();
-
- for(uiChild in uicomponent.getChildren()) {
- if(!(uiChild instanceof UIPortlet)) continue;
- String imgLocation = uiChild.getExoWindowID().getPortletApplicationName() + "/skin/DefaultSkin/portletIcons/" + uiChild.getExoWindowID().getPortletName();
- String appStatus = uiChild.getProperties().get("appStatus");
- boolean isVisible = "SHOW".equals(appStatus) || "HIDE".equals(appStatus);
-
- if(rcontext.getRemoteUser() != null) {
- %>
- <img id="DockItem${uiChild.id}" class="Icon <%=isVisible ? "ShowIcon": ""%>" onmousedown="eXo.webui.UIRightClickPopupMenu.clickRightMouse(event, this, 'DockbarContextMenu', '${uiChild.id}', null, 1)" src="/${imgLocation}.png" alt=""
- onerror="this.src='/eXoResources/skin/sharedImages/Icon80x80/DefaultPortlet.png'" onclick="eXo.desktop.UIDesktop.showHideWindow('UIWindow-${uiChild.id}', this);" /><span class="Tooltip" style="display: none"><%=uiChild.getTitle();%></span>
- <%}else{%>
- <img id="DockItem${uiChild.id}" class="Icon <%=isVisible ? "ShowIcon": ""%>" src="/${imgLocation}.png" alt=""
- onerror="this.src='/eXoResources/skin/sharedImages/Icon80x80/DefaultPortlet.png'" onclick="eXo.desktop.UIDesktop.showHideWindow('UIWindow-${uiChild.id}', this);" /><span class="Tooltip" style="display: none"><%=uiChild.getTitle();%></span>
- <%}}%>
-
- <img class="Separator" alt="" src="/webosResources/skin/Defaultskin/portal/webui/component/view/UIPageDesktop/background/Separator2x1.png" />
- <img id="PortletsViewer" class="Icon" src="/eXoResources/skin/sharedImages/Icon80x80/ShowPortletsViewer.png" alt="" title=""/><span class="Tooltip" style="display: none;"><%=_ctx.appRes("UIPageDesktop.title.ShowPortletDesktop")%></span>
- <img id="GadgetsViewer" class="Icon" src="/eXoResources/skin/sharedImages/Icon80x80/HideWidgetsViewer.png" alt="" title=""/><span class="Tooltip" style="display: none;"><%=_ctx.appRes("UIPageDesktop.title.ShowWidgetDesktop")%></span>
- </div>
- </div>
- </div>
- </div>
-
- </div>
- </div>
- </div>
- </div>
-</div>
-
-<%
- jsmanager.addOnLoadJavascript('eXo.desktop.UIDesktop.init');
- jsmanager.addOnResizeJavascript('eXo.desktop.UIDesktop.fixDesktop');
-%>
\ No newline at end of file
Modified: exo/portal/branches/webos-gatein-branch/web/rest/pom.xml
===================================================================
--- exo/portal/branches/webos-gatein-branch/web/rest/pom.xml 2010-12-01 03:22:48 UTC (rev 5394)
+++ exo/portal/branches/webos-gatein-branch/web/rest/pom.xml 2010-12-01 04:25:29 UTC (rev 5395)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.web</artifactId>
- <version>3.2.0-Beta01-SNAPSHOT</version>
+ <version>3.2.0-Beta02-webos</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/webos-gatein-branch/webui/core/pom.xml
===================================================================
--- exo/portal/branches/webos-gatein-branch/webui/core/pom.xml 2010-12-01 03:22:48 UTC (rev 5394)
+++ exo/portal/branches/webos-gatein-branch/webui/core/pom.xml 2010-12-01 04:25:29 UTC (rev 5395)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.webui</artifactId>
- <version>3.2.0-Beta01-SNAPSHOT</version>
+ <version>3.2.0-Beta02-webos</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/webos-gatein-branch/webui/dashboard/pom.xml
===================================================================
--- exo/portal/branches/webos-gatein-branch/webui/dashboard/pom.xml 2010-12-01 03:22:48 UTC (rev 5394)
+++ exo/portal/branches/webos-gatein-branch/webui/dashboard/pom.xml 2010-12-01 04:25:29 UTC (rev 5395)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.webui</artifactId>
- <version>3.2.0-Beta01-SNAPSHOT</version>
+ <version>3.2.0-Beta02-webos</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/webos-gatein-branch/webui/eXo/pom.xml
===================================================================
--- exo/portal/branches/webos-gatein-branch/webui/eXo/pom.xml 2010-12-01 03:22:48 UTC (rev 5394)
+++ exo/portal/branches/webos-gatein-branch/webui/eXo/pom.xml 2010-12-01 04:25:29 UTC (rev 5395)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.webui</artifactId>
- <version>3.2.0-Beta01-SNAPSHOT</version>
+ <version>3.2.0-Beta02-webos</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/webos-gatein-branch/webui/framework/pom.xml
===================================================================
--- exo/portal/branches/webos-gatein-branch/webui/framework/pom.xml 2010-12-01 03:22:48 UTC (rev 5394)
+++ exo/portal/branches/webos-gatein-branch/webui/framework/pom.xml 2010-12-01 04:25:29 UTC (rev 5395)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.webui</artifactId>
- <version>3.2.0-Beta01-SNAPSHOT</version>
+ <version>3.2.0-Beta02-webos</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/webos-gatein-branch/webui/pom.xml
===================================================================
--- exo/portal/branches/webos-gatein-branch/webui/pom.xml 2010-12-01 03:22:48 UTC (rev 5394)
+++ exo/portal/branches/webos-gatein-branch/webui/pom.xml 2010-12-01 04:25:29 UTC (rev 5395)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.2.0-Beta01-SNAPSHOT</version>
+ <version>3.2.0-Beta02-webos</version>
</parent>
<artifactId>exo.portal.webui</artifactId>
Modified: exo/portal/branches/webos-gatein-branch/webui/portal/pom.xml
===================================================================
--- exo/portal/branches/webos-gatein-branch/webui/portal/pom.xml 2010-12-01 03:22:48 UTC (rev 5394)
+++ exo/portal/branches/webos-gatein-branch/webui/portal/pom.xml 2010-12-01 04:25:29 UTC (rev 5395)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.webui</artifactId>
- <version>3.2.0-Beta01-SNAPSHOT</version>
+ <version>3.2.0-Beta02-webos</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Deleted: exo/portal/branches/webos-gatein-branch/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIAddNewApplication.java
===================================================================
--- exo/portal/branches/webos-gatein-branch/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIAddNewApplication.java 2010-12-01 03:22:48 UTC (rev 5394)
+++ exo/portal/branches/webos-gatein-branch/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIAddNewApplication.java 2010-12-01 04:25:29 UTC (rev 5395)
@@ -1,289 +0,0 @@
-/**
- * Copyright (C) 2009 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.webui.application;
-
-import org.exoplatform.application.registry.Application;
-import org.exoplatform.application.registry.ApplicationCategory;
-import org.exoplatform.application.registry.ApplicationRegistryService;
-import org.exoplatform.container.ExoContainer;
-import org.exoplatform.container.ExoContainerContext;
-import org.exoplatform.portal.application.PortalRequestContext;
-import org.exoplatform.portal.config.DataStorage;
-import org.exoplatform.portal.config.UserPortalConfigService;
-import org.exoplatform.portal.config.model.ApplicationType;
-import org.exoplatform.portal.config.model.CloneApplicationState;
-import org.exoplatform.portal.config.model.ModelObject;
-import org.exoplatform.portal.config.model.Page;
-import org.exoplatform.portal.config.model.TransientApplicationState;
-import org.exoplatform.portal.pom.spi.gadget.Gadget;
-import org.exoplatform.portal.pom.spi.portlet.Portlet;
-import org.exoplatform.portal.pom.spi.wsrp.WSRPState;
-import org.exoplatform.portal.webui.page.UIPage;
-import org.exoplatform.portal.webui.portal.UIPortal;
-import org.exoplatform.portal.webui.util.PortalDataMapper;
-import org.exoplatform.portal.webui.util.Util;
-import org.exoplatform.portal.webui.workspace.UIMaskWorkspace;
-import org.exoplatform.portal.webui.workspace.UIPortalApplication;
-import org.exoplatform.portal.webui.workspace.UIPortalToolPanel;
-import org.exoplatform.portal.webui.workspace.UIWorkingWorkspace;
-import org.exoplatform.webui.config.annotation.ComponentConfig;
-import org.exoplatform.webui.config.annotation.EventConfig;
-import org.exoplatform.webui.core.UIComponent;
-import org.exoplatform.webui.core.UIContainer;
-import org.exoplatform.webui.event.Event;
-import org.exoplatform.webui.event.EventListener;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-/** Created by The eXo Platform SARL Author : Anh Nguyen ntuananh.vn at gmail.com Oct 18, 2007 */
- at ComponentConfig(template = "system:/groovy/portal/webui/application/UIAddNewApplication.gtmpl", events = {
- @EventConfig(listeners = UIMaskWorkspace.CloseActionListener.class),
- @EventConfig(listeners = UIAddNewApplication.AddApplicationActionListener.class),
- @EventConfig(listeners = UIAddNewApplication.AddToStartupActionListener.class)})
-public class UIAddNewApplication extends UIContainer
-{
-
- private List<ApplicationCategory> listAppCategories;
-
- private UIComponent uiComponentParent;
-
- private boolean isInPage;
-
- public List<ApplicationCategory> getApplicationCategories() throws Exception
- {
- return listAppCategories;
- }
-
- public List<ApplicationCategory> getApplicationCategories(String remoteUser,
- ApplicationType[] applicationType) throws Exception
- {
- ExoContainer container = ExoContainerContext.getCurrentContainer();
- ApplicationRegistryService prService = (ApplicationRegistryService)container.getComponentInstanceOfType(ApplicationRegistryService.class);
-
- if (applicationType == null)
- {
- applicationType = new ApplicationType[0];
- }
-
- List<ApplicationCategory> appCategories = prService.getApplicationCategories(remoteUser,
- applicationType);
-
- if (appCategories == null)
- {
- appCategories = new ArrayList();
- }
- else
- {
- Iterator<ApplicationCategory> cateItr = appCategories.iterator();
- while (cateItr.hasNext())
- {
- ApplicationCategory cate = cateItr.next();
- List<Application> applications = cate.getApplications();
- if (applications.size() < 1)
- {
- cateItr.remove();
- }
- }
- }
- listAppCategories = appCategories;
-
- return listAppCategories;
-
- }
-
- public UIComponent getUiComponentParent()
- {
- return uiComponentParent;
- }
-
- public void setUiComponentParent(UIComponent uiComponentParent)
- {
- this.uiComponentParent = uiComponentParent;
- }
-
- public boolean isInPage()
- {
- return isInPage;
- }
-
- public void setInPage(boolean isInPage)
- {
- this.isInPage = isInPage;
- }
-
- private Application getApplication(String id) throws Exception
- {
-
- List<ApplicationCategory> pCategories = getApplicationCategories();
-
- for (ApplicationCategory pCategory : pCategories)
- {
- List<Application> applications = pCategory.getApplications();
- for (Application application : applications)
- {
- if (application.getId().equals(id))
- {
- return application;
- }
- }
- }
-
- return null;
- }
-
- /**
- * Add Application to UiPage
- *
- * @param event
- * @throws Exception
- */
- private static void addApplicationToPage(Event<UIAddNewApplication> event, boolean atStartup) throws Exception
- {
- UIPortal uiPortal = Util.getUIPortal();
-
- UIPortalApplication uiPortalApp = uiPortal.getAncestorOfType(UIPortalApplication.class);
- UIPage uiPage;
- if (uiPortal.isRendered())
- {
- uiPage = uiPortal.findFirstComponentOfType(UIPage.class);
- }
- else
- {
- UIPortalToolPanel uiPortalToolPanel = uiPortalApp.findFirstComponentOfType(UIPortalToolPanel.class);
- uiPage = uiPortalToolPanel.findFirstComponentOfType(UIPage.class);
- }
-
- String applicationId = event.getRequestContext().getRequestParameter(UIComponent.OBJECTID);
-
- Application application = event.getSource().getApplication(applicationId);
- ApplicationType appType = application.getType();
- String portletName = application.getApplicationName();
-// String appGroup = application.getApplicationGroup();
-
- // TODO review windowId for eXoWidget and eXoApplication
- UIComponent component = null;
- if (ApplicationType.GADGET.equals(appType))
- {
- UIGadget uiGadget = uiPage.createUIComponent(event.getRequestContext(), UIGadget.class, null, null);
-
- uiGadget.setState(new TransientApplicationState<Gadget>(portletName));
-
- // Set Properties For gadget
- int posX = (int)(Math.random() * 400);
- int posY = (int)(Math.random() * 200);
-
- uiGadget.getProperties().put(UIApplication.locationX, String.valueOf(posX));
- uiGadget.getProperties().put(UIApplication.locationY, String.valueOf(posY));
-
- component = uiGadget;
- }
- else
- {
- boolean remote = ApplicationType.WSRP_PORTLET.equals(appType);
-
- UIPortlet uiPortlet = uiPage.createUIComponent(UIPortlet.class, null, null);
-
- CloneApplicationState appState;
- Object appId;
- if (!remote)
- {
- appState = new CloneApplicationState<Portlet>(application.getId());
- }
- else
- {
- appState = new CloneApplicationState<WSRPState>(application.getId());
- }
-
- ApplicationType applicationType = remote ? ApplicationType.WSRP_PORTLET : ApplicationType.PORTLET;
- PortletState portletState = new PortletState(appState, applicationType);
-
- uiPortlet.setState(portletState);
- uiPortlet.setPortletInPortal(false);
-
- if (atStartup)
- {
- uiPortlet.getProperties().setProperty("appStatus", "HIDE");
- }
-
- if (application != null)
- {
- String displayName = application.getDisplayName();
- if (displayName != null)
- {
- uiPortlet.setTitle(displayName);
- }
- else if (portletName != null)
- {
- uiPortlet.setTitle(portletName);
- }
- uiPortlet.setDescription(application.getDescription());
- List<String> accessPers = application.getAccessPermissions();
- String[] accessPermissions = accessPers.toArray(new String[accessPers.size()]);
- uiPortlet.setAccessPermissions(accessPermissions);
-
- component = uiPortlet;
- }
- }
-
- // Add component to page
- uiPage.addChild(component);
-
- // Save all changes
- if (uiPage.isModifiable())
- {
- Page page = (Page)PortalDataMapper.buildModelObject(uiPage);
- if (page.getChildren() == null)
- {
- page.setChildren(new ArrayList<ModelObject>());
- }
- DataStorage dataService = uiPortalApp.getApplicationComponent(DataStorage.class);
- dataService.save(page);
- }
-
- PortalRequestContext pcontext = Util.getPortalRequestContext();
- UIWorkingWorkspace uiWorkingWS = uiPortalApp.getChildById(UIPortalApplication.UI_WORKING_WS_ID);
- pcontext.addUIComponentToUpdateByAjax(uiWorkingWS);
- pcontext.setFullRender(true);
- }
-
- static public class AddApplicationActionListener extends EventListener<UIAddNewApplication>
- {
- public void execute(Event<UIAddNewApplication> event) throws Exception
- {
- if (event.getSource().isInPage())
- {
- addApplicationToPage(event, false);
- }
- }
- }
-
- static public class AddToStartupActionListener extends EventListener<UIAddNewApplication>
- {
- public void execute(Event<UIAddNewApplication> event) throws Exception
- {
- if (event.getSource().isInPage())
- {
- addApplicationToPage(event, true);
- }
- }
- }
-}
Deleted: exo/portal/branches/webos-gatein-branch/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIDesktopPage.java
===================================================================
--- exo/portal/branches/webos-gatein-branch/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIDesktopPage.java 2010-12-01 03:22:48 UTC (rev 5394)
+++ exo/portal/branches/webos-gatein-branch/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIDesktopPage.java 2010-12-01 04:25:29 UTC (rev 5395)
@@ -1,235 +0,0 @@
-/**
- * Copyright (C) 2009 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.webui.page;
-
-import org.exoplatform.portal.config.DataStorage;
-import org.exoplatform.portal.config.model.ModelObject;
-import org.exoplatform.portal.config.model.Page;
-import org.exoplatform.portal.config.model.PageNavigation;
-import org.exoplatform.portal.webui.application.UIAddNewApplication;
-import org.exoplatform.portal.webui.application.UIApplication;
-import org.exoplatform.portal.webui.application.UIGadget;
-import org.exoplatform.portal.webui.application.UIPortlet;
-import org.exoplatform.portal.webui.navigation.PageNavigationUtils;
-import org.exoplatform.portal.webui.page.UIPageActionListener.DeleteGadgetActionListener;
-import org.exoplatform.portal.webui.page.UIPageActionListener.RemoveChildActionListener;
-import org.exoplatform.portal.webui.portal.PageNodeEvent;
-import org.exoplatform.portal.webui.portal.UIPortal;
-import org.exoplatform.portal.webui.portal.UIPortalComponentActionListener.ShowLoginFormActionListener;
-import org.exoplatform.portal.webui.util.PortalDataMapper;
-import org.exoplatform.portal.webui.util.Util;
-import org.exoplatform.portal.webui.workspace.UIMaskWorkspace;
-import org.exoplatform.portal.webui.workspace.UIPortalApplication;
-import org.exoplatform.webui.config.annotation.ComponentConfig;
-import org.exoplatform.webui.config.annotation.EventConfig;
-import org.exoplatform.webui.core.UIComponent;
-import org.exoplatform.webui.event.Event;
-import org.exoplatform.webui.event.EventListener;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.concurrent.CopyOnWriteArrayList;
-
-import javax.portlet.WindowState;
-
-/**
- * May 19, 2006
- */
-
- at ComponentConfig(lifecycle = UIPageLifecycle.class, template = "system:/groovy/portal/webui/page/UIDesktopPage.gtmpl", events = {
- @EventConfig(listeners = ShowLoginFormActionListener.class),
- @EventConfig(listeners = DeleteGadgetActionListener.class),
- @EventConfig(listeners = RemoveChildActionListener.class),
- @EventConfig(listeners = UIDesktopPage.SaveGadgetPropertiesActionListener.class),
- @EventConfig(listeners = UIDesktopPage.SaveWindowPropertiesActionListener.class),
- @EventConfig(listeners = UIDesktopPage.ShowAddNewApplicationActionListener.class),
- @EventConfig(listeners = UIDesktopPage.ChangePageActionListener.class),
- @EventConfig(listeners = UIDesktopPage.ShowPortletActionListener.class)})
-public class UIDesktopPage extends UIPage
-{
-
- public UIDesktopPage()
- {
- setChildren((List<UIComponent>)new CopyOnWriteArrayList<UIComponent>());
- }
-
- public boolean isShowMaxWindow()
- {
- return true;
- }
-
- public List<PageNavigation> getNavigations() throws Exception
- {
- List<PageNavigation> allNav = Util.getUIPortal().getNavigations();
- String removeUser = Util.getPortalRequestContext().getRemoteUser();
- List<PageNavigation> result = new ArrayList<PageNavigation>();
- for (PageNavigation nav : allNav)
- {
- result.add(PageNavigationUtils.filter(nav, removeUser));
- }
- return result;
- }
-
- static public class SaveGadgetPropertiesActionListener extends EventListener<UIPage>
- {
- public void execute(Event<UIPage> event) throws Exception
- {
- UIPage uiPage = event.getSource();
- String objectId = event.getRequestContext().getRequestParameter(UIComponent.OBJECTID);
- List<UIGadget> uiGadgets = new ArrayList<UIGadget>();
- uiPage.findComponentOfType(uiGadgets, UIGadget.class);
- UIGadget uiGadget = null;
- for (UIGadget ele : uiGadgets)
- {
- if (ele.getId().equals(objectId))
- {
- uiGadget = ele;
- break;
- }
- }
- if (uiGadget == null)
- return;
- String posX = event.getRequestContext().getRequestParameter("posX");
- String posY = event.getRequestContext().getRequestParameter("posY");
- String zIndex = event.getRequestContext().getRequestParameter(UIApplication.zIndex);
-
- uiGadget.getProperties().put(UIApplication.locationX, posX);
- uiGadget.getProperties().put(UIApplication.locationY, posY);
- uiGadget.getProperties().put(UIApplication.zIndex, zIndex);
-
- if (!uiPage.isModifiable())
- return;
- Page page = (Page)PortalDataMapper.buildModelObject(uiPage);
- if (page.getChildren() == null)
- page.setChildren(new ArrayList<ModelObject>());
- DataStorage dataService = uiPage.getApplicationComponent(DataStorage.class);
- dataService.save(page);
- }
- }
-
- static public class SaveWindowPropertiesActionListener extends EventListener<UIPage>
- {
- public void execute(Event<UIPage> event) throws Exception
- {
- UIPage uiPage = event.getSource();
- String objectId = event.getRequestContext().getRequestParameter(UIComponent.OBJECTID);
-
- UIApplication uiApp = uiPage.getChildById(objectId);
- if (uiApp == null)
- return;
-
- /*########################## Save Position ##########################*/
- String posX = event.getRequestContext().getRequestParameter("posX");
- String posY = event.getRequestContext().getRequestParameter("posY");
-
- if (posX != null)
- uiApp.getProperties().put(UIApplication.locationX, posX);
- if (posY != null)
- uiApp.getProperties().put(UIApplication.locationY, posY);
-
- //System.out.println("\n\n\n\n\n\n\n\n\n\n\n SAVE POSX: "+posX+"\n SAVE POSY: "+posY+"\n\n\n\n\n\n\n\n\n");
- /*########################## Save ZIndex ##########################*/
- String zIndex = event.getRequestContext().getRequestParameter(UIApplication.zIndex);
-
- if (zIndex != null)
- uiApp.getProperties().put(UIApplication.zIndex, zIndex);
-
- /*########################## Save Dimension ##########################*/
- String windowWidth = event.getRequestContext().getRequestParameter("windowWidth");
- String windowHeight = event.getRequestContext().getRequestParameter("windowHeight");
-
- if (windowWidth != null)
- uiApp.getProperties().put("windowWidth", windowWidth);
- if (windowHeight != null)
- uiApp.getProperties().put("windowHeight", windowHeight);
-
- // if(appWidth != null) uiComponent.getProperties().put(UIApplication.appWidth, appWidth);
- // if(appHeight != null) uiComponent.getProperties().put(UIApplication.appHeight, appHeight);
-
- // String applicationHeight = event.getRequestContext().getRequestParameter("applicationHeight");
- // if(applicationHeight != null) uiComponent.getProperties().put("applicationHeight", applicationHeight);
-
- /*########################## Save Window status (SHOW / HIDE) ##########################*/
- String appStatus = event.getRequestContext().getRequestParameter(UIApplication.appStatus);
- if (appStatus != null)
- uiApp.getProperties().put(UIApplication.appStatus, appStatus);
-
- // if(!uiPage.isModifiable()) return;
- // Page page = PortalDataMapper.toPageModel(uiPage);
- // UserPortalConfigService configService = uiPage.getApplicationComponent(UserPortalConfigService.class);
- // if(page.getChildren() == null) page.setChildren(new ArrayList<Object>());
- // configService.update(page);
- }
- }
-
- static public class ShowAddNewApplicationActionListener extends EventListener<UIPage>
- {
- public void execute(Event<UIPage> event) throws Exception
- {
- UIPage uiPage = event.getSource();
- UIPortalApplication uiPortalApp = uiPage.getAncestorOfType(UIPortalApplication.class);
- UIMaskWorkspace uiMaskWorkspace = uiPortalApp.getChildById(UIPortalApplication.UI_MASK_WS_ID);
-
- UIAddNewApplication uiAddApplication = uiPage.createUIComponent(UIAddNewApplication.class, null, null);
- uiAddApplication.setInPage(true);
- uiAddApplication.setUiComponentParent(uiPage);
- uiAddApplication.getApplicationCategories(event.getRequestContext().getRemoteUser(), null);
-
- uiMaskWorkspace.setWindowSize(700, 375);
- uiMaskWorkspace.setUIComponent(uiAddApplication);
- uiMaskWorkspace.setShow(true);
- event.getRequestContext().addUIComponentToUpdateByAjax(uiMaskWorkspace);
- }
- }
-
- static public class ChangePageActionListener extends EventListener<UIPage>
- {
- public void execute(Event<UIPage> event) throws Exception
- {
- String uri = event.getRequestContext().getRequestParameter(OBJECTID);
- UIPortal uiPortal = Util.getUIPortal();
- UIPageBody uiPageBody = uiPortal.findFirstComponentOfType(UIPageBody.class);
- if (uiPageBody != null)
- {
- if (uiPageBody.getMaximizedUIComponent() != null)
- {
- UIPortlet currentPortlet = (UIPortlet)uiPageBody.getMaximizedUIComponent();
- currentPortlet.setCurrentWindowState(WindowState.NORMAL);
- uiPageBody.setMaximizedUIComponent(null);
- }
- }
- PageNodeEvent<UIPortal> pnevent = new PageNodeEvent<UIPortal>(uiPortal, PageNodeEvent.CHANGE_PAGE_NODE, uri);
- uiPortal.broadcast(pnevent, Event.Phase.PROCESS);
- }
- }
-
- static public class ShowPortletActionListener extends EventListener<UIPage>
- {
- public void execute(Event<UIPage> event) throws Exception
- {
- UIPage uiPage = event.getSource();
- String portletId = event.getRequestContext().getRequestParameter(UIComponent.OBJECTID);
- UIPortlet uiPortlet = uiPage.getChildById(portletId);
- uiPortlet.getProperties().setProperty("appStatus", "SHOW");
- event.getRequestContext().addUIComponentToUpdateByAjax(uiPortlet);
- }
- }
-
-}
\ No newline at end of file
Modified: exo/portal/branches/webos-gatein-branch/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageBody.java
===================================================================
--- exo/portal/branches/webos-gatein-branch/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageBody.java 2010-12-01 03:22:48 UTC (rev 5394)
+++ exo/portal/branches/webos-gatein-branch/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageBody.java 2010-12-01 04:25:29 UTC (rev 5395)
@@ -146,14 +146,9 @@
return uiPage;
}
- if (Page.DESKTOP_PAGE.equals(page.getFactoryId()))
- {
- uiPage = createUIComponent(context, UIDesktopPage.class, null, null);
- }
- else
- {
- uiPage = createUIComponent(context, UIPage.class, null, null);
- }
+ Class<? extends UIPage> clazz = Class.forName(page.getFactoryId()).asSubclass(UIPage.class);
+ uiPage = createUIComponent(context, clazz, null, null);
+
PortalDataMapper.toUIPage(uiPage, page);
uiPortal.setUIPage(page.getId(), uiPage);
Modified: exo/portal/branches/webos-gatein-branch/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageCreationWizard.java
===================================================================
--- exo/portal/branches/webos-gatein-branch/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageCreationWizard.java 2010-12-01 03:22:48 UTC (rev 5394)
+++ exo/portal/branches/webos-gatein-branch/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageCreationWizard.java 2010-12-01 04:25:29 UTC (rev 5395)
@@ -350,16 +350,10 @@
}
UIPagePreview uiPagePreview = uiWizard.getChild(UIPagePreview.class);
- UIPage uiPage;
- if (Page.DESKTOP_PAGE.equals(page.getFactoryId()))
- {
- uiPage = uiWizard.createUIComponent(context, UIDesktopPage.class, null, null);
- }
- else
- {
- uiPage = uiWizard.createUIComponent(context, UIPage.class, null, null);
- }
-
+
+ Class<? extends UIPage> clazz = Class.forName(page.getFactoryId()).asSubclass(UIPage.class);
+ UIPage uiPage = uiWizard.createUIComponent(context, clazz, null, null);
+
PortalDataMapper.toUIPage(uiPage, page);
uiPagePreview.setUIComponent(uiPage);
Modified: exo/portal/branches/webos-gatein-branch/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalForm.java
===================================================================
--- exo/portal/branches/webos-gatein-branch/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalForm.java 2010-12-01 03:22:48 UTC (rev 5394)
+++ exo/portal/branches/webos-gatein-branch/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalForm.java 2010-12-01 04:25:29 UTC (rev 5395)
@@ -124,7 +124,7 @@
}
WebuiRequestContext context = WebuiRequestContext.getCurrentInstance();
Param param = initParams.getParam("PortalTemplateConfigOption");
- List<SelectItemCategory> portalTemplates = (List<SelectItemCategory>)param.getMapGroovyObject(context);
+ List<SelectItemCategory> portalTemplates = (List<SelectItemCategory>)param.getFreshObject(context);
for (SelectItemCategory itemCategory : portalTemplates)
{
uiTemplateInput.getItemCategories().add(itemCategory);
Modified: exo/portal/branches/webos-gatein-branch/webui/portal/src/main/java/org/exoplatform/portal/webui/util/Util.java
===================================================================
--- exo/portal/branches/webos-gatein-branch/webui/portal/src/main/java/org/exoplatform/portal/webui/util/Util.java 2010-12-01 03:22:48 UTC (rev 5394)
+++ exo/portal/branches/webos-gatein-branch/webui/portal/src/main/java/org/exoplatform/portal/webui/util/Util.java 2010-12-01 04:25:29 UTC (rev 5395)
@@ -19,13 +19,14 @@
package org.exoplatform.portal.webui.util;
+import java.util.List;
+
import org.exoplatform.portal.application.PortalRequestContext;
import org.exoplatform.portal.config.UserPortalConfigService;
import org.exoplatform.portal.config.model.Page;
import org.exoplatform.portal.config.model.PageNode;
import org.exoplatform.portal.webui.application.UIPortlet;
import org.exoplatform.portal.webui.container.UIContainer;
-import org.exoplatform.portal.webui.page.UIDesktopPage;
import org.exoplatform.portal.webui.page.UIPage;
import org.exoplatform.portal.webui.portal.UIPortal;
import org.exoplatform.portal.webui.portal.UIPortalComponent;
@@ -38,8 +39,6 @@
import org.exoplatform.webui.core.UIComponentDecorator;
import org.exoplatform.webui.event.Event;
-import java.util.List;
-
/**
* Jun 5, 2006
*/
@@ -226,14 +225,10 @@
if (uiPage != null && uiPage.getId().equals(page.getId()))
return uiPage;
WebuiRequestContext context = Util.getPortalRequestContext();
- if (Page.DESKTOP_PAGE.equals(page.getFactoryId()))
- {
- uiPage = uiParent.createUIComponent(context, UIDesktopPage.class, null, null);
- }
- else
- {
- uiPage = uiParent.createUIComponent(context, UIPage.class, null, null);
- }
+
+ Class<? extends UIPage> clazz = Class.forName(page.getFactoryId()).asSubclass(UIPage.class);
+ uiPage = uiParent.createUIComponent(context, clazz, null, null);
+
PortalDataMapper.toUIPage(uiPage, page);
return uiPage;
}
Modified: exo/portal/branches/webos-gatein-branch/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIMainActionListener.java
===================================================================
--- exo/portal/branches/webos-gatein-branch/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIMainActionListener.java 2010-12-01 03:22:48 UTC (rev 5394)
+++ exo/portal/branches/webos-gatein-branch/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIMainActionListener.java 2010-12-01 04:25:29 UTC (rev 5395)
@@ -19,6 +19,8 @@
package org.exoplatform.portal.webui.workspace;
+import java.lang.reflect.Method;
+
import org.exoplatform.portal.application.PortalRequestContext;
import org.exoplatform.portal.config.UserACL;
import org.exoplatform.portal.config.UserPortalConfig;
@@ -37,6 +39,7 @@
import org.exoplatform.portal.webui.util.PortalDataMapper;
import org.exoplatform.portal.webui.util.Util;
import org.exoplatform.web.application.ApplicationMessage;
+import org.exoplatform.webui.application.WebuiRequestContext;
import org.exoplatform.webui.event.Event;
import org.exoplatform.webui.event.EventListener;
@@ -225,5 +228,22 @@
prContext.addUIComponentToUpdateByAjax(uiMaskWS);
}
}
+
+ public static class EditBackgroundActionListener extends EventListener<UIWorkingWorkspace>
+ {
+ @Override
+ public void execute(Event<UIWorkingWorkspace> event) throws Exception
+ {
+
+ UIWorkingWorkspace workingWorkspace = event.getSource();
+ UIPage uiPage = workingWorkspace.findFirstComponentOfType(UIPage.class);
+
+ Method showEditBackgroundPopupMethod = uiPage.getClass().getDeclaredMethod("showEditBackgroundPopup", WebuiRequestContext.class);
+ if(showEditBackgroundPopupMethod != null)
+ {
+ showEditBackgroundPopupMethod.invoke(uiPage, event.getRequestContext());
+ }
+ }
+ }
}
Modified: exo/portal/branches/webos-gatein-branch/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIWorkingWorkspace.java
===================================================================
--- exo/portal/branches/webos-gatein-branch/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIWorkingWorkspace.java 2010-12-01 03:22:48 UTC (rev 5394)
+++ exo/portal/branches/webos-gatein-branch/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIWorkingWorkspace.java 2010-12-01 04:25:29 UTC (rev 5395)
@@ -42,6 +42,7 @@
@EventConfig(listeners = UIMainActionListener.CreatePortalActionListener.class),
@EventConfig(listeners = UIMainActionListener.EditCurrentPageActionListener.class),
@EventConfig(listeners = UIMainActionListener.PageCreationWizardActionListener.class),
+ @EventConfig(listeners = UIMainActionListener.EditBackgroundActionListener.class),
@EventConfig(listeners = UIMainActionListener.EditInlineActionListener.class)})
public class UIWorkingWorkspace extends UIContainer
{
Modified: exo/portal/branches/webos-gatein-branch/webui/portlet/pom.xml
===================================================================
--- exo/portal/branches/webos-gatein-branch/webui/portlet/pom.xml 2010-12-01 03:22:48 UTC (rev 5394)
+++ exo/portal/branches/webos-gatein-branch/webui/portlet/pom.xml 2010-12-01 04:25:29 UTC (rev 5395)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.webui</artifactId>
- <version>3.2.0-Beta01-SNAPSHOT</version>
+ <version>3.2.0-Beta02-webos</version>
</parent>
<modelVersion>4.0.0</modelVersion>
More information about the gatein-commits
mailing list