8:44 a.m.
Author: julien_viet
Date: 2010-07-22 09:44:35 -0400 (Thu, 22 Jul 2010)
New Revision: 3685
Added:
portal/trunk/webui/dashboard/
Removed:
portal/trunk/component/dashboard/
Modified:
portal/trunk/component/pom.xml
portal/trunk/packaging/jboss-as/ear/pom.xml
portal/trunk/packaging/module/src/main/javascript/portal.packaging.module.js
portal/trunk/pom.xml
portal/trunk/portlet/dashboard/pom.xml
portal/trunk/webui/dashboard/pom.xml
portal/trunk/webui/pom.xml
Log:
GTNPORTAL-1371: Move dashboard module from component to webui
Modified: portal/trunk/component/pom.xml
===================================================================
--- portal/trunk/component/pom.xml 2010-07-22 13:03:34 UTC (rev 3684)
+++ portal/trunk/component/pom.xml 2010-07-22 13:44:35 UTC (rev 3685)
@@ -46,7 +46,6 @@
<module>scripting</module>
<module>management</module>
<module>identity</module>
- <module>dashboard</module>
</modules>
</project>
Modified: portal/trunk/packaging/jboss-as/ear/pom.xml
===================================================================
--- portal/trunk/packaging/jboss-as/ear/pom.xml 2010-07-22 13:03:34 UTC (rev 3684)
+++ portal/trunk/packaging/jboss-as/ear/pom.xml 2010-07-22 13:44:35 UTC (rev 3685)
@@ -120,10 +120,6 @@
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
- <artifactId>exo.portal.component.dashboard</artifactId>
- </dependency>
- <dependency>
- <groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.management</artifactId>
</dependency>
<dependency>
@@ -146,6 +142,10 @@
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.webui.core</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.exoplatform.portal</groupId>
+ <artifactId>exo.portal.webui.dashboard</artifactId>
+ </dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.gadgets-core</artifactId>
Modified: portal/trunk/packaging/module/src/main/javascript/portal.packaging.module.js
===================================================================
---
portal/trunk/packaging/module/src/main/javascript/portal.packaging.module.js 2010-07-22
13:03:34 UTC (rev 3684)
+++
portal/trunk/packaging/module/src/main/javascript/portal.packaging.module.js 2010-07-22
13:44:35 UTC (rev 3685)
@@ -193,7 +193,7 @@
module.portlet.dashboard =
new Project("org.exoplatform.portal",
"exo.portal.portlet.dashboard", "exo-portlet", module.version).
- addDependency(new Project("org.exoplatform.portal",
"exo.portal.component.dashboard", "jar", module.version));
+ addDependency(new Project("org.exoplatform.portal",
"exo.portal.webui.dashboard", "jar", module.version));
module.sample = {};
module.sample.framework =
Modified: portal/trunk/pom.xml
===================================================================
--- portal/trunk/pom.xml 2010-07-22 13:03:34 UTC (rev 3684)
+++ portal/trunk/pom.xml 2010-07-22 13:44:35 UTC (rev 3685)
@@ -412,11 +412,6 @@
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
- <artifactId>exo.portal.component.dashboard</artifactId>
- <version>3.2.0-Beta01-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.management</artifactId>
<version>3.2.0-Beta01-SNAPSHOT</version>
</dependency>
@@ -447,6 +442,11 @@
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
+ <artifactId>exo.portal.webui.dashboard</artifactId>
+ <version>3.2.0-Beta01-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.gadgets-core</artifactId>
<version>3.2.0-Beta01-SNAPSHOT</version>
</dependency>
Modified: portal/trunk/portlet/dashboard/pom.xml
===================================================================
--- portal/trunk/portlet/dashboard/pom.xml 2010-07-22 13:03:34 UTC (rev 3684)
+++ portal/trunk/portlet/dashboard/pom.xml 2010-07-22 13:44:35 UTC (rev 3685)
@@ -45,7 +45,7 @@
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
- <artifactId>exo.portal.component.dashboard</artifactId>
+ <artifactId>exo.portal.webui.dashboard</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
Copied: portal/trunk/webui/dashboard (from rev 3683, portal/trunk/component/dashboard)
Modified: portal/trunk/webui/dashboard/pom.xml
===================================================================
--- portal/trunk/component/dashboard/pom.xml 2010-07-22 12:06:19 UTC (rev 3683)
+++ portal/trunk/webui/dashboard/pom.xml 2010-07-22 13:44:35 UTC (rev 3685)
@@ -22,12 +22,12 @@
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.exoplatform.portal</groupId>
- <artifactId>exo.portal.component</artifactId>
+ <artifactId>exo.portal.webui</artifactId>
<version>3.2.0-Beta01-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>exo.portal.component.dashboard</artifactId>
+ <artifactId>exo.portal.webui.dashboard</artifactId>
<packaging>jar</packaging>
<name>GateIn Portal Component Dashboard Portlet</name>
Modified: portal/trunk/webui/pom.xml
===================================================================
--- portal/trunk/webui/pom.xml 2010-07-22 13:03:34 UTC (rev 3684)
+++ portal/trunk/webui/pom.xml 2010-07-22 13:44:35 UTC (rev 3685)
@@ -40,6 +40,7 @@
<module>core</module>
<module>eXo</module>
<module>portal</module>
+ <module>dashboard</module>
</modules>
</project>