gatein SVN: r4855 - in epp/portal/branches/EPP_5_1_Branch/component/portal/src: main/resources and 2 other directories.
by do-not-reply＠jboss.org
Author: thomas.heute(a)jboss.com
Date: 2010-10-27 06:36:41 -0400 (Wed, 27 Oct 2010)
New Revision: 4855
Added:
epp/portal/branches/EPP_5_1_Branch/component/portal/src/main/java/org/exoplatform/portal/config/serialize/JibxStringSerialize.java
Modified:
epp/portal/branches/EPP_5_1_Branch/component/portal/src/main/resources/binding.xml
epp/portal/branches/EPP_5_1_Branch/component/portal/src/test/java/org/exoplatform/portal/config/TestJIBXXmlMapping.java
epp/portal/branches/EPP_5_1_Branch/component/portal/src/test/resources/portal/portal/classic/navigation.xml
Log:
JBEPP-583: Content of page-reference element in navigation.xml should be trimmed when read in
Copied: epp/portal/branches/EPP_5_1_Branch/component/portal/src/main/java/org/exoplatform/portal/config/serialize/JibxStringSerialize.java (from rev 4429, portal/branches/branch-GTNPORTAL-1493/component/portal/src/main/java/org/exoplatform/portal/config/serialize/JibxStringSerialize.java)
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/component/portal/src/main/java/org/exoplatform/portal/config/serialize/JibxStringSerialize.java (rev 0)
+++ epp/portal/branches/EPP_5_1_Branch/component/portal/src/main/java/org/exoplatform/portal/config/serialize/JibxStringSerialize.java 2010-10-27 10:36:41 UTC (rev 4855)
@@ -0,0 +1,35 @@
+/*
+ * Copyright (C) 2003-2010 eXo Platform SAS.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Affero General Public License
+ * as published by the Free Software Foundation; either version 3
+ * of the License, or (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see<http://www.gnu.org/licenses/>.
+ */
+package org.exoplatform.portal.config.serialize;
+
+/**
+ * Created by The eXo Platform SAS
+ * Author : Vu Viet Phuong
+ * phuong_vu(a)exoplatform.com
+ * Sep 29, 2010
+ */
+public class JibxStringSerialize
+{
+ public static String deserializeString(String untrimmed)
+ {
+ if (untrimmed == null)
+ {
+ return null;
+ }
+ return untrimmed.trim();
+ }
+}
Modified: epp/portal/branches/EPP_5_1_Branch/component/portal/src/main/resources/binding.xml
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/component/portal/src/main/resources/binding.xml 2010-10-27 10:24:33 UTC (rev 4854)
+++ epp/portal/branches/EPP_5_1_Branch/component/portal/src/main/resources/binding.xml 2010-10-27 10:36:41 UTC (rev 4855)
@@ -97,7 +97,8 @@
<value name="start-publication-date" field="startPublicationDate" usage="optional"/>
<value name="end-publication-date" field="endPublicationDate" usage="optional"/>
<value name="visibility" field="visibility" usage="optional" default="DISPLAYED"/>
- <value name="page-reference" field="pageReference" usage="optional"/>
+ <value name="page-reference" field="pageReference" usage="optional"
+ deserializer="org.exoplatform.portal.config.serialize.JibxStringSerialize.deserializeString"/>
<collection field="children" usage="optional" item-type="org.exoplatform.portal.config.model.PageNode"/>
</mapping>
@@ -146,6 +147,5 @@
<collection field="preferences"
item-type="org.exoplatform.portal.application.Preference"/>
<structure name="preferences-validator" usage="optional"/>
- </mapping>
-
+ </mapping>
</binding>
Modified: epp/portal/branches/EPP_5_1_Branch/component/portal/src/test/java/org/exoplatform/portal/config/TestJIBXXmlMapping.java
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/component/portal/src/test/java/org/exoplatform/portal/config/TestJIBXXmlMapping.java 2010-10-27 10:24:33 UTC (rev 4854)
+++ epp/portal/branches/EPP_5_1_Branch/component/portal/src/test/java/org/exoplatform/portal/config/TestJIBXXmlMapping.java 2010-10-27 10:36:41 UTC (rev 4855)
@@ -82,6 +82,9 @@
Object obj =
uctx.unmarshalDocument(new FileInputStream("src/test/resources/portal/portal/classic/navigation.xml"), null);
assertEquals(PageNavigation.class, obj.getClass());
+
+ PageNavigation pageNavigation = (PageNavigation)obj;
+ assertEquals("portal::classic::homepage", pageNavigation.getNode("home").getPageReference());
IMarshallingContext mctx = bfact.createMarshallingContext();
mctx.setIndent(2);
Modified: epp/portal/branches/EPP_5_1_Branch/component/portal/src/test/resources/portal/portal/classic/navigation.xml
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/component/portal/src/test/resources/portal/portal/classic/navigation.xml 2010-10-27 10:24:33 UTC (rev 4854)
+++ epp/portal/branches/EPP_5_1_Branch/component/portal/src/test/resources/portal/portal/classic/navigation.xml 2010-10-27 10:36:41 UTC (rev 4855)
@@ -30,7 +30,9 @@
<uri>home</uri>
<name>home</name>
<label>#{portal.classic.home}</label>
- <page-reference>portal::classic::homepage</page-reference>
+ <page-reference>
+ portal::classic::homepage
+ </page-reference>
</node>
<node>
<uri>webexplorer</uri>
13 years, 8 months
- 1
- 0
gatein SVN: r4854 - in epp/portal/branches/EPP_5_1_Branch/component/identity/src: test/java/org/exoplatform/services/organization and 1 other directory.
by do-not-reply＠jboss.org
Author: thomas.heute(a)jboss.com
Date: 2010-10-27 06:24:33 -0400 (Wed, 27 Oct 2010)
New Revision: 4854
Modified:
epp/portal/branches/EPP_5_1_Branch/component/identity/src/main/java/org/exoplatform/services/organization/idm/MembershipDAOImpl.java
epp/portal/branches/EPP_5_1_Branch/component/identity/src/test/java/org/exoplatform/services/organization/TestOrganizationService.java
Log:
JBEPP-582: A MembershipType is automatically created if missing while making a membership link
Modified: epp/portal/branches/EPP_5_1_Branch/component/identity/src/main/java/org/exoplatform/services/organization/idm/MembershipDAOImpl.java
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/component/identity/src/main/java/org/exoplatform/services/organization/idm/MembershipDAOImpl.java 2010-10-27 09:59:57 UTC (rev 4853)
+++ epp/portal/branches/EPP_5_1_Branch/component/identity/src/main/java/org/exoplatform/services/organization/idm/MembershipDAOImpl.java 2010-10-27 10:24:33 UTC (rev 4854)
@@ -102,6 +102,11 @@
+ " because membership type is null");
}
+ if (orgService.getMembershipTypeHandler().findMembershipType(mt.getName()) == null)
+ {
+ throw new InvalidNameException("MembershipType doesn't exist: " + mt.getName());
+ }
+
String plGroupName = getPLIDMGroupName(g.getGroupName());
String groupId =
Modified: epp/portal/branches/EPP_5_1_Branch/component/identity/src/test/java/org/exoplatform/services/organization/TestOrganizationService.java
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/component/identity/src/test/java/org/exoplatform/services/organization/TestOrganizationService.java 2010-10-27 09:59:57 UTC (rev 4853)
+++ epp/portal/branches/EPP_5_1_Branch/component/identity/src/test/java/org/exoplatform/services/organization/TestOrganizationService.java 2010-10-27 10:24:33 UTC (rev 4854)
@@ -340,6 +340,7 @@
mt = mtHandler_.createMembershipTypeInstance();
mt.setName("membershipType3");
+ mtHandler_.createMembershipType(mt, true);
membershipHandler_.linkMembership(userBenj, group2, mt, true);
/*
@@ -491,6 +492,37 @@
// userHandler_.removeUser(user.getUserName(), false);
// }
+ public void testLinkMembership() throws Exception {
+ String g1 = "grp1";
+ String usr1 = "usr1";
+ String mstype1 = "mstype1";
+
+ Group group1 = groupHandler_.createGroupInstance();
+ group1.setGroupName(g1);
+ groupHandler_.addChild(null, group1, true);
+
+ User user = createUser(usr1);
+
+ MembershipType mt = mtHandler_.createMembershipTypeInstance();
+ mt.setName(mstype1);
+
+ try {
+
+ membershipHandler_.linkMembership(user, group1, mt, true);
+ fail();
+ }
+ catch (Exception e)
+ {
+ //expected as membership type was not created first
+ }
+
+ assertNull(mtHandler_.findMembershipType(mstype1));
+
+ userHandler_.removeUser(usr1, true);
+ groupHandler_.removeGroup(group1, true);
+ }
+
+
public void testFindUsersByGroupId() throws Exception
{
PageList users = userHandler_.findUsersByGroup("/users");
13 years, 8 months
- 1
- 0
gatein SVN: r4853 - portal/branches/branch-GTNPORTAL-1592/portlet/exoadmin/src/main/webapp/skin/applicationregistry/webui/component/UIApplicationRegistryPortlet.
by do-not-reply＠jboss.org
Author: kien_nguyen
Date: 2010-10-27 05:59:57 -0400 (Wed, 27 Oct 2010)
New Revision: 4853
Modified:
portal/branches/branch-GTNPORTAL-1592/portlet/exoadmin/src/main/webapp/skin/applicationregistry/webui/component/UIApplicationRegistryPortlet/DefaultStylesheet.css
Log:
GTNPORTAL-1235 Little error in View URL of a gadget detail when URL of gadget have length with Russian language
Modified: portal/branches/branch-GTNPORTAL-1592/portlet/exoadmin/src/main/webapp/skin/applicationregistry/webui/component/UIApplicationRegistryPortlet/DefaultStylesheet.css
===================================================================
--- portal/branches/branch-GTNPORTAL-1592/portlet/exoadmin/src/main/webapp/skin/applicationregistry/webui/component/UIApplicationRegistryPortlet/DefaultStylesheet.css 2010-10-27 09:07:32 UTC (rev 4852)
+++ portal/branches/branch-GTNPORTAL-1592/portlet/exoadmin/src/main/webapp/skin/applicationregistry/webui/component/UIApplicationRegistryPortlet/DefaultStylesheet.css 2010-10-27 09:59:57 UTC (rev 4853)
@@ -354,7 +354,8 @@
font-size: 11px;
color: black;
text-align: right; /* orientation=lt */
- text-align: left; /* orientation=rt */
+ text-align: left; /* orientation=rt */
+ word-wrap: break-word;
}
.UIApplicationRegistryPortlet .ApplicationContentLabel .RightLabel {
13 years, 8 months
- 1
- 0
gatein SVN: r4852 - in exo/portal/branches/3.1.5-PLF-perf: component and 72 other directories.
by do-not-reply＠jboss.org
Author: aheritier
Date: 2010-10-27 05:07:32 -0400 (Wed, 27 Oct 2010)
New Revision: 4852
Modified:
exo/portal/branches/3.1.5-PLF-perf/component/application-registry/pom.xml
exo/portal/branches/3.1.5-PLF-perf/component/common/pom.xml
exo/portal/branches/3.1.5-PLF-perf/component/dashboard/pom.xml
exo/portal/branches/3.1.5-PLF-perf/component/identity/pom.xml
exo/portal/branches/3.1.5-PLF-perf/component/management/pom.xml
exo/portal/branches/3.1.5-PLF-perf/component/pc/pom.xml
exo/portal/branches/3.1.5-PLF-perf/component/pom.xml
exo/portal/branches/3.1.5-PLF-perf/component/portal/pom.xml
exo/portal/branches/3.1.5-PLF-perf/component/resources/pom.xml
exo/portal/branches/3.1.5-PLF-perf/component/scripting/pom.xml
exo/portal/branches/3.1.5-PLF-perf/component/test/core/pom.xml
exo/portal/branches/3.1.5-PLF-perf/component/test/jcr/pom.xml
exo/portal/branches/3.1.5-PLF-perf/component/test/organization/pom.xml
exo/portal/branches/3.1.5-PLF-perf/component/test/pom.xml
exo/portal/branches/3.1.5-PLF-perf/component/web/pom.xml
exo/portal/branches/3.1.5-PLF-perf/component/wsrp/pom.xml
exo/portal/branches/3.1.5-PLF-perf/component/xml-parser/pom.xml
exo/portal/branches/3.1.5-PLF-perf/docs/pom.xml
exo/portal/branches/3.1.5-PLF-perf/docs/reference-guide/pom.xml
exo/portal/branches/3.1.5-PLF-perf/docs/user-guide/pom.xml
exo/portal/branches/3.1.5-PLF-perf/examples/extension/config/pom.xml
exo/portal/branches/3.1.5-PLF-perf/examples/extension/ear/pom.xml
exo/portal/branches/3.1.5-PLF-perf/examples/extension/jar/pom.xml
exo/portal/branches/3.1.5-PLF-perf/examples/extension/pom.xml
exo/portal/branches/3.1.5-PLF-perf/examples/extension/war/pom.xml
exo/portal/branches/3.1.5-PLF-perf/examples/pom.xml
exo/portal/branches/3.1.5-PLF-perf/examples/portal/config/pom.xml
exo/portal/branches/3.1.5-PLF-perf/examples/portal/ear/pom.xml
exo/portal/branches/3.1.5-PLF-perf/examples/portal/jar/pom.xml
exo/portal/branches/3.1.5-PLF-perf/examples/portal/pom.xml
exo/portal/branches/3.1.5-PLF-perf/examples/portal/rest-war/pom.xml
exo/portal/branches/3.1.5-PLF-perf/examples/portal/war/pom.xml
exo/portal/branches/3.1.5-PLF-perf/examples/portlets/jsfhellouser/pom.xml
exo/portal/branches/3.1.5-PLF-perf/examples/portlets/jsphellouser/pom.xml
exo/portal/branches/3.1.5-PLF-perf/examples/portlets/pom.xml
exo/portal/branches/3.1.5-PLF-perf/examples/portlets/simplesthelloworld/pom.xml
exo/portal/branches/3.1.5-PLF-perf/examples/portlets/struts-jpetstore/pom.xml
exo/portal/branches/3.1.5-PLF-perf/examples/skins/pom.xml
exo/portal/branches/3.1.5-PLF-perf/examples/skins/simpleskin/pom.xml
exo/portal/branches/3.1.5-PLF-perf/gadgets/core/pom.xml
exo/portal/branches/3.1.5-PLF-perf/gadgets/eXoGadgets/pom.xml
exo/portal/branches/3.1.5-PLF-perf/gadgets/pom.xml
exo/portal/branches/3.1.5-PLF-perf/gadgets/server/pom.xml
exo/portal/branches/3.1.5-PLF-perf/packaging/module/pom.xml
exo/portal/branches/3.1.5-PLF-perf/packaging/pkg/pom.xml
exo/portal/branches/3.1.5-PLF-perf/packaging/pom.xml
exo/portal/branches/3.1.5-PLF-perf/packaging/product/pom.xml
exo/portal/branches/3.1.5-PLF-perf/packaging/reports/pom.xml
exo/portal/branches/3.1.5-PLF-perf/pom.xml
exo/portal/branches/3.1.5-PLF-perf/portlet/dashboard/pom.xml
exo/portal/branches/3.1.5-PLF-perf/portlet/exoadmin/pom.xml
exo/portal/branches/3.1.5-PLF-perf/portlet/pom.xml
exo/portal/branches/3.1.5-PLF-perf/portlet/web/pom.xml
exo/portal/branches/3.1.5-PLF-perf/server/jboss/patch-ear/pom.xml
exo/portal/branches/3.1.5-PLF-perf/server/jboss/plugin/pom.xml
exo/portal/branches/3.1.5-PLF-perf/server/jboss/pom.xml
exo/portal/branches/3.1.5-PLF-perf/server/pom.xml
exo/portal/branches/3.1.5-PLF-perf/server/tomcat/patch/pom.xml
exo/portal/branches/3.1.5-PLF-perf/server/tomcat/plugin/pom.xml
exo/portal/branches/3.1.5-PLF-perf/server/tomcat/pom.xml
exo/portal/branches/3.1.5-PLF-perf/starter/ear/pom.xml
exo/portal/branches/3.1.5-PLF-perf/starter/pom.xml
exo/portal/branches/3.1.5-PLF-perf/starter/war/pom.xml
exo/portal/branches/3.1.5-PLF-perf/testsuite/pom.xml
exo/portal/branches/3.1.5-PLF-perf/testsuite/selenium-snifftests/pom.xml
exo/portal/branches/3.1.5-PLF-perf/testsuite/webuibasedsamples/pom.xml
exo/portal/branches/3.1.5-PLF-perf/web/eXoResources/pom.xml
exo/portal/branches/3.1.5-PLF-perf/web/pom.xml
exo/portal/branches/3.1.5-PLF-perf/web/portal/pom.xml
exo/portal/branches/3.1.5-PLF-perf/web/rest/pom.xml
exo/portal/branches/3.1.5-PLF-perf/webui/core/pom.xml
exo/portal/branches/3.1.5-PLF-perf/webui/eXo/pom.xml
exo/portal/branches/3.1.5-PLF-perf/webui/pom.xml
exo/portal/branches/3.1.5-PLF-perf/webui/portal/pom.xml
Log:
[SWF-578] Create perf branch from 3.0.1
Modified: exo/portal/branches/3.1.5-PLF-perf/component/application-registry/pom.xml
===================================================================
--- exo/portal/branches/3.1.5-PLF-perf/component/application-registry/pom.xml 2010-10-27 08:04:59 UTC (rev 4851)
+++ exo/portal/branches/3.1.5-PLF-perf/component/application-registry/pom.xml 2010-10-27 09:07:32 UTC (rev 4852)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component</artifactId>
- <version>3.1.5-PLF</version>
+ <version>3.1.6-PLF-PERF-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/3.1.5-PLF-perf/component/common/pom.xml
===================================================================
--- exo/portal/branches/3.1.5-PLF-perf/component/common/pom.xml 2010-10-27 08:04:59 UTC (rev 4851)
+++ exo/portal/branches/3.1.5-PLF-perf/component/common/pom.xml 2010-10-27 09:07:32 UTC (rev 4852)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component</artifactId>
- <version>3.1.5-PLF</version>
+ <version>3.1.6-PLF-PERF-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>exo.portal.component.common</artifactId>
Modified: exo/portal/branches/3.1.5-PLF-perf/component/dashboard/pom.xml
===================================================================
--- exo/portal/branches/3.1.5-PLF-perf/component/dashboard/pom.xml 2010-10-27 08:04:59 UTC (rev 4851)
+++ exo/portal/branches/3.1.5-PLF-perf/component/dashboard/pom.xml 2010-10-27 09:07:32 UTC (rev 4852)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component</artifactId>
- <version>3.1.5-PLF</version>
+ <version>3.1.6-PLF-PERF-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/3.1.5-PLF-perf/component/identity/pom.xml
===================================================================
--- exo/portal/branches/3.1.5-PLF-perf/component/identity/pom.xml 2010-10-27 08:04:59 UTC (rev 4851)
+++ exo/portal/branches/3.1.5-PLF-perf/component/identity/pom.xml 2010-10-27 09:07:32 UTC (rev 4852)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component</artifactId>
- <version>3.1.5-PLF</version>
+ <version>3.1.6-PLF-PERF-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/3.1.5-PLF-perf/component/management/pom.xml
===================================================================
--- exo/portal/branches/3.1.5-PLF-perf/component/management/pom.xml 2010-10-27 08:04:59 UTC (rev 4851)
+++ exo/portal/branches/3.1.5-PLF-perf/component/management/pom.xml 2010-10-27 09:07:32 UTC (rev 4852)
@@ -21,7 +21,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component</artifactId>
- <version>3.1.5-PLF</version>
+ <version>3.1.6-PLF-PERF-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/3.1.5-PLF-perf/component/pc/pom.xml
===================================================================
--- exo/portal/branches/3.1.5-PLF-perf/component/pc/pom.xml 2010-10-27 08:04:59 UTC (rev 4851)
+++ exo/portal/branches/3.1.5-PLF-perf/component/pc/pom.xml 2010-10-27 09:07:32 UTC (rev 4852)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component</artifactId>
- <version>3.1.5-PLF</version>
+ <version>3.1.6-PLF-PERF-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/3.1.5-PLF-perf/component/pom.xml
===================================================================
--- exo/portal/branches/3.1.5-PLF-perf/component/pom.xml 2010-10-27 08:04:59 UTC (rev 4851)
+++ exo/portal/branches/3.1.5-PLF-perf/component/pom.xml 2010-10-27 09:07:32 UTC (rev 4852)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.1.5-PLF</version>
+ <version>3.1.6-PLF-PERF-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.component</artifactId>
Modified: exo/portal/branches/3.1.5-PLF-perf/component/portal/pom.xml
===================================================================
--- exo/portal/branches/3.1.5-PLF-perf/component/portal/pom.xml 2010-10-27 08:04:59 UTC (rev 4851)
+++ exo/portal/branches/3.1.5-PLF-perf/component/portal/pom.xml 2010-10-27 09:07:32 UTC (rev 4852)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component</artifactId>
- <version>3.1.5-PLF</version>
+ <version>3.1.6-PLF-PERF-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/3.1.5-PLF-perf/component/resources/pom.xml
===================================================================
--- exo/portal/branches/3.1.5-PLF-perf/component/resources/pom.xml 2010-10-27 08:04:59 UTC (rev 4851)
+++ exo/portal/branches/3.1.5-PLF-perf/component/resources/pom.xml 2010-10-27 09:07:32 UTC (rev 4852)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component</artifactId>
- <version>3.1.5-PLF</version>
+ <version>3.1.6-PLF-PERF-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/3.1.5-PLF-perf/component/scripting/pom.xml
===================================================================
--- exo/portal/branches/3.1.5-PLF-perf/component/scripting/pom.xml 2010-10-27 08:04:59 UTC (rev 4851)
+++ exo/portal/branches/3.1.5-PLF-perf/component/scripting/pom.xml 2010-10-27 09:07:32 UTC (rev 4852)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component</artifactId>
- <version>3.1.5-PLF</version>
+ <version>3.1.6-PLF-PERF-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/3.1.5-PLF-perf/component/test/core/pom.xml
===================================================================
--- exo/portal/branches/3.1.5-PLF-perf/component/test/core/pom.xml 2010-10-27 08:04:59 UTC (rev 4851)
+++ exo/portal/branches/3.1.5-PLF-perf/component/test/core/pom.xml 2010-10-27 09:07:32 UTC (rev 4852)
@@ -22,7 +22,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.test</artifactId>
- <version>3.1.5-PLF</version>
+ <version>3.1.6-PLF-PERF-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/3.1.5-PLF-perf/component/test/jcr/pom.xml
===================================================================
--- exo/portal/branches/3.1.5-PLF-perf/component/test/jcr/pom.xml 2010-10-27 08:04:59 UTC (rev 4851)
+++ exo/portal/branches/3.1.5-PLF-perf/component/test/jcr/pom.xml 2010-10-27 09:07:32 UTC (rev 4852)
@@ -22,7 +22,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.test</artifactId>
- <version>3.1.5-PLF</version>
+ <version>3.1.6-PLF-PERF-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/3.1.5-PLF-perf/component/test/organization/pom.xml
===================================================================
--- exo/portal/branches/3.1.5-PLF-perf/component/test/organization/pom.xml 2010-10-27 08:04:59 UTC (rev 4851)
+++ exo/portal/branches/3.1.5-PLF-perf/component/test/organization/pom.xml 2010-10-27 09:07:32 UTC (rev 4852)
@@ -22,7 +22,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.test</artifactId>
- <version>3.1.5-PLF</version>
+ <version>3.1.6-PLF-PERF-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/3.1.5-PLF-perf/component/test/pom.xml
===================================================================
--- exo/portal/branches/3.1.5-PLF-perf/component/test/pom.xml 2010-10-27 08:04:59 UTC (rev 4851)
+++ exo/portal/branches/3.1.5-PLF-perf/component/test/pom.xml 2010-10-27 09:07:32 UTC (rev 4852)
@@ -22,7 +22,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component</artifactId>
- <version>3.1.5-PLF</version>
+ <version>3.1.6-PLF-PERF-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/3.1.5-PLF-perf/component/web/pom.xml
===================================================================
--- exo/portal/branches/3.1.5-PLF-perf/component/web/pom.xml 2010-10-27 08:04:59 UTC (rev 4851)
+++ exo/portal/branches/3.1.5-PLF-perf/component/web/pom.xml 2010-10-27 09:07:32 UTC (rev 4852)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component</artifactId>
- <version>3.1.5-PLF</version>
+ <version>3.1.6-PLF-PERF-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/3.1.5-PLF-perf/component/wsrp/pom.xml
===================================================================
--- exo/portal/branches/3.1.5-PLF-perf/component/wsrp/pom.xml 2010-10-27 08:04:59 UTC (rev 4851)
+++ exo/portal/branches/3.1.5-PLF-perf/component/wsrp/pom.xml 2010-10-27 09:07:32 UTC (rev 4852)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component</artifactId>
- <version>3.1.5-PLF</version>
+ <version>3.1.6-PLF-PERF-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/3.1.5-PLF-perf/component/xml-parser/pom.xml
===================================================================
--- exo/portal/branches/3.1.5-PLF-perf/component/xml-parser/pom.xml 2010-10-27 08:04:59 UTC (rev 4851)
+++ exo/portal/branches/3.1.5-PLF-perf/component/xml-parser/pom.xml 2010-10-27 09:07:32 UTC (rev 4852)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component</artifactId>
- <version>3.1.5-PLF</version>
+ <version>3.1.6-PLF-PERF-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/3.1.5-PLF-perf/docs/pom.xml
===================================================================
--- exo/portal/branches/3.1.5-PLF-perf/docs/pom.xml 2010-10-27 08:04:59 UTC (rev 4851)
+++ exo/portal/branches/3.1.5-PLF-perf/docs/pom.xml 2010-10-27 09:07:32 UTC (rev 4852)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.1.5-PLF</version>
+ <version>3.1.6-PLF-PERF-SNAPSHOT</version>
</parent>
<groupId>org.gatein.doc</groupId>
Modified: exo/portal/branches/3.1.5-PLF-perf/docs/reference-guide/pom.xml
===================================================================
--- exo/portal/branches/3.1.5-PLF-perf/docs/reference-guide/pom.xml 2010-10-27 08:04:59 UTC (rev 4851)
+++ exo/portal/branches/3.1.5-PLF-perf/docs/reference-guide/pom.xml 2010-10-27 09:07:32 UTC (rev 4852)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.gatein.doc</groupId>
<artifactId>docs-aggregator</artifactId>
- <version>3.1.5-PLF</version>
+ <version>3.1.6-PLF-PERF-SNAPSHOT</version>
</parent>
<groupId>org.gatein.doc</groupId>
Modified: exo/portal/branches/3.1.5-PLF-perf/docs/user-guide/pom.xml
===================================================================
--- exo/portal/branches/3.1.5-PLF-perf/docs/user-guide/pom.xml 2010-10-27 08:04:59 UTC (rev 4851)
+++ exo/portal/branches/3.1.5-PLF-perf/docs/user-guide/pom.xml 2010-10-27 09:07:32 UTC (rev 4852)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.gatein.doc</groupId>
<artifactId>docs-aggregator</artifactId>
- <version>3.1.5-PLF</version>
+ <version>3.1.6-PLF-PERF-SNAPSHOT</version>
</parent>
<artifactId>gatein-user-guide-en</artifactId>
Modified: exo/portal/branches/3.1.5-PLF-perf/examples/extension/config/pom.xml
===================================================================
--- exo/portal/branches/3.1.5-PLF-perf/examples/extension/config/pom.xml 2010-10-27 08:04:59 UTC (rev 4851)
+++ exo/portal/branches/3.1.5-PLF-perf/examples/extension/config/pom.xml 2010-10-27 09:07:32 UTC (rev 4852)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.1.5-PLF</version>
+ <version>3.1.6-PLF-PERF-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/3.1.5-PLF-perf/examples/extension/ear/pom.xml
===================================================================
--- exo/portal/branches/3.1.5-PLF-perf/examples/extension/ear/pom.xml 2010-10-27 08:04:59 UTC (rev 4851)
+++ exo/portal/branches/3.1.5-PLF-perf/examples/extension/ear/pom.xml 2010-10-27 09:07:32 UTC (rev 4852)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.1.5-PLF</version>
+ <version>3.1.6-PLF-PERF-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -37,23 +37,23 @@
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.sample.extension.config</artifactId>
- <version>3.1.5-PLF</version>
+ <version>3.1.6-PLF-PERF-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.sample.extension.jar</artifactId>
- <version>3.1.5-PLF</version>
+ <version>3.1.6-PLF-PERF-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.web</artifactId>
- <version>3.1.5-PLF</version>
+ <version>3.1.6-PLF-PERF-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.sample.extension.war</artifactId>
- <version>3.1.5-PLF</version>
+ <version>3.1.6-PLF-PERF-SNAPSHOT</version>
<type>war</type>
</dependency>
</dependencies>
Modified: exo/portal/branches/3.1.5-PLF-perf/examples/extension/jar/pom.xml
===================================================================
--- exo/portal/branches/3.1.5-PLF-perf/examples/extension/jar/pom.xml 2010-10-27 08:04:59 UTC (rev 4851)
+++ exo/portal/branches/3.1.5-PLF-perf/examples/extension/jar/pom.xml 2010-10-27 09:07:32 UTC (rev 4852)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.1.5-PLF</version>
+ <version>3.1.6-PLF-PERF-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/3.1.5-PLF-perf/examples/extension/pom.xml
===================================================================
--- exo/portal/branches/3.1.5-PLF-perf/examples/extension/pom.xml 2010-10-27 08:04:59 UTC (rev 4851)
+++ exo/portal/branches/3.1.5-PLF-perf/examples/extension/pom.xml 2010-10-27 09:07:32 UTC (rev 4852)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.1.5-PLF</version>
+ <version>3.1.6-PLF-PERF-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.sample.extension.root</artifactId>
Modified: exo/portal/branches/3.1.5-PLF-perf/examples/extension/war/pom.xml
===================================================================
--- exo/portal/branches/3.1.5-PLF-perf/examples/extension/war/pom.xml 2010-10-27 08:04:59 UTC (rev 4851)
+++ exo/portal/branches/3.1.5-PLF-perf/examples/extension/war/pom.xml 2010-10-27 09:07:32 UTC (rev 4852)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.1.5-PLF</version>
+ <version>3.1.6-PLF-PERF-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/3.1.5-PLF-perf/examples/pom.xml
===================================================================
--- exo/portal/branches/3.1.5-PLF-perf/examples/pom.xml 2010-10-27 08:04:59 UTC (rev 4851)
+++ exo/portal/branches/3.1.5-PLF-perf/examples/pom.xml 2010-10-27 09:07:32 UTC (rev 4852)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.1.5-PLF</version>
+ <version>3.1.6-PLF-PERF-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.sample</artifactId>
Modified: exo/portal/branches/3.1.5-PLF-perf/examples/portal/config/pom.xml
===================================================================
--- exo/portal/branches/3.1.5-PLF-perf/examples/portal/config/pom.xml 2010-10-27 08:04:59 UTC (rev 4851)
+++ exo/portal/branches/3.1.5-PLF-perf/examples/portal/config/pom.xml 2010-10-27 09:07:32 UTC (rev 4852)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.1.5-PLF</version>
+ <version>3.1.6-PLF-PERF-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/3.1.5-PLF-perf/examples/portal/ear/pom.xml
===================================================================
--- exo/portal/branches/3.1.5-PLF-perf/examples/portal/ear/pom.xml 2010-10-27 08:04:59 UTC (rev 4851)
+++ exo/portal/branches/3.1.5-PLF-perf/examples/portal/ear/pom.xml 2010-10-27 09:07:32 UTC (rev 4852)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.1.5-PLF</version>
+ <version>3.1.6-PLF-PERF-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -37,29 +37,29 @@
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.sample.portal.config</artifactId>
- <version>3.1.5-PLF</version>
+ <version>3.1.6-PLF-PERF-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.sample.portal.jar</artifactId>
- <version>3.1.5-PLF</version>
+ <version>3.1.6-PLF-PERF-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.web</artifactId>
- <version>3.1.5-PLF</version>
+ <version>3.1.6-PLF-PERF-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.sample.portal.war</artifactId>
- <version>3.1.5-PLF</version>
+ <version>3.1.6-PLF-PERF-SNAPSHOT</version>
<type>war</type>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.sample.portal.rest-war</artifactId>
- <version>3.1.5-PLF</version>
+ <version>3.1.6-PLF-PERF-SNAPSHOT</version>
<type>war</type>
</dependency>
</dependencies>
Modified: exo/portal/branches/3.1.5-PLF-perf/examples/portal/jar/pom.xml
===================================================================
--- exo/portal/branches/3.1.5-PLF-perf/examples/portal/jar/pom.xml 2010-10-27 08:04:59 UTC (rev 4851)
+++ exo/portal/branches/3.1.5-PLF-perf/examples/portal/jar/pom.xml 2010-10-27 09:07:32 UTC (rev 4852)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.1.5-PLF</version>
+ <version>3.1.6-PLF-PERF-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/3.1.5-PLF-perf/examples/portal/pom.xml
===================================================================
--- exo/portal/branches/3.1.5-PLF-perf/examples/portal/pom.xml 2010-10-27 08:04:59 UTC (rev 4851)
+++ exo/portal/branches/3.1.5-PLF-perf/examples/portal/pom.xml 2010-10-27 09:07:32 UTC (rev 4852)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.1.5-PLF</version>
+ <version>3.1.6-PLF-PERF-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.sample.portal.root</artifactId>
Modified: exo/portal/branches/3.1.5-PLF-perf/examples/portal/rest-war/pom.xml
===================================================================
--- exo/portal/branches/3.1.5-PLF-perf/examples/portal/rest-war/pom.xml 2010-10-27 08:04:59 UTC (rev 4851)
+++ exo/portal/branches/3.1.5-PLF-perf/examples/portal/rest-war/pom.xml 2010-10-27 09:07:32 UTC (rev 4852)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.1.5-PLF</version>
+ <version>3.1.6-PLF-PERF-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/3.1.5-PLF-perf/examples/portal/war/pom.xml
===================================================================
--- exo/portal/branches/3.1.5-PLF-perf/examples/portal/war/pom.xml 2010-10-27 08:04:59 UTC (rev 4851)
+++ exo/portal/branches/3.1.5-PLF-perf/examples/portal/war/pom.xml 2010-10-27 09:07:32 UTC (rev 4852)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.1.5-PLF</version>
+ <version>3.1.6-PLF-PERF-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/3.1.5-PLF-perf/examples/portlets/jsfhellouser/pom.xml
===================================================================
--- exo/portal/branches/3.1.5-PLF-perf/examples/portlets/jsfhellouser/pom.xml 2010-10-27 08:04:59 UTC (rev 4851)
+++ exo/portal/branches/3.1.5-PLF-perf/examples/portlets/jsfhellouser/pom.xml 2010-10-27 09:07:32 UTC (rev 4852)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.gatein.portal.examples.portlets</groupId>
<artifactId>parent</artifactId>
- <version>3.1.5-PLF</version>
+ <version>3.1.6-PLF-PERF-SNAPSHOT</version>
</parent>
<artifactId>gatein-jsf-hellouser</artifactId>
Modified: exo/portal/branches/3.1.5-PLF-perf/examples/portlets/jsphellouser/pom.xml
===================================================================
--- exo/portal/branches/3.1.5-PLF-perf/examples/portlets/jsphellouser/pom.xml 2010-10-27 08:04:59 UTC (rev 4851)
+++ exo/portal/branches/3.1.5-PLF-perf/examples/portlets/jsphellouser/pom.xml 2010-10-27 09:07:32 UTC (rev 4852)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.gatein.portal.examples.portlets</groupId>
<artifactId>parent</artifactId>
- <version>3.1.5-PLF</version>
+ <version>3.1.6-PLF-PERF-SNAPSHOT</version>
</parent>
<artifactId>gatein-jsp-hellouser</artifactId>
@@ -36,4 +36,4 @@
<scope>provided</scope>
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
Modified: exo/portal/branches/3.1.5-PLF-perf/examples/portlets/pom.xml
===================================================================
--- exo/portal/branches/3.1.5-PLF-perf/examples/portlets/pom.xml 2010-10-27 08:04:59 UTC (rev 4851)
+++ exo/portal/branches/3.1.5-PLF-perf/examples/portlets/pom.xml 2010-10-27 09:07:32 UTC (rev 4852)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.1.5-PLF</version>
+ <version>3.1.6-PLF-PERF-SNAPSHOT</version>
</parent>
<groupId>org.gatein.portal.examples.portlets</groupId>
Modified: exo/portal/branches/3.1.5-PLF-perf/examples/portlets/simplesthelloworld/pom.xml
===================================================================
--- exo/portal/branches/3.1.5-PLF-perf/examples/portlets/simplesthelloworld/pom.xml 2010-10-27 08:04:59 UTC (rev 4851)
+++ exo/portal/branches/3.1.5-PLF-perf/examples/portlets/simplesthelloworld/pom.xml 2010-10-27 09:07:32 UTC (rev 4852)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.gatein.portal.examples.portlets</groupId>
<artifactId>parent</artifactId>
- <version>3.1.5-PLF</version>
+ <version>3.1.6-PLF-PERF-SNAPSHOT</version>
</parent>
<artifactId>gatein-simplest-helloworld</artifactId>
@@ -37,4 +37,4 @@
<scope>provided</scope>
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
Modified: exo/portal/branches/3.1.5-PLF-perf/examples/portlets/struts-jpetstore/pom.xml
===================================================================
--- exo/portal/branches/3.1.5-PLF-perf/examples/portlets/struts-jpetstore/pom.xml 2010-10-27 08:04:59 UTC (rev 4851)
+++ exo/portal/branches/3.1.5-PLF-perf/examples/portlets/struts-jpetstore/pom.xml 2010-10-27 09:07:32 UTC (rev 4852)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.gatein.portal.examples.portlets</groupId>
<artifactId>parent</artifactId>
- <version>3.1.5-PLF</version>
+ <version>3.1.6-PLF-PERF-SNAPSHOT</version>
</parent>
<artifactId>struts-jpetstore</artifactId>
@@ -172,4 +172,4 @@
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
Modified: exo/portal/branches/3.1.5-PLF-perf/examples/skins/pom.xml
===================================================================
--- exo/portal/branches/3.1.5-PLF-perf/examples/skins/pom.xml 2010-10-27 08:04:59 UTC (rev 4851)
+++ exo/portal/branches/3.1.5-PLF-perf/examples/skins/pom.xml 2010-10-27 09:07:32 UTC (rev 4852)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.1.5-PLF</version>
+ <version>3.1.6-PLF-PERF-SNAPSHOT</version>
</parent>
<groupId>org.gatein.portal.examples.skins</groupId>
Modified: exo/portal/branches/3.1.5-PLF-perf/examples/skins/simpleskin/pom.xml
===================================================================
--- exo/portal/branches/3.1.5-PLF-perf/examples/skins/simpleskin/pom.xml 2010-10-27 08:04:59 UTC (rev 4851)
+++ exo/portal/branches/3.1.5-PLF-perf/examples/skins/simpleskin/pom.xml 2010-10-27 09:07:32 UTC (rev 4852)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.portal.examples.skins</groupId>
<artifactId>parent</artifactId>
- <version>3.1.5-PLF</version>
+ <version>3.1.6-PLF-PERF-SNAPSHOT</version>
</parent>
<artifactId>gatein-sample-skin</artifactId>
Modified: exo/portal/branches/3.1.5-PLF-perf/gadgets/core/pom.xml
===================================================================
--- exo/portal/branches/3.1.5-PLF-perf/gadgets/core/pom.xml 2010-10-27 08:04:59 UTC (rev 4851)
+++ exo/portal/branches/3.1.5-PLF-perf/gadgets/core/pom.xml 2010-10-27 09:07:32 UTC (rev 4852)
@@ -14,7 +14,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.gadgets</artifactId>
- <version>3.1.5-PLF</version>
+ <version>3.1.6-PLF-PERF-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.gadgets-core</artifactId>
Modified: exo/portal/branches/3.1.5-PLF-perf/gadgets/eXoGadgets/pom.xml
===================================================================
--- exo/portal/branches/3.1.5-PLF-perf/gadgets/eXoGadgets/pom.xml 2010-10-27 08:04:59 UTC (rev 4851)
+++ exo/portal/branches/3.1.5-PLF-perf/gadgets/eXoGadgets/pom.xml 2010-10-27 09:07:32 UTC (rev 4852)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.gadgets</artifactId>
- <version>3.1.5-PLF</version>
+ <version>3.1.6-PLF-PERF-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/3.1.5-PLF-perf/gadgets/pom.xml
===================================================================
--- exo/portal/branches/3.1.5-PLF-perf/gadgets/pom.xml 2010-10-27 08:04:59 UTC (rev 4851)
+++ exo/portal/branches/3.1.5-PLF-perf/gadgets/pom.xml 2010-10-27 09:07:32 UTC (rev 4852)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.1.5-PLF</version>
+ <version>3.1.6-PLF-PERF-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.gadgets</artifactId>
Modified: exo/portal/branches/3.1.5-PLF-perf/gadgets/server/pom.xml
===================================================================
--- exo/portal/branches/3.1.5-PLF-perf/gadgets/server/pom.xml 2010-10-27 08:04:59 UTC (rev 4851)
+++ exo/portal/branches/3.1.5-PLF-perf/gadgets/server/pom.xml 2010-10-27 09:07:32 UTC (rev 4852)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.gadgets</artifactId>
- <version>3.1.5-PLF</version>
+ <version>3.1.6-PLF-PERF-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.gadgets-server</artifactId>
Modified: exo/portal/branches/3.1.5-PLF-perf/packaging/module/pom.xml
===================================================================
--- exo/portal/branches/3.1.5-PLF-perf/packaging/module/pom.xml 2010-10-27 08:04:59 UTC (rev 4851)
+++ exo/portal/branches/3.1.5-PLF-perf/packaging/module/pom.xml 2010-10-27 09:07:32 UTC (rev 4852)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.packaging</artifactId>
- <version>3.1.5-PLF</version>
+ <version>3.1.6-PLF-PERF-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/3.1.5-PLF-perf/packaging/pkg/pom.xml
===================================================================
--- exo/portal/branches/3.1.5-PLF-perf/packaging/pkg/pom.xml 2010-10-27 08:04:59 UTC (rev 4851)
+++ exo/portal/branches/3.1.5-PLF-perf/packaging/pkg/pom.xml 2010-10-27 09:07:32 UTC (rev 4852)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.packaging</artifactId>
- <version>3.1.5-PLF</version>
+ <version>3.1.6-PLF-PERF-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -67,19 +67,19 @@
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>portal.packaging.module</artifactId>
- <version>3.1.5-PLF</version>
+ <version>3.1.6-PLF-PERF-SNAPSHOT</version>
<type>js</type>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>portal.packaging.product</artifactId>
- <version>3.1.5-PLF</version>
+ <version>3.1.6-PLF-PERF-SNAPSHOT</version>
<type>js</type>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.server.jboss.patch-ear</artifactId>
- <version>3.1.5-PLF</version>
+ <version>3.1.6-PLF-PERF-SNAPSHOT</version>
</dependency>
<!-- Missing packaging dependencies -->
Modified: exo/portal/branches/3.1.5-PLF-perf/packaging/pom.xml
===================================================================
--- exo/portal/branches/3.1.5-PLF-perf/packaging/pom.xml 2010-10-27 08:04:59 UTC (rev 4851)
+++ exo/portal/branches/3.1.5-PLF-perf/packaging/pom.xml 2010-10-27 09:07:32 UTC (rev 4852)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.1.5-PLF</version>
+ <version>3.1.6-PLF-PERF-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/3.1.5-PLF-perf/packaging/product/pom.xml
===================================================================
--- exo/portal/branches/3.1.5-PLF-perf/packaging/product/pom.xml 2010-10-27 08:04:59 UTC (rev 4851)
+++ exo/portal/branches/3.1.5-PLF-perf/packaging/product/pom.xml 2010-10-27 09:07:32 UTC (rev 4852)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.packaging</artifactId>
- <version>3.1.5-PLF</version>
+ <version>3.1.6-PLF-PERF-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/3.1.5-PLF-perf/packaging/reports/pom.xml
===================================================================
--- exo/portal/branches/3.1.5-PLF-perf/packaging/reports/pom.xml 2010-10-27 08:04:59 UTC (rev 4851)
+++ exo/portal/branches/3.1.5-PLF-perf/packaging/reports/pom.xml 2010-10-27 09:07:32 UTC (rev 4852)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.packaging</artifactId>
- <version>3.1.5-PLF</version>
+ <version>3.1.6-PLF-PERF-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/3.1.5-PLF-perf/pom.xml
===================================================================
--- exo/portal/branches/3.1.5-PLF-perf/pom.xml 2010-10-27 08:04:59 UTC (rev 4851)
+++ exo/portal/branches/3.1.5-PLF-perf/pom.xml 2010-10-27 09:07:32 UTC (rev 4852)
@@ -31,16 +31,16 @@
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.1.5-PLF</version>
+ <version>3.1.6-PLF-PERF-SNAPSHOT</version>
<packaging>pom</packaging>
<name>GateIn - Portal</name>
<properties>
- <org.exoplatform.kernel.version>2.2.5-GA</org.exoplatform.kernel.version>
- <org.exoplatform.core.version>2.3.5-GA</org.exoplatform.core.version>
- <org.exoplatform.ws.version>2.1.5-GA</org.exoplatform.ws.version>
- <org.exoplatform.jcr.version>1.12.5-GA</org.exoplatform.jcr.version>
+ <org.exoplatform.kernel.version>2.2.6-GA-PERF-SNAPSHOT</org.exoplatform.kernel.version>
+ <org.exoplatform.core.version>2.3.6-GA-PERF-SNAPSHOT</org.exoplatform.core.version>
+ <org.exoplatform.ws.version>2.1.6-GA-PERF-SNAPSHOT</org.exoplatform.ws.version>
+ <org.exoplatform.jcr.version>1.12.6-GA-PERF-SNAPSHOT</org.exoplatform.jcr.version>
<org.jibx.version>1.2.1</org.jibx.version>
<org.shindig.version>1.0-r790473-Patch04</org.shindig.version>
<nl.captcha.simplecaptcha.version>1.1.1-GA-Patch01</nl.captcha.simplecaptcha.version>
@@ -341,110 +341,110 @@
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.common</artifactId>
- <version>3.1.5-PLF</version>
+ <version>3.1.6-PLF-PERF-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.web</artifactId>
- <version>3.1.5-PLF</version>
+ <version>3.1.6-PLF-PERF-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.portal</artifactId>
- <version>3.1.5-PLF</version>
+ <version>3.1.6-PLF-PERF-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.portal</artifactId>
- <version>3.1.5-PLF</version>
+ <version>3.1.6-PLF-PERF-SNAPSHOT</version>
<type>test-jar</type>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.pc</artifactId>
- <version>3.1.5-PLF</version>
+ <version>3.1.6-PLF-PERF-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.identity</artifactId>
- <version>3.1.5-PLF</version>
+ <version>3.1.6-PLF-PERF-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.resources</artifactId>
- <version>3.1.5-PLF</version>
+ <version>3.1.6-PLF-PERF-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.application-registry</artifactId>
- <version>3.1.5-PLF</version>
+ <version>3.1.6-PLF-PERF-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.xml-parser</artifactId>
- <version>3.1.5-PLF</version>
+ <version>3.1.6-PLF-PERF-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.scripting</artifactId>
- <version>3.1.5-PLF</version>
+ <version>3.1.6-PLF-PERF-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.dashboard</artifactId>
- <version>3.1.5-PLF</version>
+ <version>3.1.6-PLF-PERF-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.webui.portal</artifactId>
- <version>3.1.5-PLF</version>
+ <version>3.1.6-PLF-PERF-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.webui.eXo</artifactId>
- <version>3.1.5-PLF</version>
+ <version>3.1.6-PLF-PERF-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.webui.core</artifactId>
- <version>3.1.5-PLF</version>
+ <version>3.1.6-PLF-PERF-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.gadgets-core</artifactId>
- <version>3.1.5-PLF</version>
+ <version>3.1.6-PLF-PERF-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.test.core</artifactId>
- <version>3.1.5-PLF</version>
+ <version>3.1.6-PLF-PERF-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.test.core</artifactId>
- <version>3.1.5-PLF</version>
+ <version>3.1.6-PLF-PERF-SNAPSHOT</version>
<type>test-jar</type>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.test.jcr</artifactId>
- <version>3.1.5-PLF</version>
+ <version>3.1.6-PLF-PERF-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.test.jcr</artifactId>
- <version>3.1.5-PLF</version>
+ <version>3.1.6-PLF-PERF-SNAPSHOT</version>
<type>test-jar</type>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.test.organization</artifactId>
- <version>3.1.5-PLF</version>
+ <version>3.1.6-PLF-PERF-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.test.organization</artifactId>
- <version>3.1.5-PLF</version>
+ <version>3.1.6-PLF-PERF-SNAPSHOT</version>
<type>test-jar</type>
</dependency>
Modified: exo/portal/branches/3.1.5-PLF-perf/portlet/dashboard/pom.xml
===================================================================
--- exo/portal/branches/3.1.5-PLF-perf/portlet/dashboard/pom.xml 2010-10-27 08:04:59 UTC (rev 4851)
+++ exo/portal/branches/3.1.5-PLF-perf/portlet/dashboard/pom.xml 2010-10-27 09:07:32 UTC (rev 4852)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.portlet</artifactId>
- <version>3.1.5-PLF</version>
+ <version>3.1.6-PLF-PERF-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/3.1.5-PLF-perf/portlet/exoadmin/pom.xml
===================================================================
--- exo/portal/branches/3.1.5-PLF-perf/portlet/exoadmin/pom.xml 2010-10-27 08:04:59 UTC (rev 4851)
+++ exo/portal/branches/3.1.5-PLF-perf/portlet/exoadmin/pom.xml 2010-10-27 09:07:32 UTC (rev 4852)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.portlet</artifactId>
- <version>3.1.5-PLF</version>
+ <version>3.1.6-PLF-PERF-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/3.1.5-PLF-perf/portlet/pom.xml
===================================================================
--- exo/portal/branches/3.1.5-PLF-perf/portlet/pom.xml 2010-10-27 08:04:59 UTC (rev 4851)
+++ exo/portal/branches/3.1.5-PLF-perf/portlet/pom.xml 2010-10-27 09:07:32 UTC (rev 4852)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.1.5-PLF</version>
+ <version>3.1.6-PLF-PERF-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.portlet</artifactId>
Modified: exo/portal/branches/3.1.5-PLF-perf/portlet/web/pom.xml
===================================================================
--- exo/portal/branches/3.1.5-PLF-perf/portlet/web/pom.xml 2010-10-27 08:04:59 UTC (rev 4851)
+++ exo/portal/branches/3.1.5-PLF-perf/portlet/web/pom.xml 2010-10-27 09:07:32 UTC (rev 4852)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.portlet</artifactId>
- <version>3.1.5-PLF</version>
+ <version>3.1.6-PLF-PERF-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/3.1.5-PLF-perf/server/jboss/patch-ear/pom.xml
===================================================================
--- exo/portal/branches/3.1.5-PLF-perf/server/jboss/patch-ear/pom.xml 2010-10-27 08:04:59 UTC (rev 4851)
+++ exo/portal/branches/3.1.5-PLF-perf/server/jboss/patch-ear/pom.xml 2010-10-27 09:07:32 UTC (rev 4852)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.server.jboss</artifactId>
- <version>3.1.5-PLF</version>
+ <version>3.1.6-PLF-PERF-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/3.1.5-PLF-perf/server/jboss/plugin/pom.xml
===================================================================
--- exo/portal/branches/3.1.5-PLF-perf/server/jboss/plugin/pom.xml 2010-10-27 08:04:59 UTC (rev 4851)
+++ exo/portal/branches/3.1.5-PLF-perf/server/jboss/plugin/pom.xml 2010-10-27 09:07:32 UTC (rev 4852)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.server.jboss</artifactId>
- <version>3.1.5-PLF</version>
+ <version>3.1.6-PLF-PERF-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/3.1.5-PLF-perf/server/jboss/pom.xml
===================================================================
--- exo/portal/branches/3.1.5-PLF-perf/server/jboss/pom.xml 2010-10-27 08:04:59 UTC (rev 4851)
+++ exo/portal/branches/3.1.5-PLF-perf/server/jboss/pom.xml 2010-10-27 09:07:32 UTC (rev 4852)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.server</artifactId>
- <version>3.1.5-PLF</version>
+ <version>3.1.6-PLF-PERF-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.server.jboss</artifactId>
Modified: exo/portal/branches/3.1.5-PLF-perf/server/pom.xml
===================================================================
--- exo/portal/branches/3.1.5-PLF-perf/server/pom.xml 2010-10-27 08:04:59 UTC (rev 4851)
+++ exo/portal/branches/3.1.5-PLF-perf/server/pom.xml 2010-10-27 09:07:32 UTC (rev 4852)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.1.5-PLF</version>
+ <version>3.1.6-PLF-PERF-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.server</artifactId>
Modified: exo/portal/branches/3.1.5-PLF-perf/server/tomcat/patch/pom.xml
===================================================================
--- exo/portal/branches/3.1.5-PLF-perf/server/tomcat/patch/pom.xml 2010-10-27 08:04:59 UTC (rev 4851)
+++ exo/portal/branches/3.1.5-PLF-perf/server/tomcat/patch/pom.xml 2010-10-27 09:07:32 UTC (rev 4852)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.server.tomcat</artifactId>
- <version>3.1.5-PLF</version>
+ <version>3.1.6-PLF-PERF-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/3.1.5-PLF-perf/server/tomcat/plugin/pom.xml
===================================================================
--- exo/portal/branches/3.1.5-PLF-perf/server/tomcat/plugin/pom.xml 2010-10-27 08:04:59 UTC (rev 4851)
+++ exo/portal/branches/3.1.5-PLF-perf/server/tomcat/plugin/pom.xml 2010-10-27 09:07:32 UTC (rev 4852)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.server.tomcat</artifactId>
- <version>3.1.5-PLF</version>
+ <version>3.1.6-PLF-PERF-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/3.1.5-PLF-perf/server/tomcat/pom.xml
===================================================================
--- exo/portal/branches/3.1.5-PLF-perf/server/tomcat/pom.xml 2010-10-27 08:04:59 UTC (rev 4851)
+++ exo/portal/branches/3.1.5-PLF-perf/server/tomcat/pom.xml 2010-10-27 09:07:32 UTC (rev 4852)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.server</artifactId>
- <version>3.1.5-PLF</version>
+ <version>3.1.6-PLF-PERF-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.server.tomcat</artifactId>
Modified: exo/portal/branches/3.1.5-PLF-perf/starter/ear/pom.xml
===================================================================
--- exo/portal/branches/3.1.5-PLF-perf/starter/ear/pom.xml 2010-10-27 08:04:59 UTC (rev 4851)
+++ exo/portal/branches/3.1.5-PLF-perf/starter/ear/pom.xml 2010-10-27 09:07:32 UTC (rev 4852)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.1.5-PLF</version>
+ <version>3.1.6-PLF-PERF-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -37,7 +37,7 @@
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.starter.war</artifactId>
- <version>3.1.5-PLF</version>
+ <version>3.1.6-PLF-PERF-SNAPSHOT</version>
<type>war</type>
</dependency>
</dependencies>
Modified: exo/portal/branches/3.1.5-PLF-perf/starter/pom.xml
===================================================================
--- exo/portal/branches/3.1.5-PLF-perf/starter/pom.xml 2010-10-27 08:04:59 UTC (rev 4851)
+++ exo/portal/branches/3.1.5-PLF-perf/starter/pom.xml 2010-10-27 09:07:32 UTC (rev 4852)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.1.5-PLF</version>
+ <version>3.1.6-PLF-PERF-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.starter.root</artifactId>
Modified: exo/portal/branches/3.1.5-PLF-perf/starter/war/pom.xml
===================================================================
--- exo/portal/branches/3.1.5-PLF-perf/starter/war/pom.xml 2010-10-27 08:04:59 UTC (rev 4851)
+++ exo/portal/branches/3.1.5-PLF-perf/starter/war/pom.xml 2010-10-27 09:07:32 UTC (rev 4852)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.1.5-PLF</version>
+ <version>3.1.6-PLF-PERF-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/3.1.5-PLF-perf/testsuite/pom.xml
===================================================================
--- exo/portal/branches/3.1.5-PLF-perf/testsuite/pom.xml 2010-10-27 08:04:59 UTC (rev 4851)
+++ exo/portal/branches/3.1.5-PLF-perf/testsuite/pom.xml 2010-10-27 09:07:32 UTC (rev 4852)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.1.5-PLF</version>
+ <version>3.1.6-PLF-PERF-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.testsuite</artifactId>
Modified: exo/portal/branches/3.1.5-PLF-perf/testsuite/selenium-snifftests/pom.xml
===================================================================
--- exo/portal/branches/3.1.5-PLF-perf/testsuite/selenium-snifftests/pom.xml 2010-10-27 08:04:59 UTC (rev 4851)
+++ exo/portal/branches/3.1.5-PLF-perf/testsuite/selenium-snifftests/pom.xml 2010-10-27 09:07:32 UTC (rev 4852)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.testsuite</artifactId>
- <version>3.1.5-PLF</version>
+ <version>3.1.6-PLF-PERF-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.selenium.snifftests</artifactId>
Modified: exo/portal/branches/3.1.5-PLF-perf/testsuite/webuibasedsamples/pom.xml
===================================================================
--- exo/portal/branches/3.1.5-PLF-perf/testsuite/webuibasedsamples/pom.xml 2010-10-27 08:04:59 UTC (rev 4851)
+++ exo/portal/branches/3.1.5-PLF-perf/testsuite/webuibasedsamples/pom.xml 2010-10-27 09:07:32 UTC (rev 4852)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.testsuite</artifactId>
- <version>3.1.5-PLF</version>
+ <version>3.1.6-PLF-PERF-SNAPSHOT</version>
</parent>
<artifactId>exo.webui.based.samples</artifactId>
Modified: exo/portal/branches/3.1.5-PLF-perf/web/eXoResources/pom.xml
===================================================================
--- exo/portal/branches/3.1.5-PLF-perf/web/eXoResources/pom.xml 2010-10-27 08:04:59 UTC (rev 4851)
+++ exo/portal/branches/3.1.5-PLF-perf/web/eXoResources/pom.xml 2010-10-27 09:07:32 UTC (rev 4852)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.web</artifactId>
- <version>3.1.5-PLF</version>
+ <version>3.1.6-PLF-PERF-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/3.1.5-PLF-perf/web/pom.xml
===================================================================
--- exo/portal/branches/3.1.5-PLF-perf/web/pom.xml 2010-10-27 08:04:59 UTC (rev 4851)
+++ exo/portal/branches/3.1.5-PLF-perf/web/pom.xml 2010-10-27 09:07:32 UTC (rev 4852)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.1.5-PLF</version>
+ <version>3.1.6-PLF-PERF-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.web</artifactId>
Modified: exo/portal/branches/3.1.5-PLF-perf/web/portal/pom.xml
===================================================================
--- exo/portal/branches/3.1.5-PLF-perf/web/portal/pom.xml 2010-10-27 08:04:59 UTC (rev 4851)
+++ exo/portal/branches/3.1.5-PLF-perf/web/portal/pom.xml 2010-10-27 09:07:32 UTC (rev 4852)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.web</artifactId>
- <version>3.1.5-PLF</version>
+ <version>3.1.6-PLF-PERF-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/3.1.5-PLF-perf/web/rest/pom.xml
===================================================================
--- exo/portal/branches/3.1.5-PLF-perf/web/rest/pom.xml 2010-10-27 08:04:59 UTC (rev 4851)
+++ exo/portal/branches/3.1.5-PLF-perf/web/rest/pom.xml 2010-10-27 09:07:32 UTC (rev 4852)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.web</artifactId>
- <version>3.1.5-PLF</version>
+ <version>3.1.6-PLF-PERF-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/3.1.5-PLF-perf/webui/core/pom.xml
===================================================================
--- exo/portal/branches/3.1.5-PLF-perf/webui/core/pom.xml 2010-10-27 08:04:59 UTC (rev 4851)
+++ exo/portal/branches/3.1.5-PLF-perf/webui/core/pom.xml 2010-10-27 09:07:32 UTC (rev 4852)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.webui</artifactId>
- <version>3.1.5-PLF</version>
+ <version>3.1.6-PLF-PERF-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/3.1.5-PLF-perf/webui/eXo/pom.xml
===================================================================
--- exo/portal/branches/3.1.5-PLF-perf/webui/eXo/pom.xml 2010-10-27 08:04:59 UTC (rev 4851)
+++ exo/portal/branches/3.1.5-PLF-perf/webui/eXo/pom.xml 2010-10-27 09:07:32 UTC (rev 4852)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.webui</artifactId>
- <version>3.1.5-PLF</version>
+ <version>3.1.6-PLF-PERF-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/3.1.5-PLF-perf/webui/pom.xml
===================================================================
--- exo/portal/branches/3.1.5-PLF-perf/webui/pom.xml 2010-10-27 08:04:59 UTC (rev 4851)
+++ exo/portal/branches/3.1.5-PLF-perf/webui/pom.xml 2010-10-27 09:07:32 UTC (rev 4852)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.1.5-PLF</version>
+ <version>3.1.6-PLF-PERF-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.webui</artifactId>
Modified: exo/portal/branches/3.1.5-PLF-perf/webui/portal/pom.xml
===================================================================
--- exo/portal/branches/3.1.5-PLF-perf/webui/portal/pom.xml 2010-10-27 08:04:59 UTC (rev 4851)
+++ exo/portal/branches/3.1.5-PLF-perf/webui/portal/pom.xml 2010-10-27 09:07:32 UTC (rev 4852)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.webui</artifactId>
- <version>3.1.5-PLF</version>
+ <version>3.1.6-PLF-PERF-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
13 years, 8 months
- 1
- 0
gatein SVN: r4851 - exo/portal/branches.
by do-not-reply＠jboss.org
Author: aheritier
Date: 2010-10-27 04:04:59 -0400 (Wed, 27 Oct 2010)
New Revision: 4851
Added:
exo/portal/branches/3.1.5-PLF-perf/
Log:
[SWF-578] Create perf branch from 3.0.1
Copied: exo/portal/branches/3.1.5-PLF-perf (from rev 4850, exo/portal/tags/3.1.5-PLF)
13 years, 8 months
- 1
- 0
gatein SVN: r4850 - in epp/docs/branches/EPP_5_1_Branch: Reference_Guide/en-US and 1 other directories.
by do-not-reply＠jboss.org
Author: smumford
Date: 2010-10-27 01:17:01 -0400 (Wed, 27 Oct 2010)
New Revision: 4850
Modified:
epp/docs/branches/EPP_5_1_Branch/Installation_Guide/en-US/Book_Info.xml
epp/docs/branches/EPP_5_1_Branch/Installation_Guide/en-US/Revision_History.xml
epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/Book_Info.xml
epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/Book_Info.xml
Log:
Removed older version numbers from book subtitles
Modified: epp/docs/branches/EPP_5_1_Branch/Installation_Guide/en-US/Book_Info.xml
===================================================================
--- epp/docs/branches/EPP_5_1_Branch/Installation_Guide/en-US/Book_Info.xml 2010-10-27 04:11:08 UTC (rev 4849)
+++ epp/docs/branches/EPP_5_1_Branch/Installation_Guide/en-US/Book_Info.xml 2010-10-27 05:17:01 UTC (rev 4850)
@@ -11,8 +11,8 @@
<subtitle>An Installation Guide for &PRODUCT;</subtitle>
<productname>JBoss Enterprise Portal Platform</productname>
<productnumber>5</productnumber>
- <edition>1.8</edition>
- <pubsnumber>1</pubsnumber>
+ <edition>1</edition>
+ <pubsnumber>1.8</pubsnumber>
<abstract>
<para>
This book provides information about obtaining, installing and
Modified: epp/docs/branches/EPP_5_1_Branch/Installation_Guide/en-US/Revision_History.xml
===================================================================
--- epp/docs/branches/EPP_5_1_Branch/Installation_Guide/en-US/Revision_History.xml 2010-10-27 04:11:08 UTC (rev 4849)
+++ epp/docs/branches/EPP_5_1_Branch/Installation_Guide/en-US/Revision_History.xml 2010-10-27 05:17:01 UTC (rev 4850)
@@ -8,20 +8,21 @@
<title>Revision History</title>
<simpara>
<revhistory>
- <revision>
- <revnumber>1-1.8</revnumber>
- <date>Tue Oct 26 2010</date>
- <author>
- <firstname>Scott</firstname>
- <surname>Mumford</surname>
- <email>smumford(a)redhat.com</email>
- </author>
- <revdescription>
- <simplelist>
- <member>Added Recommended Practices section from earlier Release Notes.</member>
- </simplelist>
- </revdescription>
- </revision>
+
+ <revision>
+ <revnumber>1-1.8</revnumber>
+ <date>Tue Oct 26 2010</date>
+ <author>
+ <firstname>Scott</firstname>
+ <surname>Mumford</surname>
+ <email>smumford(a)redhat.com</email>
+ </author>
+ <revdescription>
+ <simplelist>
+ <member>Added Recommended Practices section from earlier Release Notes.</member>
+ </simplelist>
+ </revdescription>
+ </revision>
<revision>
<revnumber>1-1.7</revnumber>
<date>Tue Oct 26 2010</date>
Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/Book_Info.xml
===================================================================
--- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/Book_Info.xml 2010-10-27 04:11:08 UTC (rev 4849)
+++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/Book_Info.xml 2010-10-27 05:17:01 UTC (rev 4850)
@@ -5,7 +5,7 @@
]>
<bookinfo id="book-Reference_Guide">
<title>Reference Guide</title>
- <subtitle>An in-depth guide to Enterprise Portal Platform 5.0.1</subtitle>
+ <subtitle>An in-depth guide to Enterprise Portal Platform 5</subtitle>
<productname>JBoss Enterprise Portal Platform</productname>
<productnumber>5</productnumber>
<edition>1</edition>
Modified: epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/Book_Info.xml
===================================================================
--- epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/Book_Info.xml 2010-10-27 04:11:08 UTC (rev 4849)
+++ epp/docs/branches/EPP_5_1_Branch/User_Guide/en-US/Book_Info.xml 2010-10-27 05:17:01 UTC (rev 4850)
@@ -3,7 +3,7 @@
%BOOK_ENTITIES;
]><bookinfo id="book-User_Guide-User_Guide">
<title>User Guide</title>
- <subtitle>A User Guide for Enterprise Portal Platform 5.0</subtitle>
+ <subtitle>A User Guide for Enterprise Portal Platform 5</subtitle>
<productname>JBoss Enterprise Portal Platform</productname>
<productnumber>5</productnumber>
<edition>1</edition>
13 years, 8 months
- 1
- 0
gatein SVN: r4849 - portal/branches/branch-GTNPORTAL-1592/web/eXoResources/src/main/webapp/javascript/eXo/core.
by do-not-reply＠jboss.org
Author: phuong_vu
Date: 2010-10-27 00:11:08 -0400 (Wed, 27 Oct 2010)
New Revision: 4849
Modified:
portal/branches/branch-GTNPORTAL-1592/web/eXoResources/src/main/webapp/javascript/eXo/core/DOMUtil.js
Log:
GTNPORTAL-1549 Fix my mistake in last commit to DOMUtil.js
Modified: portal/branches/branch-GTNPORTAL-1592/web/eXoResources/src/main/webapp/javascript/eXo/core/DOMUtil.js
===================================================================
--- portal/branches/branch-GTNPORTAL-1592/web/eXoResources/src/main/webapp/javascript/eXo/core/DOMUtil.js 2010-10-27 03:16:50 UTC (rev 4848)
+++ portal/branches/branch-GTNPORTAL-1592/web/eXoResources/src/main/webapp/javascript/eXo/core/DOMUtil.js 2010-10-27 04:11:08 UTC (rev 4849)
@@ -411,8 +411,7 @@
return [];
}
- var nodes = [],
- var elements = root.getElementsByTagName(tag);
+ var nodes = [], elements = root.getElementsByTagName(tag);
for (var i = 0, len = elements.length; i < len; ++i) {
if ( method(elements[i]) ) {
13 years, 8 months
- 1
- 0
gatein SVN: r4848 - in portal/branches/branch-GTNPORTAL-1592: examples/portal/war/src/main/webapp/WEB-INF and 1 other directories.
by do-not-reply＠jboss.org
Author: ndkhoiits
Date: 2010-10-26 23:16:50 -0400 (Tue, 26 Oct 2010)
New Revision: 4848
Modified:
portal/branches/branch-GTNPORTAL-1592/component/web/api/src/main/java/org/exoplatform/web/GenericHttpListener.java
portal/branches/branch-GTNPORTAL-1592/examples/portal/war/src/main/webapp/WEB-INF/web.xml
portal/branches/branch-GTNPORTAL-1592/web/portal/src/main/webapp/WEB-INF/web.xml
Log:
GTNPORTAL-1345 Avoid NPE when a portal container has been disabled
Modified: portal/branches/branch-GTNPORTAL-1592/component/web/api/src/main/java/org/exoplatform/web/GenericHttpListener.java
===================================================================
--- portal/branches/branch-GTNPORTAL-1592/component/web/api/src/main/java/org/exoplatform/web/GenericHttpListener.java 2010-10-26 14:34:50 UTC (rev 4847)
+++ portal/branches/branch-GTNPORTAL-1592/component/web/api/src/main/java/org/exoplatform/web/GenericHttpListener.java 2010-10-27 03:16:50 UTC (rev 4848)
@@ -19,6 +19,7 @@
package org.exoplatform.web;
+import org.exoplatform.commons.utils.PropertyManager;
import org.exoplatform.container.ExoContainer;
import org.exoplatform.container.ExoContainerContext;
import org.exoplatform.container.PortalContainer;
@@ -140,7 +141,19 @@
PortalContainer.setInstance(portalContainer);
hasBeenSet = true;
}
- broadcast(portalContainer, CONTEXT_DESTROYED, event);
+ final String ctxName = event.getServletContext().getServletContextName();
+ if (!PortalContainer.isPortalContainerNameDisabled(ctxName) && portalContainer instanceof PortalContainer)
+ {
+ // The portal container corresponding to the current servlet context could be found
+ broadcast(portalContainer, CONTEXT_DESTROYED, event);
+ }
+ else if (PropertyManager.isDevelopping())
+ {
+ log.info("The portal environment could not be set for the webapp '" + ctxName
+ + "' because this servlet context has not been defined as a "
+ + "dependency of any portal container or it is a disabled portal"
+ + " container, the contextDestroyed event will be ignored");
+ }
}
catch (Exception ex)
{
Modified: portal/branches/branch-GTNPORTAL-1592/examples/portal/war/src/main/webapp/WEB-INF/web.xml
===================================================================
--- portal/branches/branch-GTNPORTAL-1592/examples/portal/war/src/main/webapp/WEB-INF/web.xml 2010-10-26 14:34:50 UTC (rev 4847)
+++ portal/branches/branch-GTNPORTAL-1592/examples/portal/war/src/main/webapp/WEB-INF/web.xml 2010-10-27 03:16:50 UTC (rev 4848)
@@ -73,6 +73,16 @@
<filter-name>CacheUserProfileFilter</filter-name>
<filter-class>org.exoplatform.web.CacheUserProfileFilter</filter-class>
</filter>
+
+ <filter>
+ <filter-name>PortalContainerFilter</filter-name>
+ <filter-class>org.exoplatform.container.web.PortalContainerFilter</filter-class>
+ </filter>
+
+ <filter-mapping>
+ <filter-name>PortalContainerFilter</filter-name>
+ <url-pattern>/*</url-pattern>
+ </filter-mapping>
<filter-mapping>
<filter-name>GenericFilter</filter-name>
Modified: portal/branches/branch-GTNPORTAL-1592/web/portal/src/main/webapp/WEB-INF/web.xml
===================================================================
--- portal/branches/branch-GTNPORTAL-1592/web/portal/src/main/webapp/WEB-INF/web.xml 2010-10-26 14:34:50 UTC (rev 4847)
+++ portal/branches/branch-GTNPORTAL-1592/web/portal/src/main/webapp/WEB-INF/web.xml 2010-10-27 03:16:50 UTC (rev 4848)
@@ -94,6 +94,16 @@
<filter-name>ClusteredSSOFilter</filter-name>
<filter-class>org.exoplatform.web.login.ClusteredSSOFilter</filter-class>
</filter>
+
+ <filter>
+ <filter-name>PortalContainerFilter</filter-name>
+ <filter-class>org.exoplatform.container.web.PortalContainerFilter</filter-class>
+ </filter>
+
+ <filter-mapping>
+ <filter-name>PortalContainerFilter</filter-name>
+ <url-pattern>/*</url-pattern>
+ </filter-mapping>
<filter-mapping>
<filter-name>RememberMeFilter</filter-name>
13 years, 8 months
- 1
- 0
gatein SVN: r4847 - in components/wsrp/trunk: admin-gui/src/main/webapp/WEB-INF/classes and 4 other directories.
by do-not-reply＠jboss.org
Author: chris.laprun(a)jboss.com
Date: 2010-10-26 10:34:50 -0400 (Tue, 26 Oct 2010)
New Revision: 4847
Modified:
components/wsrp/trunk/admin-gui/src/main/java/org/gatein/wsrp/admin/ui/ConsumerManagerBean.java
components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/classes/Resource.properties
components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/classes/Resource_fr.properties
components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/EndpointConfigurationInfo.java
components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/ProducerInfo.java
components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/services/SOAPServiceFactory.java
components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/services/ServiceFactory.java
components/wsrp/trunk/consumer/src/test/java/org/gatein/wsrp/test/protocol/v1/BehaviorBackedServiceFactory.java
components/wsrp/trunk/consumer/src/test/java/org/gatein/wsrp/test/protocol/v2/BehaviorBackedServiceFactory.java
Log:
- GTNWSRP-118: replaced EndpointConfigurationInfo.forceRefresh method implementation by call to new ServiceFactory.refresh method. This also has the advantage of not tying EndpointConfigurationInfo to WSRP classes.
- GTNWSRP-120: improved handling of ProducerInfo.refresh when WSDL is not correct. Improved error message as well.
Modified: components/wsrp/trunk/admin-gui/src/main/java/org/gatein/wsrp/admin/ui/ConsumerManagerBean.java
===================================================================
--- components/wsrp/trunk/admin-gui/src/main/java/org/gatein/wsrp/admin/ui/ConsumerManagerBean.java 2010-10-26 14:34:32 UTC (rev 4846)
+++ components/wsrp/trunk/admin-gui/src/main/java/org/gatein/wsrp/admin/ui/ConsumerManagerBean.java 2010-10-26 14:34:50 UTC (rev 4847)
@@ -50,6 +50,7 @@
private static final String REFRESH_BYPASSED = "bean_consumermanager_refresh_bypassed";
private static final String REFRESH_SUCCESS = "bean_consumermanager_refresh_success";
private static final String REFRESH_FAILURE = "bean_consumermanager_refresh_failure";
+ private static final String REFRESH_FAILURE_WSDL = "bean_consumermanager_refresh_failure_wsdl";
private static final String REFRESH_EXCEPTION = "bean_consumermanager_refresh_exception";
static final String CONFIGURE_CONSUMER = "configureConsumer";
static final String EXPORT = "export";
@@ -329,8 +330,15 @@
}
else if (RefreshResult.Status.FAILURE.equals(status))
{
- // todo: extract information from registration result to be more precise
- return REFRESH_FAILURE;
+ RefreshResult registrationResult = result.getRegistrationResult();
+ if (registrationResult != null)
+ {
+ return REFRESH_FAILURE;
+ }
+ else
+ {
+ return REFRESH_FAILURE_WSDL;
+ }
}
else if (RefreshResult.Status.MODIFY_REGISTRATION_REQUIRED.equals(status))
{
Modified: components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/classes/Resource.properties
===================================================================
--- components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/classes/Resource.properties 2010-10-26 14:34:32 UTC (rev 4846)
+++ components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/classes/Resource.properties 2010-10-26 14:34:50 UTC (rev 4847)
@@ -194,6 +194,7 @@
bean_consumermanager_refresh_bypassed = Refresh was not necessary.
bean_consumermanager_refresh_success = Refresh was successful.
bean_consumermanager_refresh_failure = Refresh failed (probably because the registration information was not valid).
+bean_consumermanager_refresh_failure_wsdl = Refresh failed (probably because the WSDL information was not valid).
bean_consumermanager_refresh_exception = An unexpected error occurred.
bean_consumermanager_refresh_modify = Either local or remote information has been changed, you should modify your registration with the remote producer.\n\
The new local information will be saved but your current registration data will be used until you successfully \
Modified: components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/classes/Resource_fr.properties
===================================================================
--- components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/classes/Resource_fr.properties 2010-10-26 14:34:32 UTC (rev 4846)
+++ components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/classes/Resource_fr.properties 2010-10-26 14:34:50 UTC (rev 4847)
@@ -179,4 +179,5 @@
edit_consumer_export=Exporter portlets
edit_consumer_export_title=Portlets en export
edit_consumer_import=Importer portlets
-edit_consumer_import_title=Portlets en import
\ No newline at end of file
+edit_consumer_import_title=Portlets en import
+bean_consumermanager_refresh_failure_wsdl=Le rafra\u00eechissement a \u00e9chou\u00e9 (probablement \u00e0 cause d'URL WSDL non valide)
\ No newline at end of file
Modified: components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/EndpointConfigurationInfo.java
===================================================================
--- components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/EndpointConfigurationInfo.java 2010-10-26 14:34:32 UTC (rev 4846)
+++ components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/EndpointConfigurationInfo.java 2010-10-26 14:34:50 UTC (rev 4847)
@@ -32,10 +32,6 @@
import org.gatein.wsrp.services.SOAPServiceFactory;
import org.gatein.wsrp.services.ServiceDescriptionService;
import org.gatein.wsrp.services.ServiceFactory;
-import org.oasis.wsrp.v2.WSRPV2MarkupPortType;
-import org.oasis.wsrp.v2.WSRPV2PortletManagementPortType;
-import org.oasis.wsrp.v2.WSRPV2RegistrationPortType;
-import org.oasis.wsrp.v2.WSRPV2ServiceDescriptionPortType;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -198,12 +194,14 @@
boolean forceRefresh() throws InvokerUnavailableException
{
- getService(WSRPV2ServiceDescriptionPortType.class, serviceFactory);
- getService(WSRPV2MarkupPortType.class, serviceFactory);
- getService(WSRPV2PortletManagementPortType.class, serviceFactory);
- getService(WSRPV2RegistrationPortType.class, serviceFactory);
-
- return true;
+ try
+ {
+ return serviceFactory.refresh(true);
+ }
+ catch (Exception e)
+ {
+ throw new InvokerUnavailableException(e);
+ }
}
public String getRemoteHostAddress()
Modified: components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/ProducerInfo.java
===================================================================
--- components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/ProducerInfo.java 2010-10-26 14:34:32 UTC (rev 4846)
+++ components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/ProducerInfo.java 2010-10-26 14:34:50 UTC (rev 4847)
@@ -339,6 +339,13 @@
{
RefreshResult result = internalRefresh(forceRefresh);
+ // if the refresh failed, return immediately
+ if (RefreshResult.Status.FAILURE.equals(result.getStatus()))
+ {
+ setActiveAndSave(false);
+ return result;
+ }
+
// update DB
if (result.didRefreshHappen())
{
@@ -347,7 +354,7 @@
{
setActive(false);
- // record what the Producer's expectations are
+ // record what the Producer's expectations are if we managed to get a service description
expectedRegistrationInfo = new RegistrationInfo(this.persistentRegistrationInfo);
expectedRegistrationInfo.refresh(result.getServiceDescription(), getId(), true, true, true);
}
@@ -397,7 +404,16 @@
log.debug("Couldn't refresh endpoint information, attempting a second time: " + e, e);
// try again as refresh on a failed service factory will fail without attempting the refresh
- didJustRefresh = persistentEndpointInfo.forceRefresh();
+ try
+ {
+ didJustRefresh = persistentEndpointInfo.forceRefresh();
+ }
+ catch (InvokerUnavailableException e1)
+ {
+ result.setStatus(RefreshResult.Status.FAILURE);
+ return result;
+ }
+
// todo: should we fail fast here?
// throw new PortletInvokerException("Couldn't refresh endpoint information: " + e.getLocalizedMessage());
}
Modified: components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/services/SOAPServiceFactory.java
===================================================================
--- components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/services/SOAPServiceFactory.java 2010-10-26 14:34:32 UTC (rev 4846)
+++ components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/services/SOAPServiceFactory.java 2010-10-26 14:34:50 UTC (rev 4847)
@@ -155,11 +155,7 @@
log.debug("Getting service for class " + clazz);
}
- // if we need a refresh, reload information from WSDL
- if (!isAvailable() && !isFailed())
- {
- start();
- }
+ refresh(false);
Object service = wsService.getPort(clazz);
@@ -429,6 +425,19 @@
}
}
+ public boolean refresh(boolean force) throws Exception
+ {
+ // if we need a refresh, reload information from WSDL
+ if (force || (!isAvailable() && !isFailed()))
+ {
+ start();
+
+ return true;
+ }
+
+ return false;
+ }
+
protected class WSDLInfo
{
private final QName wsrp2ServiceQName;
Modified: components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/services/ServiceFactory.java
===================================================================
--- components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/services/ServiceFactory.java 2010-10-26 14:34:32 UTC (rev 4846)
+++ components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/services/ServiceFactory.java 2010-10-26 14:34:50 UTC (rev 4847)
@@ -89,4 +89,6 @@
* @return
*/
Version getWSRPVersion();
+
+ boolean refresh(boolean force) throws Exception;
}
Modified: components/wsrp/trunk/consumer/src/test/java/org/gatein/wsrp/test/protocol/v1/BehaviorBackedServiceFactory.java
===================================================================
--- components/wsrp/trunk/consumer/src/test/java/org/gatein/wsrp/test/protocol/v1/BehaviorBackedServiceFactory.java 2010-10-26 14:34:32 UTC (rev 4846)
+++ components/wsrp/trunk/consumer/src/test/java/org/gatein/wsrp/test/protocol/v1/BehaviorBackedServiceFactory.java 2010-10-26 14:34:50 UTC (rev 4847)
@@ -179,6 +179,18 @@
return ServiceFactory.WSRP1;
}
+ public boolean refresh(boolean force) throws Exception
+ {
+ if (force || (!isAvailable() && !isFailed()))
+ {
+ start();
+
+ return true;
+ }
+
+ return false;
+ }
+
public void create() throws Exception
{
throw new NotYetImplemented();
Modified: components/wsrp/trunk/consumer/src/test/java/org/gatein/wsrp/test/protocol/v2/BehaviorBackedServiceFactory.java
===================================================================
--- components/wsrp/trunk/consumer/src/test/java/org/gatein/wsrp/test/protocol/v2/BehaviorBackedServiceFactory.java 2010-10-26 14:34:32 UTC (rev 4846)
+++ components/wsrp/trunk/consumer/src/test/java/org/gatein/wsrp/test/protocol/v2/BehaviorBackedServiceFactory.java 2010-10-26 14:34:50 UTC (rev 4847)
@@ -138,6 +138,18 @@
return ServiceFactory.WSRP2;
}
+ public boolean refresh(boolean force) throws Exception
+ {
+ if (force || (!isAvailable() && !isFailed()))
+ {
+ start();
+
+ return true;
+ }
+
+ return false;
+ }
+
public BehaviorRegistry getRegistry()
{
return registry;
13 years, 8 months
- 1
- 0
gatein SVN: r4846 - in portal/branches/branch-GTNPORTAL-1592/webui: eXo/src/main/java/org/exoplatform/webui/organization/account and 1 other directory.
by do-not-reply＠jboss.org
Author: ndkhoiits
Date: 2010-10-26 10:34:32 -0400 (Tue, 26 Oct 2010)
New Revision: 4846
Modified:
portal/branches/branch-GTNPORTAL-1592/webui/core/src/main/java/org/exoplatform/webui/core/UIPageIterator.java
portal/branches/branch-GTNPORTAL-1592/webui/eXo/src/main/java/org/exoplatform/webui/organization/account/UIUserSelector.java
Log:
GTNPORTAL-1577 Persist user selection state when adding users to group or change to other page
Modified: portal/branches/branch-GTNPORTAL-1592/webui/core/src/main/java/org/exoplatform/webui/core/UIPageIterator.java
===================================================================
--- portal/branches/branch-GTNPORTAL-1592/webui/core/src/main/java/org/exoplatform/webui/core/UIPageIterator.java 2010-10-26 12:06:39 UTC (rev 4845)
+++ portal/branches/branch-GTNPORTAL-1592/webui/core/src/main/java/org/exoplatform/webui/core/UIPageIterator.java 2010-10-26 14:34:32 UTC (rev 4846)
@@ -19,15 +19,17 @@
package org.exoplatform.webui.core;
+import org.exoplatform.commons.serialization.api.annotations.Serialized;
import org.exoplatform.commons.utils.EmptySerializablePageList;
import org.exoplatform.commons.utils.PageList;
-import org.exoplatform.commons.serialization.api.annotations.Serialized;
import org.exoplatform.webui.config.annotation.ComponentConfig;
import org.exoplatform.webui.config.annotation.EventConfig;
import org.exoplatform.webui.event.Event;
import org.exoplatform.webui.event.EventListener;
+import java.util.HashSet;
import java.util.List;
+import java.util.Set;
/**
* A component that allows pagination, with an iterator to change pages
@@ -42,6 +44,8 @@
*/
private PageList pageList_ = EmptySerializablePageList.get();
+ private Set<String> selectedItems = new HashSet<String>();
+
public UIPageIterator()
{
}
@@ -95,6 +99,28 @@
{
pageList_.getPage(page);
}
+
+ public void setSelectedItem(String key, boolean value)
+ {
+ if (value == false && this.selectedItems.contains(key))
+ {
+ selectedItems.remove(key);
+ }
+ else if (value)
+ {
+ selectedItems.add(key);
+ }
+ }
+
+ public Set<String> getSelectedItems()
+ {
+ return selectedItems;
+ }
+
+ public boolean isSelectedItem(String key)
+ {
+ return selectedItems.contains(key);
+ }
@SuppressWarnings("unused")
static public class ShowPageActionListener extends EventListener<UIPageIterator>
Modified: portal/branches/branch-GTNPORTAL-1592/webui/eXo/src/main/java/org/exoplatform/webui/organization/account/UIUserSelector.java
===================================================================
--- portal/branches/branch-GTNPORTAL-1592/webui/eXo/src/main/java/org/exoplatform/webui/organization/account/UIUserSelector.java 2010-10-26 12:06:39 UTC (rev 4845)
+++ portal/branches/branch-GTNPORTAL-1592/webui/eXo/src/main/java/org/exoplatform/webui/organization/account/UIUserSelector.java 2010-10-26 14:34:32 UTC (rev 4846)
@@ -41,18 +41,20 @@
import org.exoplatform.webui.core.lifecycle.UIFormLifecycle;
import org.exoplatform.webui.core.model.SelectItemOption;
import org.exoplatform.webui.event.Event;
+import org.exoplatform.webui.event.Event.Phase;
import org.exoplatform.webui.event.EventListener;
-import org.exoplatform.webui.event.Event.Phase;
import org.exoplatform.webui.form.UIForm;
import org.exoplatform.webui.form.UIFormCheckBoxInput;
import org.exoplatform.webui.form.UIFormSelectBox;
import org.exoplatform.webui.form.UIFormStringInput;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Collection;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.Set;
import java.util.concurrent.CopyOnWriteArrayList;
/**
@@ -119,7 +121,7 @@
uiIterator_ = new UIPageIterator();
uiIterator_.setPageList(objPageList);
uiIterator_.setId("UISelectUserPage");
-
+
// create group selector
UIPopupWindow uiPopup = addChild(UIPopupWindow.class, null, "UIPopupGroupSelector");
uiPopup.setWindowSize(540, 0);
@@ -138,8 +140,14 @@
for (Object obj : uiIterator_.getCurrentPageData())
{
User user = (User)obj;
- if (getUIFormCheckBoxInput(user.getUserName()) == null)
- addUIFormInput(new UIFormCheckBoxInput<Boolean>(user.getUserName(), user.getUserName(), false));
+ UIFormCheckBoxInput<Boolean> uiFormCheckBoxInput = getUIFormCheckBoxInput(user.getUserName());
+ if (uiFormCheckBoxInput == null)
+ {
+ uiFormCheckBoxInput = new UIFormCheckBoxInput<Boolean>(user.getUserName(), user.getUserName(), false);
+ addUIFormInput(uiFormCheckBoxInput);
+ }
+
+ uiFormCheckBoxInput.setChecked(uiIterator_.isSelectedItem(user.getUserName()));
}
}
return new ArrayList<User>(uiIterator_.getCurrentPageData());
@@ -315,31 +323,32 @@
static public class AddActionListener extends EventListener<UIUserSelector>
{
- @SuppressWarnings("unchecked")
public void execute(Event<UIUserSelector> event) throws Exception
{
UIUserSelector uiForm = event.getSource();
StringBuilder sb = new StringBuilder();
- int count = 0;
- for (Object o : uiForm.uiIterator_.getCurrentPageData())
+
+ uiForm.setSelectedItem();
+
+ // get item from selected item map
+ Set<String> items = uiForm.uiIterator_.getSelectedItems();
+ if (items.size() == 0)
{
- User u = (User)o;
- UIFormCheckBoxInput input = uiForm.getUIFormCheckBoxInput(u.getUserName());
- if (input != null && input.isChecked())
- {
- count++;
- if (sb.toString() != null && sb.toString().trim().length() != 0)
- sb.append(",");
- sb.append(u.getUserName());
- }
- }
- if (count == 0)
- {
UIApplication uiApp = uiForm.getAncestorOfType(UIApplication.class);
uiApp.addMessage(new ApplicationMessage("UIUserSelector.msg.user-required", null));
event.getRequestContext().addUIComponentToUpdateByAjax(uiApp.getUIPopupMessages());
return;
}
+ String[] arrItems = items.toArray(new String[items.size()]);
+ Arrays.sort(arrItems);
+
+ for (String key : arrItems)
+ {
+ if (sb.toString() != null && sb.toString().trim().length() != 0)
+ sb.append(",");
+ sb.append(key);
+ }
+
uiForm.setSelectedUsers(sb.toString());
uiForm.<UIComponent> getParent().broadcast(event, event.getExecutionPhase());
}
@@ -379,6 +388,19 @@
{
getUIStringInput(FIELD_KEYWORD).setValue(value);
}
+
+ private void setSelectedItem() throws Exception
+ {
+ for (Object o : this.uiIterator_.getCurrentPageData())
+ {
+ User u = (User) o;
+ UIFormCheckBoxInput input = this.getUIFormCheckBoxInput(u.getUserName());
+ if (input != null)
+ {
+ this.uiIterator_.setSelectedItem(u.getUserName(), input.isChecked());
+ }
+ }
+ }
static public class SelectGroupActionListener extends EventListener<UIGroupSelector>
{
@@ -457,6 +479,8 @@
public void execute(Event<UIUserSelector> event) throws Exception
{
UIUserSelector uiSelectUserForm = event.getSource();
+ uiSelectUserForm.setSelectedItem();
+
int page = Integer.parseInt(event.getRequestContext().getRequestParameter(OBJECTID));
uiSelectUserForm.updateCurrentPage(page);
event.getRequestContext().addUIComponentToUpdateByAjax(uiSelectUserForm);
13 years, 8 months
- 1
- 0