gatein SVN: r733 - tools/maven/dep/trunk.
by do-not-reply＠jboss.org
Author: thomas.heute(a)jboss.com
Date: 2009-11-20 10:38:56 -0500 (Fri, 20 Nov 2009)
New Revision: 733
Modified:
tools/maven/dep/trunk/pom.xml
Log:
[maven-release-plugin] prepare release 1.0.0-Beta03
Modified: tools/maven/dep/trunk/pom.xml
===================================================================
--- tools/maven/dep/trunk/pom.xml 2009-11-20 15:37:10 UTC (rev 732)
+++ tools/maven/dep/trunk/pom.xml 2009-11-20 15:38:56 UTC (rev 733)
@@ -8,7 +8,7 @@
<groupId>org.gatein</groupId>
<artifactId>gatein-dep</artifactId>
- <version>1.0.0-Beta03-SNAPSHOT</version>
+ <version>1.0.0-Beta03</version>
<packaging>pom</packaging>
<parent>
@@ -18,9 +18,9 @@
</parent>
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/tools/maven/dep/trunk/</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/tools/maven/dep/trunk/</developerConnection>
- <url>http://fisheye.jboss.org/browse/gatein/tools/maven/dep/trunk/</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/tools/maven/dep/tags/1.0.0-...</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/tools/maven/dep/tags/1.0.0-Beta03</developerConnection>
+ <url>http://fisheye.jboss.org/browse/gatein/tools/maven/dep/tags/1.0.0-Beta03</url>
</scm>
<properties>
@@ -43,8 +43,6 @@
<version.apache.tomcat>6.0.16</version.apache.tomcat>
<version.apache.commons-logging>1.1.1</version.apache.commons-logging>
<version.apache.commons-httpclient>3.0.1</version.apache.commons-httpclient>
- <version.apache.portals.bridges>1.0.4</version.apache.portals.bridges>
- <version.apache.taglibs>1.1.2</version.apache.taglibs>
<version.xerces>2.9.1</version.xerces>
<version.jboss.logging>2.0.4.GA</version.jboss.logging>
@@ -128,6 +126,11 @@
<artifactId>slf4j-api</artifactId>
<version>${version.slf4j}</version>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <version>${version.slf4j}</version>
+ </dependency>
<dependency>
<groupId>apache-log4j</groupId>
@@ -197,16 +200,6 @@
<version>${version.apache.tomcat}</version>
</dependency>
<dependency>
- <groupId>apache-taglibs</groupId>
- <artifactId>jstl</artifactId>
- <version>${version.apache.taglibs}</version>
- </dependency>
- <dependency>
- <groupId>apache-taglibs</groupId>
- <artifactId>standard</artifactId>
- <version>${version.apache.taglibs}</version>
- </dependency>
- <dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>${version.apache.commons-logging}</version>
@@ -331,12 +324,6 @@
</dependency>
<dependency>
- <groupId>org.apache.portals.bridges</groupId>
- <artifactId>portals-bridges-common</artifactId>
- <version>${version.apache.portals.bridges}</version>
- </dependency>
-
- <dependency>
<groupId>sun-jaxb</groupId>
<artifactId>jaxb-api</artifactId>
<version>${version.sun-jaxb}</version>
15 years, 1 month
gatein SVN: r732 - components/pc/trunk/test/src/test/java/org/gatein/pc/test/portlet/jsr168/api/portletcontext.
by do-not-reply＠jboss.org
Author: thomas.heute(a)jboss.com
Date: 2009-11-20 10:37:10 -0500 (Fri, 20 Nov 2009)
New Revision: 732
Modified:
components/pc/trunk/test/src/test/java/org/gatein/pc/test/portlet/jsr168/api/portletcontext/ServerInfoTestCase.java
Log:
GTNPC-12: PortalContext.VERSION is incorrect
Test wasn't passing
Modified: components/pc/trunk/test/src/test/java/org/gatein/pc/test/portlet/jsr168/api/portletcontext/ServerInfoTestCase.java
===================================================================
--- components/pc/trunk/test/src/test/java/org/gatein/pc/test/portlet/jsr168/api/portletcontext/ServerInfoTestCase.java 2009-11-20 13:04:13 UTC (rev 731)
+++ components/pc/trunk/test/src/test/java/org/gatein/pc/test/portlet/jsr168/api/portletcontext/ServerInfoTestCase.java 2009-11-20 15:37:10 UTC (rev 732)
@@ -47,7 +47,7 @@
{
/** . */
- private static final String VERSION_REGEX = "JBossPortletContainer/[0-9]+\\.[0-9]+(|\\.SNAPSHOT)";
+ private static final String VERSION_REGEX = "GateInPortletContainer/[0-9]+\\.[0-9]+(|\\.CR[0-9]{2})(|\\.SNAPSHOT)(|\\.ALPHA[0-9]{2})(|\\.BETA[0-9]{2})(|\\.SP[0-9]{2})(|\\.CP[0-9]{2})";
/** . */
private static final Pattern VERSION_PATTERN = Pattern.compile(VERSION_REGEX, Pattern.CASE_INSENSITIVE);
15 years, 1 month
gatein SVN: r731 - tools/packager/tags/1.0.0-Beta02/src/main/javascript/eXo/server.
by do-not-reply＠jboss.org
Author: dbaeli
Date: 2009-11-20 08:04:13 -0500 (Fri, 20 Nov 2009)
New Revision: 731
Modified:
tools/packager/tags/1.0.0-Beta02/src/main/javascript/eXo/server/Jboss.js
tools/packager/tags/1.0.0-Beta02/src/main/javascript/eXo/server/JbossEar.js
Log:
GTNPORTAL-73: hibernate package in the EAR (no clean-up)
Modified: tools/packager/tags/1.0.0-Beta02/src/main/javascript/eXo/server/Jboss.js
===================================================================
--- tools/packager/tags/1.0.0-Beta02/src/main/javascript/eXo/server/Jboss.js 2009-11-20 13:03:27 UTC (rev 730)
+++ tools/packager/tags/1.0.0-Beta02/src/main/javascript/eXo/server/Jboss.js 2009-11-20 13:04:13 UTC (rev 731)
@@ -86,7 +86,6 @@
// Remove hibernate libs for JBoss AS5
if (this.exoJBoss5) {
print("====================== JBOSS5 AS 5 ====================== ");
- product.removeDependencyByGroupId("org.hibernate");
product.removeDependency(new Project("org.jboss", "jbossxb", "jar", "2.0.0.GA"));
product.removeDependency(new Project("org.jboss.logging", "jboss-logging-spi", "jar", "2.0.5.GA"));
product.removeDependency(new Project("org.jboss", "jboss-common-core", "jar", "2.2.9.GA"));
Modified: tools/packager/tags/1.0.0-Beta02/src/main/javascript/eXo/server/JbossEar.js
===================================================================
--- tools/packager/tags/1.0.0-Beta02/src/main/javascript/eXo/server/JbossEar.js 2009-11-20 13:03:27 UTC (rev 730)
+++ tools/packager/tags/1.0.0-Beta02/src/main/javascript/eXo/server/JbossEar.js 2009-11-20 13:04:13 UTC (rev 731)
@@ -93,7 +93,6 @@
// Remove hibernate libs for JBoss AS5
if (this.exoJBoss5) {
print("====================== JBOSS5 AS 5 ====================== ");
- product.removeDependencyByGroupId("org.hibernate");
product.removeDependency(new Project("org.jboss", "jbossxb", "jar", "2.0.0.GA"));
product.removeDependency(new Project("org.jboss.logging", "jboss-logging-spi", "jar", "2.0.5.GA"));
product.removeDependency(new Project("org.jboss", "jboss-common-core", "jar", "2.2.9.GA"));
15 years, 1 month
gatein SVN: r730 - in components/pc/trunk: api and 11 other directories.
by do-not-reply＠jboss.org
Author: thomas.heute(a)jboss.com
Date: 2009-11-20 08:03:27 -0500 (Fri, 20 Nov 2009)
New Revision: 730
Modified:
components/pc/trunk/api/pom.xml
components/pc/trunk/bridge/pom.xml
components/pc/trunk/controller/pom.xml
components/pc/trunk/docs/pom.xml
components/pc/trunk/federation/pom.xml
components/pc/trunk/jsr168api/pom.xml
components/pc/trunk/management/pom.xml
components/pc/trunk/mc/pom.xml
components/pc/trunk/pom.xml
components/pc/trunk/portal/pom.xml
components/pc/trunk/portlet/pom.xml
components/pc/trunk/samples/pom.xml
components/pc/trunk/test/pom.xml
Log:
wrong padding
Modified: components/pc/trunk/api/pom.xml
===================================================================
--- components/pc/trunk/api/pom.xml 2009-11-20 13:01:59 UTC (rev 729)
+++ components/pc/trunk/api/pom.xml 2009-11-20 13:03:27 UTC (rev 730)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.1.0-CR1-SNAPSHOT</version>
+ <version>2.1.0-CR01-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.gatein.pc</groupId>
Modified: components/pc/trunk/bridge/pom.xml
===================================================================
--- components/pc/trunk/bridge/pom.xml 2009-11-20 13:01:59 UTC (rev 729)
+++ components/pc/trunk/bridge/pom.xml 2009-11-20 13:03:27 UTC (rev 730)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.1.0-CR1-SNAPSHOT</version>
+ <version>2.1.0-CR01-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-bridge</artifactId>
Modified: components/pc/trunk/controller/pom.xml
===================================================================
--- components/pc/trunk/controller/pom.xml 2009-11-20 13:01:59 UTC (rev 729)
+++ components/pc/trunk/controller/pom.xml 2009-11-20 13:03:27 UTC (rev 730)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.1.0-CR1-SNAPSHOT</version>
+ <version>2.1.0-CR01-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-controller</artifactId>
Modified: components/pc/trunk/docs/pom.xml
===================================================================
--- components/pc/trunk/docs/pom.xml 2009-11-20 13:01:59 UTC (rev 729)
+++ components/pc/trunk/docs/pom.xml 2009-11-20 13:03:27 UTC (rev 730)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.1.0-CR1-SNAPSHOT</version>
+ <version>2.1.0-CR01-SNAPSHOT</version>
</parent>
<artifactId>docs-aggregator</artifactId>
<packaging>pom</packaging>
Modified: components/pc/trunk/federation/pom.xml
===================================================================
--- components/pc/trunk/federation/pom.xml 2009-11-20 13:01:59 UTC (rev 729)
+++ components/pc/trunk/federation/pom.xml 2009-11-20 13:03:27 UTC (rev 730)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.1.0-CR1-SNAPSHOT</version>
+ <version>2.1.0-CR01-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-federation</artifactId>
Modified: components/pc/trunk/jsr168api/pom.xml
===================================================================
--- components/pc/trunk/jsr168api/pom.xml 2009-11-20 13:01:59 UTC (rev 729)
+++ components/pc/trunk/jsr168api/pom.xml 2009-11-20 13:03:27 UTC (rev 730)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.1.0-CR1-SNAPSHOT</version>
+ <version>2.1.0-CR01-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-jsr168api</artifactId>
Modified: components/pc/trunk/management/pom.xml
===================================================================
--- components/pc/trunk/management/pom.xml 2009-11-20 13:01:59 UTC (rev 729)
+++ components/pc/trunk/management/pom.xml 2009-11-20 13:03:27 UTC (rev 730)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.1.0-CR1-SNAPSHOT</version>
+ <version>2.1.0-CR01-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-management</artifactId>
Modified: components/pc/trunk/mc/pom.xml
===================================================================
--- components/pc/trunk/mc/pom.xml 2009-11-20 13:01:59 UTC (rev 729)
+++ components/pc/trunk/mc/pom.xml 2009-11-20 13:03:27 UTC (rev 730)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.1.0-CR1-SNAPSHOT</version>
+ <version>2.1.0-CR01-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-mc</artifactId>
Modified: components/pc/trunk/pom.xml
===================================================================
--- components/pc/trunk/pom.xml 2009-11-20 13:01:59 UTC (rev 729)
+++ components/pc/trunk/pom.xml 2009-11-20 13:03:27 UTC (rev 730)
@@ -6,7 +6,7 @@
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.1.0-CR1-SNAPSHOT</version>
+ <version>2.1.0-CR01-SNAPSHOT</version>
<packaging>pom</packaging>
<parent>
Modified: components/pc/trunk/portal/pom.xml
===================================================================
--- components/pc/trunk/portal/pom.xml 2009-11-20 13:01:59 UTC (rev 729)
+++ components/pc/trunk/portal/pom.xml 2009-11-20 13:03:27 UTC (rev 730)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.1.0-CR1-SNAPSHOT</version>
+ <version>2.1.0-CR01-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-portal</artifactId>
Modified: components/pc/trunk/portlet/pom.xml
===================================================================
--- components/pc/trunk/portlet/pom.xml 2009-11-20 13:01:59 UTC (rev 729)
+++ components/pc/trunk/portlet/pom.xml 2009-11-20 13:03:27 UTC (rev 730)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.1.0-CR1-SNAPSHOT</version>
+ <version>2.1.0-CR01-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-portlet</artifactId>
Modified: components/pc/trunk/samples/pom.xml
===================================================================
--- components/pc/trunk/samples/pom.xml 2009-11-20 13:01:59 UTC (rev 729)
+++ components/pc/trunk/samples/pom.xml 2009-11-20 13:03:27 UTC (rev 730)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.1.0-CR1-SNAPSHOT</version>
+ <version>2.1.0-CR01-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-samples</artifactId>
Modified: components/pc/trunk/test/pom.xml
===================================================================
--- components/pc/trunk/test/pom.xml 2009-11-20 13:01:59 UTC (rev 729)
+++ components/pc/trunk/test/pom.xml 2009-11-20 13:03:27 UTC (rev 730)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.1.0-CR1-SNAPSHOT</version>
+ <version>2.1.0-CR01-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-test</artifactId>
15 years, 1 month
gatein SVN: r729 - tools/packager/trunk.
by do-not-reply＠jboss.org
Author: dbaeli
Date: 2009-11-20 08:01:59 -0500 (Fri, 20 Nov 2009)
New Revision: 729
Modified:
tools/packager/trunk/pom.xml
Log:
[maven-release-plugin] rollback the release of 1.0.0-Beta02
Modified: tools/packager/trunk/pom.xml
===================================================================
--- tools/packager/trunk/pom.xml 2009-11-20 12:59:59 UTC (rev 728)
+++ tools/packager/trunk/pom.xml 2009-11-20 13:01:59 UTC (rev 729)
@@ -22,13 +22,13 @@
<parent>
<groupId>org.gatein</groupId>
<artifactId>gatein-parent</artifactId>
- <version>1.0.0-Beta04</version>
+ <version>1.0.0-Beta03</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.gatein.tools</groupId>
<artifactId>packager</artifactId>
- <version>1.0.0-Beta03-SNAPSHOT</version>
+ <version>1.0.0-Beta02-SNAPSHOT</version>
<name>GateIn Packager</name>
<packaging>pom</packaging>
<scm>
15 years, 1 month
gatein SVN: r728 - tools/packager/trunk/src/main/javascript/eXo/server.
by do-not-reply＠jboss.org
Author: dbaeli
Date: 2009-11-20 07:59:59 -0500 (Fri, 20 Nov 2009)
New Revision: 728
Modified:
tools/packager/trunk/src/main/javascript/eXo/server/Jboss.js
tools/packager/trunk/src/main/javascript/eXo/server/JbossEar.js
Log:
GTNPORTAL-73: hibernate package in the EAR (no clean-up)
Modified: tools/packager/trunk/src/main/javascript/eXo/server/Jboss.js
===================================================================
--- tools/packager/trunk/src/main/javascript/eXo/server/Jboss.js 2009-11-20 11:55:27 UTC (rev 727)
+++ tools/packager/trunk/src/main/javascript/eXo/server/Jboss.js 2009-11-20 12:59:59 UTC (rev 728)
@@ -86,7 +86,6 @@
// Remove hibernate libs for JBoss AS5
if (this.exoJBoss5) {
print("====================== JBOSS5 AS 5 ====================== ");
- product.removeDependencyByGroupId("org.hibernate");
product.removeDependency(new Project("org.jboss", "jbossxb", "jar", "2.0.0.GA"));
product.removeDependency(new Project("org.jboss.logging", "jboss-logging-spi", "jar", "2.0.5.GA"));
product.removeDependency(new Project("org.jboss", "jboss-common-core", "jar", "2.2.9.GA"));
Modified: tools/packager/trunk/src/main/javascript/eXo/server/JbossEar.js
===================================================================
--- tools/packager/trunk/src/main/javascript/eXo/server/JbossEar.js 2009-11-20 11:55:27 UTC (rev 727)
+++ tools/packager/trunk/src/main/javascript/eXo/server/JbossEar.js 2009-11-20 12:59:59 UTC (rev 728)
@@ -93,7 +93,6 @@
// Remove hibernate libs for JBoss AS5
if (this.exoJBoss5) {
print("====================== JBOSS5 AS 5 ====================== ");
- product.removeDependencyByGroupId("org.hibernate");
product.removeDependency(new Project("org.jboss", "jbossxb", "jar", "2.0.0.GA"));
product.removeDependency(new Project("org.jboss.logging", "jboss-logging-spi", "jar", "2.0.5.GA"));
product.removeDependency(new Project("org.jboss", "jboss-common-core", "jar", "2.2.9.GA"));
15 years, 1 month
gatein SVN: r727 - in portal/trunk: portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component and 1 other directory.
by do-not-reply＠jboss.org
Author: trong.tran
Date: 2009-11-20 06:55:27 -0500 (Fri, 20 Nov 2009)
New Revision: 727
Modified:
portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/registry/mop/MOPApplicationRegistryService.java
portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component/UIApplicationOrganizer.java
Log:
GTNPORTAL-241 The gadget name is registered wrongly to Application Registry
Modified: portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/registry/mop/MOPApplicationRegistryService.java
===================================================================
--- portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/registry/mop/MOPApplicationRegistryService.java 2009-11-20 09:39:56 UTC (rev 726)
+++ portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/registry/mop/MOPApplicationRegistryService.java 2009-11-20 11:55:27 UTC (rev 727)
@@ -317,7 +317,7 @@
{
String contentId = application.getContentId();
ContentType<?> contentType = application.getType().getContentType();
- String definitionName = application.getDisplayName().replace(' ', '_');
+ String definitionName = application.getApplicationName();
contentDef = categoryDef.createContent(definitionName, contentType, contentId);
}
else
Modified: portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component/UIApplicationOrganizer.java
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component/UIApplicationOrganizer.java 2009-11-20 09:39:56 UTC (rev 726)
+++ portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component/UIApplicationOrganizer.java 2009-11-20 11:55:27 UTC (rev 727)
@@ -240,14 +240,6 @@
UIApplicationOrganizer uiOrganizer = event.getSource();
ApplicationRegistryService service = uiOrganizer.getApplicationComponent(ApplicationRegistryService.class);
- // Remove preconfig application to prevent duplicating
- List<Application> preConfigApplications = service.getAllApplications();
- if (preConfigApplications!=null) {
- for (Application application : preConfigApplications) {
- service.remove(application);
- }
- }
-
service.importAllPortlets();
service.importExoGadgets();
uiOrganizer.reload();
15 years, 1 month
gatein SVN: r726 - in portal/trunk/portlet/dashboard/src/main: webapp/groovy/dashboard/webui/component and 1 other directory.
by do-not-reply＠jboss.org
Author: liem_nguyen
Date: 2009-11-20 04:39:56 -0500 (Fri, 20 Nov 2009)
New Revision: 726
Modified:
portal/trunk/portlet/dashboard/src/main/java/org/exoplatform/dashboard/webui/component/UITabPaneDashboard.java
portal/trunk/portlet/dashboard/src/main/webapp/groovy/dashboard/webui/component/UITabPaneDashboard.gtmpl
Log:
GTNPORTAL-243 Can't add new tan when create new page for dashboard
Modified: portal/trunk/portlet/dashboard/src/main/java/org/exoplatform/dashboard/webui/component/UITabPaneDashboard.java
===================================================================
--- portal/trunk/portlet/dashboard/src/main/java/org/exoplatform/dashboard/webui/component/UITabPaneDashboard.java 2009-11-20 09:35:42 UTC (rev 725)
+++ portal/trunk/portlet/dashboard/src/main/java/org/exoplatform/dashboard/webui/component/UITabPaneDashboard.java 2009-11-20 09:39:56 UTC (rev 726)
@@ -101,9 +101,10 @@
return null;
}
- public int getCurrentNumberOfTabs()
+ public int getCurrentNumberOfTabs() throws Exception
{
- return pageNavigation.getNodes().size();
+
+ return getSameSiblingsNode().size();
}
public int getStartShowIndex()
@@ -123,6 +124,19 @@
}
}
+ public List<PageNode> getSameSiblingsNode() throws Exception
+ {
+ List<PageNode> siblings = getPageNavigation().getNodes();
+ List<PageNode> selectedPath = Util.getUIPortal().getSelectedPaths();
+ if (selectedPath != null && selectedPath.size() > 1)
+ {
+ PageNode currentParent = selectedPath.get(selectedPath.size() - 2);
+ siblings = currentParent.getChildren();
+
+ }
+ return siblings;
+ }
+
public PageNavigation getPageNavigation() throws Exception
{
if (pageNavigation == null)
@@ -141,9 +155,16 @@
{
try
{
- ArrayList<PageNode> nodes = pageNavigation.getNodes();
- if (nodes.size() < 2)
+ List<PageNode> nodes = pageNavigation.getNodes();
+ PageNode parentNode = null;
+ List<PageNode> selectedPath = uiPortal.getSelectedPaths();
+ if (selectedPath != null && selectedPath.size() > 1)
{
+ parentNode = selectedPath.get(selectedPath.size() - 2);
+ nodes = parentNode.getChildren();
+ }
+ if (parentNode == null && nodes.size() < 2)
+ {
return null; // At the moment, we prevent user from deleting all the dashboard
}
PageNode tobeRemoved = nodes.get(nodeIndex);
@@ -181,6 +202,13 @@
pageNavigation.getOwnerId());
page.setTitle(nodeLabel);
+ List<PageNode> selectedPath = uiPortal.getSelectedPaths();
+ PageNode parentNode = null;
+ if (selectedPath != null && selectedPath.size() > 1)
+ {
+ parentNode = selectedPath.get(selectedPath.size() - 2);
+ }
+
PageNode pageNode = new PageNode();
pageNode.setLabel(nodeLabel);
String uniqueNodeName = nodeLabel.toLowerCase().replace(' ', '_');
@@ -189,18 +217,28 @@
uniqueNodeName = uniqueNodeName + "_" + System.currentTimeMillis();
}
+ String fullName = (parentNode != null) ? parentNode.getUri() + "/" + uniqueNodeName : uniqueNodeName;
+
page.setName(uniqueNodeName);
pageNode.setName(uniqueNodeName);
- pageNode.setUri(uniqueNodeName);
+ pageNode.setUri(fullName);
pageNode.setPageReference(page.getPageId());
- pageNavigation.addNode(pageNode);
+ if (parentNode == null)
+ {
+ pageNavigation.addNode(pageNode);
+ }
+ else if (parentNode.getChildren() != null)
+ {
+ parentNode.getChildren().add(pageNode);
+ }
+
uiPortal.setSelectedNode(pageNode);
configService.create(page);
configService.update(pageNavigation);
- return uniqueNodeName;
+ return fullName;
}
catch (Exception ex)
{
@@ -248,7 +286,15 @@
{
try
{
- ArrayList<PageNode> nodes = pageNavigation.getNodes();
+ List<PageNode> nodes = pageNavigation.getNodes();
+ List<PageNode> selectedPath = uiPortal.getSelectedPaths();
+ PageNode parentNode = null;
+ if (selectedPath != null && selectedPath.size() > 1)
+ {
+ parentNode = selectedPath.get(selectedPath.size() - 2);
+ nodes = parentNode.getChildren();
+ }
+
PageNode renamedNode = nodes.get(nodeIndex);
if (renamedNode == null || newNodeLabel.length() == 0)
{
@@ -263,10 +309,13 @@
newNodeName = newNodeName + "_" + System.currentTimeMillis();
}
renamedNode.setName(newNodeName);
- renamedNode.setUri(newNodeName);
+ String newUri = (parentNode != null) ? parentNode.getUri() + "/" + newNodeName : newNodeName;
+
+ renamedNode.setUri(newUri);
+
configService.update(pageNavigation);
- return newNodeName;
+ return newUri;
}
catch (Exception ex)
{
@@ -311,7 +360,11 @@
{
UITabPaneDashboard source = event.getSource();
WebuiRequestContext context = event.getRequestContext();
- if (source.getCurrentNumberOfTabs() == 1)
+ List<PageNode> path = Util.getUIPortal().getSelectedPaths();
+ boolean isRoot = true;
+ if (path != null && path.size() > 1)
+ isRoot = false;
+ if (isRoot && source.getCurrentNumberOfTabs() == 1)
{
source.getAncestorOfType(UIApplication.class).addMessage(
new ApplicationMessage("UITabPaneDashboard.msg.cannotDeleteLastTab", null));
@@ -324,7 +377,7 @@
if (selectedNode != null)
{
PortalRequestContext prContext = Util.getPortalRequestContext();
- prContext.getResponse().sendRedirect(prContext.getPortalURI() + selectedNode.getName());
+ prContext.getResponse().sendRedirect(prContext.getPortalURI() + selectedNode.getUri());
}
}
}
@@ -341,13 +394,13 @@
context.getUIApplication().addMessage(new ApplicationMessage("UITabPaneDashboard.msg.wrongTabName", null));
return;
}
- String newNodeName = tabPane.createNewPageNode(newTabLabel);
+ String uri = tabPane.createNewPageNode(newTabLabel);
//If new node is created with success, then redirect to it
- if (newNodeName != null)
+ if (uri != null)
{
PortalRequestContext prContext = Util.getPortalRequestContext();
- prContext.getResponse().sendRedirect(prContext.getPortalURI() + newNodeName);
+ prContext.getResponse().sendRedirect(prContext.getPortalURI() + uri);
}
}
}
@@ -375,13 +428,13 @@
context.getUIApplication().addMessage(new ApplicationMessage("UITabPaneDashboard.msg.wrongTabName", null));
return;
}
- String newNodeName = tabPane.renamePageNode(nodeIndex, newTabLabel);
+ String newUri = tabPane.renamePageNode(nodeIndex, newTabLabel);
//If page node is renamed with success, then redirect to new URL
- if (newNodeName != null)
+ if (newUri != null)
{
PortalRequestContext prContext = Util.getPortalRequestContext();
- prContext.getResponse().sendRedirect(prContext.getPortalURI() + newNodeName);
+ prContext.getResponse().sendRedirect(prContext.getPortalURI() + newUri);
}
}
}
Modified: portal/trunk/portlet/dashboard/src/main/webapp/groovy/dashboard/webui/component/UITabPaneDashboard.gtmpl
===================================================================
--- portal/trunk/portlet/dashboard/src/main/webapp/groovy/dashboard/webui/component/UITabPaneDashboard.gtmpl 2009-11-20 09:35:42 UTC (rev 725)
+++ portal/trunk/portlet/dashboard/src/main/webapp/groovy/dashboard/webui/component/UITabPaneDashboard.gtmpl 2009-11-20 09:39:56 UTC (rev 726)
@@ -7,8 +7,9 @@
import org.exoplatform.portal.application.PortalRequestContext;
import org.exoplatform.web.application.JavascriptManager;
- PageNavigation pageNavigation = uicomponent.getPageNavigation();
- ArrayList<PageNode> nodes = pageNavigation.getNodes();
+ //PageNavigation pageNavigation = uicomponent.getPageNavigation();
+ //ArrayList<PageNode> nodes = pageNavigation.getNodes();
+ ArrayList<PageNode> nodes = uicomponent.getSameSiblingsNode();
def tabNbs = nodes.size();
PortalRequestContext pcontext = Util.getPortalRequestContext();
@@ -56,7 +57,7 @@
<div class="LeftTab">
<div class="RightTab">
<div class="MiddleTab">
- <a href="<%= portalURI + node.getName(); %>"><span>$tabLabel</span></a>
+ <a href="<%= portalURI + node.getUri(); %>"><span>$tabLabel</span></a>
<a href="<%= uicomponent.url("DeleteTab",param); %>">
<img class="CloseIcon" src="/eXoResources/skin/sharedImages/Blank.gif" alt="DEL" />
</a>
15 years, 1 month
gatein SVN: r725 - in portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIToolbarContainer: background and 1 other directory.
by do-not-reply＠jboss.org
Author: thuy.nguyen
Date: 2009-11-20 04:35:42 -0500 (Fri, 20 Nov 2009)
New Revision: 725
Modified:
portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIToolbarContainer/Stylesheet.css
portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIToolbarContainer/background/ToolbarContainer.gif
Log:
GTNPORTAL-266: Error displaying when change icon for page ( node)
Modified: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIToolbarContainer/Stylesheet.css
===================================================================
--- portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIToolbarContainer/Stylesheet.css 2009-11-20 07:34:48 UTC (rev 724)
+++ portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIToolbarContainer/Stylesheet.css 2009-11-20 09:35:42 UTC (rev 725)
@@ -121,79 +121,81 @@
.UIToolbarContainer .MenuItem .ArrowIcon {
background: url('background/ToolbarContainer.gif') no-repeat right bottom; /* orientation=lt */
- background: url('background/ToolbarContainer-rt.gif') no-repeat left bottom; /* orientation=rt */
+ background: url('background/ToolbarContainer-rt.gif') no-repeat 5px bottom; /* orientation=rt */
}
.UIToolbarContainer .MenuItem a {
- padding-right: 15px; /* orientation=lt */
- padding-left: 15px; /* orientation=rt */
+ padding-right: 25px; /* orientation=lt */
+ padding-left: 25px; /* orientation=rt */
}
-.UIToolbarContainer .MenuItem .DefaultPageIcon {
+.UIToolbarContainer .ItemIcon {
background-position: 10px center; /* orientation=lt */
- background-position: 90% center; /* orientation=rt */
+ background-position: 95% center; /* orientation=rt */
}
/**********************************/
.UIToolbarContainer .DashboardIcon {
- background: url('background/ToolbarContainer.gif') no-repeat left -64px; /* orientation=lt */
- background: url('background/ToolbarContainer.gif') no-repeat right -64px; /* orientation=rt */
+ background: url('background/ToolbarContainer.gif') no-repeat 5px -64px; /* orientation=lt */
+ background: url('background/ToolbarContainer.gif') no-repeat 100% -64px; /* orientation=rt */
}
.UIToolbarContainer .SiteIcon {
- background: url('background/ToolbarContainer.gif') no-repeat left -96px; /* orientation=lt */
- background: url('background/ToolbarContainer.gif') no-repeat right -96px; /* orientation=rt */
+ background: url('background/ToolbarContainer.gif') no-repeat 5px -96px; /* orientation=lt */
+ background: url('background/ToolbarContainer.gif') no-repeat 100% -96px; /* orientation=rt */
}
.UIToolbarContainer .SitesIcon {
- background: url('background/ToolbarContainer.gif') no-repeat left -96px; /* orientation=lt */
- background: url('background/ToolbarContainer.gif') no-repeat right -96px; /* orientation=rt */
+ background: url('background/ToolbarContainer.gif') no-repeat 5px -96px; /* orientation=lt */
+ background: url('background/ToolbarContainer.gif') no-repeat 100% -96px; /* orientation=rt */
}
.UIToolbarContainer .GroupIcon {
background: url('background/ToolbarContainer.gif') no-repeat left -128px; /* orientation=lt */
- background: url('background/ToolbarContainer.gif') no-repeat right -128px; /* orientation=rt */
+ background: url('background/ToolbarContainer.gif') no-repeat 100% -128px; /* orientation=rt */
+ margin-left: 10px; /* orientation=lt */
+ margin-right: 10px; /* orientation=rt */
}
.UIToolbarContainer .EditorIcon {
- background: url('background/ToolbarContainer.gif') no-repeat left -161px; /* orientation=lt */
- background: url('background/ToolbarContainer.gif') no-repeat right -161px; /* orientation=rt */
+ background: url('background/ToolbarContainer.gif') no-repeat 5px -161px; /* orientation=lt */
+ background: url('background/ToolbarContainer.gif') no-repeat 100% -161px; /* orientation=rt */
}
.UIToolbarContainer .AddPageIcon {
- background: url('background/ToolbarContainer.gif') no-repeat left -320px; /* orientation=lt */
- background: url('background/ToolbarContainer.gif') no-repeat right -320px; /* orientation=rt */
+ background: url('background/ToolbarContainer.gif') no-repeat 5px -320px; /* orientation=lt */
+ background: url('background/ToolbarContainer.gif') no-repeat 100% -320px; /* orientation=rt */
}
.UIToolbarContainer .EditPageIcon {
- background: url('background/ToolbarContainer.gif') no-repeat left -352px; /* orientation=lt */
- background: url('background/ToolbarContainer.gif') no-repeat right -352px; /* orientation=rt */
+ background: url('background/ToolbarContainer.gif') no-repeat 5px -352px; /* orientation=lt */
+ background: url('background/ToolbarContainer.gif') no-repeat 100% -352px; /* orientation=rt */
}
.UIToolbarContainer .EditSiteIcon {
- background: url('background/ToolbarContainer.gif') no-repeat left -384px; /* orientation=lt */
- background: url('background/ToolbarContainer.gif') no-repeat right -384px; /* orientation=rt */
+ background: url('background/ToolbarContainer.gif') no-repeat 5px -384px; /* orientation=lt */
+ background: url('background/ToolbarContainer.gif') no-repeat 100% -384px; /* orientation=rt */
}
.UIToolbarContainer .ChangeLanguageIcon {
- background: url('background/ToolbarContainer.gif') no-repeat left -192px; /* orientation=lt */
- background: url('background/ToolbarContainer.gif') no-repeat right -192px; /* orientation=rt */
+ background: url('background/ToolbarContainer.gif') no-repeat 5px -192px; /* orientation=lt */
+ background: url('background/ToolbarContainer.gif') no-repeat 100% -192px; /* orientation=rt */
}
.UIToolbarContainer .ChangeSkinIcon {
- background: url('background/ToolbarContainer.gif') no-repeat left -224px; /* orientation=lt */
- background: url('background/ToolbarContainer.gif') no-repeat right -224px; /* orientation=rt */
+ background: url('background/ToolbarContainer.gif') no-repeat 5px -224px; /* orientation=lt */
+ background: url('background/ToolbarContainer.gif') no-repeat 100% -224px; /* orientation=rt */
}
.UIToolbarContainer .AccountSettingIcon {
- background: url('background/ToolbarContainer.gif') no-repeat left -256px; /* orientation=lt */
- background: url('background/ToolbarContainer.gif') no-repeat right -256px; /* orientation=rt */
+ background: url('background/ToolbarContainer.gif') no-repeat 5px -256px; /* orientation=lt */
+ background: url('background/ToolbarContainer.gif') no-repeat 100% -256px; /* orientation=rt */
}
.UIToolbarContainer .SignOutIcon {
- background: url('background/ToolbarContainer.gif') no-repeat left -288px; /* orientation=lt */
- background: url('background/ToolbarContainer.gif') no-repeat right -288px; /* orientation=rt */
+ background: url('background/ToolbarContainer.gif') no-repeat 5px -288px; /* orientation=lt */
+ background: url('background/ToolbarContainer.gif') no-repeat 100% -288px; /* orientation=rt */
}
.UIToolbarContainer .Name a {
Modified: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIToolbarContainer/background/ToolbarContainer.gif
===================================================================
(Binary files differ)
15 years, 1 month
gatein SVN: r724 - portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/classic.
by do-not-reply＠jboss.org
Author: tan_pham_dinh
Date: 2009-11-20 02:34:48 -0500 (Fri, 20 Nov 2009)
New Revision: 724
Modified:
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/classic/pages.xml
Log:
GTNPORTAL-227: Wrong sitemap preferences
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/classic/pages.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/classic/pages.xml 2009-11-20 07:02:31 UTC (rev 723)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/classic/pages.xml 2009-11-20 07:34:48 UTC (rev 724)
@@ -103,13 +103,6 @@
<portlet>
<application-ref>web</application-ref>
<portlet-ref>SiteMapPortlet</portlet-ref>
- <preferences>
- <preference>
- <name>url</name>
- <value>http://www.facebook.com</value>
- <read-only>false</read-only>
- </preference>
- </preferences>
</portlet>
<title>SiteMap</title>
<access-permissions>Everyone</access-permissions>
15 years, 1 month