gatein SVN: r8758 - in epp/portal/branches/EPP_5_2_Branch/portlet/dashboard/src/main: webapp/WEB-INF/classes/locale/portlet/dashboard and 1 other directory.
by do-not-reply＠jboss.org
Author: ppalaga
Date: 2012-06-29 08:10:35 -0400 (Fri, 29 Jun 2012)
New Revision: 8758
Modified:
epp/portal/branches/EPP_5_2_Branch/portlet/dashboard/src/main/java/org/exoplatform/dashboard/webui/component/UITabPaneDashboard.java
epp/portal/branches/EPP_5_2_Branch/portlet/dashboard/src/main/webapp/WEB-INF/classes/locale/portlet/dashboard/TabbedDashboardPortlet_cs.properties
epp/portal/branches/EPP_5_2_Branch/portlet/dashboard/src/main/webapp/WEB-INF/classes/locale/portlet/dashboard/TabbedDashboardPortlet_de.properties
epp/portal/branches/EPP_5_2_Branch/portlet/dashboard/src/main/webapp/WEB-INF/classes/locale/portlet/dashboard/TabbedDashboardPortlet_en.properties
epp/portal/branches/EPP_5_2_Branch/portlet/dashboard/src/main/webapp/WEB-INF/classes/locale/portlet/dashboard/TabbedDashboardPortlet_fr.properties
Log:
Bug 805527 - message when adding dashboard page with invalid name
Modified: epp/portal/branches/EPP_5_2_Branch/portlet/dashboard/src/main/java/org/exoplatform/dashboard/webui/component/UITabPaneDashboard.java
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/portlet/dashboard/src/main/java/org/exoplatform/dashboard/webui/component/UITabPaneDashboard.java 2012-06-29 11:13:50 UTC (rev 8757)
+++ epp/portal/branches/EPP_5_2_Branch/portlet/dashboard/src/main/java/org/exoplatform/dashboard/webui/component/UITabPaneDashboard.java 2012-06-29 12:10:35 UTC (rev 8758)
@@ -35,7 +35,6 @@
import org.exoplatform.portal.webui.page.UIPageBody;
import org.exoplatform.portal.webui.portal.UIPortal;
import org.exoplatform.portal.webui.util.Util;
-import org.exoplatform.portal.webui.workspace.UIPortalApplication;
import org.exoplatform.services.log.ExoLogger;
import org.exoplatform.services.log.Log;
import org.exoplatform.web.application.ApplicationMessage;
@@ -264,7 +263,7 @@
return null;
}
- String uniqueNodeName = nodeLabel.toLowerCase().replace(' ', '_');
+ String uniqueNodeName = buildName(nodeLabel);
SiteKey siteKey = userNav.getKey();
Page page =
@@ -304,16 +303,23 @@
{
return false;
}
+ return true;
+ }
+
+ private String buildName(String label)
+ {
+ StringBuffer nodeName = new StringBuffer();
for (int i = 0; i < label.length(); i++)
{
char c = label.charAt(i);
- if (Character.isLetter(c) || Character.isDigit(c) || c == '_' || c == '-' || Character.isSpaceChar(c))
+ if (Character.isLetter(c) || Character.isDigit(c) || c == '_' || c == '-')
{
+ nodeName.append(c);
continue;
}
- return false;
+ nodeName.append("_");
}
- return true;
+ return nodeName.toString();
}
public UserNode renamePageNode(String nodeName, String newNodeLabel)
@@ -328,7 +334,7 @@
UserNode renamedNode = parentNode.getChild(nodeName);
renamedNode.setLabel(newNodeLabel);
- String newNodeName = newNodeLabel.toLowerCase().replace(' ', '_');
+ String newNodeName = buildName(newNodeLabel);
if (parentNode.getChild(newNodeName) != null)
{
newNodeName = newNodeName + "_" + System.currentTimeMillis();
Modified: epp/portal/branches/EPP_5_2_Branch/portlet/dashboard/src/main/webapp/WEB-INF/classes/locale/portlet/dashboard/TabbedDashboardPortlet_cs.properties
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/portlet/dashboard/src/main/webapp/WEB-INF/classes/locale/portlet/dashboard/TabbedDashboardPortlet_cs.properties 2012-06-29 11:13:50 UTC (rev 8757)
+++ epp/portal/branches/EPP_5_2_Branch/portlet/dashboard/src/main/webapp/WEB-INF/classes/locale/portlet/dashboard/TabbedDashboardPortlet_cs.properties 2012-06-29 12:10:35 UTC (rev 8758)
@@ -18,11 +18,11 @@
# 02110-1301 USA, or see the FSF site: http://www.fsf.org.
#
-UITabPaneDashboard.action.addNewDashboard=P\u0159idat n\u00E1st\u011Bnku
-UITabPaneDashboard.action.switchShowRange=Zm\u011Bnit rozsah
-UITabPaneDashboard.msg.cannotDeleteLastTab=Nemohu smazat posledn\u00ED z\u00E1lo\u017Eku.
-UITabPaneDashboard.msg.deleteTab=Opravdu chcete smazat tuto n\u00E1st\u011Bnku?
-UITabPaneDashboard.msg.wrongTabName={0}: je nespr\u00E1vn\u00E1; pouze p\u00EDsmena, \u010D\u00EDslice, podtr\u017E\u00EDtko, poml\u010Dka a mezera jsou povoleny.
+UITabPaneDashboard.action.addNewDashboard=P\u0159idat n\u00e1st\u011bnku
+UITabPaneDashboard.action.switchShowRange=Zm\u011bnit rozsah
+UITabPaneDashboard.msg.cannotDeleteLastTab=Nemohu smazat posledn\u00ed z\u00e1lo\u017eku.
+UITabPaneDashboard.msg.deleteTab=Opravdu chcete smazat tuto n\u00e1st\u011bnku?
+UITabPaneDashboard.msg.wrongTabName=Jm\u00e9no mus\u00ed b\u00fdt vypln\u011bno a mus\u00ed za\u010d\u00ednat p\u00edsmenem.
# Copyright (C) 2009 eXo Platform SAS.
#
# This is free software; you can redistribute it and/or modify it
@@ -45,4 +45,4 @@
UITabPaneDashboard.action.switchShowRange=Zm\u011bnit rozsah
UITabPaneDashboard.msg.cannotDeleteLastTab=Nemohu smazat posledn\u00ed z\u00e1lo\u017eku.
UITabPaneDashboard.msg.deleteTab=Opravdu chcete smazat tuto n\u00e1st\u011bnku?
-UITabPaneDashboard.msg.wrongTabName={0}: je nespr\u00e1vn\u00e1; pouze p\u00edsmena, \u010d\u00edslice, podtr\u017e\u00edtko, poml\u010dka a mezera jsou povoleny.
+UITabPaneDashboard.msg.wrongTabName=Jm\u00e9no mus\u00ed b\u00fdt vypln\u011bno a mus\u00ed za\u010d\u00ednat p\u00edsmenem.
Modified: epp/portal/branches/EPP_5_2_Branch/portlet/dashboard/src/main/webapp/WEB-INF/classes/locale/portlet/dashboard/TabbedDashboardPortlet_de.properties
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/portlet/dashboard/src/main/webapp/WEB-INF/classes/locale/portlet/dashboard/TabbedDashboardPortlet_de.properties 2012-06-29 11:13:50 UTC (rev 8757)
+++ epp/portal/branches/EPP_5_2_Branch/portlet/dashboard/src/main/webapp/WEB-INF/classes/locale/portlet/dashboard/TabbedDashboardPortlet_de.properties 2012-06-29 12:10:35 UTC (rev 8758)
@@ -21,4 +21,4 @@
UITabPaneDashboard.action.switchShowRange=Switch Range
UITabPaneDashboard.msg.deleteTab=M\u00f6chten Sie wirklich dieses Dashboard entfernen?
UITabPaneDashboard.msg.cannotDeleteLastTab=Die letzte Registerkarte kann nicht gel\u00f6scht werden.
-UITabPaneDashboard.msg.wrongTabName=Es sind nur Buchstaben und Zahlen sowie Unterstrich, Freizeichen und Bindestrich erlaubt.
\ No newline at end of file
+UITabPaneDashboard.msg.wrongTabName=Der Name muss ausgef\u00fcllt werden und es muss mit einem Buchtaben anfangen.
\ No newline at end of file
Modified: epp/portal/branches/EPP_5_2_Branch/portlet/dashboard/src/main/webapp/WEB-INF/classes/locale/portlet/dashboard/TabbedDashboardPortlet_en.properties
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/portlet/dashboard/src/main/webapp/WEB-INF/classes/locale/portlet/dashboard/TabbedDashboardPortlet_en.properties 2012-06-29 11:13:50 UTC (rev 8757)
+++ epp/portal/branches/EPP_5_2_Branch/portlet/dashboard/src/main/webapp/WEB-INF/classes/locale/portlet/dashboard/TabbedDashboardPortlet_en.properties 2012-06-29 12:10:35 UTC (rev 8758)
@@ -21,4 +21,4 @@
UITabPaneDashboard.action.switchShowRange=Switch Range
UITabPaneDashboard.msg.deleteTab=Really want to remove this dashboard?
UITabPaneDashboard.msg.cannotDeleteLastTab=Can not delete the last tab.
-UITabPaneDashboard.msg.wrongTabName={0}: is invalid; only alpha, digit, underscore, dash and space characters allowed.
\ No newline at end of file
+UITabPaneDashboard.msg.wrongTabName=Name cannot be empty and must start with a character
\ No newline at end of file
Modified: epp/portal/branches/EPP_5_2_Branch/portlet/dashboard/src/main/webapp/WEB-INF/classes/locale/portlet/dashboard/TabbedDashboardPortlet_fr.properties
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/portlet/dashboard/src/main/webapp/WEB-INF/classes/locale/portlet/dashboard/TabbedDashboardPortlet_fr.properties 2012-06-29 11:13:50 UTC (rev 8757)
+++ epp/portal/branches/EPP_5_2_Branch/portlet/dashboard/src/main/webapp/WEB-INF/classes/locale/portlet/dashboard/TabbedDashboardPortlet_fr.properties 2012-06-29 12:10:35 UTC (rev 8758)
@@ -20,5 +20,5 @@
UITabPaneDashboard.action.addNewDashboard =Ajoute Dashboard
UITabPaneDashboard.action.switchShowRange =Decale
UITabPaneDashboard.msg.deleteTab=Really want to remove this dashboard?
-UITabPaneDashboard.msg.cannotDeleteLastTab=Can not delete the last tab.
-UITabPaneDashboard.msg.wrongTabName={0}: is invalid; only alpha, digit, underscore, dash and space characters allowed.
\ No newline at end of file
+UITabPaneDashboard.msg.cannotDeleteLastTab=Impossible de supprimer le dernier onglet
+UITabPaneDashboard.msg.wrongTabName=Nom ne peut pas \u00eatre vide et doit commencer par un caract\u00e8re
\ No newline at end of file
11 years, 10 months
gatein SVN: r8757 - in epp/portal/branches/EPP_5_2_Branch: distribution/mead-tools/gatein-wsrp and 1 other directory.
by do-not-reply＠jboss.org
Author: hfnukal
Date: 2012-06-29 07:13:50 -0400 (Fri, 29 Jun 2012)
New Revision: 8757
Modified:
epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-wsrp/pom.xml
epp/portal/branches/EPP_5_2_Branch/pom.xml
Log:
Bug 836223 - WSRP upgrade to 2.1.6-EPP522-GA
Modified: epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-wsrp/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-wsrp/pom.xml 2012-06-29 07:08:20 UTC (rev 8756)
+++ epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-wsrp/pom.xml 2012-06-29 11:13:50 UTC (rev 8757)
@@ -17,10 +17,11 @@
<properties>
- <scm.type>svn</scm.type>
- <scm.base>${svn.base}</scm.base>
- <scm.repo>${svn.gatein.repo}</scm.repo>
- <scm.path>components/wsrp/tags/${org.gatein.wsrp.version}</scm.path>
+ <scm.type>git</scm.type>
+ <scm.base>${git.base}</scm.base>
+ <scm.repo>gatein</scm.repo>
+ <scm.path>gatein-wsrp.git</scm.path>
+ <scm.version>${org.gatein.wsrp.version}</scm.version>
<mead.build.profiles></mead.build.profiles>
<mead.build.properties>skipTests=true container.unpack.dir=/maven/build/test-containers JBOSS_5_1_0_HOME=/maven/build/test-containers/jboss-5.1.0.GA </mead.build.properties>
Modified: epp/portal/branches/EPP_5_2_Branch/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/pom.xml 2012-06-29 07:08:20 UTC (rev 8756)
+++ epp/portal/branches/EPP_5_2_Branch/pom.xml 2012-06-29 11:13:50 UTC (rev 8757)
@@ -53,7 +53,7 @@
<org.gatein.wci.version>2.1.1-GA</org.gatein.wci.version>
<org.gatein.pc.version>2.3.1-GA</org.gatein.pc.version>
<org.picketlink.idm>1.3.2.CR01</org.picketlink.idm>
- <org.gatein.wsrp.version>2.1.5-EPP521-GA</org.gatein.wsrp.version>
+ <org.gatein.wsrp.version>2.1.6-EPP522-GA</org.gatein.wsrp.version>
<org.gatein.mop.version>1.1.2-GA</org.gatein.mop.version>
<org.gatein.mgmt.version>1.0.1-GA</org.gatein.mgmt.version>
<org.slf4j.version>1.5.8</org.slf4j.version>
11 years, 10 months
gatein SVN: r8756 - epp/portal/branches/EPP_5_2_Branch.
by do-not-reply＠jboss.org
Author: hfnukal
Date: 2012-06-29 03:08:20 -0400 (Fri, 29 Jun 2012)
New Revision: 8756
Modified:
epp/portal/branches/EPP_5_2_Branch/pom.xml
Log:
Bug 836278 - Upgrade PortletBridge
Modified: epp/portal/branches/EPP_5_2_Branch/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/pom.xml 2012-06-29 05:39:58 UTC (rev 8755)
+++ epp/portal/branches/EPP_5_2_Branch/pom.xml 2012-06-29 07:08:20 UTC (rev 8756)
@@ -68,7 +68,7 @@
<jgroups.version>2.6.20.Final</jgroups.version>
<sso.version>1.1.1-GA</sso.version>
- <portletbridge.version>2.3.0.CP01.EPP521</portletbridge.version>
+ <portletbridge.version>2.3.1.GA.EPP522</portletbridge.version>
<org.jboss.eppsp.version>${project.version}</org.jboss.eppsp.version>
<!-- ************** -->
11 years, 10 months
gatein SVN: r8755 - epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/jboss-picketlink-idm.
by do-not-reply＠jboss.org
Author: hfnukal
Date: 2012-06-29 01:39:58 -0400 (Fri, 29 Jun 2012)
New Revision: 8755
Modified:
epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/jboss-picketlink-idm/pom.xml
Log:
Bug 830081 - PicketLink upgrade
Modified: epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/jboss-picketlink-idm/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/jboss-picketlink-idm/pom.xml 2012-06-28 14:38:09 UTC (rev 8754)
+++ epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/jboss-picketlink-idm/pom.xml 2012-06-29 05:39:58 UTC (rev 8755)
@@ -19,10 +19,11 @@
<doc.path>${project.name}-apidoc</doc.path>
<source.path>${project.name}</source.path>
- <scm.type>svn</scm.type>
- <scm.base>${svn.base}</scm.base>
+ <scm.type>git</scm.type>
+ <scm.base>${git.base}</scm.base>
<scm.repo>picketlink</scm.repo>
- <scm.path>idm/tags/${org.picketlink.idm}</scm.path>
+ <scm.path>picketlink-idm.git</scm.path>
+ <scm.version>${org.picketlink.idm}</scm.version>
<mead.build.profiles>dev</mead.build.profiles>
<mead.build.properties></mead.build.properties>
11 years, 10 months
gatein SVN: r8754 - in epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/src: main/resources/eap and 1 other directories.
by do-not-reply＠jboss.org
Author: hfnukal
Date: 2012-06-28 10:38:09 -0400 (Thu, 28 Jun 2012)
New Revision: 8754
Added:
epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/src/main/resources/eap/CVE-2011-4605/
epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/src/main/resources/eap/CVE-2011-4605/http-invoker.zip
epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/src/main/resources/eap/CVE-2011-4605/jboss-ha-legacy-client.jar
epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/src/main/resources/eap/CVE-2011-4605/jbossha.jar
epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/src/main/resources/eap/CVE-2011-4605/jnpserver.jar
Modified:
epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/src/build.xml
Log:
Bug 836210 - JNDI CVE-2011-4605
Modified: epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/src/build.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/src/build.xml 2012-06-28 14:37:21 UTC (rev 8753)
+++ epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/src/build.xml 2012-06-28 14:38:09 UTC (rev 8754)
@@ -175,4 +175,12 @@
failonerror="${patch.failonerror}"
/>
</target>
+
+ <target name="patch-CVE-2011-4605">
+ <echo>Patch for CVE-2011-4605 JNDI</echo>
+ <copy overwrite="true" file="${basedir}/src/main/resources/eap/CVE-2011-4605/jboss-ha-legacy-client.jar" tofile="${epp.path}/jboss-as/client/jboss-ha-legacy-client.jar"/>
+ <copy overwrite="true" file="${basedir}/src/main/resources/eap/CVE-2011-4605/jbossha.jar" tofile="${epp.path}/jboss-as/common/lib/jbossha.jar"/>
+ <copy overwrite="true" file="${basedir}/src/main/resources/eap/CVE-2011-4605/jnpserver.jar" tofile="${epp.path}/jboss-as/common/lib/jnpserver.jar"/>
+ </target>
+
</project>
\ No newline at end of file
Added: epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/src/main/resources/eap/CVE-2011-4605/http-invoker.zip
===================================================================
(Binary files differ)
Property changes on: epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/src/main/resources/eap/CVE-2011-4605/http-invoker.zip
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/src/main/resources/eap/CVE-2011-4605/jboss-ha-legacy-client.jar
===================================================================
(Binary files differ)
Property changes on: epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/src/main/resources/eap/CVE-2011-4605/jboss-ha-legacy-client.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/src/main/resources/eap/CVE-2011-4605/jbossha.jar
===================================================================
(Binary files differ)
Property changes on: epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/src/main/resources/eap/CVE-2011-4605/jbossha.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/src/main/resources/eap/CVE-2011-4605/jnpserver.jar
===================================================================
(Binary files differ)
Property changes on: epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/src/main/resources/eap/CVE-2011-4605/jnpserver.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
11 years, 10 months
gatein SVN: r8753 - epp/portal/branches/EPP_5_2_Branch.
by do-not-reply＠jboss.org
Author: hfnukal
Date: 2012-06-28 10:37:21 -0400 (Thu, 28 Jun 2012)
New Revision: 8753
Modified:
epp/portal/branches/EPP_5_2_Branch/pom.xml
Log:
Bug 830081 - PicketLink upgrade
Modified: epp/portal/branches/EPP_5_2_Branch/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/pom.xml 2012-06-28 14:36:26 UTC (rev 8752)
+++ epp/portal/branches/EPP_5_2_Branch/pom.xml 2012-06-28 14:37:21 UTC (rev 8753)
@@ -52,7 +52,7 @@
<org.gatein.dep.version>1.1.0-GA</org.gatein.dep.version>
<org.gatein.wci.version>2.1.1-GA</org.gatein.wci.version>
<org.gatein.pc.version>2.3.1-GA</org.gatein.pc.version>
- <org.picketlink.idm>1.3.1.GA</org.picketlink.idm>
+ <org.picketlink.idm>1.3.2.CR01</org.picketlink.idm>
<org.gatein.wsrp.version>2.1.5-EPP521-GA</org.gatein.wsrp.version>
<org.gatein.mop.version>1.1.2-GA</org.gatein.mop.version>
<org.gatein.mgmt.version>1.0.1-GA</org.gatein.mgmt.version>
11 years, 10 months
gatein SVN: r8752 - epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/serverAddon/gatein.ear.
by do-not-reply＠jboss.org
Author: hfnukal
Date: 2012-06-28 10:36:26 -0400 (Thu, 28 Jun 2012)
New Revision: 8752
Modified:
epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/serverAddon/gatein.ear/pom.xml
Log:
Bug 804897 - EMBARGOED CVE-2012-1167 JBoss: authentication bypass when running under JACC with ignoreBaseDecision on JBossWebRealm
Modified: epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/serverAddon/gatein.ear/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/serverAddon/gatein.ear/pom.xml 2012-06-27 12:55:08 UTC (rev 8751)
+++ epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/serverAddon/gatein.ear/pom.xml 2012-06-28 14:36:26 UTC (rev 8752)
@@ -1321,12 +1321,12 @@
</dependency>
<!-- included in EAP endorsed dir -->
-<!-- <dependency>
+ <dependency>
<artifactId>xercesImpl</artifactId>
- <groupId>apache-xerces</groupId>
+ <groupId>xerces</groupId>
<type>jar</type>
- <version>2.9.1</version>
- </dependency>-->
+ <version>2.9.1-patch-01</version>
+ </dependency>
</dependencies>
<build>
11 years, 10 months
gatein SVN: r8751 - in epp/portal/branches/EPP_5_2_Branch/webui: portal/src/main/java/org/exoplatform/portal/webui/application and 1 other directory.
by do-not-reply＠jboss.org
Author: ppalaga
Date: 2012-06-27 08:55:08 -0400 (Wed, 27 Jun 2012)
New Revision: 8751
Modified:
epp/portal/branches/EPP_5_2_Branch/webui/
epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletForm.java
Log:
Bug 793856 - (JBEPP-930) Error message about portlet dimensions (width, height) not clear enough
Property changes on: epp/portal/branches/EPP_5_2_Branch/webui
___________________________________________________________________
Modified: svn:ignore
- *.iml
.idea
.project
+ *.iml
.idea
.project
.settings
Modified: epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletForm.java
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletForm.java 2012-06-27 07:11:15 UTC (rev 8750)
+++ epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletForm.java 2012-06-27 12:55:08 UTC (rev 8751)
@@ -101,9 +101,9 @@
.addValidator(StringLengthValidator.class, 3, 60)
.addValidator(NotHTMLTagValidator.class, "UIPortletForm.msg.InvalidPortletTitle"))
.addUIFormInput(new UIFormStringInput("width", "width", null)
- .addValidator(ExpressionValidator.class, "(^([1-9]\\d*)px$)?", "UIPortletForm.msg.InvalidWidthHeight"))
+ .addValidator(ExpressionValidator.class, "(^([1-9]\\d*)(?:px)?$)?", "UIPortletForm.msg.InvalidWidthHeight"))
.addUIFormInput(new UIFormStringInput("height", "height", null)
- .addValidator(ExpressionValidator.class, "(^([1-9]\\d*)px$)?", "UIPortletForm.msg.InvalidWidthHeight"))
+ .addValidator(ExpressionValidator.class, "(^([1-9]\\d*)(?:px)?$)?", "UIPortletForm.msg.InvalidWidthHeight"))
.addUIFormInput(new UICheckBoxInput("showInfoBar", "showInfoBar", false))
.addUIFormInput(new UICheckBoxInput("showPortletMode", "showPortletMode", false))
.addUIFormInput(new UICheckBoxInput("showWindowState", "showWindowState", false))
@@ -383,6 +383,10 @@
}
else
{
+ if (!width.endsWith("px"))
+ {
+ width = width.concat("px");
+ }
uiPortlet.setWidth(width);
}
@@ -393,6 +397,10 @@
}
else
{
+ if (!height.endsWith("px"))
+ {
+ height = height.concat("px");
+ }
uiPortlet.setHeight(height);
}
11 years, 10 months
gatein SVN: r8750 - in epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF: conf/jbosscache/local and 2 other directories.
by do-not-reply＠jboss.org
Author: hfnukal
Date: 2012-06-27 03:11:15 -0400 (Wed, 27 Jun 2012)
New Revision: 8750
Modified:
epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/classes/picketlink-idm/idm-local-cache-config.xml
epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/jbosscache/local/config.xml
epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/jcr/jbosscache/local/config.xml
epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/jcr/jbosscache/local/lock-config.xml
epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/jboss-cache.xml
Log:
Bug 803776 - Disable exposure of jmx stats for anonymous caches
Modified: epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/classes/picketlink-idm/idm-local-cache-config.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/classes/picketlink-idm/idm-local-cache-config.xml 2012-06-27 07:04:43 UTC (rev 8749)
+++ epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/classes/picketlink-idm/idm-local-cache-config.xml 2012-06-27 07:11:15 UTC (rev 8750)
@@ -36,6 +36,8 @@
<!-- A config appropriate for entity/collection caching. -->
<cache-config name="local-optimistic-entity">
+ <!-- Disable exposure of jmx stats for anonymous caches -->
+ <jmxStatistics enabled="false"/>
<!-- Node locking scheme -->
<attribute name="NodeLockingScheme">OPTIMISTIC</attribute>
@@ -114,6 +116,8 @@
itself is configured with CacheMode=LOCAL.
-->
<cache-config name="local-timestamps-cache">
+ <!-- Disable exposure of jmx stats for anonymous caches -->
+ <jmxStatistics enabled="false"/>
<!-- Node locking scheme -->
<attribute name="NodeLockingScheme">PESSIMISTIC</attribute>
Modified: epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/jbosscache/local/config.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/jbosscache/local/config.xml 2012-06-27 07:04:43 UTC (rev 8749)
+++ epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/jbosscache/local/config.xml 2012-06-27 07:11:15 UTC (rev 8750)
@@ -18,5 +18,6 @@
-->
<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:jboss:jbosscache-core:config:3.1">
-
+ <!-- Disable exposure of jmx stats for anonymous caches -->
+ <jmxStatistics enabled="false"/>
</jbosscache>
\ No newline at end of file
Modified: epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/jcr/jbosscache/local/config.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/jcr/jbosscache/local/config.xml 2012-06-27 07:04:43 UTC (rev 8749)
+++ epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/jcr/jbosscache/local/config.xml 2012-06-27 07:11:15 UTC (rev 8750)
@@ -36,4 +36,7 @@
</default>
</eviction>
+ <!-- Disable exposure of jmx stats for anonymous caches -->
+ <jmxStatistics enabled="false"/>
+
</jbosscache>
Modified: epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/jcr/jbosscache/local/lock-config.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/jcr/jbosscache/local/lock-config.xml 2012-06-27 07:04:43 UTC (rev 8749)
+++ epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/jcr/jbosscache/local/lock-config.xml 2012-06-27 07:11:15 UTC (rev 8750)
@@ -40,4 +40,6 @@
</properties>
</loader>
</loaders>
+ <!-- Disable exposure of jmx stats for anonymous caches -->
+ <jmxStatistics enabled="false"/>
</jbosscache>
Modified: epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/jboss-cache.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/jboss-cache.xml 2012-06-27 07:04:43 UTC (rev 8749)
+++ epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/jboss-cache.xml 2012-06-27 07:11:15 UTC (rev 8750)
@@ -13,4 +13,6 @@
</default>
</eviction>
+ <!-- Disable exposure of jmx stats for anonymous caches -->
+ <jmxStatistics enabled="false"/>
</jbosscache>
11 years, 10 months
gatein SVN: r8749 - epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/serverAddon/src.
by do-not-reply＠jboss.org
Author: hfnukal
Date: 2012-06-27 03:04:43 -0400 (Wed, 27 Jun 2012)
New Revision: 8749
Modified:
epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/serverAddon/src/assemble.xml
Log:
Bug 821713 - [RFE] Ship gatein-wsrp-integration.ear in exploded format
Modified: epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/serverAddon/src/assemble.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/serverAddon/src/assemble.xml 2012-06-27 06:46:36 UTC (rev 8748)
+++ epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/serverAddon/src/assemble.xml 2012-06-27 07:04:43 UTC (rev 8749)
@@ -56,8 +56,9 @@
<includes>
<include>org.gatein.integration:extension-ear-as5:ear</include>
</includes>
- <outputDirectory>deploy</outputDirectory>
- <outputFileNameMapping>gatein-wsrp-integration.ear</outputFileNameMapping>
+ <outputDirectory>deploy/gatein-wsrp-integration.ear</outputDirectory>
+ <!--<outputFileNameMapping>gatein-wsrp-integration.ear</outputFileNameMapping>-->
+ <unpack>true</unpack>
</dependencySet>
<dependencySet>
<includes>
11 years, 10 months