From 08e7e5f038c3eccbec42fa06c388379d754684d2 Mon Sep 17 00:00:00 2001 From: Derek Hulley Date: Wed, 17 Dec 2008 06:49:28 +0000 Subject: [PATCH] Merged V3.0 to HEAD 11410: Activity Service - iBatis mapping files for MS SQL Server (using AlfrescoSQLServerDialect) Can be Enterprised when dual build is set up 11414: Fix for missing servlet reference in repo web.xml 11415: Activity Service - iBatis mapping files for new Oracle dialects (using AlfrescoOracle10gDialect or AlfrescoOracle9iDialect) Can be Entperprised when dual build is up 11424: Remove conflicting java mail libraries. NOTE: Might affect 'CMIS web service implementation' 11426: Activity Service - use lower-case columns 11428: ETHREEOH-300: Site contributor can not delete his own blog posts 11431: Removed tutorial from Guest home 11432: ETHREEOH-198: SiteService is not MT enabled 11440: Close all ScrollableResults in try{} finally{} 11442: Fix for ETHREEOH-268, ETHREEOH-269, ETHREEOH-431, ETHREEOH-438, ETHREEOH-456, ETHREEOH-468, ETHREEOH-532 11443: Update to JSF client Help URL 11444: Build fix 11447: MT - fix ETHREEOH-530 11448: Fix for ETHREEOH-424: Edit Web Content: dojo.data.fromrfc3339 is not a function 11449: Fix for ETHREEOH-218: DM forms should be disabled git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@12427 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- config/alfresco/web-client-config-actions.xml | 9 --------- config/alfresco/web-client-config.xml | 2 +- .../web/app/servlet/ExternalAccessServlet.java | 18 +++++++++--------- .../web/forms/xforms/XFormsProcessor.java | 3 ++- source/web/WEB-INF/web.xml | 5 ----- 5 files changed, 12 insertions(+), 25 deletions(-) diff --git a/config/alfresco/web-client-config-actions.xml b/config/alfresco/web-client-config-actions.xml index 0a088b907e..440b161168 100644 --- a/config/alfresco/web-client-config-actions.xml +++ b/config/alfresco/web-client-config-actions.xml @@ -488,14 +488,6 @@ wizard:createContent - - - org.alfresco.web.action.evaluator.CreateFormEvaluator - create_form - /images/icons/create_form.gif - wizard:createForm - - @@ -1066,7 +1058,6 @@ - diff --git a/config/alfresco/web-client-config.xml b/config/alfresco/web-client-config.xml index 048894f8d5..35002de440 100644 --- a/config/alfresco/web-client-config.xml +++ b/config/alfresco/web-client-config.xml @@ -71,7 +71,7 @@ false - http://www.alfresco.org/help/webclient + http://www.alfresco.com/help/3/enterprise/DMExplorerHelp diff --git a/source/java/org/alfresco/web/app/servlet/ExternalAccessServlet.java b/source/java/org/alfresco/web/app/servlet/ExternalAccessServlet.java index d9a7bd4b55..576f15470a 100644 --- a/source/java/org/alfresco/web/app/servlet/ExternalAccessServlet.java +++ b/source/java/org/alfresco/web/app/servlet/ExternalAccessServlet.java @@ -72,13 +72,13 @@ public class ExternalAccessServlet extends BaseServlet private static Log logger = LogFactory.getLog(ExternalAccessServlet.class); - public final static String OUTCOME_DOCDETAILS = "dialog:showDocDetails"; - public final static String OUTCOME_SPACEDETAILS = "dialog:showSpaceDetails"; - public final static String OUTCOME_BROWSE = "browse"; - public final static String OUTCOME_MYALFRESCO = "myalfresco"; - public final static String OUTCOME_LOGOUT = "logout"; - public final static String OUTCOME_DIALOG = "dialog"; - public final static String OUTCOME_WIZARD = "wizard"; + public final static String OUTCOME_DOCDETAILS = "showDocDetails"; + public final static String OUTCOME_SPACEDETAILS = "showSpaceDetails"; + public final static String OUTCOME_BROWSE = "browse"; + public final static String OUTCOME_MYALFRESCO = "myalfresco"; + public final static String OUTCOME_LOGOUT = "logout"; + public final static String OUTCOME_DIALOG = "dialog"; + public final static String OUTCOME_WIZARD = "wizard"; private static final String ARG_TEMPLATE = "template"; private static final String ARG_PAGE = "page"; @@ -164,7 +164,7 @@ public class ExternalAccessServlet extends BaseServlet // perform the appropriate JSF navigation outcome NavigationHandler navigationHandler = fc.getApplication().getNavigationHandler(); - navigationHandler.handleNavigation(fc, null, outcome); + navigationHandler.handleNavigation(fc, null, "dialog:" + OUTCOME_DOCDETAILS); } else if (OUTCOME_SPACEDETAILS.equals(outcome)) { @@ -197,7 +197,7 @@ public class ExternalAccessServlet extends BaseServlet // perform the appropriate JSF navigation outcome NavigationHandler navigationHandler = fc.getApplication().getNavigationHandler(); - navigationHandler.handleNavigation(fc, null, outcome); + navigationHandler.handleNavigation(fc, null, "dialog:" + OUTCOME_SPACEDETAILS); } else if (OUTCOME_BROWSE.equals(outcome)) { diff --git a/source/java/org/alfresco/web/forms/xforms/XFormsProcessor.java b/source/java/org/alfresco/web/forms/xforms/XFormsProcessor.java index bb5bffd1d1..f159009cae 100644 --- a/source/java/org/alfresco/web/forms/xforms/XFormsProcessor.java +++ b/source/java/org/alfresco/web/forms/xforms/XFormsProcessor.java @@ -81,7 +81,8 @@ public class XFormsProcessor implements FormProcessor "/scripts/ajax/tiny_mce_wcm_extensions.js", "/scripts/ajax/xforms.js", "/scripts/ajax/file_picker_widget.js", - "/scripts/upload_helper.js" + "/scripts/upload_helper.js", + "/scripts/ajax/dojo/src/date/serialize.js" }; /** Localized strings needed by the xforms client. */ diff --git a/source/web/WEB-INF/web.xml b/source/web/WEB-INF/web.xml index 654deaf1bb..b7b1110c5c 100644 --- a/source/web/WEB-INF/web.xml +++ b/source/web/WEB-INF/web.xml @@ -390,11 +390,6 @@ JBPMDeployProcessServlet org.alfresco.web.app.servlet.JBPMDeployProcessServlet - - - StatusOKServlet - org.alfresco.web.app.servlet.StatusOKServlet - Faces Servlet