JBoss Portal SVN: r12163 - branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal.
by portal-commits＠lists.jboss.org
Author: vrockai
Date: 2008-10-24 08:03:56 -0400 (Fri, 24 Oct 2008)
New Revision: 12163
Modified:
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/DashboardsTestCase.java
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/PortletDefinitionsTestCase.java
Log:
new tests fixes
Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/DashboardsTestCase.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/DashboardsTestCase.java 2008-10-23 20:04:16 UTC (rev 12162)
+++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/DashboardsTestCase.java 2008-10-24 12:03:56 UTC (rev 12163)
@@ -10,26 +10,26 @@
public class DashboardsTestCase extends JBossPortalSeleniumTestCase {
- private static final String T_DH_SUB_UPDATE = "//input[contains(@id,'common-edit-theme-form:_id125jbpns_2fadmin_2fdefault_2fAdminPortletWindowsnpbj')]";
- private static final String T_DH_SEL_RENDERSET = "//input[contains(@id,'common-edit-theme-form:renderSet')]";
- private static final String T_DH_SEL_THEME = "//input[contains(@id,'common-edit-theme-form:theme')]";
- private static final String T_DH_SEL_LAYOUT = "//input[contains(@id,'common-edit-theme-form:layout')]";
- private static final String T_PA_SUB_UPDATE = "//input[contains(@id,'common-edit-page-error-form:update_2')]";
- private static final String T_PO_SUB_UPDATE = "//input[contains(@id,'common-edit-portal-error-form:update_1')]";
+ private static final String T_DH_SUB_UPDATE = "//form[contains(@id,'common-edit-theme-form')]/input[@type='submit']";
+ private static final String T_DH_SEL_RENDERSET = "//select[contains(@id,'common-edit-theme-form:renderSet')]";
+ private static final String T_DH_SEL_THEME = "//select[contains(@id,'common-edit-theme-form:theme')]";
+ private static final String T_DH_SEL_LAYOUT = "//select[contains(@id,'common-edit-theme-form:layout')]";
+ private static final String T_PA_SUB_UPDATE = "//input[contains(@id,'common-edit-page-error-form:update')]";
+ private static final String T_PO_SUB_UPDATE = "//input[contains(@id,'common-edit-portal-error-form:update')]";
private static final String T_PA_INP_PAGEADD = "//input[contains(@id,'common-edit-page-error-form:page-res-select')]";
private static final String T_PO_INP_PAGEADD = "//input[contains(@id,'common-edit-portal-error-form:portal-res-input')]";
- private static final String T_PA_SEL_PNF = "//input[contains(@id,'common-edit-page-error-form:page-not-found-select')]";
- private static final String T_PA_SEL_INTERN = "//input[contains(@id,'common-edit-page-error-form:page-internal-select')]";
- private static final String T_PA_SEL_ERROR = "//input[contains(@id,'common-edit-page-error-form:page-error-select')]";
- private static final String T_PA_SEL_CONTROL = "//input[contains(@id,'common-edit-page-error-form:page-control-select')]";
- private static final String T_PA_SEL_ACCESS = "//input[contains(@id,'common-edit-page-error-form:page-access-select')]";
- private static final String T_PO_SEL_PNF = "//input[contains(@id,'common-edit-portal-error-form:portal-not-found-select')]";
- private static final String T_PO_SEL_UNAVAIL = "//input[contains(@id,'common-edit-portal-error-form:portal-unavail-select')]";
- private static final String T_PO_SEL_ACCESS = "//input[contains(@id,'common-edit-portal-error-form:portal-access-select')]";
+ private static final String T_PA_SEL_PNF = "//select[contains(@id,'common-edit-page-error-form:page-not-found-select')]";
+ private static final String T_PA_SEL_INTERN = "//select[contains(@id,'common-edit-page-error-form:page-internal-select')]";
+ private static final String T_PA_SEL_ERROR = "//select[contains(@id,'common-edit-page-error-form:page-error-select')]";
+ private static final String T_PA_SEL_CONTROL = "//select[contains(@id,'common-edit-page-error-form:page-control-select')]";
+ private static final String T_PA_SEL_ACCESS = "//select[contains(@id,'common-edit-page-error-form:page-access-select')]";
+ private static final String T_PO_SEL_PNF = "//select[contains(@id,'common-edit-portal-error-form:portal-not-found-select')]";
+ private static final String T_PO_SEL_UNAVAIL = "//select[contains(@id,'common-edit-portal-error-form:portal-unavail-select')]";
+ private static final String T_PO_SEL_ACCESS = "//select[contains(@id,'common-edit-portal-error-form:portal-access-select')]";
private static final String SUBMIT_UPDATE_VALUE = "//input[contains(@id,'common-manage-prop-form:update')]";
private static final String TABLE_PROPS = "//table[contains(@id,'common-manage-prop-form:prop-data-table')]";
- private static final String T_PROPS_INPUT_VALUE = "//a[contains(@id,'common-manage-prop-form:prop-data-table:{0}:prop-value-input')]";
- private static final String T_PROPS_LINK_DEL = "//a[contains(@id,'common-manage-prop-form:prop-data-table:{0}:delete')]";
+ private static final String T_PROPS_INPUT_VALUE = "//input[contains(@id,''common-manage-prop-form:prop-data-table:{0}:prop-value-input'')]";
+ private static final String T_PROPS_LINK_DEL = "//a[contains(@id,''common-manage-prop-form:prop-data-table:{0}:delete'')]";
private static final String TABLE_PA_ERR = "//form[@id='common-edit-page-error-form']/table";
private static final String TABLE_PO_ERR = "//form[@id='common-edit-portal-error-form']/table";
Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/PortletDefinitionsTestCase.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/PortletDefinitionsTestCase.java 2008-10-23 20:04:16 UTC (rev 12162)
+++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/PortletDefinitionsTestCase.java 2008-10-24 12:03:56 UTC (rev 12163)
@@ -10,18 +10,18 @@
public class PortletDefinitionsTestCase extends JBossPortalSeleniumTestCase{
- private static final String T_LINK_PREF = "def-list:portlet-pref-{0}";
- private static final String SUBMIT_CREATE_INST = "add_instance_form:_id19jbpns_2fadmin_2fdefault_2fAdminPortletWindowsnpbj";
- private static final String INPUT_INSTANCE_NAME = "add_instance_form:instanceId";
- private static final String T_LINK_CREATE = "def-list:create-instance-{0}";
- private static final String SUBMIT_PROVIDER_VIEW = "definition-form:view-portlets";
- private static final String SELECT_PROVIDER = "definition-form:menu";
- private static final String TABLE_PORTLET = "//form[@id='def-list']/table";
- private static final String LINK_NAME_ADMIN_PORT = "common-show-portlet-detail-form:field1:select";
- private static final String LINK_ADMIN_PORT = "def-list:portlet-def-0";
+ private static final String T_LINK_PREF = "//a[contains(@id,''def-list:portlet-pref-{0}'')]";
+ private static final String SUBMIT_CREATE_INST = "//input[contains(@id,'add_instance_form:_id19jbpns_2fadmin_2fdefault_2fAdminPortletWindowsnpbj')]";
+ private static final String INPUT_INSTANCE_NAME = "//input[contains(@id,'add_instance_form:instanceId')]";
+ private static final String T_LINK_CREATE = "//a[contains(@id,''def-list:create-instance-{0}'')]";
+ private static final String SUBMIT_PROVIDER_VIEW = "//input[contains(@id,'definition-form:view-portlets')]";
+ private static final String SELECT_PROVIDER = "//select[contains(@id,'definition-form:menu')]";
+ private static final String TABLE_PORTLET = "//form[contains(@id,'def-list')]/table";
+ private static final String LINK_NAME_ADMIN_PORT = "//a[contains(@id,'common-show-portlet-detail-form:field1:select')]";
+ private static final String LINK_ADMIN_PORT = "//a[contains(@id,'def-list:portlet-def-0')]";
private static final String LINK_ADMIN = "link=Admin";
- private static final String LINK_TAB_PD = "admin-subtab-form:portlet-def-link";
- private static final String LINK_PD_MAIN = "man-form:def-link";
+ private static final String LINK_TAB_PD = "//a[contains(@id,'admin-subtab-form:portlet-def-link')]";
+ private static final String LINK_PD_MAIN = "//a[contains(@id,'man-form:def-link')]";
@BeforeMethod(groups = { "log" })
17 years, 6 months
- 1
- 0
JBoss Portal SVN: r12162 - branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/model/content.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2008-10-23 16:04:16 -0400 (Thu, 23 Oct 2008)
New Revision: 12162
Modified:
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/model/content/InternalContentProvider.java
Log:
- JBPORTAL-2208: Commented out change made for JBPORTAL-2114 as it's causing problems with WSRP
Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/model/content/InternalContentProvider.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/model/content/InternalContentProvider.java 2008-10-23 19:41:48 UTC (rev 12161)
+++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/model/content/InternalContentProvider.java 2008-10-23 20:04:16 UTC (rev 12162)
@@ -66,8 +66,6 @@
import org.w3c.dom.Element;
import javax.portlet.MimeResponse;
-import javax.portlet.PortletModeException;
-import javax.portlet.WindowStateException;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
@@ -286,12 +284,13 @@
}
// fail fast if we are requesting a window state that is not supported by this portlet
- if (!supportedWindowStates.contains(windowState))
+ // todo: this causes an issue with WSRP. See: JBPORTAL-2208
+ /*if (!supportedWindowStates.contains(windowState))
{
String windowStateName = windowState.toString();
throw new WindowStateException(windowStateName + " is not supported by portlet " + getPortletName(portlet),
new javax.portlet.WindowState(windowStateName));
- }
+ }*/
// Add modes for any media type
Set<ModeInfo> modesInfo = capabilitiesInfo.getAllModes();
@@ -318,12 +317,13 @@
}
// fail fast if we are requesting a window state that is not supported by this portlet
- if (!supportedModes.contains(mode))
+ // todo: this causes an issue with WSRP. See: JBPORTAL-2208
+ /*if (!supportedModes.contains(mode))
{
String modeName = mode.toString();
throw new PortletModeException(modeName + " is not supported by portlet " + getPortletName(portlet),
new javax.portlet.PortletMode(modeName));
- }
+ }*/
// Remove edit mode if the user is not logged it
if (rendererContext.getUser() == null)
17 years, 6 months
- 1
- 0
JBoss Portal SVN: r12161 - tags/JBoss_Portal_2_6_7/core/src/main/org/jboss/portal/core/impl/model/content.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2008-10-23 15:41:48 -0400 (Thu, 23 Oct 2008)
New Revision: 12161
Modified:
tags/JBoss_Portal_2_6_7/core/src/main/org/jboss/portal/core/impl/model/content/InternalContentProvider.java
Log:
- JBPORTAL-2208: Commented out change made for JBPORTAL-2114 as it's causing problems with WSRP.
Modified: tags/JBoss_Portal_2_6_7/core/src/main/org/jboss/portal/core/impl/model/content/InternalContentProvider.java
===================================================================
--- tags/JBoss_Portal_2_6_7/core/src/main/org/jboss/portal/core/impl/model/content/InternalContentProvider.java 2008-10-23 19:34:22 UTC (rev 12160)
+++ tags/JBoss_Portal_2_6_7/core/src/main/org/jboss/portal/core/impl/model/content/InternalContentProvider.java 2008-10-23 19:41:48 UTC (rev 12161)
@@ -62,8 +62,6 @@
import org.jboss.portal.security.spi.auth.PortalAuthorizationManagerFactory;
import org.jboss.portal.theme.impl.render.dynamic.DynaRenderOptions;
-import javax.portlet.PortletModeException;
-import javax.portlet.WindowStateException;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
@@ -239,12 +237,13 @@
}
// fail fast if we are requesting a window state that is not supported by this portlet
- if (!supportedWindowStates.contains(windowState))
+ // todo: this causes an issue with WSRP. See: JBPORTAL-2208
+ /*if (!supportedWindowStates.contains(windowState))
{
String windowStateName = windowState.toString();
throw new WindowStateException(windowStateName + " is not supported by portlet " + getPortletName(portlet),
new javax.portlet.WindowState(windowStateName));
- }
+ }*/
//
Set modesInfo = capabilitiesInfo.getAllModes();
@@ -260,12 +259,13 @@
}
// fail fast if we are requesting a window state that is not supported by this portlet
- if (!supportedModes.contains(mode))
+ // todo: this causes an issue with WSRP. See: JBPORTAL-2208
+ /*if (!supportedModes.contains(mode))
{
String modeName = mode.toString();
throw new PortletModeException(modeName + " is not supported by portlet " + getPortletName(portlet),
new javax.portlet.PortletMode(modeName));
- }
+ }*/
// Remove edit mode if the user is not logged it
if (rendererContext.getUser() == null)
17 years, 6 months
- 1
- 0
JBoss Portal SVN: r12160 - branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/content.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2008-10-23 15:34:22 -0400 (Thu, 23 Oct 2008)
New Revision: 12160
Modified:
branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/content/InternalContentProvider.java
Log:
- JBPORTAL-2208: Commented out change made for JBPORTAL-2114 as it's causing problems with WSRP.
Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/content/InternalContentProvider.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/content/InternalContentProvider.java 2008-10-23 18:34:30 UTC (rev 12159)
+++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/content/InternalContentProvider.java 2008-10-23 19:34:22 UTC (rev 12160)
@@ -62,8 +62,6 @@
import org.jboss.portal.security.spi.auth.PortalAuthorizationManagerFactory;
import org.jboss.portal.theme.impl.render.dynamic.DynaRenderOptions;
-import javax.portlet.PortletModeException;
-import javax.portlet.WindowStateException;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
@@ -239,12 +237,13 @@
}
// fail fast if we are requesting a window state that is not supported by this portlet
- if (!supportedWindowStates.contains(windowState))
+ // todo: this causes an issue with WSRP. See: JBPORTAL-2208
+ /*if (!supportedWindowStates.contains(windowState))
{
String windowStateName = windowState.toString();
throw new WindowStateException(windowStateName + " is not supported by portlet " + getPortletName(portlet),
new javax.portlet.WindowState(windowStateName));
- }
+ }*/
//
Set modesInfo = capabilitiesInfo.getAllModes();
@@ -260,12 +259,13 @@
}
// fail fast if we are requesting a window state that is not supported by this portlet
- if (!supportedModes.contains(mode))
+ // todo: this causes an issue with WSRP. See: JBPORTAL-2208
+ /*if (!supportedModes.contains(mode))
{
String modeName = mode.toString();
throw new PortletModeException(modeName + " is not supported by portlet " + getPortletName(portlet),
new javax.portlet.PortletMode(modeName));
- }
+ }*/
// Remove edit mode if the user is not logged it
if (rendererContext.getUser() == null)
17 years, 6 months
- 1
- 0
JBoss Portal SVN: r12159 - tags/JBoss_Portal_2_6_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2008-10-23 14:34:30 -0400 (Thu, 23 Oct 2008)
New Revision: 12159
Modified:
tags/JBoss_Portal_2_6_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/create.jsp
tags/JBoss_Portal_2_6_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/edit.jsp
tags/JBoss_Portal_2_6_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/pending_items.jsp
Log:
JBPORTAL-2210: Wysiwyg editor is not showing images correctly
Modified: tags/JBoss_Portal_2_6_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/create.jsp
===================================================================
--- tags/JBoss_Portal_2_6_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/create.jsp 2008-10-23 18:32:16 UTC (rev 12158)
+++ tags/JBoss_Portal_2_6_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/create.jsp 2008-10-23 18:34:30 UTC (rev 12159)
@@ -61,6 +61,7 @@
plugin_insertdate_timeFormat : "%H:%M:%S",
relative_urls : "true",
convert_urls: "false",
+ document_base_url : "<%= sDocBase %>",
extended_valid_elements :
"style[type],a[name|href|target|title|onclick],img[class|src|border=0|alt|title|hspace|vspace|width|height|align|onmouseover|onmouseout|name],font[face|size|color],hr[class|width|size|noshade]"
});
Modified: tags/JBoss_Portal_2_6_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/edit.jsp
===================================================================
--- tags/JBoss_Portal_2_6_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/edit.jsp 2008-10-23 18:32:16 UTC (rev 12158)
+++ tags/JBoss_Portal_2_6_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/edit.jsp 2008-10-23 18:34:30 UTC (rev 12159)
@@ -40,6 +40,7 @@
plugin_insertdate_timeFormat : "%H:%M:%S",
relative_urls : "true",
convert_urls: "false",
+ document_base_url : "<%= sDocBase %>",
extended_valid_elements :
"style[type],a[name|href|target|title|onclick],img[class|src|border=0|alt|title|hspace|vspace|width|height|align|onmouseover|onmouseout|name],font[face|size|color],hr[class|width|size|noshade]"
});
Modified: tags/JBoss_Portal_2_6_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/pending_items.jsp
===================================================================
--- tags/JBoss_Portal_2_6_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/pending_items.jsp 2008-10-23 18:32:16 UTC (rev 12158)
+++ tags/JBoss_Portal_2_6_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/pending_items.jsp 2008-10-23 18:34:30 UTC (rev 12159)
@@ -122,6 +122,7 @@
plugin_insertdate_timeFormat : "%H:%M:%S",
relative_urls : "true",
convert_urls: "false",
+ document_base_url : "<%= sDocBase %>",
extended_valid_elements :
"style[type],a[name|href|target|title|onclick],img[class|src|border=0|alt|title|hspace|vspace|width|height|align|onmouseover|onmouseout|name],font[face|size|color],hr[class|width|size|noshade]"
});
17 years, 6 months
- 1
- 0
JBoss Portal SVN: r12158 - branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2008-10-23 14:32:16 -0400 (Thu, 23 Oct 2008)
New Revision: 12158
Modified:
branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/create.jsp
branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/edit.jsp
branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/pending_items.jsp
Log:
JBPORTAL-2210: Wysiwyg editor is not showing images correctly
Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/create.jsp
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/create.jsp 2008-10-23 18:10:24 UTC (rev 12157)
+++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/create.jsp 2008-10-23 18:32:16 UTC (rev 12158)
@@ -61,6 +61,7 @@
plugin_insertdate_timeFormat : "%H:%M:%S",
relative_urls : "true",
convert_urls: "false",
+ document_base_url : "<%= sDocBase %>",
extended_valid_elements :
"style[type],a[name|href|target|title|onclick],img[class|src|border=0|alt|title|hspace|vspace|width|height|align|onmouseover|onmouseout|name],font[face|size|color],hr[class|width|size|noshade]"
});
Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/edit.jsp
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/edit.jsp 2008-10-23 18:10:24 UTC (rev 12157)
+++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/edit.jsp 2008-10-23 18:32:16 UTC (rev 12158)
@@ -40,6 +40,7 @@
plugin_insertdate_timeFormat : "%H:%M:%S",
relative_urls : "true",
convert_urls: "false",
+ document_base_url : "<%= sDocBase %>",
extended_valid_elements :
"style[type],a[name|href|target|title|onclick],img[class|src|border=0|alt|title|hspace|vspace|width|height|align|onmouseover|onmouseout|name],font[face|size|color],hr[class|width|size|noshade]"
});
Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/pending_items.jsp
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/pending_items.jsp 2008-10-23 18:10:24 UTC (rev 12157)
+++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/pending_items.jsp 2008-10-23 18:32:16 UTC (rev 12158)
@@ -122,6 +122,7 @@
plugin_insertdate_timeFormat : "%H:%M:%S",
relative_urls : "true",
convert_urls: "false",
+ document_base_url : "<%= sDocBase %>",
extended_valid_elements :
"style[type],a[name|href|target|title|onclick],img[class|src|border=0|alt|title|hspace|vspace|width|height|align|onmouseover|onmouseout|name],font[face|size|color],hr[class|width|size|noshade]"
});
17 years, 6 months
- 1
- 0
JBoss Portal SVN: r12157 - in tags/JBoss_Portal_2_6_7/core-wsrp/src: resources/portal-wsrp-admin-war/WEB-INF/classes and 1 other directory.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2008-10-23 14:10:24 -0400 (Thu, 23 Oct 2008)
New Revision: 12157
Modified:
tags/JBoss_Portal_2_6_7/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ConsumerBean.java
tags/JBoss_Portal_2_6_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/WSRPConfigurationResource.properties
tags/JBoss_Portal_2_6_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/WSRPConfigurationResource_fr.properties
Log:
- JBPORTAL-2209: duplicate old registration instead of duplicating the ref (!)
- Improved robustness and user notification.
Modified: tags/JBoss_Portal_2_6_7/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ConsumerBean.java
===================================================================
--- tags/JBoss_Portal_2_6_7/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ConsumerBean.java 2008-10-23 16:51:39 UTC (rev 12156)
+++ tags/JBoss_Portal_2_6_7/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ConsumerBean.java 2008-10-23 18:10:24 UTC (rev 12157)
@@ -327,11 +327,18 @@
return getSortedProperties(getExpectedRegistrationInfo());
}
- private LinkedList<RegistrationProperty> getSortedProperties(RegistrationInfo registrationInfo)
+ private List<RegistrationProperty> getSortedProperties(RegistrationInfo registrationInfo)
{
- LinkedList<RegistrationProperty> list = new LinkedList<RegistrationProperty>(registrationInfo.getRegistrationProperties().values());
- Collections.sort(list);
- return list;
+ if (registrationInfo != null)
+ {
+ LinkedList<RegistrationProperty> list = new LinkedList<RegistrationProperty>(registrationInfo.getRegistrationProperties().values());
+ Collections.sort(list);
+ return list;
+ }
+ else
+ {
+ return Collections.emptyList();
+ }
}
// Actions
@@ -438,7 +445,7 @@
{
// if we want to change an existing registration property (for example, to upgrade service) then there are
// no expected information, we're just using the modified local version
- newReg = oldReg;
+ newReg = new RegistrationInfo(oldReg);
if (!isRegistrationLocallyModified())
{
Modified: tags/JBoss_Portal_2_6_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/WSRPConfigurationResource.properties
===================================================================
--- tags/JBoss_Portal_2_6_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/WSRPConfigurationResource.properties 2008-10-23 16:51:39 UTC (rev 12156)
+++ tags/JBoss_Portal_2_6_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/WSRPConfigurationResource.properties 2008-10-23 18:10:24 UTC (rev 12157)
@@ -155,7 +155,9 @@
bean_consumermanager_refresh_success = Refresh was successful.
bean_consumermanager_refresh_failure = Refresh failed (probably because the registration information was not valid).
bean_consumermanager_refresh_exception = An unexpected error occurred.
-bean_consumermanager_refresh_modify = The local information has been changed, you should modify your registration with the remote producer.
+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 \
+modify the registration with the producer.
# ProducerBean
bean_producer_regpolicy_unset = RegistrationPolicy unset
Modified: tags/JBoss_Portal_2_6_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/WSRPConfigurationResource_fr.properties
===================================================================
--- tags/JBoss_Portal_2_6_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/WSRPConfigurationResource_fr.properties 2008-10-23 16:51:39 UTC (rev 12156)
+++ tags/JBoss_Portal_2_6_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/WSRPConfigurationResource_fr.properties 2008-10-23 18:10:24 UTC (rev 12157)
@@ -133,5 +133,7 @@
bean_consumermanager_refresh_success=Le rafra\u00eechissement a r\u00e9ussi.
bean_producer_cancel_success=Toutes les modifications faites \u00e0 la configuration du producteur ont \u00e9t\u00e9 annull\u00e9es!
bean_producer_save_success=La configuration du producteur a bien \u00e9t\u00e9 sauvegard\u00e9e!
-bean_consumermanager_refresh_modify=Les informations locales ont chang\u00e9, vous devriez modifier votre enregistrement avec le producteur.
+bean_consumermanager_refresh_modify=Les informations locales ou distantes ont chang\u00e9, vous devriez modifier votre enregistrement avec le producteur.\n\
+Les nouvelles informations locales sont enregistr\u00e9es mais les donn\u00e9es d'enregistrement courantes seront utilis\u00e9es\
+tant que vous n'aurez pas mis \u00e0 jour votre enregistrement aupr\u00e8s du producteur.
bean_consumer_update_success=Consommateur mis \u00e0 jour!
\ No newline at end of file
17 years, 6 months
- 1
- 0
JBoss Portal SVN: r12156 - in branches/JBoss_Portal_Branch_2_7/core-wsrp/src: resources/portal-wsrp-admin-war/WEB-INF/classes and 1 other directory.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2008-10-23 12:51:39 -0400 (Thu, 23 Oct 2008)
New Revision: 12156
Modified:
branches/JBoss_Portal_Branch_2_7/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ConsumerBean.java
branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/Resource.properties
branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/Resource_fr.properties
Log:
- JBPORTAL-2209: duplicate old registration instead of duplicating the ref (!)
- Improved robustness and user notification.
Modified: branches/JBoss_Portal_Branch_2_7/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ConsumerBean.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ConsumerBean.java 2008-10-23 16:51:11 UTC (rev 12155)
+++ branches/JBoss_Portal_Branch_2_7/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ConsumerBean.java 2008-10-23 16:51:39 UTC (rev 12156)
@@ -326,11 +326,18 @@
return getSortedProperties(getExpectedRegistrationInfo());
}
- private LinkedList<RegistrationProperty> getSortedProperties(RegistrationInfo registrationInfo)
+ private List<RegistrationProperty> getSortedProperties(RegistrationInfo registrationInfo)
{
- LinkedList<RegistrationProperty> list = new LinkedList<RegistrationProperty>(registrationInfo.getRegistrationProperties().values());
- Collections.sort(list);
- return list;
+ if (registrationInfo != null)
+ {
+ LinkedList<RegistrationProperty> list = new LinkedList<RegistrationProperty>(registrationInfo.getRegistrationProperties().values());
+ Collections.sort(list);
+ return list;
+ }
+ else
+ {
+ return Collections.emptyList();
+ }
}
// Actions
@@ -437,7 +444,7 @@
{
// if we want to change an existing registration property (for example, to upgrade service) then there are
// no expected information, we're just using the modified local version
- newReg = oldReg;
+ newReg = new RegistrationInfo(oldReg);
if (!isRegistrationLocallyModified())
{
Modified: branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/Resource.properties
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/Resource.properties 2008-10-23 16:51:11 UTC (rev 12155)
+++ branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/Resource.properties 2008-10-23 16:51:39 UTC (rev 12156)
@@ -155,7 +155,9 @@
bean_consumermanager_refresh_success = Refresh was successful.
bean_consumermanager_refresh_failure = Refresh failed (probably because the registration 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.
+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 \
+modify the registration with the producer.
# ProducerBean
bean_producer_regpolicy_unset = RegistrationPolicy unset
Modified: branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/Resource_fr.properties
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/Resource_fr.properties 2008-10-23 16:51:11 UTC (rev 12155)
+++ branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/Resource_fr.properties 2008-10-23 16:51:39 UTC (rev 12156)
@@ -133,7 +133,9 @@
bean_consumermanager_refresh_success=Le rafra\u00eechissement a r\u00e9ussi.
bean_producer_cancel_success=Toutes les modifications faites \u00e0 la configuration du producteur ont \u00e9t\u00e9 annull\u00e9es!
bean_producer_save_success=La configuration du producteur a bien \u00e9t\u00e9 sauvegard\u00e9e!
-bean_consumermanager_refresh_modify=Les informations locales ou distantes ont chang\u00e9, vous devriez modifier votre enregistrement avec le producteur.
+bean_consumermanager_refresh_modify=Les informations locales ou distantes ont chang\u00e9, vous devriez modifier votre enregistrement avec le producteur.\n\
+Les nouvelles informations locales sont enregistr\u00e9es mais les donn\u00e9es d'enregistrement courantes seront utilis\u00e9es\
+tant que vous n'aurez pas mis \u00e0 jour votre enregistrement aupr\u00e8s du producteur.
bean_consumer_update_success=Consommateur mis \u00e0 jour!
registration_property_status_inexistent=Inexistant sur le producteur
registration_property_status_invalid_value=Invalide valeur
17 years, 6 months
- 1
- 0
JBoss Portal SVN: r12155 - in branches/JBoss_Portal_Branch_2_6/core-wsrp/src: resources/portal-wsrp-admin-war/WEB-INF/classes and 1 other directory.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2008-10-23 12:51:11 -0400 (Thu, 23 Oct 2008)
New Revision: 12155
Modified:
branches/JBoss_Portal_Branch_2_6/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ConsumerBean.java
branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/WSRPConfigurationResource.properties
branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/WSRPConfigurationResource_fr.properties
Log:
- JBPORTAL-2209: duplicate old registration instead of duplicating the ref (!)
- Improved robustness and user notification.
Modified: branches/JBoss_Portal_Branch_2_6/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ConsumerBean.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ConsumerBean.java 2008-10-23 16:41:14 UTC (rev 12154)
+++ branches/JBoss_Portal_Branch_2_6/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ConsumerBean.java 2008-10-23 16:51:11 UTC (rev 12155)
@@ -327,11 +327,18 @@
return getSortedProperties(getExpectedRegistrationInfo());
}
- private LinkedList<RegistrationProperty> getSortedProperties(RegistrationInfo registrationInfo)
+ private List<RegistrationProperty> getSortedProperties(RegistrationInfo registrationInfo)
{
- LinkedList<RegistrationProperty> list = new LinkedList<RegistrationProperty>(registrationInfo.getRegistrationProperties().values());
- Collections.sort(list);
- return list;
+ if (registrationInfo != null)
+ {
+ LinkedList<RegistrationProperty> list = new LinkedList<RegistrationProperty>(registrationInfo.getRegistrationProperties().values());
+ Collections.sort(list);
+ return list;
+ }
+ else
+ {
+ return Collections.emptyList();
+ }
}
// Actions
@@ -438,7 +445,7 @@
{
// if we want to change an existing registration property (for example, to upgrade service) then there are
// no expected information, we're just using the modified local version
- newReg = oldReg;
+ newReg = new RegistrationInfo(oldReg);
if (!isRegistrationLocallyModified())
{
Modified: branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/WSRPConfigurationResource.properties
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/WSRPConfigurationResource.properties 2008-10-23 16:41:14 UTC (rev 12154)
+++ branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/WSRPConfigurationResource.properties 2008-10-23 16:51:11 UTC (rev 12155)
@@ -155,7 +155,9 @@
bean_consumermanager_refresh_success = Refresh was successful.
bean_consumermanager_refresh_failure = Refresh failed (probably because the registration information was not valid).
bean_consumermanager_refresh_exception = An unexpected error occurred.
-bean_consumermanager_refresh_modify = The local information has been changed, you should modify your registration with the remote producer.
+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 \
+modify the registration with the producer.
# ProducerBean
bean_producer_regpolicy_unset = RegistrationPolicy unset
Modified: branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/WSRPConfigurationResource_fr.properties
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/WSRPConfigurationResource_fr.properties 2008-10-23 16:41:14 UTC (rev 12154)
+++ branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/WSRPConfigurationResource_fr.properties 2008-10-23 16:51:11 UTC (rev 12155)
@@ -133,5 +133,7 @@
bean_consumermanager_refresh_success=Le rafra\u00eechissement a r\u00e9ussi.
bean_producer_cancel_success=Toutes les modifications faites \u00e0 la configuration du producteur ont \u00e9t\u00e9 annull\u00e9es!
bean_producer_save_success=La configuration du producteur a bien \u00e9t\u00e9 sauvegard\u00e9e!
-bean_consumermanager_refresh_modify=Les informations locales ont chang\u00e9, vous devriez modifier votre enregistrement avec le producteur.
+bean_consumermanager_refresh_modify=Les informations locales ou distantes ont chang\u00e9, vous devriez modifier votre enregistrement avec le producteur.\n\
+Les nouvelles informations locales sont enregistr\u00e9es mais les donn\u00e9es d'enregistrement courantes seront utilis\u00e9es\
+tant que vous n'aurez pas mis \u00e0 jour votre enregistrement aupr\u00e8s du producteur.
bean_consumer_update_success=Consommateur mis \u00e0 jour!
\ No newline at end of file
17 years, 6 months
- 1
- 0
JBoss Portal SVN: r12154 - in branches/JBoss_Portal_Branch_2_7: core and 6 other directories.
by portal-commits＠lists.jboss.org
Author: sohil.shah(a)jboss.com
Date: 2008-10-23 12:41:14 -0400 (Thu, 23 Oct 2008)
New Revision: 12154
Modified:
branches/JBoss_Portal_Branch_2_7/build/build-thirdparty.xml
branches/JBoss_Portal_Branch_2_7/core-cms/src/main/org/jboss/portal/core/cms/servlet/CMSExportServlet.java
branches/JBoss_Portal_Branch_2_7/core-cms/src/main/org/jboss/portal/core/cms/ui/admin/CMSAdminConstants.java
branches/JBoss_Portal_Branch_2_7/core-cms/src/main/org/jboss/portal/core/cms/ui/admin/CMSAdminPortlet.java
branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-sar/conf/hibernate/cms/domain.hbm.xml
branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-sar/conf/hibernate/cms/hibernate.cfg.xml
branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource.properties
branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource_de.properties
branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/accessdenied.jsp
branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmcreatecollection.jsp
branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/create.jsp
branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/exportarchive_pickup_error.jsp
branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/main.jsp
branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/searchResults.jsp
branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/viewfile.jsp
branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/editor/main.jsp
branches/JBoss_Portal_Branch_2_7/core/build.xml
Log:
* porting 2.6.7 code
* upgrading cms module to 1.2.1
Modified: branches/JBoss_Portal_Branch_2_7/build/build-thirdparty.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/build/build-thirdparty.xml 2008-10-23 16:23:22 UTC (rev 12153)
+++ branches/JBoss_Portal_Branch_2_7/build/build-thirdparty.xml 2008-10-23 16:41:14 UTC (rev 12154)
@@ -46,7 +46,7 @@
<componentref name="jboss-portal/modules/test" version="1.0.3"/>
<componentref name="jboss-portal/modules/portlet" version="2.0.4"/>
<componentref name="jboss-portal/modules/identity" version="1.0.5"/>
- <componentref name="jboss-portal/modules/cms" version="1.2.0"/>
+ <componentref name="jboss-portal/modules/cms" version="1.2.1"/>
<componentref name="antlr" version="2.7.6.ga"/>
<componentref name="apache-ant" version="1.6.5"/>
<componentref name="jackrabbit" version="1.4"/>
Modified: branches/JBoss_Portal_Branch_2_7/core/build.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core/build.xml 2008-10-23 16:23:22 UTC (rev 12153)
+++ branches/JBoss_Portal_Branch_2_7/core/build.xml 2008-10-23 16:41:14 UTC (rev 12154)
@@ -775,7 +775,7 @@
<copy todir="${jboss.home}/server/${portal-ha.deploy.dir}/jboss-portal-ha.sar" overwrite="true">
<fileset dir="${build.lib}/jboss-portal-ha-exploded.sar"/>
</copy>
- <copy todir="${jboss.home}/server/ports-02/deploy/jboss-portal-ha.sar" overwrite="true">
+ <copy todir="${jboss.home}/server/${portal-ha.node2.deploy.dir}/jboss-portal-ha.sar" overwrite="true">
<fileset dir="${build.lib}/jboss-portal-ha-exploded.sar"/>
</copy>
</target>
Modified: branches/JBoss_Portal_Branch_2_7/core-cms/src/main/org/jboss/portal/core/cms/servlet/CMSExportServlet.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-cms/src/main/org/jboss/portal/core/cms/servlet/CMSExportServlet.java 2008-10-23 16:23:22 UTC (rev 12153)
+++ branches/JBoss_Portal_Branch_2_7/core-cms/src/main/org/jboss/portal/core/cms/servlet/CMSExportServlet.java 2008-10-23 16:41:14 UTC (rev 12154)
@@ -22,17 +22,29 @@
******************************************************************************/
package org.jboss.portal.core.cms.servlet;
-import org.jboss.portal.common.io.IOTools;
+import org.jboss.mx.util.MBeanProxy;
+import org.jboss.mx.util.MBeanServerLocator;
-import javax.servlet.ServletOutputStream;
+import javax.management.MBeanServer;
+import javax.management.ObjectName;
+import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import java.io.File;
-import java.io.FileInputStream;
+import javax.servlet.UnavailableException;
import java.io.IOException;
import java.io.InputStream;
+import java.io.OutputStream;
+import org.apache.log4j.Logger;
+
+import org.jboss.portal.common.io.IOTools;
+import org.jboss.portal.cms.CMS;
+import org.jboss.portal.cms.Command;
+import org.jboss.portal.cms.CMSException;
+import org.jboss.portal.cms.model.File;
+
+
/**
* Used for archive export in CMS.
*
@@ -42,27 +54,59 @@
{
/** The serialVersionUID */
private static final long serialVersionUID = 9192970961535895941L;
+
+ private static Logger log = Logger.getLogger(CMSExportServlet.class);
+
+ /**
+ *
+ */
+ private CMS cmsService = null;
+
+ /**
+ *
+ */
+ public void init() throws ServletException
+ {
+ try
+ {
+ MBeanServer mbeanServer = MBeanServerLocator.locateJBoss();
+ this.cmsService = (CMS)MBeanProxy.get(CMS.class, new ObjectName("portal:service=CMS"), mbeanServer);
+ if(this.cmsService == null)
+ {
+ throw new CMSException("CMS Service was not found!!");
+ }
+ }
+ catch(Exception e)
+ {
+ throw new UnavailableException(e.getMessage());
+ }
+ }
public void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException
{
String sPickupFile = (String)request.getSession().getAttribute("pickupfile");
-
- File file = new File(sPickupFile);
try
{
- //response.setContentType(getServletContext().getMimeType(file.getName()));
+ //Get the file to be downloaded
+ Command downloadCommand = this.cmsService.getCommandFactory().createDownloadArchiveCommand(sPickupFile);
+ File file = (File)this.cmsService.execute(downloadCommand);
+
+ //SetUp the response header
response.setContentType("application/zip");
- response.setContentLength((int)file.length());
+ response.setContentLength((int)file.getSize());
response.setHeader("Content-Disposition", "attachment; filename=" + file.getName());
-
- InputStream in = IOTools.safeBufferedWrapper(new FileInputStream(file));
- ServletOutputStream sout = response.getOutputStream();
+
+ //Write the contents
+ InputStream in = IOTools.safeBufferedWrapper(file.getContent().getStream());
+ OutputStream sout = response.getOutputStream();
byte[] buf = new byte[2048];
int len;
while ((len = in.read(buf)) > 0)
{
sout.write(buf, 0, len);
}
+
+ //Cleanup
in.close();
sout.flush();
sout.close();
@@ -75,16 +119,9 @@
}
catch (IOException e1)
{
- e1.printStackTrace();
+ log.error(this, e1);
}
- }
- finally
- {
- if (!file.delete())
- {
- file.deleteOnExit();
- }
- }
+ }
}
public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException
Modified: branches/JBoss_Portal_Branch_2_7/core-cms/src/main/org/jboss/portal/core/cms/ui/admin/CMSAdminConstants.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-cms/src/main/org/jboss/portal/core/cms/ui/admin/CMSAdminConstants.java 2008-10-23 16:23:22 UTC (rev 12153)
+++ branches/JBoss_Portal_Branch_2_7/core-cms/src/main/org/jboss/portal/core/cms/ui/admin/CMSAdminConstants.java 2008-10-23 16:41:14 UTC (rev 12154)
@@ -63,6 +63,8 @@
public static final String OP_CREATE_COLLECTION = "createcollection";
public static final String OP_CONFIRM_CREATE_COLLECTION = "confirmcreatecollection";
+
+ public static final String OP_CONFIRM_CREATE_COLLECTION_VALIDATION_ERROR = "confirmcreatecollection_validationError";
public static final String OP_CONFIRMCOPY = "confirmcopy";
@@ -111,4 +113,12 @@
public static final String OP_VIEWPENDINGPREVIEW = "view_pending_preview";
public static final String OP_MODIFYANDAPPROVE = "modify_and_approve";
+
+ public static final String CMS_FILENAME_INVALID = "CMS_FILENAME_INVALID";
+
+ public static final String CMS_FOLDERNAME_INVALID = "CMS_FOLDERNAME_INVALID";
+
+ public static final String CMS_DATE_PATTERN = "CMS_DATE_PATTERN";
+
+ public static final String DATE_FORMAT = "dateFormat";
}
Modified: branches/JBoss_Portal_Branch_2_7/core-cms/src/main/org/jboss/portal/core/cms/ui/admin/CMSAdminPortlet.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-cms/src/main/org/jboss/portal/core/cms/ui/admin/CMSAdminPortlet.java 2008-10-23 16:23:22 UTC (rev 12153)
+++ branches/JBoss_Portal_Branch_2_7/core-cms/src/main/org/jboss/portal/core/cms/ui/admin/CMSAdminPortlet.java 2008-10-23 16:41:14 UTC (rev 12154)
@@ -78,7 +78,6 @@
import javax.portlet.UnavailableException;
import java.io.IOException;
import java.io.InputStream;
-import java.io.PrintWriter;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Date;
@@ -89,6 +88,8 @@
import java.util.Set;
import java.util.Vector;
import java.util.ResourceBundle;
+import java.text.SimpleDateFormat;
+import java.text.Format;
/**
* @author <a href="mailto:roy@jboss.org">Roy Russo</a>
@@ -155,6 +156,13 @@
protected void doView(final JBossRenderRequest rReq, final JBossRenderResponse rRes)
throws PortletException, IOException, UnavailableException
{
+ //SetUp the properly localized Date Formatter to be used by the View JSPs
+ ResourceBundle bundle = this.getPortletConfig().getResourceBundle(rReq.getLocale());
+ String datePattern = bundle.getString(CMSAdminConstants.CMS_DATE_PATTERN);
+ Format dateFormat = new SimpleDateFormat(datePattern, rReq.getLocale());
+ rReq.setAttribute(CMSAdminConstants.DATE_FORMAT, dateFormat);
+
+
//check and make sure the CMSAdminPortlet is accessible to the current user
if (!this.isPortletAccessible(rReq))
{
@@ -208,8 +216,8 @@
{
String sPath = rReq.getParameter("path");
String sOp = rReq.getParameter("returnOp");
-
+
rRes.setContentType("text/html");
rReq.setAttribute("path", sPath);
rReq.setAttribute("returnOp", sOp);
@@ -219,7 +227,7 @@
catch(Exception e)
{
throw new PortletException(e);
- }
+ }
}
private void internalDoView(JBossRenderRequest rReq, JBossRenderResponse rRes)
@@ -274,7 +282,7 @@
javax.portlet.PortletRequestDispatcher prd = getPortletContext().getRequestDispatcher(CMSAdminConstants.CMS_JSP_PATH + "/main.jsp");
prd.include(rReq, rRes);
}
- else if (CMSAdminConstants.OP_CONFIRM_CREATE_COLLECTION.equals(op))
+ else if (CMSAdminConstants.OP_CONFIRM_CREATE_COLLECTION.equals(op) || CMSAdminConstants.OP_CONFIRM_CREATE_COLLECTION_VALIDATION_ERROR.equals(op))
{
try
{
@@ -295,6 +303,21 @@
String sPath = rReq.getParameter("path");
rRes.setContentType("text/html");
rReq.setAttribute("createpath", sPath);
+
+ if (rReq.getParameter("error:message") != null)
+ {
+ rReq.setAttribute("error:message", rReq.getParameter("error:message"));
+ }
+ if (rReq.getParameter("error:newcollectionname") != null)
+ {
+ rReq.setAttribute("error:newcollectionname", rReq.getParameter("error:newcollectionname"));
+ }
+ if (rReq.getParameter("error:newcollectiondescription") != null)
+ {
+ rReq.setAttribute("error:newcollectiondescription", rReq.getParameter("error:newcollectiondescription"));
+ }
+
+
javax.portlet.PortletRequestDispatcher prd = getPortletContext().getRequestDispatcher(CMSAdminConstants.CMS_JSP_PATH + "/confirmcreatecollection.jsp");
prd.include(rReq, rRes);
}
@@ -563,6 +586,14 @@
{
rReq.setAttribute("error:language", rReq.getParameter("error:language"));
}
+ if (rReq.getParameter("error:filename") != null)
+ {
+ rReq.setAttribute("error:filename", rReq.getParameter("error:filename"));
+ }
+ if (rReq.getParameter("error:message") != null)
+ {
+ rReq.setAttribute("error:message", rReq.getParameter("error:message"));
+ }
javax.portlet.PortletRequestDispatcher prd = getPortletContext().getRequestDispatcher(CMSAdminConstants.CMS_JSP_PATH + "/create.jsp");
prd.include(rReq, rRes);
@@ -733,6 +764,13 @@
}
else if (CMSAdminConstants.OP_VIEWPENDING.equals(op))
{
+ boolean isWorkflowManagementAccessible = this.isWorkflowManagementAccessible(rReq);
+ if(!isWorkflowManagementAccessible)
+ {
+ this.showAccessDeniedScreen(rReq, rRes);
+ return;
+ }
+
String sPath = rReq.getParameter("path");
if (this.getApprovePublish() != null)
@@ -760,6 +798,20 @@
String path = rReq.getParameter("path");
String contentPath = rReq.getParameter("contentPath");
+ boolean isWorkflowManagementAccessible = this.isWorkflowManagementAccessible(rReq);
+ if(!isWorkflowManagementAccessible)
+ {
+ this.showAccessDeniedScreen(rReq, rRes);
+ return;
+ }
+
+ boolean hasWriteAccess = this.hasWriteAccess(rReq, path);
+ if(!hasWriteAccess)
+ {
+ this.showAccessDeniedScreen(rReq, rRes);
+ return;
+ }
+
if (this.getApprovePublish() != null)
{
try
@@ -854,11 +906,46 @@
folder.setName(sFolderName);
folder.setBasePath(sNewPath);
- Command saveCMD = CMSService.getCommandFactory().createFolderSaveCommand(folder);
- CMSService.execute(saveCMD);
+ try
+ {
+ Command saveCMD = CMSService.getCommandFactory().createFolderSaveCommand(folder);
+ CMSService.execute(saveCMD);
+ }
+ catch(CMSException cme)
+ {
+ if(cme.hasPathFormatFailure())
+ {
+ //Validation Error occurred
+ //FileName should not be empty
+ aRes.setRenderParameter("op", CMSAdminConstants.OP_CONFIRM_CREATE_COLLECTION_VALIDATION_ERROR);
+ aRes.setRenderParameter("path", aReq.getParameter("destination"));
+ //used to remember the data already submitted by the user
+ aRes.setRenderParameter("error:message", CMSAdminConstants.CMS_FOLDERNAME_INVALID);
+ aRes.setRenderParameter("error:newcollectionname", aReq.getParameter("newcollectionname"));
+ aRes.setRenderParameter("error:newcollectiondescription", aReq.getParameter("newcollectiondescription"));
+
+ return;
+ }
+ else
+ {
+ throw cme;
+ }
+ }
+
aRes.setRenderParameter("op", CMSAdminConstants.OP_MAIN);
aRes.setRenderParameter("path", sNewPath);
+ }
+ else
+ {
+ //Validation Error
+ aRes.setRenderParameter("op", CMSAdminConstants.OP_CONFIRM_CREATE_COLLECTION_VALIDATION_ERROR);
+ aRes.setRenderParameter("path", aReq.getParameter("destination"));
+
+ //used to remember the data already submitted by the user
+ aRes.setRenderParameter("error:message", CMSAdminConstants.CMS_FOLDERNAME_INVALID);
+ aRes.setRenderParameter("error:newcollectionname", aReq.getParameter("newcollectionname"));
+ aRes.setRenderParameter("error:newcollectiondescription", aReq.getParameter("newcollectiondescription"));
}
}
else if (CMSAdminConstants.OP_UPLOADCONTENT.equals(op))
@@ -1031,7 +1118,27 @@
{
String sNodeName = sFrom.substring(sFrom.lastIndexOf("/") + 1, sFrom.length());
sTo = FileUtil.cleanDoubleSlashes(sTo + "/" + sNodeName);
+
+ // check if destination already exists
+ Command existsCMD = CMSService.getCommandFactory().createItemExistsCommand(sTo);
+ Boolean bExists = (Boolean)CMSService.execute(existsCMD);
+ if (bExists.booleanValue())
+ {
+ List messages = new ArrayList();
+ messages.add(this.resources.getObject("CMS_MSG_DESTINATION_ALREADY_EXISTS"));
+ aReq.getPortletSession().setAttribute("messages", messages);
+ try
+ {
+ String sParentPath = NodeUtil.getParentPath(sFrom);
+ aRes.setRenderParameter("path", sParentPath);
+ }
+ catch (Exception e)
+ {
+ }
+ return;
+ }
+
Command copyCommand = CMSService.getCommandFactory().createCopyCommand(sFrom, sTo);
CMSService.execute(copyCommand);
@@ -1056,6 +1163,29 @@
{
String sNodeName = sFrom.substring(sFrom.lastIndexOf("/") + 1, sFrom.length());
sTo = FileUtil.cleanDoubleSlashes(sTo + "/" + sNodeName);
+
+ // check if destination already exists
+ Command existsCMD = CMSService.getCommandFactory().createItemExistsCommand(sTo);
+ Boolean bExists = (Boolean)CMSService.execute(existsCMD);
+ if (bExists.booleanValue())
+ {
+ List messages = new ArrayList();
+ messages.add(this.resources.getObject("CMS_MSG_DESTINATION_ALREADY_EXISTS"));
+ aReq.getPortletSession().setAttribute("messages", messages);
+ try
+ {
+ String sParentPath = NodeUtil.getParentPath(sFrom);
+ aRes.setRenderParameter("path", sParentPath);
+ }
+ catch (Exception e)
+ {
+
+ }
+ return;
+ }
+
+ Command moveCommand = CMSService.getCommandFactory().createMoveCommand(sFrom, sTo);
+ CMSService.execute(moveCommand);
if ("fo".equalsIgnoreCase(sType))
{
aRes.setRenderParameter("op", CMSAdminConstants.OP_MAIN);
@@ -1063,9 +1193,7 @@
else if ("fi".equalsIgnoreCase(sType))
{
aRes.setRenderParameter("op", CMSAdminConstants.OP_VIEWFILE);
- }
- Command moveCommand = CMSService.getCommandFactory().createMoveCommand(sFrom, sTo);
- CMSService.execute(moveCommand);
+ }
aRes.setRenderParameter("path", sTo);
}
@@ -1241,8 +1369,40 @@
file.setContent(new Locale(sLanguage), content);
+ //Check and make sure file can be successfully saved
Command existsCMD = CMSService.getCommandFactory().createItemExistsCommand(content.getBasePath());
- Boolean bExists = (Boolean)CMSService.execute(existsCMD);
+ Boolean bExists = null;
+ try
+ {
+ bExists = (Boolean)CMSService.execute(existsCMD);
+ }
+ catch(CMSException cme)
+ {
+ if(cme.hasPathFormatFailure())
+ {
+ //Validation Error occurred
+ //FileName should not be empty
+ aRes.setRenderParameter("op", CMSAdminConstants.OP_CREATEFILE_VALIDATION_ERROR);
+
+ //set render parameters here
+ aRes.setRenderParameter("path", sDirectory);
+
+ //used to remember the data already submitted by the user
+ aRes.setRenderParameter("error:message", CMSAdminConstants.CMS_FILENAME_INVALID);
+ aRes.setRenderParameter("error:filename", aReq.getParameter("filename"));
+ aRes.setRenderParameter("error:content", aReq.getParameter("elm1"));
+ aRes.setRenderParameter("error:description", aReq.getParameter("description"));
+ aRes.setRenderParameter("error:title", aReq.getParameter("title"));
+ aRes.setRenderParameter("error:language", aReq.getParameter("language"));
+
+ return;
+ }
+ else
+ {
+ throw cme;
+ }
+ }
+
if (bExists.booleanValue()) // if file exists, update contentNode
{
Command cmdUpdate = CMSService.getCommandFactory().createUpdateFileCommand(file, content, true);
@@ -1371,6 +1531,12 @@
}
else if (CMSAdminConstants.OP_APPROVE.equals(op))
{
+ boolean hasWriteAccess = this.hasWriteAccess(aReq, aReq.getParameter("path"));
+ if(!hasWriteAccess)
+ {
+ throw new CMSException("Access to this resource is denied");
+ }
+
String sManager = aReq.getUser().getUserName();
String sPID = aReq.getParameter("pid");
try
@@ -1399,6 +1565,12 @@
}
else if (CMSAdminConstants.OP_DENY.equals(op))
{
+ boolean hasWriteAccess = this.hasWriteAccess(aReq, aReq.getParameter("path"));
+ if(!hasWriteAccess)
+ {
+ throw new CMSException("Access to this resource is denied");
+ }
+
String sManager = aReq.getUser().getUserName();
String sPID = aReq.getParameter("pid");
try
@@ -1450,6 +1622,12 @@
}
else if(CMSAdminConstants.OP_MODIFYANDAPPROVE.equals(op))
{
+ boolean hasWriteAccess = this.hasWriteAccess(aReq, aReq.getParameter("path"));
+ if(!hasWriteAccess)
+ {
+ throw new CMSException("Access to this resource is denied");
+ }
+
String modifiedContent = aReq.getParameter("elm1");
String processId = aReq.getParameter("pid");
String path = aReq.getParameter("path");
@@ -1839,4 +2017,38 @@
{
}
+
+ private boolean hasWriteAccess(PortletRequest request, String path)
+ {
+ boolean hasAccess = false;
+
+ User user = null;
+ if(request instanceof JBossRenderRequest)
+ {
+ user = ((JBossRenderRequest)request).getUser();
+ }
+ else if(request instanceof JBossActionRequest)
+ {
+ user = ((JBossActionRequest)request).getUser();
+ }
+
+ try
+ {
+ user = userModule.findUserById(user.getId());
+ }
+ catch (Exception e)
+ {
+ return false;
+ }
+
+ PortalCMSSecurityContext securityContext = new PortalCMSSecurityContext(user);
+ File file = new FileImpl();
+ file.setBasePath(path);
+ securityContext.setAttribute("command", CMSService.getCommandFactory().createFileUpdateCommand(file));
+
+ PortalPermission cmsPermission = new CMSPermission(securityContext);
+ hasAccess = this.authorizationManager.checkPermission(cmsPermission);
+
+ return hasAccess;
+ }
}
\ No newline at end of file
Modified: branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-sar/conf/hibernate/cms/domain.hbm.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-sar/conf/hibernate/cms/domain.hbm.xml 2008-10-23 16:23:22 UTC (rev 12153)
+++ branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-sar/conf/hibernate/cms/domain.hbm.xml 2008-10-23 16:41:14 UTC (rev 12154)
@@ -277,7 +277,7 @@
<!-- mapping to persist CMS Fine Grained Security related objects -->
<class name="org.jboss.portal.cms.security.PermRoleAssoc" table="jbp_cms_perm_role">
- <cache usage="read-write"/>
+ <cache usage="@portal.hibernate.cache.usage@"/>
<id
name="id"
column="ID"
@@ -292,7 +292,7 @@
/>
</class>
<class name="org.jboss.portal.cms.security.PermUserAssoc" table="jbp_cms_perm_user">
- <cache usage="read-write"/>
+ <cache usage="@portal.hibernate.cache.usage@"/>
<id
name="id"
column="ID"
@@ -307,7 +307,7 @@
/>
</class>
<class name="org.jboss.portal.cms.security.Criteria" table="jbp_cms_perm_criteria">
- <cache usage="read-write"/>
+ <cache usage="@portal.hibernate.cache.usage@"/>
<id
name="id"
column="ID"
@@ -328,7 +328,7 @@
/>
</class>
<class name="org.jboss.portal.cms.security.Permission" table="jbp_cms_perm">
- <cache usage="read-write"/>
+ <cache usage="@portal.hibernate.cache.usage@"/>
<id
name="id"
column="ID"
@@ -337,19 +337,19 @@
</id>
<!-- one-to-many association with the criteria object -->
<set name="criteria" lazy="false" table="jbp_cms_perm_criteria" cascade="all-delete-orphan">
- <cache usage="read-write"/>
+ <cache usage="@portal.hibernate.cache.usage@"/>
<key column="CMS_PERM_ID"/>
<one-to-many class="org.jboss.portal.cms.security.Criteria"/>
</set>
<!-- many-to-many association with the role object -->
<set name="roleAssoc" lazy="false" cascade="all-delete-orphan">
- <cache usage="read-write"/>
+ <cache usage="@portal.hibernate.cache.usage@"/>
<key column="CMS_PERM_ID"/>
<one-to-many class="org.jboss.portal.cms.security.PermRoleAssoc"/>
</set>
<!-- many-to-many association with the user object -->
<set name="userAssoc" lazy="false" cascade="all-delete-orphan">
- <cache usage="read-write"/>
+ <cache usage="@portal.hibernate.cache.usage@"/>
<key column="CMS_PERM_ID"/>
<one-to-many class="org.jboss.portal.cms.security.PermUserAssoc"/>
</set>
Modified: branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-sar/conf/hibernate/cms/hibernate.cfg.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-sar/conf/hibernate/cms/hibernate.cfg.xml 2008-10-23 16:23:22 UTC (rev 12153)
+++ branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-sar/conf/hibernate/cms/hibernate.cfg.xml 2008-10-23 16:41:14 UTC (rev 12154)
@@ -33,8 +33,23 @@
<!-- caching properties -->
<property name="cache.use_second_level_cache">true</property>
<property name="cache.use_query_cache">true</property>
- <property name="cache.provider_configuration_file_resource_path">conf/hibernate/cms/ehcache.xml</property>
- <property name="cache.provider_class">org.hibernate.cache.EhCacheProvider</property>
+
+ <!--
+ | Uncomment in clustered mode : use transactional replicated cache
+ @portal.single.xml.close@
+ <property name="cache.provider_class">org.jboss.hibernate.jbc.cacheprovider.JmxBoundTreeCacheProvider</property>
+ <property name="treecache.mbean.object_name">portal:service=TreeCache,type=hibernate</property>
+ @portal.single.xml.open@
+ -->
+
+ <!--
+ | Comment in clustered mode
+ @portal.clustered.xml.close@
+ <property name="cache.provider_configuration_file_resource_path">conf/hibernate/portal/ehcache.xml</property>
+ <property name="cache.provider_class">org.hibernate.cache.EhCacheProvider</property>
+ @portal.clustered.xml.open@
+ -->
+
<!-- managed environment transaction configuration -->
<property name="hibernate.transaction.manager_lookup_class">org.hibernate.transaction.JBossTransactionManagerLookup</property>
Modified: branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource.properties
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource.properties 2008-10-23 16:23:22 UTC (rev 12153)
+++ branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource.properties 2008-10-23 16:41:14 UTC (rev 12154)
@@ -105,6 +105,7 @@
CMS_REQUIRED=Required
CMS_LINK_TO_RESOURCES=Links to resources within this portal should be absolute. For example: A link to an image located in default/images/back.gif should be typed in exactly as shown here. Do not prefix a slash (/) to the path of the resource. You can verify the link is correct by clicking on the preview button in the editor
CMS_ERROR_PROCESSING=ERROR processing export request
+CMS_ERROR_EXPORT=An error occurred during the Export operation. Please make sure the Folder being exported is not empty
CMS_YOUR_EXPORT_0=Your export of
CMS_YOUR_EXPORT_1=is ready for download
CMS_CLICK_TO_DOWNLOAD=Click to Download
@@ -121,6 +122,7 @@
CMS_HELP=The CMS Portlet displays content from the file store inside a portlet window, or, in the case of binary content, outside of the portlet window altogether
CMS_TO_MODIFY=To modify how this portlet behaves, please
CMS_CLICK_HERE=click here
+CMS_SELECT_ACTION=Select Action
CMS_QUERYERROR=The query you entered is not valid
@@ -139,4 +141,11 @@
CMS_MISSING_DOCUMENT=404 - Page Not Found
CMS_MISSING_DOCUMENT_DESCRIPTION=The document you tried to access is not available
+CMS_FILENAME_INVALID=File Name is invalid. It may not contain illegal characters such as '.', '/', ':', '[', ']', '*', ''', '"', '|' or any whitespace character.
+CMS_FOLDERNAME_INVALID=Folder Name is invalid. It may not contain illegal characters such as '.', '/', ':', '[', ']', '*', ''', '"', '|' or any whitespace character.
+CMS_MSG_DESTINATION_ALREADY_EXISTS=The command was not performed, because the destination already exists.
+
+CMS_DATE_PATTERN=MM/dd/yy HH:mm
+
+
Modified: branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource_de.properties
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource_de.properties 2008-10-23 16:23:22 UTC (rev 12153)
+++ branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource_de.properties 2008-10-23 16:41:14 UTC (rev 12154)
@@ -130,3 +130,4 @@
CMS_MISSING_DOCUMENT=404 - Seite nicht gefunden
CMS_MISSING_DOCUMENT_DESCRIPTION=Das von ihnen angeforderte Dokument ist nicht verf�gbar
+CMS_DATE_PATTERN=dd/MM/yy HH:mm
\ No newline at end of file
Modified: branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/accessdenied.jsp
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/accessdenied.jsp 2008-10-23 16:23:22 UTC (rev 12153)
+++ branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/accessdenied.jsp 2008-10-23 16:41:14 UTC (rev 12154)
@@ -6,8 +6,17 @@
<portlet:defineObjects/>
<%
- String sBackPath = (String)request.getAttribute("path");
- String OP = CMSAdminConstants.OP_MAIN;
+ String OP = (String)request.getAttribute("returnOp");
+ String sBackPath = null;
+ if(OP != null)
+ {
+ sBackPath = (String)request.getAttribute("path");
+ }
+ else
+ {
+ OP = CMSAdminConstants.OP_MAIN;
+ sBackPath = "/";
+ }
%>
<link rel="stylesheet" type="text/css" href="/portal-admin/css/style.css" media="screen"/>
<div class="admin-ui">
@@ -21,18 +30,18 @@
<h2>${n:i18n("CMS_ACCESS_DENIED")}</h2>
</td>
</tr>
+ <%if(sBackPath != null){%>
<tr>
<td class="portlet-section-body" align="center">
<form name="accessdeniedform" method="post">
- <input class="portlet-form-button" type="button" value="${n:i18n("CMS_BACKTOBROWSER")}"
+ <input class="portlet-form-button" type="button" value="${n:i18n("CMS_BACKTOBROWSER")}"
name="back"
- onclick="window.location='<portlet:renderURL><portlet:param name="op" value="<%= CMSAdminConstants.OP_MAIN %>"/><portlet:param name="path" value="<%= sBackPath %>"/></portlet:renderURL>'">
+ onclick="window.location='<portlet:renderURL><portlet:param name="op" value="<%= CMSAdminConstants.OP_MAIN %>"/><portlet:param name="path" value="<%= sBackPath %>"/></portlet:renderURL>'"/>
</form>
</td>
- </tr>
- </table>
- <br/><br/>
-
-
+ </tr>
+ <%}%>
+ </table>
+ <br/><br/>
</div>
</div>
\ No newline at end of file
Modified: branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmcreatecollection.jsp
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmcreatecollection.jsp 2008-10-23 16:23:22 UTC (rev 12153)
+++ branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmcreatecollection.jsp 2008-10-23 16:41:14 UTC (rev 12154)
@@ -6,6 +6,19 @@
<%
String sCurrPath = (String)request.getAttribute("createpath");
String OP = CMSAdminConstants.OP_CONFIRM_CREATE_COLLECTION;
+
+ //validation handling related data
+ String newcollectionname = (String)request.getAttribute("error:newcollectionname");
+ String newcollectiondescription = (String)request.getAttribute("error:newcollectiondescription");
+ String errorMessage = (String)request.getAttribute("error:message");
+ if(newcollectionname == null)
+ {
+ newcollectionname = "";
+ }
+ if(newcollectiondescription == null)
+ {
+ newcollectiondescription = "";
+ }
%>
<portlet:defineObjects/>
<link rel="stylesheet" type="text/css" href="/portal-admin/css/style.css" media="screen"/>
@@ -14,6 +27,14 @@
<h3 class="sectionTitle-blue">${n:i18n("TITLE_CREATECOLLCONFIRM")}</h3>
<div class=" cms-tab-container">
<table width="100%">
+ <%if(errorMessage != null){%>
+ <tr>
+ <td colspan="2">
+ <font color="red">${n:i18n("CMS_FOLDERNAME_INVALID")}</font>
+ </td>
+ </tr>
+ <%}%>
+
<tr>
<td valign="top" width="250" class="portlet-section-alternate">
<%@ include file="folderlist.jsp" %>
@@ -36,14 +57,14 @@
<tr>
<td valign="bottom">${n:i18n("CMS_NAME")}:</td>
<td align="left"><input class="portlet-form-input-field" type="text"
- name="newcollectionname" size="40" maxlength="50">
+ name="newcollectionname" size="40" maxlength="50" value="<%=newcollectionname.replace("\"", """)%>">
</td>
</tr>
<tr>
<td valign="bottom">${n:i18n("CMS_DESCRIPTION")}:</td>
<td align="left"><input class="portlet-form-input-field" type="text"
name="newcollectiondescription"
- size="40" maxlength="80">
+ size="40" maxlength="80" value="<%=newcollectiondescription.replace("\"", """)%>">
</td>
</tr>
<tr>
Modified: branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/create.jsp
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/create.jsp 2008-10-23 16:23:22 UTC (rev 12153)
+++ branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/create.jsp 2008-10-23 16:41:14 UTC (rev 12154)
@@ -19,6 +19,8 @@
String description = (String)request.getAttribute("error:description");
String title = (String)request.getAttribute("error:title");
String language = (String)request.getAttribute("error:language");
+ String fileName = (String)request.getAttribute("error:filename");
+ String errorMessage = (String)request.getAttribute("error:message");
if (sContent == null)
{
sContent = "";
@@ -35,6 +37,10 @@
{
language = "";
}
+ if(fileName == null)
+ {
+ fileName = "";
+ }
%>
<!-- tinyMCE -->
@@ -104,7 +110,16 @@
<tr>
<td height="10"></td>
</tr>
+
+<%if(errorMessage != null){%>
<tr>
+ <td colspan="2">
+ <font color="red">${n:i18n("CMS_FILENAME_INVALID")}</font>
+ </td>
+</tr>
+<%}%>
+
+<tr>
<td>
<table>
<tr>
@@ -118,7 +133,9 @@
<td>
<input
type="text" name="filename"
- class="portlet-form-input-field"/>
+ class="portlet-form-input-field"
+ value="<%=fileName.replace("\"", """)%>"
+ />
: ${n:i18n("CMS_REQUIRED")}
</td>
</tr>
Modified: branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/exportarchive_pickup_error.jsp
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/exportarchive_pickup_error.jsp 2008-10-23 16:23:22 UTC (rev 12153)
+++ branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/exportarchive_pickup_error.jsp 2008-10-23 16:41:14 UTC (rev 12154)
@@ -1,35 +1,35 @@
-<%@ page import="org.jboss.portal.core.cms.ui.admin.CMSAdminConstants" %>
-<%@ page language="java" extends="org.jboss.portal.core.servlet.jsp.PortalJsp" %>
-<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet" %>
-<%@ taglib uri="/WEB-INF/portal-lib.tld" prefix="n" %>
-<%@ page isELIgnored="false" %>
-
-<portlet:defineObjects/>
-<link rel="stylesheet" type="text/css" href="/portal-admin/css/style.css" media="screen"/>
-<div class="admin-ui">
- <br/>
- <h3 class="sectionTitle-blue">${n:i18n("CMS_EXPORTARCHIVE")}</h3>
- <div class=" cms-tab-container">
- <%
- String sCurrPath = (String)request.getAttribute("currpath");
- %>
-
- <table width="100%">
- <tr>
- <td align="left">
- <table width="100%">
- <tr>
- <td align="center"><font color="red">${n:i18n("CMS_ERROR_PROCESSING")}!</font></td>
- </tr>
- <tr>
- <td align="center"><input class="portlet-form-button" type="button"
- value="${n:i18n("CMS_BACKTOBROWSER")}" name="cancel"
- onclick="window.location='<portlet:renderURL><portlet:param name="op" value="<%= CMSAdminConstants.OP_MAIN %>"/><portlet:param name="path" value="<%= sCurrPath %>"/></portlet:renderURL>'">
- </td>
- </tr>
- </table>
- </td>
- </tr>
- </table>
- </div>
+<%@ page import="org.jboss.portal.core.cms.ui.admin.CMSAdminConstants" %>
+<%@ page language="java" extends="org.jboss.portal.core.servlet.jsp.PortalJsp" %>
+<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet" %>
+<%@ taglib uri="/WEB-INF/portal-lib.tld" prefix="n" %>
+<%@ page isELIgnored="false" %>
+
+<portlet:defineObjects/>
+<link rel="stylesheet" type="text/css" href="/portal-admin/css/style.css" media="screen"/>
+<div class="admin-ui">
+ <br/>
+ <h3 class="sectionTitle-blue">${n:i18n("CMS_EXPORTARCHIVE")}</h3>
+ <div class=" cms-tab-container">
+ <%
+ String sCurrPath = (String)request.getAttribute("currpath");
+ %>
+
+ <table width="100%">
+ <tr>
+ <td align="left">
+ <table width="100%">
+ <tr>
+ <td align="center"><font color="red">${n:i18n("CMS_ERROR_EXPORT")}!</font></td>
+ </tr>
+ <tr>
+ <td align="center"><input class="portlet-form-button" type="button"
+ value="${n:i18n("CMS_BACKTOBROWSER")}" name="cancel"
+ onclick="window.location='<portlet:renderURL><portlet:param name="op" value="<%= CMSAdminConstants.OP_MAIN %>"/><portlet:param name="path" value="<%= sCurrPath %>"/></portlet:renderURL>'">
+ </td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+ </table>
+ </div>
</div>
\ No newline at end of file
Modified: branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/main.jsp
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/main.jsp 2008-10-23 16:23:22 UTC (rev 12153)
+++ branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/main.jsp 2008-10-23 16:41:14 UTC (rev 12154)
@@ -2,7 +2,6 @@
<%@ page import="org.jboss.portal.cms.model.Folder" %>
<%@ page import="org.jboss.portal.core.cms.ui.admin.CMSAdminConstants" %>
<%@ page import="java.text.Format" %>
-<%@ page import="java.text.SimpleDateFormat" %>
<%@ page import="java.util.List" %>
<%@ page import="java.util.StringTokenizer" %>
<%@ page language="java" extends="org.jboss.portal.core.servlet.jsp.PortalJsp" %>
@@ -22,6 +21,7 @@
String modifiedDate = "";
Boolean manageWorkflowAccessible = (Boolean)request.getAttribute("manageWorkflowAccessible");
List<String> messages = (List<String>)request.getAttribute("messages");
+ Format dateFormat = (Format)request.getAttribute("dateFormat");
%>
<div class="admin-ui">
@@ -239,10 +239,8 @@
<td>
<%
if (folder.getCreationDate() != null)
- {
- Format formatter;
- formatter = new SimpleDateFormat("MM/dd/yy HH:mm");
- createDate = formatter.format(folder.getCreationDate());
+ {
+ createDate = dateFormat.format(folder.getCreationDate());
}
%>
<%= createDate %>
@@ -251,9 +249,7 @@
<%
if (folder.getLastModified() != null)
{
- Format formatter;
- formatter = new SimpleDateFormat("MM/dd/yy HH:mm");
- modifiedDate = formatter.format(folder.getLastModified());
+ modifiedDate = dateFormat.format(folder.getLastModified());
}
%>
<%= modifiedDate %>
@@ -300,9 +296,7 @@
<%
if (file.getCreationDate() != null)
{
- Format formatter;
- formatter = new SimpleDateFormat("MM/dd/yy HH:mm");
- createDate = formatter.format(file.getCreationDate());
+ createDate = dateFormat.format(file.getCreationDate());
}
%>
<%= createDate %>
@@ -311,9 +305,7 @@
<%
if (file.getLastModified() != null)
{
- Format formatter;
- formatter = new SimpleDateFormat("MM/dd/yy HH:mm");
- modifiedDate = formatter.format(file.getLastModified());
+ modifiedDate = dateFormat.format(file.getLastModified());
}
%>
<%= modifiedDate %>
Modified: branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/searchResults.jsp
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/searchResults.jsp 2008-10-23 16:23:22 UTC (rev 12153)
+++ branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/searchResults.jsp 2008-10-23 16:41:14 UTC (rev 12154)
@@ -1,13 +1,16 @@
<%@ page import="org.jboss.portal.cms.model.File" %>
<%@ page import="org.jboss.portal.core.cms.ui.admin.CMSAdminConstants" %>
<%@ page import="java.text.Format" %>
-<%@ page import="java.text.SimpleDateFormat" %>
<%@ page import="java.util.List" %>
<%@ page language="java" extends="org.jboss.portal.core.servlet.jsp.PortalJsp" %>
<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet" %>
<%@ taglib uri="/WEB-INF/portal-lib.tld" prefix="n" %>
<%@ page isELIgnored="false" %>
+<%
+Format dateFormat = (Format)request.getAttribute("dateFormat");
+%>
+
<portlet:defineObjects/>
<link rel="stylesheet" type="text/css" href="/portal-admin/css/style.css" media="screen"/>
@@ -96,9 +99,7 @@
<%
if (file.getCreationDate() != null)
{
- Format formatter;
- formatter = new SimpleDateFormat("MM/dd/yy HH:mm");
- createDate = formatter.format(file.getCreationDate());
+ createDate = dateFormat.format(file.getCreationDate());
}
%>
<%= createDate %>
@@ -107,9 +108,7 @@
<%
if (file.getLastModified() != null)
{
- Format formatter;
- formatter = new SimpleDateFormat("MM/dd/yy HH:mm");
- modifiedDate = formatter.format(file.getLastModified());
+ modifiedDate = dateFormat.format(file.getLastModified());
}
%>
<%= modifiedDate %>
Modified: branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/viewfile.jsp
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/viewfile.jsp 2008-10-23 16:23:22 UTC (rev 12153)
+++ branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/viewfile.jsp 2008-10-23 16:41:14 UTC (rev 12154)
@@ -7,7 +7,6 @@
<%@ page import="org.jboss.portal.cms.util.NodeUtil" %>
<%@ page import="org.jboss.portal.core.cms.ui.admin.CMSAdminConstants" %>
<%@ page import="java.text.Format" %>
-<%@ page import="java.text.SimpleDateFormat" %>
<%@ page import="java.util.Collection" %>
<%@ page import="java.util.Iterator" %>
<%@ page import="java.util.List" %>
@@ -48,6 +47,8 @@
String exception = request.getParameter("exception");
Boolean manageWorkflowAccessible = (Boolean)request.getAttribute("manageWorkflowAccessible");
+
+ Format dateFormat = (Format)request.getAttribute("dateFormat");
%>
@@ -307,9 +308,7 @@
<%
if (version.getCreationDate() != null)
{
- Format formatter;
- formatter = new SimpleDateFormat("MM/dd/yy HH:mm");
- createDate = formatter.format(version.getCreationDate());
+ createDate = dateFormat.format(version.getCreationDate());
}
%>
<%= createDate %>
@@ -318,9 +317,7 @@
<%
if (version.getLastModified() != null)
{
- Format formatter;
- formatter = new SimpleDateFormat("MM/dd/yy HH:mm");
- modifiedDate = formatter.format(version.getLastModified());
+ modifiedDate = dateFormat.format(version.getLastModified());
}
%>
<%= modifiedDate %>
Modified: branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/editor/main.jsp
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/editor/main.jsp 2008-10-23 16:23:22 UTC (rev 12153)
+++ branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/editor/main.jsp 2008-10-23 16:41:14 UTC (rev 12154)
@@ -3,7 +3,6 @@
<%@ page import="org.jboss.portal.cms.model.Content" %>
<%@ page import="org.jboss.portal.core.cms.ui.admin.CMSAdminConstants" %>
<%@ page import="java.text.Format" %>
-<%@ page import="java.text.SimpleDateFormat" %>
<%@ page import="java.util.List" %>
<%@ page import="java.util.StringTokenizer" %>
<%@ page import="javax.portlet.PortletURL" %>
@@ -22,6 +21,7 @@
PortletURL url = renderResponse.createRenderURL();
url.setParameter("op", CMSAdminConstants.OP_MAIN);
url.setParameter("path", "/");
+ Format dateFormat = (Format)request.getAttribute("dateFormat");
%>
<!-- Currently browsing -->
17 years, 6 months
- 1
- 0