gatein SVN: r1912 - portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page.
by do-not-reply＠jboss.org
Author: chris.laprun(a)jboss.com
Date: 2010-03-01 07:31:01 -0500 (Mon, 01 Mar 2010)
New Revision: 1912
Modified:
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageActionListener.java
Log:
- GTNPORTAL-701: reverted changes as they seem to be causing issues.
Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageActionListener.java
===================================================================
--- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageActionListener.java 2010-03-01 08:10:40 UTC (rev 1911)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageActionListener.java 2010-03-01 12:31:01 UTC (rev 1912)
@@ -63,7 +63,9 @@
UIWorkingWorkspace uiWorkingWS = uiPortalApp.getChildById(UIPortalApplication.UI_WORKING_WS_ID);
PortalRequestContext pcontext = Util.getPortalRequestContext();
pcontext.addUIComponentToUpdateByAjax(uiWorkingWS);
-
+ uiWorkingWS.setRenderedChild(UIPortalApplication.UI_VIEWING_WS_ID);
+ pcontext.setFullRender(true);
+
PageNavigation currentNav = showedUIPortal.getSelectedNavigation();
String currentUri = showedUIPortal.getSelectedNode().getUri();
if(currentUri.startsWith("/"))
@@ -89,9 +91,6 @@
if(targetedNav == null)
{
- uiWorkingWS.setRenderedChild(UIPortalApplication.UI_VIEWING_WS_ID);
- uiPortalApp.setModeState(UIPortalApplication.NORMAL_MODE);
- pcontext.setFullRender(true);
return;
}
@@ -119,9 +118,6 @@
{
// Case 2: Either navigation type or id has been changed
// First, we try to find a cached UIPortal
- uiWorkingWS.setRenderedChild(UIPortalApplication.UI_VIEWING_WS_ID);
- uiPortalApp.setModeState(UIPortalApplication.NORMAL_MODE);
- pcontext.setFullRender(true);
UIPortal cachedUIPortal = uiPortalApp.getCachedUIPortal(newNavType, newNavId);
if (cachedUIPortal != null)
{
14 years, 10 months
gatein SVN: r1911 - portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page.
by do-not-reply＠jboss.org
Author: tan_pham_dinh
Date: 2010-03-01 03:10:40 -0500 (Mon, 01 Mar 2010)
New Revision: 1911
Modified:
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageActionListener.java
Log:
GTNPORTAL-701: Incorrect rendering if the going to the portal url while viewing some portal pages
Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageActionListener.java
===================================================================
--- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageActionListener.java 2010-03-01 07:25:55 UTC (rev 1910)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageActionListener.java 2010-03-01 08:10:40 UTC (rev 1911)
@@ -63,8 +63,6 @@
UIWorkingWorkspace uiWorkingWS = uiPortalApp.getChildById(UIPortalApplication.UI_WORKING_WS_ID);
PortalRequestContext pcontext = Util.getPortalRequestContext();
pcontext.addUIComponentToUpdateByAjax(uiWorkingWS);
- uiWorkingWS.setRenderedChild(UIPortalApplication.UI_VIEWING_WS_ID);
- pcontext.setFullRender(true);
PageNavigation currentNav = showedUIPortal.getSelectedNavigation();
String currentUri = showedUIPortal.getSelectedNode().getUri();
@@ -91,6 +89,9 @@
if(targetedNav == null)
{
+ uiWorkingWS.setRenderedChild(UIPortalApplication.UI_VIEWING_WS_ID);
+ uiPortalApp.setModeState(UIPortalApplication.NORMAL_MODE);
+ pcontext.setFullRender(true);
return;
}
@@ -118,6 +119,9 @@
{
// Case 2: Either navigation type or id has been changed
// First, we try to find a cached UIPortal
+ uiWorkingWS.setRenderedChild(UIPortalApplication.UI_VIEWING_WS_ID);
+ uiPortalApp.setModeState(UIPortalApplication.NORMAL_MODE);
+ pcontext.setFullRender(true);
UIPortal cachedUIPortal = uiPortalApp.getCachedUIPortal(newNavType, newNavId);
if (cachedUIPortal != null)
{
14 years, 10 months
gatein SVN: r1910 - portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin.
by do-not-reply＠jboss.org
Author: trong.tran
Date: 2010-03-01 02:25:55 -0500 (Mon, 01 Mar 2010)
New Revision: 1910
Modified:
portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_en.properties
Log:
GTNPORTAL-565 Change a message in resource bundle
Modified: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_en.properties
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_en.properties 2010-03-01 03:46:05 UTC (rev 1909)
+++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_en.properties 2010-03-01 07:25:55 UTC (rev 1910)
@@ -41,7 +41,7 @@
UIOrganizer.msg.deleteCategory=Are you sure to delete this category and all applications on it?
UIOrganizer.msg.deleteApplication=Are you sure to delete this application?
UIOrganizer.msg.emptyCategory=This category does not have any application, click (+) button to add application.
-UIOrganizer.msg.noCategory=There are no categories. You can click "Add Category" or "Auto Import" button to add category.
+UIOrganizer.msg.noCategory=There are no categories. You can click "Add Category" or "Import Applications" button to add category.
UIOrganizer.msg.deleteCategoryInUse=Can not delete this category, it is in use.
UIOrganizer.msg.deleteApplicationInUse=Can not delete this application, it is in use.
UIOrganizer.msg.categoryNoExist=This category is no longer in database.
14 years, 10 months
gatein SVN: r1909 - portal/trunk/docs/user-guide/en/images.
by do-not-reply＠jboss.org
Author: smumford
Date: 2010-02-28 22:46:05 -0500 (Sun, 28 Feb 2010)
New Revision: 1909
Modified:
portal/trunk/docs/user-guide/en/images/AccountProfiles3.png
portal/trunk/docs/user-guide/en/images/ChangeAccount.png
portal/trunk/docs/user-guide/en/images/ChangePassword.png
portal/trunk/docs/user-guide/en/images/Downloads.png
portal/trunk/docs/user-guide/en/images/Forgot1.png
portal/trunk/docs/user-guide/en/images/ForgotEmail1.png
portal/trunk/docs/user-guide/en/images/ForgotUserName1.png
portal/trunk/docs/user-guide/en/images/Register.png
portal/trunk/docs/user-guide/en/images/RememberMe.png
portal/trunk/docs/user-guide/en/images/SignIn1.png
portal/trunk/docs/user-guide/en/images/Signin.png
portal/trunk/docs/user-guide/en/images/StarPortlet.png
portal/trunk/docs/user-guide/en/images/Videos.png
portal/trunk/docs/user-guide/en/images/XMLURL.png
Log:
Updated images Ch1-4
Modified: portal/trunk/docs/user-guide/en/images/AccountProfiles3.png
===================================================================
(Binary files differ)
Modified: portal/trunk/docs/user-guide/en/images/ChangeAccount.png
===================================================================
(Binary files differ)
Modified: portal/trunk/docs/user-guide/en/images/ChangePassword.png
===================================================================
(Binary files differ)
Modified: portal/trunk/docs/user-guide/en/images/Downloads.png
===================================================================
(Binary files differ)
Modified: portal/trunk/docs/user-guide/en/images/Forgot1.png
===================================================================
(Binary files differ)
Modified: portal/trunk/docs/user-guide/en/images/ForgotEmail1.png
===================================================================
(Binary files differ)
Modified: portal/trunk/docs/user-guide/en/images/ForgotUserName1.png
===================================================================
(Binary files differ)
Modified: portal/trunk/docs/user-guide/en/images/Register.png
===================================================================
(Binary files differ)
Modified: portal/trunk/docs/user-guide/en/images/RememberMe.png
===================================================================
(Binary files differ)
Modified: portal/trunk/docs/user-guide/en/images/SignIn1.png
===================================================================
(Binary files differ)
Modified: portal/trunk/docs/user-guide/en/images/Signin.png
===================================================================
(Binary files differ)
Modified: portal/trunk/docs/user-guide/en/images/StarPortlet.png
===================================================================
(Binary files differ)
Modified: portal/trunk/docs/user-guide/en/images/Videos.png
===================================================================
(Binary files differ)
Modified: portal/trunk/docs/user-guide/en/images/XMLURL.png
===================================================================
(Binary files differ)
14 years, 10 months
gatein SVN: r1908 - portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application.
by do-not-reply＠jboss.org
Author: liem_nguyen
Date: 2010-02-28 20:58:12 -0500 (Sun, 28 Feb 2010)
New Revision: 1908
Modified:
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIGadget.java
Log:
GTNPORTAL-624 [Dashboard] pb after saving preferences of a gadget
Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIGadget.java
===================================================================
--- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIGadget.java 2010-03-01 00:18:49 UTC (rev 1907)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIGadget.java 2010-03-01 01:58:12 UTC (rev 1908)
@@ -442,8 +442,7 @@
return;
}
- //
- event.getRequestContext().setResponseComplete(true);
+ //event.getRequestContext().setResponseComplete(true);
}
}
14 years, 10 months
gatein SVN: r1907 - in portal/trunk: component/wsrp and 3 other directories.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2010-02-28 19:18:49 -0500 (Sun, 28 Feb 2010)
New Revision: 1907
Modified:
portal/trunk/component/pc/pom.xml
portal/trunk/component/wsrp/pom.xml
portal/trunk/gadgets/eXoGadgets/pom.xml
portal/trunk/portlet/dashboard/pom.xml
portal/trunk/webui/portal/pom.xml
Log:
DRY a bit more
Modified: portal/trunk/component/pc/pom.xml
===================================================================
--- portal/trunk/component/pc/pom.xml 2010-03-01 00:05:20 UTC (rev 1906)
+++ portal/trunk/component/pc/pom.xml 2010-03-01 00:18:49 UTC (rev 1907)
@@ -29,7 +29,6 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>exo.portal.component.pc</artifactId>
<packaging>jar</packaging>
- <version>3.0.0-CR02-SNAPSHOT</version>
<name>GateIn Portal Component PC integration</name>
<dependencies>
Modified: portal/trunk/component/wsrp/pom.xml
===================================================================
--- portal/trunk/component/wsrp/pom.xml 2010-03-01 00:05:20 UTC (rev 1906)
+++ portal/trunk/component/wsrp/pom.xml 2010-03-01 00:18:49 UTC (rev 1907)
@@ -32,7 +32,6 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>gatein.portal.component.wsrp</artifactId>
<packaging>jar</packaging>
- <version>3.0.0-CR02-SNAPSHOT</version>
<name>GateIn Portal Component WSRP integration</name>
<dependencies>
Modified: portal/trunk/gadgets/eXoGadgets/pom.xml
===================================================================
--- portal/trunk/gadgets/eXoGadgets/pom.xml 2010-03-01 00:05:20 UTC (rev 1906)
+++ portal/trunk/gadgets/eXoGadgets/pom.xml 2010-03-01 00:18:49 UTC (rev 1907)
@@ -39,7 +39,6 @@
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.web</artifactId>
- <version>3.0.0-CR02-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
Modified: portal/trunk/portlet/dashboard/pom.xml
===================================================================
--- portal/trunk/portlet/dashboard/pom.xml 2010-03-01 00:05:20 UTC (rev 1906)
+++ portal/trunk/portlet/dashboard/pom.xml 2010-03-01 00:18:49 UTC (rev 1907)
@@ -35,7 +35,6 @@
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.webui.portal</artifactId>
- <version>3.0.0-CR02-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
Modified: portal/trunk/webui/portal/pom.xml
===================================================================
--- portal/trunk/webui/portal/pom.xml 2010-03-01 00:05:20 UTC (rev 1906)
+++ portal/trunk/webui/portal/pom.xml 2010-03-01 00:18:49 UTC (rev 1907)
@@ -45,7 +45,6 @@
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.resources</artifactId>
- <version>3.0.0-CR02-SNAPSHOT</version>
</dependency>
<dependency>
14 years, 10 months
gatein SVN: r1906 - in portal/trunk: component/application-registry and 24 other directories.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2010-02-28 19:05:20 -0500 (Sun, 28 Feb 2010)
New Revision: 1906
Modified:
portal/trunk/component/application-registry/pom.xml
portal/trunk/component/common/pom.xml
portal/trunk/component/dashboard/pom.xml
portal/trunk/component/identity/pom.xml
portal/trunk/component/management/pom.xml
portal/trunk/component/pc/pom.xml
portal/trunk/component/portal/pom.xml
portal/trunk/component/resources/pom.xml
portal/trunk/component/scripting/pom.xml
portal/trunk/component/test/core/pom.xml
portal/trunk/component/test/jcr/pom.xml
portal/trunk/component/test/organization/pom.xml
portal/trunk/component/web/pom.xml
portal/trunk/component/wsrp/pom.xml
portal/trunk/component/xml-parser/pom.xml
portal/trunk/examples/extension/jar/pom.xml
portal/trunk/examples/portal/jar/pom.xml
portal/trunk/gadgets/core/pom.xml
portal/trunk/gadgets/eXoGadgets/pom.xml
portal/trunk/pom.xml
portal/trunk/portlet/dashboard/pom.xml
portal/trunk/portlet/exoadmin/pom.xml
portal/trunk/portlet/web/pom.xml
portal/trunk/webui/core/pom.xml
portal/trunk/webui/eXo/pom.xml
portal/trunk/webui/portal/pom.xml
Log:
leverage the main dependency management to avoid version number in aggregated poms
Modified: portal/trunk/component/application-registry/pom.xml
===================================================================
--- portal/trunk/component/application-registry/pom.xml 2010-02-28 23:36:37 UTC (rev 1905)
+++ portal/trunk/component/application-registry/pom.xml 2010-03-01 00:05:20 UTC (rev 1906)
@@ -45,7 +45,6 @@
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.portal</artifactId>
- <version>3.0.0-CR02-SNAPSHOT</version>
</dependency>
<dependency>
@@ -56,28 +55,24 @@
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.test.core</artifactId>
- <version>3.0.0-CR02-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.test.jcr</artifactId>
- <version>3.0.0-CR02-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.test.organization</artifactId>
- <version>3.0.0-CR02-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.portal</artifactId>
- <version>3.0.0-CR02-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
@@ -85,7 +80,6 @@
<dependency>
<groupId>org.chromattic</groupId>
<artifactId>chromattic.core</artifactId>
- <version>${version.chromattic}</version>
<scope>test</scope>
</dependency>
Modified: portal/trunk/component/common/pom.xml
===================================================================
--- portal/trunk/component/common/pom.xml 2010-02-28 23:36:37 UTC (rev 1905)
+++ portal/trunk/component/common/pom.xml 2010-03-01 00:05:20 UTC (rev 1906)
@@ -67,14 +67,12 @@
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.test.core</artifactId>
- <version>3.0.0-CR02-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.test.jcr</artifactId>
- <version>3.0.0-CR02-SNAPSHOT</version>
<scope>test</scope>
</dependency>
Modified: portal/trunk/component/dashboard/pom.xml
===================================================================
--- portal/trunk/component/dashboard/pom.xml 2010-02-28 23:36:37 UTC (rev 1905)
+++ portal/trunk/component/dashboard/pom.xml 2010-03-01 00:05:20 UTC (rev 1906)
@@ -35,14 +35,11 @@
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.webui.portal</artifactId>
- <version>3.0.0-CR02-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
-
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.webui.eXo</artifactId>
- <version>3.0.0-CR02-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
</dependencies>
Modified: portal/trunk/component/identity/pom.xml
===================================================================
--- portal/trunk/component/identity/pom.xml 2010-02-28 23:36:37 UTC (rev 1905)
+++ portal/trunk/component/identity/pom.xml 2010-03-01 00:05:20 UTC (rev 1906)
@@ -82,7 +82,6 @@
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.test.core</artifactId>
- <version>3.0.0-CR02-SNAPSHOT</version>
<scope>test</scope>
</dependency>
Modified: portal/trunk/component/management/pom.xml
===================================================================
--- portal/trunk/component/management/pom.xml 2010-02-28 23:36:37 UTC (rev 1905)
+++ portal/trunk/component/management/pom.xml 2010-03-01 00:05:20 UTC (rev 1906)
@@ -34,9 +34,7 @@
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.portal</artifactId>
- <version>3.0.0-CR02-SNAPSHOT</version>
</dependency>
-
<dependency>
<groupId>org.exoplatform.kernel</groupId>
<artifactId>exo.kernel.commons</artifactId>
Modified: portal/trunk/component/pc/pom.xml
===================================================================
--- portal/trunk/component/pc/pom.xml 2010-02-28 23:36:37 UTC (rev 1905)
+++ portal/trunk/component/pc/pom.xml 2010-03-01 00:05:20 UTC (rev 1906)
@@ -37,7 +37,6 @@
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.resources</artifactId>
- <version>3.0.0-CR02-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.gatein.common</groupId>
Modified: portal/trunk/component/portal/pom.xml
===================================================================
--- portal/trunk/component/portal/pom.xml 2010-02-28 23:36:37 UTC (rev 1905)
+++ portal/trunk/component/portal/pom.xml 2010-03-01 00:05:20 UTC (rev 1906)
@@ -46,25 +46,21 @@
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.common</artifactId>
- <version>3.0.0-CR02-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.web</artifactId>
- <version>3.0.0-CR02-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.pc</artifactId>
- <version>3.0.0-CR02-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.identity</artifactId>
- <version>3.0.0-CR02-SNAPSHOT</version>
</dependency>
<dependency>
@@ -102,21 +98,18 @@
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.test.core</artifactId>
- <version>3.0.0-CR02-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.test.jcr</artifactId>
- <version>3.0.0-CR02-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.test.organization</artifactId>
- <version>3.0.0-CR02-SNAPSHOT</version>
<scope>test</scope>
</dependency>
Modified: portal/trunk/component/resources/pom.xml
===================================================================
--- portal/trunk/component/resources/pom.xml 2010-02-28 23:36:37 UTC (rev 1905)
+++ portal/trunk/component/resources/pom.xml 2010-03-01 00:05:20 UTC (rev 1906)
@@ -76,7 +76,6 @@
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.common</artifactId>
- <version>3.0.0-CR02-SNAPSHOT</version>
</dependency>
<dependency>
@@ -87,7 +86,6 @@
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.test.core</artifactId>
- <version>3.0.0-CR02-SNAPSHOT</version>
<scope>test</scope>
</dependency>
Modified: portal/trunk/component/scripting/pom.xml
===================================================================
--- portal/trunk/component/scripting/pom.xml 2010-02-28 23:36:37 UTC (rev 1905)
+++ portal/trunk/component/scripting/pom.xml 2010-03-01 00:05:20 UTC (rev 1906)
@@ -40,13 +40,11 @@
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.common</artifactId>
- <version>3.0.0-CR02-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.xml-parser</artifactId>
- <version>3.0.0-CR02-SNAPSHOT</version>
</dependency>
<dependency>
@@ -62,7 +60,6 @@
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.test.core</artifactId>
- <version>3.0.0-CR02-SNAPSHOT</version>
<scope>test</scope>
</dependency>
</dependencies>
Modified: portal/trunk/component/test/core/pom.xml
===================================================================
--- portal/trunk/component/test/core/pom.xml 2010-02-28 23:36:37 UTC (rev 1905)
+++ portal/trunk/component/test/core/pom.xml 2010-03-01 00:05:20 UTC (rev 1906)
@@ -65,24 +65,6 @@
</dependencies>
<build>
-
-<!--
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <systemProperties>
- <property>
- <name>java.util.logging.config.class</name>
- <value>org.exoplatform.component.test</value>
- </property>
- </systemProperties>
- </configuration>
- </plugin>
- </plugins>
--->
-
<resources>
<resource>
<directory>src/main/resources</directory>
Modified: portal/trunk/component/test/jcr/pom.xml
===================================================================
--- portal/trunk/component/test/jcr/pom.xml 2010-02-28 23:36:37 UTC (rev 1905)
+++ portal/trunk/component/test/jcr/pom.xml 2010-03-01 00:05:20 UTC (rev 1906)
@@ -35,7 +35,6 @@
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.test.core</artifactId>
- <version>3.0.0-CR02-SNAPSHOT</version>
</dependency>
<dependency>
Modified: portal/trunk/component/test/organization/pom.xml
===================================================================
--- portal/trunk/component/test/organization/pom.xml 2010-02-28 23:36:37 UTC (rev 1905)
+++ portal/trunk/component/test/organization/pom.xml 2010-03-01 00:05:20 UTC (rev 1906)
@@ -35,15 +35,11 @@
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.test.core</artifactId>
- <version>3.0.0-CR02-SNAPSHOT</version>
</dependency>
-
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.identity</artifactId>
- <version>3.0.0-CR02-SNAPSHOT</version>
</dependency>
-
<dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
Modified: portal/trunk/component/web/pom.xml
===================================================================
--- portal/trunk/component/web/pom.xml 2010-02-28 23:36:37 UTC (rev 1905)
+++ portal/trunk/component/web/pom.xml 2010-03-01 00:05:20 UTC (rev 1906)
@@ -36,85 +36,66 @@
</properties>
<dependencies>
+
<dependency>
<groupId>org.exoplatform.kernel</groupId>
<artifactId>exo.kernel.container</artifactId>
- <version>${org.exoplatform.kernel.version}</version>
</dependency>
-
<dependency>
<groupId>org.exoplatform.core</groupId>
<artifactId>exo.core.component.organization.api</artifactId>
</dependency>
-
<dependency>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>exo.jcr.component.ext</artifactId>
</dependency>
-
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.common</artifactId>
- <version>3.0.0-CR02-SNAPSHOT</version>
</dependency>
-
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.resources</artifactId>
- <version>3.0.0-CR02-SNAPSHOT</version>
</dependency>
-
<dependency>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-wci</artifactId>
</dependency>
-
<dependency>
<groupId>org.chromattic</groupId>
<artifactId>chromattic.apt</artifactId>
<scope>compile</scope>
</dependency>
-
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.scripting</artifactId>
- <version>3.0.0-CR02-SNAPSHOT</version>
</dependency>
-
<dependency>
<groupId>org.apache.shindig</groupId>
<artifactId>shindig-gadgets</artifactId>
</dependency>
-
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<type>jar</type>
</dependency>
-
<dependency>
<groupId>org.json</groupId>
<artifactId>json</artifactId>
<type>jar</type>
</dependency>
-
<dependency>
<groupId>javax.security</groupId>
<artifactId>jacc</artifactId>
- <version>1.0</version>
</dependency>
-
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.test.core</artifactId>
- <version>3.0.0-CR02-SNAPSHOT</version>
<scope>test</scope>
</dependency>
-
<dependency>
<groupId>org.jboss.jbossas</groupId>
<artifactId>jboss-as-tomcat</artifactId>
- <version>5.1.0.GA</version>
<scope>provided</scope>
</dependency>
</dependencies>
Modified: portal/trunk/component/wsrp/pom.xml
===================================================================
--- portal/trunk/component/wsrp/pom.xml 2010-02-28 23:36:37 UTC (rev 1905)
+++ portal/trunk/component/wsrp/pom.xml 2010-03-01 00:05:20 UTC (rev 1906)
@@ -70,14 +70,12 @@
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.pc</artifactId>
- <version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>exo.jcr.component.ext</artifactId>
- <version>${org.exoplatform.jcr.version}</version>
</dependency>
<dependency>
<groupId>org.chromattic</groupId>
@@ -87,20 +85,17 @@
<dependency>
<groupId>org.chromattic</groupId>
<artifactId>chromattic.core</artifactId>
- <version>${version.chromattic}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.chromattic</groupId>
<artifactId>chromattic.spi</artifactId>
- <version>${version.chromattic}</version>
</dependency>
<!-- Required to process Chromattic annotations -->
<dependency>
<groupId>org.chromattic</groupId>
<artifactId>chromattic.apt</artifactId>
- <version>${version.chromattic}</version>
<scope>provided</scope>
</dependency>
@@ -108,13 +103,11 @@
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.test.jcr</artifactId>
- <version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-wci</artifactId>
- <version>${org.gatein.wci.version}</version>
</dependency>
</dependencies>
Modified: portal/trunk/component/xml-parser/pom.xml
===================================================================
--- portal/trunk/component/xml-parser/pom.xml 2010-02-28 23:36:37 UTC (rev 1905)
+++ portal/trunk/component/xml-parser/pom.xml 2010-03-01 00:05:20 UTC (rev 1906)
@@ -50,7 +50,6 @@
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.test.core</artifactId>
- <version>3.0.0-CR02-SNAPSHOT</version>
<scope>test</scope>
</dependency>
</dependencies>
Modified: portal/trunk/examples/extension/jar/pom.xml
===================================================================
--- portal/trunk/examples/extension/jar/pom.xml 2010-02-28 23:36:37 UTC (rev 1905)
+++ portal/trunk/examples/extension/jar/pom.xml 2010-03-01 00:05:20 UTC (rev 1906)
@@ -37,7 +37,6 @@
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.web</artifactId>
- <version>3.0.0-CR02-SNAPSHOT</version>
</dependency>
</dependencies>
</project>
Modified: portal/trunk/examples/portal/jar/pom.xml
===================================================================
--- portal/trunk/examples/portal/jar/pom.xml 2010-02-28 23:36:37 UTC (rev 1905)
+++ portal/trunk/examples/portal/jar/pom.xml 2010-03-01 00:05:20 UTC (rev 1906)
@@ -37,7 +37,6 @@
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.web</artifactId>
- <version>3.0.0-CR02-SNAPSHOT</version>
</dependency>
</dependencies>
</project>
Modified: portal/trunk/gadgets/core/pom.xml
===================================================================
--- portal/trunk/gadgets/core/pom.xml 2010-02-28 23:36:37 UTC (rev 1905)
+++ portal/trunk/gadgets/core/pom.xml 2010-03-01 00:05:20 UTC (rev 1906)
@@ -65,7 +65,6 @@
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.web</artifactId>
- <version>3.0.0-CR02-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
Modified: portal/trunk/gadgets/eXoGadgets/pom.xml
===================================================================
--- portal/trunk/gadgets/eXoGadgets/pom.xml 2010-02-28 23:36:37 UTC (rev 1905)
+++ portal/trunk/gadgets/eXoGadgets/pom.xml 2010-03-01 00:05:20 UTC (rev 1906)
@@ -46,7 +46,6 @@
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.webui.portal</artifactId>
- <version>3.0.0-CR02-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
Modified: portal/trunk/pom.xml
===================================================================
--- portal/trunk/pom.xml 2010-02-28 23:36:37 UTC (rev 1905)
+++ portal/trunk/pom.xml 2010-03-01 00:05:20 UTC (rev 1906)
@@ -314,6 +314,117 @@
<version>${org.gatein.mop.version}</version>
</dependency>
+ <!-- GateIn -->
+ <dependency>
+ <groupId>org.exoplatform.portal</groupId>
+ <artifactId>exo.portal.component.common</artifactId>
+ <version>3.0.0-CR02-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.exoplatform.portal</groupId>
+ <artifactId>exo.portal.component.web</artifactId>
+ <version>3.0.0-CR02-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.exoplatform.portal</groupId>
+ <artifactId>exo.portal.component.portal</artifactId>
+ <version>3.0.0-CR02-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.exoplatform.portal</groupId>
+ <artifactId>exo.portal.component.portal</artifactId>
+ <version>3.0.0-CR02-SNAPSHOT</version>
+ <type>test-jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.exoplatform.portal</groupId>
+ <artifactId>exo.portal.component.pc</artifactId>
+ <version>3.0.0-CR02-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.exoplatform.portal</groupId>
+ <artifactId>exo.portal.component.identity</artifactId>
+ <version>3.0.0-CR02-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.exoplatform.portal</groupId>
+ <artifactId>exo.portal.component.resources</artifactId>
+ <version>3.0.0-CR02-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.exoplatform.portal</groupId>
+ <artifactId>exo.portal.component.application-registry</artifactId>
+ <version>3.0.0-CR02-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.exoplatform.portal</groupId>
+ <artifactId>exo.portal.component.xml-parser</artifactId>
+ <version>3.0.0-CR02-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.exoplatform.portal</groupId>
+ <artifactId>exo.portal.component.scripting</artifactId>
+ <version>3.0.0-CR02-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.exoplatform.portal</groupId>
+ <artifactId>exo.portal.component.dashboard</artifactId>
+ <version>3.0.0-CR02-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.exoplatform.portal</groupId>
+ <artifactId>exo.portal.webui.portal</artifactId>
+ <version>3.0.0-CR02-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.exoplatform.portal</groupId>
+ <artifactId>exo.portal.webui.eXo</artifactId>
+ <version>3.0.0-CR02-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.exoplatform.portal</groupId>
+ <artifactId>exo.portal.webui.core</artifactId>
+ <version>3.0.0-CR02-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.exoplatform.portal</groupId>
+ <artifactId>exo.portal.gadgets-core</artifactId>
+ <version>3.0.0-CR02-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.exoplatform.portal</groupId>
+ <artifactId>exo.portal.component.test.core</artifactId>
+ <version>3.0.0-CR02-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.exoplatform.portal</groupId>
+ <artifactId>exo.portal.component.test.core</artifactId>
+ <version>3.0.0-CR02-SNAPSHOT</version>
+ <type>test-jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.exoplatform.portal</groupId>
+ <artifactId>exo.portal.component.test.jcr</artifactId>
+ <version>3.0.0-CR02-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.exoplatform.portal</groupId>
+ <artifactId>exo.portal.component.test.jcr</artifactId>
+ <version>3.0.0-CR02-SNAPSHOT</version>
+ <type>test-jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.exoplatform.portal</groupId>
+ <artifactId>exo.portal.component.test.organization</artifactId>
+ <version>3.0.0-CR02-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.exoplatform.portal</groupId>
+ <artifactId>exo.portal.component.test.organization</artifactId>
+ <version>3.0.0-CR02-SNAPSHOT</version>
+ <type>test-jar</type>
+ </dependency>
+
<!-- Chromattic -->
<dependency>
<groupId>org.chromattic</groupId>
@@ -379,8 +490,19 @@
<artifactId>portlet-api</artifactId>
<version>2.0</version>
</dependency>
+ <dependency>
+ <groupId>javax.security</groupId>
+ <artifactId>jacc</artifactId>
+ <version>1.0</version>
+ </dependency>
<dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-tomcat</artifactId>
+ <version>5.1.0.GA</version>
+ </dependency>
+
+ <dependency>
<groupId>commons-dbcp</groupId>
<artifactId>commons-dbcp</artifactId>
<version>1.2.2</version>
Modified: portal/trunk/portlet/dashboard/pom.xml
===================================================================
--- portal/trunk/portlet/dashboard/pom.xml 2010-02-28 23:36:37 UTC (rev 1905)
+++ portal/trunk/portlet/dashboard/pom.xml 2010-03-01 00:05:20 UTC (rev 1906)
@@ -42,13 +42,11 @@
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.webui.eXo</artifactId>
- <version>3.0.0-CR02-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.dashboard</artifactId>
- <version>3.0.0-CR02-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
</dependencies>
Modified: portal/trunk/portlet/exoadmin/pom.xml
===================================================================
--- portal/trunk/portlet/exoadmin/pom.xml 2010-02-28 23:36:37 UTC (rev 1905)
+++ portal/trunk/portlet/exoadmin/pom.xml 2010-03-01 00:05:20 UTC (rev 1906)
@@ -35,14 +35,12 @@
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.webui.portal</artifactId>
- <version>3.0.0-CR02-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.webui.eXo</artifactId>
- <version>3.0.0-CR02-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
</dependencies>
Modified: portal/trunk/portlet/web/pom.xml
===================================================================
--- portal/trunk/portlet/web/pom.xml 2010-02-28 23:36:37 UTC (rev 1905)
+++ portal/trunk/portlet/web/pom.xml 2010-03-01 00:05:20 UTC (rev 1906)
@@ -35,7 +35,6 @@
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.webui.portal</artifactId>
- <version>3.0.0-CR02-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
</dependencies>
Modified: portal/trunk/webui/core/pom.xml
===================================================================
--- portal/trunk/webui/core/pom.xml 2010-02-28 23:36:37 UTC (rev 1905)
+++ portal/trunk/webui/core/pom.xml 2010-03-01 00:05:20 UTC (rev 1906)
@@ -35,12 +35,10 @@
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.web</artifactId>
- <version>3.0.0-CR02-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.portal</artifactId>
- <version>3.0.0-CR02-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.gatein.common</groupId>
@@ -49,7 +47,6 @@
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.test.core</artifactId>
- <version>3.0.0-CR02-SNAPSHOT</version>
<scope>test</scope>
</dependency>
</dependencies>
Modified: portal/trunk/webui/eXo/pom.xml
===================================================================
--- portal/trunk/webui/eXo/pom.xml 2010-02-28 23:36:37 UTC (rev 1905)
+++ portal/trunk/webui/eXo/pom.xml 2010-03-01 00:05:20 UTC (rev 1906)
@@ -35,13 +35,11 @@
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.webui.core</artifactId>
- <version>3.0.0-CR02-SNAPSHOT</version>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.application-registry</artifactId>
- <version>3.0.0-CR02-SNAPSHOT</version>
- </dependency>
+ </dependency>
</dependencies>
</project>
Modified: portal/trunk/webui/portal/pom.xml
===================================================================
--- portal/trunk/webui/portal/pom.xml 2010-02-28 23:36:37 UTC (rev 1905)
+++ portal/trunk/webui/portal/pom.xml 2010-03-01 00:05:20 UTC (rev 1906)
@@ -51,31 +51,26 @@
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.webui.core</artifactId>
- <version>3.0.0-CR02-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.webui.eXo</artifactId>
- <version>3.0.0-CR02-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.portal</artifactId>
- <version>3.0.0-CR02-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.application-registry</artifactId>
- <version>3.0.0-CR02-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.pc</artifactId>
- <version>3.0.0-CR02-SNAPSHOT</version>
</dependency>
<dependency>
@@ -90,7 +85,6 @@
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.gadgets-core</artifactId>
- <version>3.0.0-CR02-SNAPSHOT</version>
</dependency>
</dependencies>
</project>
14 years, 10 months