gatein SVN: r7484 - portal/trunk/component/web/server/src/main/java/org/exoplatform/upload.
by do-not-reply＠jboss.org
Author: haint
Date: 2011-09-22 08:06:15 -0400 (Thu, 22 Sep 2011)
New Revision: 7484
Modified:
portal/trunk/component/web/server/src/main/java/org/exoplatform/upload/MimeTypeUploadPlugin.java
Log:
GTNPORTAL-1966: Change AGPL to LGPL license on header
Modified: portal/trunk/component/web/server/src/main/java/org/exoplatform/upload/MimeTypeUploadPlugin.java
===================================================================
--- portal/trunk/component/web/server/src/main/java/org/exoplatform/upload/MimeTypeUploadPlugin.java 2011-09-22 11:58:08 UTC (rev 7483)
+++ portal/trunk/component/web/server/src/main/java/org/exoplatform/upload/MimeTypeUploadPlugin.java 2011-09-22 12:06:15 UTC (rev 7484)
@@ -1,8 +1,8 @@
-/*
+/**
* Copyright (C) 2003-2011 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
+ * modify it under the terms of the GNU Lesser General Public License
* as published by the Free Software Foundation; either version 3
* of the License, or (at your option) any later version.
*
13 years, 3 months
gatein SVN: r7483 - in portal/branches/xss/webui/core/src/main/java/org/exoplatform/webui/form: ext and 1 other directory.
by do-not-reply＠jboss.org
Author: trong.tran
Date: 2011-09-22 07:58:08 -0400 (Thu, 22 Sep 2011)
New Revision: 7483
Modified:
portal/branches/xss/webui/core/src/main/java/org/exoplatform/webui/form/UIFormHiddenInput.java
portal/branches/xss/webui/core/src/main/java/org/exoplatform/webui/form/UIFormInputBase.java
portal/branches/xss/webui/core/src/main/java/org/exoplatform/webui/form/UIFormInputInfo.java
portal/branches/xss/webui/core/src/main/java/org/exoplatform/webui/form/UIFormSelectBox.java
portal/branches/xss/webui/core/src/main/java/org/exoplatform/webui/form/UIFormStringInput.java
portal/branches/xss/webui/core/src/main/java/org/exoplatform/webui/form/UIFormTextAreaInput.java
portal/branches/xss/webui/core/src/main/java/org/exoplatform/webui/form/UIFormWYSIWYGInput.java
portal/branches/xss/webui/core/src/main/java/org/exoplatform/webui/form/ext/UIFormColorPicker.java
portal/branches/xss/webui/core/src/main/java/org/exoplatform/webui/form/ext/UIFormComboBox.java
portal/branches/xss/webui/core/src/main/java/org/exoplatform/webui/form/ext/UIFormInputSetWithAction.java
Log:
GTNPORTAL-2123 HTML encoding is needed for most of UIFormInput components to avoid XSS attacks
Modified: portal/branches/xss/webui/core/src/main/java/org/exoplatform/webui/form/UIFormHiddenInput.java
===================================================================
--- portal/branches/xss/webui/core/src/main/java/org/exoplatform/webui/form/UIFormHiddenInput.java 2011-09-22 11:32:42 UTC (rev 7482)
+++ portal/branches/xss/webui/core/src/main/java/org/exoplatform/webui/form/UIFormHiddenInput.java 2011-09-22 11:58:08 UTC (rev 7483)
@@ -20,6 +20,7 @@
package org.exoplatform.webui.form;
import org.exoplatform.webui.application.WebuiRequestContext;
+import org.gatein.common.text.EntityEncoder;
import java.io.Writer;
@@ -62,10 +63,12 @@
print.write(" id='");
print.write(getId());
print.write("'");
- if (value_ != null && value_.length() > 0)
+ String value = getValue();
+ if (value != null && value.length() > 0)
{
print.write(" value='");
- print.write(value_);
+ value = EntityEncoder.FULL.encode(value);
+ print.write(value);
print.write("'");
}
print.write(" />");
Modified: portal/branches/xss/webui/core/src/main/java/org/exoplatform/webui/form/UIFormInputBase.java
===================================================================
--- portal/branches/xss/webui/core/src/main/java/org/exoplatform/webui/form/UIFormInputBase.java 2011-09-22 11:32:42 UTC (rev 7482)
+++ portal/branches/xss/webui/core/src/main/java/org/exoplatform/webui/form/UIFormInputBase.java 2011-09-22 11:58:08 UTC (rev 7483)
@@ -91,11 +91,6 @@
*/
protected boolean readonly_ = false;
- /**
- * Encode the value before rendering or not. The value will be encoded by default.
- */
- protected boolean escapedHTML_ = true;
-
public UIFormInputBase(String name, String bindingField, Class<T> typeValue)
{
this.name = name;
@@ -242,15 +237,4 @@
{
this.label = label;
}
-
- public boolean isEscapedHTML()
- {
- return escapedHTML_;
- }
-
- public void setEscapedHTML(boolean escapedHTML)
- {
- this.escapedHTML_ = escapedHTML;
- }
-
}
\ No newline at end of file
Modified: portal/branches/xss/webui/core/src/main/java/org/exoplatform/webui/form/UIFormInputInfo.java
===================================================================
--- portal/branches/xss/webui/core/src/main/java/org/exoplatform/webui/form/UIFormInputInfo.java 2011-09-22 11:32:42 UTC (rev 7482)
+++ portal/branches/xss/webui/core/src/main/java/org/exoplatform/webui/form/UIFormInputInfo.java 2011-09-22 11:58:08 UTC (rev 7483)
@@ -21,6 +21,7 @@
import org.exoplatform.webui.application.WebuiRequestContext;
import org.exoplatform.commons.serialization.api.annotations.Serialized;
+import org.gatein.common.text.EntityEncoder;
import java.io.Writer;
@@ -52,8 +53,12 @@
{
Writer w = context.getWriter();
w.append("<span id=\"").append(getId()).append("\" class=\"").append(getId()).append("\">");
- if (value_ != null)
- w.write(value_);
+ String value = getValue();
+ if (value != null)
+ {
+ value = EntityEncoder.FULL.encode(value);
+ w.write(value);
+ }
w.write("</span>");
}
Modified: portal/branches/xss/webui/core/src/main/java/org/exoplatform/webui/form/UIFormSelectBox.java
===================================================================
--- portal/branches/xss/webui/core/src/main/java/org/exoplatform/webui/form/UIFormSelectBox.java 2011-09-22 11:32:42 UTC (rev 7482)
+++ portal/branches/xss/webui/core/src/main/java/org/exoplatform/webui/form/UIFormSelectBox.java 2011-09-22 11:58:08 UTC (rev 7483)
@@ -23,6 +23,7 @@
import org.exoplatform.commons.serialization.api.annotations.Serialized;
import org.exoplatform.webui.core.UIComponent;
import org.exoplatform.webui.core.model.SelectItemOption;
+import org.gatein.common.text.EntityEncoder;
import java.io.Writer;
import java.util.ArrayList;
@@ -254,10 +255,12 @@
{
}
+ String value = item.getValue();
+ value = EntityEncoder.FULL.encode(value);
if (item.isSelected())
{
w.write("<option selected=\"selected\" value=\"");
- w.write(item.getValue());
+ w.write(value);
w.write("\">");
}
else
Modified: portal/branches/xss/webui/core/src/main/java/org/exoplatform/webui/form/UIFormStringInput.java
===================================================================
--- portal/branches/xss/webui/core/src/main/java/org/exoplatform/webui/form/UIFormStringInput.java 2011-09-22 11:32:42 UTC (rev 7482)
+++ portal/branches/xss/webui/core/src/main/java/org/exoplatform/webui/form/UIFormStringInput.java 2011-09-22 11:58:08 UTC (rev 7483)
@@ -115,10 +115,7 @@
w.write('\'');
if (value != null && value.length() > 0)
{
- if (isEscapedHTML())
- {
- value = EntityEncoder.FULL.encode(value);
- }
+ value = EntityEncoder.FULL.encode(value);
w.write(" value='");
w.write(value);
w.write('\'');
Modified: portal/branches/xss/webui/core/src/main/java/org/exoplatform/webui/form/UIFormTextAreaInput.java
===================================================================
--- portal/branches/xss/webui/core/src/main/java/org/exoplatform/webui/form/UIFormTextAreaInput.java 2011-09-22 11:32:42 UTC (rev 7482)
+++ portal/branches/xss/webui/core/src/main/java/org/exoplatform/webui/form/UIFormTextAreaInput.java 2011-09-22 11:58:08 UTC (rev 7483)
@@ -73,10 +73,7 @@
w.write(">");
if (value != null)
{
- if (isEscapedHTML())
- {
- value = EntityEncoder.FULL.encode(value);
- }
+ value = EntityEncoder.FULL.encode(value);
w.write(value);
}
w.write("</textarea>");
Modified: portal/branches/xss/webui/core/src/main/java/org/exoplatform/webui/form/UIFormWYSIWYGInput.java
===================================================================
--- portal/branches/xss/webui/core/src/main/java/org/exoplatform/webui/form/UIFormWYSIWYGInput.java 2011-09-22 11:32:42 UTC (rev 7482)
+++ portal/branches/xss/webui/core/src/main/java/org/exoplatform/webui/form/UIFormWYSIWYGInput.java 2011-09-22 11:58:08 UTC (rev 7483)
@@ -28,11 +28,10 @@
* Author : Tran The Trong
* trongtt(a)gmail.com
* November 07, 2007
+
+ * @deprecated should use {@link org.exoplatform.webui.form.wysiwyg.UIFormWYSIWYGInput} instead
*/
@Deprecated
-/**
- * Should use org.exoplatform.webui.form.wysiwyg.UIFormWYSIWYGInput
- * */
public class UIFormWYSIWYGInput extends UIFormInputBase<String>
{
Modified: portal/branches/xss/webui/core/src/main/java/org/exoplatform/webui/form/ext/UIFormColorPicker.java
===================================================================
--- portal/branches/xss/webui/core/src/main/java/org/exoplatform/webui/form/ext/UIFormColorPicker.java 2011-09-22 11:32:42 UTC (rev 7482)
+++ portal/branches/xss/webui/core/src/main/java/org/exoplatform/webui/form/ext/UIFormColorPicker.java 2011-09-22 11:58:08 UTC (rev 7483)
@@ -24,6 +24,7 @@
import org.exoplatform.webui.form.UIFormInput;
import org.exoplatform.webui.form.UIFormInputBase;
import org.exoplatform.webui.form.ext.UIFormColorPicker.Colors.Color;
+import org.gatein.common.text.EntityEncoder;
import java.io.Writer;
import java.util.HashMap;
@@ -196,12 +197,17 @@
public void processRender(WebuiRequestContext context) throws Exception
{
+ String value = getValue();
+ if (value != null)
+ {
+ value = EntityEncoder.FULL.encode(value);
+ }
Writer w = context.getWriter();
w.write("<div class='UIFormColorPicker'>");
w.write("<div class=\"UIColorPickerInput\" onclick=\"eXo.webui.UIColorPicker.show(this)\">");
- w.write("<span class=\" DisplayValue " + encodeValue(value_).toString() + "\"></span>");
+ w.write("<span class=\" DisplayValue " + value + "\"></span>");
w.write("</div>");
- w.write("<div class=\"CalendarTableColor\" selectedColor=\"" + encodeValue(value_).toString() + " \">");
+ w.write("<div class=\"CalendarTableColor\" selectedColor=\"" + value + " \">");
int i = 0;
int count = 0;
while (i <= size() / items())
@@ -227,9 +233,9 @@
w.write("</div>");
w.write("<input class='UIColorPickerValue' name='" + getId() + "' type='hidden'" + " id='" + getId() + "' "
+ renderJsActions());
- if (value_ != null && value_.trim().length() > 0)
+ if (value != null && value.trim().length() > 0)
{
- w.write(" value='" + value_ + "'");
+ w.write(" value='" + value + "'");
}
w.write(" />");
w.write("</div>");
@@ -243,36 +249,6 @@
return super.setValue(arg0);
}
- private StringBuilder encodeValue(String value)
- {
- char[] chars = {'\'', '"'};
- String[] refs = {"'", """};
- StringBuilder builder = new StringBuilder(value);
- int idx;
- for (int i = 0; i < chars.length; i++)
- {
- idx = indexOf(builder, chars[i], 0);
- while (idx > -1)
- {
- builder = builder.replace(idx, idx + 1, refs[i]);
- idx = indexOf(builder, chars[i], idx);
- }
- }
- return builder;
- }
-
- private int indexOf(StringBuilder builder, char c, int from)
- {
- int i = from;
- while (i < builder.length())
- {
- if (builder.charAt(i) == c)
- return i;
- i++;
- }
- return -1;
- }
-
static public class Colors
{
Modified: portal/branches/xss/webui/core/src/main/java/org/exoplatform/webui/form/ext/UIFormComboBox.java
===================================================================
--- portal/branches/xss/webui/core/src/main/java/org/exoplatform/webui/form/ext/UIFormComboBox.java 2011-09-22 11:32:42 UTC (rev 7482)
+++ portal/branches/xss/webui/core/src/main/java/org/exoplatform/webui/form/ext/UIFormComboBox.java 2011-09-22 11:58:08 UTC (rev 7483)
@@ -23,6 +23,7 @@
import org.exoplatform.webui.core.model.SelectItemOption;
import org.exoplatform.webui.form.UIForm;
import org.exoplatform.webui.form.UIFormInputBase;
+import org.gatein.common.text.EntityEncoder;
import java.io.Writer;
import java.util.HashMap;
@@ -193,6 +194,12 @@
}
text += "</div></div></div>";
options = options.substring(0, options.length() - 1) + "]";
+
+ String value = getValue();
+ if (value != null)
+ {
+ value = EntityEncoder.FULL.encode(value);
+ }
text += "<input type='hidden' name='" + getName() + "' id='" + getId() + "'";
if (value_ != null && value_.trim().length() > 0)
{
Modified: portal/branches/xss/webui/core/src/main/java/org/exoplatform/webui/form/ext/UIFormInputSetWithAction.java
===================================================================
--- portal/branches/xss/webui/core/src/main/java/org/exoplatform/webui/form/ext/UIFormInputSetWithAction.java 2011-09-22 11:32:42 UTC (rev 7482)
+++ portal/branches/xss/webui/core/src/main/java/org/exoplatform/webui/form/ext/UIFormInputSetWithAction.java 2011-09-22 11:58:08 UTC (rev 7483)
@@ -19,7 +19,6 @@
package org.exoplatform.webui.form.ext;
-import org.exoplatform.webui.application.WebuiRequestContext;
import org.exoplatform.webui.config.annotation.ComponentConfig;
import org.exoplatform.webui.form.UIForm;
import org.exoplatform.webui.form.UIFormInput;
@@ -89,14 +88,6 @@
isShowActionInfo = isShow;
}
- /* (non-Javadoc)
- * @see org.exoplatform.webui.form.UIFormInputSet#processRender(org.exoplatform.webui.application.WebuiRequestContext)
- */
- public void processRender(WebuiRequestContext context) throws Exception
- {
- super.processRender(context);
- }
-
/**
* Sets the actions.
*
13 years, 3 months
gatein SVN: r7482 - portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config.
by do-not-reply＠jboss.org
Author: hoang_to
Date: 2011-09-22 07:32:42 -0400 (Thu, 22 Sep 2011)
New Revision: 7482
Modified:
portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestDataStorage.java
Log:
GTNPORTAL-2074: Add JUnit test
Modified: portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestDataStorage.java
===================================================================
--- portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestDataStorage.java 2011-09-22 09:04:21 UTC (rev 7481)
+++ portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestDataStorage.java 2011-09-22 11:32:42 UTC (rev 7482)
@@ -371,8 +371,59 @@
assertEquals(application2.getStorageId(), application.getStorageId());
}
- // Need to make window move 3 unit test
+ // Test for issue GTNPORTAL-2074
+ public void testWindowMove3() throws Exception
+ {
+ assertNull(storage_.getPage("portal::test::testWindowMove3"));
+ Page page = new Page();
+ page.setOwnerType(PortalConfig.PORTAL_TYPE);
+ page.setOwnerId("test");
+ page.setName("testWindowMove3");
+ Application app1 = new Application(ApplicationType.PORTLET);
+ app1.setState(new TransientApplicationState<Portlet>());
+ Application app2 = new Application(ApplicationType.PORTLET);
+ app2.setState(new TransientApplicationState<Portlet>());
+ Container parentOfApp2 = new Container();
+ parentOfApp2.getChildren().add(app2);
+
+ page.getChildren().add(app1);
+ page.getChildren().add(parentOfApp2);
+
+ storage_.save(page);
+
+ Page page2 = storage_.getPage("portal::test::testWindowMove3");
+ assertNotNull(page2);
+
+ assertTrue(page2.getChildren().get(1) instanceof Container);
+ Container container = (Container)page2.getChildren().get(1);
+
+ assertTrue(container.getChildren().get(0) instanceof Application);
+ Application persistedApp2 = (Application)container.getChildren().remove(0);
+
+ Container transientContainer = new Container();
+ transientContainer.getChildren().add(persistedApp2);
+
+ page2.getChildren().add(transientContainer);
+
+ storage_.save(page2);
+
+ Page page3 = storage_.getPage("portal::test::testWindowMove3");
+
+ assertEquals(container.getStorageId(), page3.getChildren().get(1).getStorageId());
+
+ assertTrue(page3.getChildren().get(2) instanceof Container);
+ Container formerTransientCont = (Container)page3.getChildren().get(2);
+ assertEquals(1, formerTransientCont.getChildren().size());
+ assertTrue(formerTransientCont.getChildren().get(0) instanceof Application);
+
+ assertEquals(persistedApp2.getStorageId(), formerTransientCont.getChildren().get(0).getStorageId());
+
+ storage_.remove(page3);
+
+ assertNull(storage_.getPage("portal::test::testWindowMove3"));
+ }
+
/**
* Test that setting a page reference to null will actually remove the page reference from the PageNode
* @throws Exception
13 years, 3 months
gatein SVN: r7481 - in portal/trunk/portlet/web/src/main: webapp/groovy/portal/webui/component and 1 other directory.
by do-not-reply＠jboss.org
Author: hoang_to
Date: 2011-09-22 05:04:21 -0400 (Thu, 22 Sep 2011)
New Revision: 7481
Modified:
portal/trunk/portlet/web/src/main/java/org/exoplatform/portal/webui/component/UIBreadcumbsPortlet.java
portal/trunk/portlet/web/src/main/webapp/groovy/portal/webui/component/UIBreadcumbsPortlet.gtmpl
Log:
GTNPORTAL-2111: Breadcumbs portlet does not update label as language is changed
Modified: portal/trunk/portlet/web/src/main/java/org/exoplatform/portal/webui/component/UIBreadcumbsPortlet.java
===================================================================
--- portal/trunk/portlet/web/src/main/java/org/exoplatform/portal/webui/component/UIBreadcumbsPortlet.java 2011-09-22 07:18:37 UTC (rev 7480)
+++ portal/trunk/portlet/web/src/main/java/org/exoplatform/portal/webui/component/UIBreadcumbsPortlet.java 2011-09-22 09:04:21 UTC (rev 7481)
@@ -19,18 +19,17 @@
package org.exoplatform.portal.webui.component;
+import org.exoplatform.portal.mop.user.UserNavigation;
import org.exoplatform.portal.mop.user.UserNode;
+import org.exoplatform.portal.mop.user.UserPortal;
import org.exoplatform.portal.webui.util.Util;
import org.exoplatform.webui.application.WebuiRequestContext;
import org.exoplatform.webui.application.portlet.PortletRequestContext;
import org.exoplatform.webui.config.annotation.ComponentConfig;
import org.exoplatform.webui.core.UIPortletApplication;
import org.exoplatform.webui.core.lifecycle.UIApplicationLifecycle;
-
-import java.util.ArrayList;
-import java.util.Collections;
+import java.util.LinkedList;
import java.util.List;
-
import javax.portlet.PortletPreferences;
import javax.portlet.PortletRequest;
@@ -72,16 +71,19 @@
public List<UserNode> getSelectedPath() throws Exception
{
UserNode node = Util.getUIPortal().getSelectedUserNode();
- List<UserNode> paths = new ArrayList<UserNode>();
+ UserPortal userPortal = Util.getPortalRequestContext().getUserPortalConfig().getUserPortal();
+ UserNavigation nav = userPortal.getNavigation(node.getNavigation().getKey());
+ UserNode targetNode = userPortal.resolvePath(nav, null, node.getURI());
+ LinkedList<UserNode> paths = new LinkedList<UserNode>();
+
do
{
- paths.add(node);
- node = node.getParent();
+ paths.addFirst(targetNode);
+ targetNode = targetNode.getParent();
}
- while (node != null && node.getParent() != null);
- Collections.reverse(paths);
-
+ while (targetNode != null && targetNode.getParent() != null);
+
return paths;
}
Modified: portal/trunk/portlet/web/src/main/webapp/groovy/portal/webui/component/UIBreadcumbsPortlet.gtmpl
===================================================================
--- portal/trunk/portlet/web/src/main/webapp/groovy/portal/webui/component/UIBreadcumbsPortlet.gtmpl 2011-09-22 07:18:37 UTC (rev 7480)
+++ portal/trunk/portlet/web/src/main/webapp/groovy/portal/webui/component/UIBreadcumbsPortlet.gtmpl 2011-09-22 09:04:21 UTC (rev 7481)
@@ -1,12 +1,14 @@
<%
import java.util.List;
+ import org.exoplatform.portal.mop.user.UserNode;
import org.exoplatform.portal.webui.util.Util;
import org.exoplatform.portal.application.PortalRequestContext;
import org.gatein.common.text.EntityEncoder;
import org.exoplatform.web.url.PortalURL;
import org.exoplatform.web.url.navigation.NavigationResource;
- List list = uicomponent.getSelectedPath();
+ List<UserNode> list = uicomponent.getSelectedPath();
+ int size = list.size();
PortalRequestContext pcontext = Util.getPortalRequestContext();
PortalURL nodeURL = nodeurl();
@@ -18,16 +20,17 @@
<div class="RightBreadcumbsBar">
<div class="BreadcumbsInfoBar">
<div class="HomeIcon LeftBlock BCHome16x16Icon"><span></span></div>
- <%if(list.size() > 0) {
+ <%if(size > 0) {
String note = "LeftBlock";
- for(i in 0 .. list.size()-1) {
- def node = list.get(i);
+ int counter = 0;
+ for(UserNode node : list) {
+ counter++;
String actionLink = nodeURL.setNode(node);
- if(i == list.size()-1) note = "Selected";
+ if(counter == size) note = "Selected";
%>
<a href="<%=(node.getPageRef() == null) ? "#" : actionLink%>" class="$note"><%=node.getEncodedResolvedLabel();%></a>
<%
- if(i != list.size()-1) {
+ if(counter < size) {
%>
<div class="RightBlackGridArrowIcon LeftBlock RightBlackGridArrow16x16Icon"><span></span></div>
<%
13 years, 3 months
gatein SVN: r7480 - epp/portal/tags/EPP_5_2_0_ER01/distribution/mead-tools/exo-kernel.
by do-not-reply＠jboss.org
Author: hfnukal
Date: 2011-09-22 03:18:37 -0400 (Thu, 22 Sep 2011)
New Revision: 7480
Modified:
epp/portal/tags/EPP_5_2_0_ER01/distribution/mead-tools/exo-kernel/pom.xml
Log:
JBEPP-1091 Patch fro exo-kernel
Modified: epp/portal/tags/EPP_5_2_0_ER01/distribution/mead-tools/exo-kernel/pom.xml
===================================================================
--- epp/portal/tags/EPP_5_2_0_ER01/distribution/mead-tools/exo-kernel/pom.xml 2011-09-22 07:17:38 UTC (rev 7479)
+++ epp/portal/tags/EPP_5_2_0_ER01/distribution/mead-tools/exo-kernel/pom.xml 2011-09-22 07:18:37 UTC (rev 7480)
@@ -22,7 +22,7 @@
<mead.build.profiles></mead.build.profiles>
<mead.build.properties></mead.build.properties>
- <mead.patch.path></mead.patch.path>
+ <mead.patch.path>patches/org.exoplatform.kernel-exo-kernel/tags/2.3.0-CR4-CP01/</mead.patch.path>
</properties>
</project>
\ No newline at end of file
13 years, 3 months
gatein SVN: r7479 - epp/portal/tags/EPP_5_2_0_ER01/distribution/mead-tools.
by do-not-reply＠jboss.org
Author: hfnukal
Date: 2011-09-22 03:17:38 -0400 (Thu, 22 Sep 2011)
New Revision: 7479
Modified:
epp/portal/tags/EPP_5_2_0_ER01/distribution/mead-tools/build.xml
Log:
JBEPP-1091
Modified: epp/portal/tags/EPP_5_2_0_ER01/distribution/mead-tools/build.xml
===================================================================
--- epp/portal/tags/EPP_5_2_0_ER01/distribution/mead-tools/build.xml 2011-09-22 03:16:42 UTC (rev 7478)
+++ epp/portal/tags/EPP_5_2_0_ER01/distribution/mead-tools/build.xml 2011-09-22 07:17:38 UTC (rev 7479)
@@ -252,12 +252,17 @@
<arg value="${mead.svn.base}/${mead.svn.repo}/${mead.svn.path}" />
<arg line="${svn.path}" />
</exec>
-
+
<echo>Resolve dependencies output to ${ant.build.dir}/mvn.resolve.log</echo>
<exec executable="mvn" dir="${svn.path}" output="${ant.build.dir}/mvn.resolve.log" failonerror="true" failifexecutionfails="">
<arg value="dependency:resolve"/>
</exec>
+ <echo>Resolve plugin dependencies output to ${ant.build.dir}/mvn.resolve.log</echo>
+ <exec executable="mvn" dir="${svn.path}" output="${ant.build.dir}/mvn.resolve-plugins.log" failonerror="true" failifexecutionfails="">
+ <arg value="dependency:resolve-plugins"/>
+ </exec>
+
<echo>Dependency list output to ${ant.build.dir}/mvn.dependency.list</echo>
<exec executable="mvn" dir="${svn.path}" output="${ant.build.dir}/mvn.dependency.list" failonerror="true" failifexecutionfails="">
<arg value="dependency:list"/>
@@ -267,7 +272,7 @@
<loadfile property="mvn.dependency.list" srcFile="${ant.build.dir}/mvn.dependency.list">
<filterchain>
<linecontainsregexp>
- <regexp pattern=":[a-zA-Z0-9\.]*:[a-zA-Z0-9\.]*:[a-zA-Z0-9\.]*" />
+ <regexp pattern=":[A-Za-z0-9_\\\-\.]+:[A-Za-z0-9_\\\-\.]+:[A-Za-z0-9_\\\-\.]+" />
</linecontainsregexp>
<!--<deletecharacters chars="\[INFO\]"/>-->
<replaceregex pattern="\[INFO\]" replace=""/>
13 years, 3 months
gatein SVN: r7478 - in portal/trunk: examples/portal/war/src/main/webapp/WEB-INF/conf and 3 other directories.
by do-not-reply＠jboss.org
Author: haint
Date: 2011-09-21 23:16:42 -0400 (Wed, 21 Sep 2011)
New Revision: 7478
Added:
portal/trunk/component/web/server/src/main/java/org/exoplatform/upload/MimeTypeUploadPlugin.java
portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/mimetype/
portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/mimetype/mimetypes.properties
Modified:
portal/trunk/component/web/server/src/main/java/org/exoplatform/upload/UploadService.java
portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/web/web-inf-extension-configuration.xml
portal/trunk/testsuite/webuibasedsamples/src/main/webapp/WEB-INF/web.xml
Log:
GTNPORTAL-1966: Mime Type definition for file uploading
Added: portal/trunk/component/web/server/src/main/java/org/exoplatform/upload/MimeTypeUploadPlugin.java
===================================================================
--- portal/trunk/component/web/server/src/main/java/org/exoplatform/upload/MimeTypeUploadPlugin.java (rev 0)
+++ portal/trunk/component/web/server/src/main/java/org/exoplatform/upload/MimeTypeUploadPlugin.java 2011-09-22 03:16:42 UTC (rev 7478)
@@ -0,0 +1,64 @@
+/*
+ * Copyright (C) 2003-2011 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.upload;
+
+import java.net.URL;
+import java.net.URLConnection;
+import java.util.Properties;
+
+import org.exoplatform.container.component.BaseComponentPlugin;
+import org.exoplatform.container.configuration.ConfigurationManager;
+import org.exoplatform.container.xml.InitParams;
+import org.exoplatform.container.xml.ValueParam;
+import org.gatein.common.logging.Logger;
+import org.gatein.common.logging.LoggerFactory;
+
+/**
+ * Created by The eXo Platform SAS
+ * Author : Nguyen Thanh Hai
+ * haint(a)exoplatform.com
+ * Jun 29, 2011
+ */
+public class MimeTypeUploadPlugin extends BaseComponentPlugin
+{
+ final private static Logger log = LoggerFactory.getLogger(MimeTypeUploadPlugin.class);
+ final private static String MIMETYPE_PATH = "mimetype-path" ;
+ final private static String DEFAULT_MIMETYPE = "mimetype-default";
+
+ private Properties mimeTypes = new Properties();
+ private String mimetypeDefault ;
+
+ public MimeTypeUploadPlugin(InitParams initParams, ConfigurationManager configurationService) throws Exception
+ {
+ ValueParam param = initParams.getValueParam(MIMETYPE_PATH) ;
+ URL filePath = configurationService.getURL(param.getValue());
+ URLConnection connection = filePath.openConnection() ;
+ mimeTypes.load(connection.getInputStream()) ;
+
+ param = initParams.getValueParam(DEFAULT_MIMETYPE) ;
+ if(param != null) mimetypeDefault = param.getValue() ;
+ }
+
+ public String getMimeType(String fileName)
+ {
+ if(fileName.indexOf('.') == -1) return mimetypeDefault ;
+ String ext = fileName.substring(fileName.lastIndexOf('.') + 1);
+ String mimeType = mimeTypes.getProperty(ext.toLowerCase(), mimetypeDefault);
+ if (mimeType == null || mimeType.length() == 0) return null ;
+ return mimeType;
+ }
+}
Modified: portal/trunk/component/web/server/src/main/java/org/exoplatform/upload/UploadService.java
===================================================================
--- portal/trunk/component/web/server/src/main/java/org/exoplatform/upload/UploadService.java 2011-09-21 17:34:23 UTC (rev 7477)
+++ portal/trunk/component/web/server/src/main/java/org/exoplatform/upload/UploadService.java 2011-09-22 03:16:42 UTC (rev 7478)
@@ -20,6 +20,9 @@
package org.exoplatform.upload;
import java.io.File;
+import java.io.FileOutputStream;
+import java.io.InputStream;
+import java.util.ArrayList;
import java.util.HashSet;
import java.util.LinkedHashMap;
import java.util.List;
@@ -44,6 +47,8 @@
{
/** . */
private static final Logger log = LoggerFactory.getLogger(UploadService.class);
+
+ private List<MimeTypeUploadPlugin> plugins ;
private Map<String, UploadResource> uploadResources = new LinkedHashMap<String, UploadResource>();
@@ -52,7 +57,7 @@
private int defaultUploadLimitMB_;
private Map<String, Integer> uploadLimitsMB_ = new LinkedHashMap<String, Integer>();
-
+
public static String UPLOAD_RESOURCES_STACK = "uploadResourcesStack";
public UploadService(PortalContainerInfo pinfo, InitParams params) throws Exception
@@ -67,7 +72,12 @@
if (!uploadDir.exists())
uploadDir.mkdirs();
}
-
+
+ public void register(MimeTypeUploadPlugin plugin) {
+ if(plugins == null) plugins = new ArrayList<MimeTypeUploadPlugin>() ;
+ plugins.add(plugin) ;
+ }
+
/**
* Create UploadResource for HttpServletRequest
*
@@ -120,6 +130,12 @@
upResource.setFileName(fileName);
upResource.setMimeType(fileItem.getContentType());
+ if(plugins != null)
+ for(MimeTypeUploadPlugin plugin : plugins)
+ {
+ String mimeType = plugin.getMimeType(fileName) ;
+ if(mimeType != null) upResource.setMimeType(mimeType) ;
+ }
upResource.setStoreLocation(storeLocation);
upResource.setStatus(UploadResource.UPLOADED_STATUS);
}
@@ -276,4 +292,6 @@
}
return false;
}
+
+
}
Added: portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/mimetype/mimetypes.properties
===================================================================
--- portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/mimetype/mimetypes.properties (rev 0)
+++ portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/mimetype/mimetypes.properties 2011-09-22 03:16:42 UTC (rev 7478)
@@ -0,0 +1,156 @@
+ai=application/postscript
+aif=audio/x-aiff
+aifc=audio/x-aiff
+aiff=audio/x-aiff
+any=text/any
+asc=text/plain
+au=audio/basic
+avi=video/x-msvideo
+bcpio=application/x-bcpio
+bin=application/octet-stream
+bz2=application/x-bzip2
+cdf=application/x-netcdf
+class=application/octet-stream
+cpio=application/x-cpio
+cpt=application/mac-compactpro
+cq=application/cq-durboser
+csh=application/x-csh
+css=text/css
+dcr=application/x-director
+dir=application/x-director
+dms=application/octet-stream
+doc=application/msword
+dvi=application/x-dvi
+dxr=application/x-director
+ecma=text/qhtml
+eps=application/postscript
+esp=text/qhtml
+etx=text/x-setext
+exe=application/octet-stream
+ez=application/andrew-inset
+gif=image/gif
+gtar=application/x-gtar
+gz=application/x-gzip
+hdf=application/x-hdf
+hqx=application/mac-binhex40
+htm=text/html
+html=text/html
+ice=x-conference/x-cooltalk
+ief=image/ief
+iges=model/iges
+igs=model/iges
+jpeg=image/jpeg
+jpe=image/jpeg
+jpg=image/jpeg
+bmp=image/bmp
+js=application/x-javascript
+kar=audio/midi
+latex=application/x-latex
+lha=application/octet-stream
+lzh=application/octet-stream
+man=application/x-troff-man
+me=application/x-troff-me
+mesh=model/mesh
+mid=audio/midi
+midi=audio/midi
+mif=application/vnd=mif
+mov=video/quicktime
+m4v=video/x-m4v
+m4a=audio/x-m4a
+movie=video/x-sgi-movie
+mp2=audio/mp2
+mp3=audio/mp3
+mpe=video/mpe
+mp4=video/mp4
+mpeg=video/mpeg
+mpg=video/mpeg
+mpg=video/mpg
+mpga=audio/mpga
+ms=application/x-troff-ms
+msh=model/mesh
+nc=application/x-netcdf
+oda=application/oda
+pbm=image/x-portable-bitmap
+pdb=chemical/x-pdb
+pdf=application/pdf
+pgm=image/x-portable-graymap
+pgn=application/x-chess-pgn
+png=image/png
+pnm=image/x-portable-anymap
+ppm=image/x-portable-pixmap
+ppt=application/ppt
+properties=text/plain
+ps=application/postscript
+qhtml=text/qhtml
+qt=video/quicktime
+ra=audio/x-realaudio
+ram=audio/x-pn-realaudio
+rm=audio/x-pn-realaudio
+ras=image/x-cmu-raster
+rgb=image/x-rgb
+roff=application/x-troff
+rpm=application/x-rpm
+rtf=application/rtf
+sgm=text/sgml
+sgml=text/sgml
+sh=application/x-sh
+shar=application/x-shar
+silo=model/mesh
+sit=application/x-stuffit
+skd=application/x-koan
+skm=application/x-koan
+skp=application/x-koan
+skt=application/x-koan
+smi=application/smil
+smil=application/smil
+snd=audio/basic
+spl=application/x-futuresplash
+src=application/x-wais-source
+sv4cpio=application/x-sv4cpio
+sv4crc=application/x-sv4crc
+swf=application/x-shockwave-flash
+t=application/x-troff
+tar=application/x-tar
+tcl=application/x-tcl
+tex=application/x-tex
+texi=application/x-texinfo
+texinfo=application/x-texinfo
+tgz=application/x-gzip
+tif=image/tiff
+tiff=image/tiff
+tr=application/x-troff
+tsv=text/tab-separated-values
+txt=text/plain
+odt=application/vnd.oasis.opendocument.text
+ods=application/vnd.oasis.opendocument.spreadsheet
+odp=application/vnd.oasis.opendocument.presentation
+odb=application/vnd.oasis.opendocument.database
+ustar=application/x-ustar
+vcd=application/x-cdlink
+vm=text/plain
+vrml=model/vrml
+wav=audio/x-wav
+wrl=model/vrml
+xbm=image/x-xbitmap
+xls=application/xls
+xml=text/xml
+xpdl=text/xml
+xpm=image/x-xpixmap
+xwd=image/x-xwindowdump
+xyz=chemical/x-pdb
+zip=application/zip
+rar=application/rar
+msg=application/vnd.ms-outlook
+flv=video/x-flv
+docx=application/vnd.openxmlformats-officedocument.wordprocessingml.document
+wpd=application/wordperfect
+wiki=text/x-wiki
+sxc=application/vnd.sun.xml.calc
+xlsx=application/vnd.openxmlformats-officedocument.spreadsheetml.sheet
+csv=text/csv
+tsv=text/tab-separated-values
+sxi=application/vnd.sun.xml.impress
+pptx=application/vnd.openxmlformats-officedocument.presentationml.presentation
+odg=application/vnd.oasis.opendocument.graphics
+svg=image/svg+xml
+sxw=application/vnd.sun.xml.writer
\ No newline at end of file
Modified: portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/web/web-inf-extension-configuration.xml
===================================================================
--- portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/web/web-inf-extension-configuration.xml 2011-09-21 17:34:23 UTC (rev 7477)
+++ portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/web/web-inf-extension-configuration.xml 2011-09-22 03:16:42 UTC (rev 7478)
@@ -88,4 +88,22 @@
</init-params>
</component-plugin>
</external-component-plugins>
+ <external-component-plugins>
+ <target-component>org.exoplatform.upload.UploadService</target-component>
+ <component-plugin>
+ <name>MIME type Plugins for UploadService</name>
+ <set-method>register</set-method>
+ <type>org.exoplatform.upload.MimeTypeUploadPlugin</type>
+ <init-params>
+ <value-param>
+ <name>mimetype-path</name>
+ <value>war:/conf/mimetype/mimetypes.properties</value>
+ </value-param>
+ <value-param>
+ <name>mimetype-default</name>
+ <value>application/octet-stream</value>
+ </value-param>
+ </init-params>
+ </component-plugin>
+ </external-component-plugins>
</configuration>
\ No newline at end of file
Modified: portal/trunk/testsuite/webuibasedsamples/src/main/webapp/WEB-INF/web.xml
===================================================================
--- portal/trunk/testsuite/webuibasedsamples/src/main/webapp/WEB-INF/web.xml 2011-09-21 17:34:23 UTC (rev 7477)
+++ portal/trunk/testsuite/webuibasedsamples/src/main/webapp/WEB-INF/web.xml 2011-09-22 03:16:42 UTC (rev 7478)
@@ -28,11 +28,12 @@
<servlet>
<servlet-name>GateInServlet</servlet-name>
<servlet-class>org.gatein.wci.api.GateInServlet</servlet-class>
+ <load-on-startup>0</load-on-startup>
</servlet>
+
<servlet-mapping>
<servlet-name>GateInServlet</servlet-name>
<url-pattern>/gateinservlet</url-pattern>
- <load-on-startup>0</load-on-startup>
</servlet-mapping>
<security-role>
13 years, 3 months
gatein SVN: r7477 - portal/trunk/component/web/controller.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2011-09-21 13:34:23 -0400 (Wed, 21 Sep 2011)
New Revision: 7477
Modified:
portal/trunk/component/web/controller/pom.xml
Log:
for now put the japex on the japex profile until a fixed version of the japex plugin works with maven 3
Modified: portal/trunk/component/web/controller/pom.xml
===================================================================
--- portal/trunk/component/web/controller/pom.xml 2011-09-21 16:57:54 UTC (rev 7476)
+++ portal/trunk/component/web/controller/pom.xml 2011-09-21 17:34:23 UTC (rev 7477)
@@ -93,66 +93,66 @@
</exclusions>
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>com.sun.japex</groupId>
- <artifactId>japex-maven-plugin</artifactId>
- <version>1.2.3</version>
- <executions>
- <execution>
- <id>japex</id>
- <goals>
- <goal>japex</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <japexConfig>
- <testSuite name="ParsingPerformance" xmlns="http://www.sun.com/japex/testSuite">
- <param name="japex.namedClassPath" value="maven.test.classpath"/>
- <param name="japex.resultUnit" value="ms"/>
- <param name="japex.warmupIterations" value="10000"/>
- <param name="japex.runIterations" value="${japex.runIterations}"/>
- <param name="japex.numberOfThreads" value="${japex.numberOfThreads}"/>
- <driver name="JavaUtilRegex">
- <param name="japex.driverClass" value="org.exoplatform.web.controller.performance.ControllerRendererDriver"/>
- <param name="description" value="Controller performance with the java.util.regex package"/>
- <param name="regex" value="java"/>
- </driver>
- <driver name="JRegex">
- <param name="japex.driverClass" value="org.exoplatform.web.controller.performance.ControllerRendererDriver"/>
- <param name="description" value="Controller performance with the jregex package"/>
- <param name="regex" value="jregex"/>
- </driver>
- <testCase name="classic">
- <param name="parameters" value="{ 'gtn:handler' : 'portal', 'gtn:sitetype' : 'portal' , 'gtn:sitename' : 'classic', 'gtn:path' : 'page' }"/>
- </testCase>
- <testCase name="fr/classic">
- <param name="parameters" value="{ 'gtn:handler' : 'portal', 'gtn:lang' : 'fr', 'gtn:sitetype' : 'portal' , 'gtn:sitename' : 'classic', 'gtn:path' : 'page' }"/>
- </testCase>
- <testCase name="group">
- <param name="parameters" value="{ 'gtn:handler' : 'portal', 'gtn:sitetype' : 'group' , 'gtn:sitename' : '/platform/administrator', 'gtn:path' : 'page' }"/>
- </testCase>
- <testCase name="user">
- <param name="parameters" value="{ 'gtn:handler' : 'portal', 'gtn:sitetype' : 'user' , 'gtn:sitename' : 'root', 'gtn:path' : 'page' }"/>
- </testCase>
- </testSuite>
- </japexConfig>
- </configuration>
- </plugin>
- </plugins>
- </build>
<profiles>
-
<profile>
<id>japex</id>
<properties>
<japex.runIterations>1000000</japex.runIterations>
<japex.numberOfThreads>4</japex.numberOfThreads>
</properties>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>com.sun.japex</groupId>
+ <artifactId>japex-maven-plugin</artifactId>
+ <version>1.2.3</version>
+ <executions>
+ <execution>
+ <id>japex</id>
+ <goals>
+ <goal>japex</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <japexConfig>
+ <testSuite name="ParsingPerformance" xmlns="http://www.sun.com/japex/testSuite">
+ <param name="japex.namedClassPath" value="maven.test.classpath"/>
+ <param name="japex.resultUnit" value="ms"/>
+ <param name="japex.warmupIterations" value="10000"/>
+ <param name="japex.runIterations" value="${japex.runIterations}"/>
+ <param name="japex.numberOfThreads" value="${japex.numberOfThreads}"/>
+ <driver name="JavaUtilRegex">
+ <param name="japex.driverClass" value="org.exoplatform.web.controller.performance.ControllerRendererDriver"/>
+ <param name="description" value="Controller performance with the java.util.regex package"/>
+ <param name="regex" value="java"/>
+ </driver>
+ <driver name="JRegex">
+ <param name="japex.driverClass" value="org.exoplatform.web.controller.performance.ControllerRendererDriver"/>
+ <param name="description" value="Controller performance with the jregex package"/>
+ <param name="regex" value="jregex"/>
+ </driver>
+ <testCase name="classic">
+ <param name="parameters" value="{ 'gtn:handler' : 'portal', 'gtn:sitetype' : 'portal' , 'gtn:sitename' : 'classic', 'gtn:path' : 'page' }"/>
+ </testCase>
+ <testCase name="fr/classic">
+ <param name="parameters" value="{ 'gtn:handler' : 'portal', 'gtn:lang' : 'fr', 'gtn:sitetype' : 'portal' , 'gtn:sitename' : 'classic', 'gtn:path' : 'page' }"/>
+ </testCase>
+ <testCase name="group">
+ <param name="parameters" value="{ 'gtn:handler' : 'portal', 'gtn:sitetype' : 'group' , 'gtn:sitename' : '/platform/administrator', 'gtn:path' : 'page' }"/>
+ </testCase>
+ <testCase name="user">
+ <param name="parameters" value="{ 'gtn:handler' : 'portal', 'gtn:sitetype' : 'user' , 'gtn:sitename' : 'root', 'gtn:path' : 'page' }"/>
+ </testCase>
+ </testSuite>
+ </japexConfig>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</profile>
+
<profile>
<!-- A never ending test used to profile the rendering execution -->
<id>standalone</id>
13 years, 3 months
gatein SVN: r7476 - portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/data.
by do-not-reply＠jboss.org
Author: hoang_to
Date: 2011-09-21 12:57:54 -0400 (Wed, 21 Sep 2011)
New Revision: 7476
Modified:
portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/data/Mapper.java
Log:
GTNPORTAL-2074: Lose application when drag/drop during edit page or edit layout
Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/data/Mapper.java
===================================================================
--- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/data/Mapper.java 2011-09-21 16:50:22 UTC (rev 7475)
+++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/data/Mapper.java 2011-09-21 16:57:54 UTC (rev 7476)
@@ -698,6 +698,13 @@
// object
// will be processed
}
+ else if(hierarchyRelationships.containsKey(dstChildId))
+ {
+ // The dstChild is placed under transient Chromattic entity whose storageId == null. However,
+ // the hierachyRelationships contains dstChildId in key set, so we have to mark dstChild as
+ // moved object
+ modelObjectMap.put(dstChildId, null);
+ }
}
}
13 years, 3 months
gatein SVN: r7475 - components/wsrp/trunk/admin-gui/src/main/java/org/gatein/wsrp/admin/ui.
by do-not-reply＠jboss.org
Author: chris.laprun(a)jboss.com
Date: 2011-09-21 12:50:22 -0400 (Wed, 21 Sep 2011)
New Revision: 7475
Modified:
components/wsrp/trunk/admin-gui/src/main/java/org/gatein/wsrp/admin/ui/BeanContext.java
Log:
- GTNWSRP-192: Fixed improper default resource name
Modified: components/wsrp/trunk/admin-gui/src/main/java/org/gatein/wsrp/admin/ui/BeanContext.java
===================================================================
--- components/wsrp/trunk/admin-gui/src/main/java/org/gatein/wsrp/admin/ui/BeanContext.java 2011-09-21 12:05:11 UTC (rev 7474)
+++ components/wsrp/trunk/admin-gui/src/main/java/org/gatein/wsrp/admin/ui/BeanContext.java 2011-09-21 16:50:22 UTC (rev 7475)
@@ -44,7 +44,7 @@
protected final static Logger log = LoggerFactory.getLogger(BeanContext.class);
public static final String STATUS = "status";
- private static final String DEFAULT_RESOURCE_NAME = "Resource";
+ private static final String DEFAULT_RESOURCE_NAME = "locale.portlet.Resource";
private static final String UNEXPECTED_ERROR = "bean_support_unexpected_error";
private static final String CAUSE = "bean_support_cause";
private static final String CURRENT_PLACEHOLDER = "###";
13 years, 3 months