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

@@ -488,14 +488,6 @@
             <action>wizard:createContent</action>
          </action>
 
-         <!-- Create XML content type -->
-         <action id="create_form">
-            <evaluator>org.alfresco.web.action.evaluator.CreateFormEvaluator</evaluator>
-            <label-id>create_form</label-id>
-            <image>/images/icons/create_form.gif</image>
-            <action>wizard:createForm</action>
-         </action>
-
          <!-- Edit XML content type -->
          <action id="edit_form">
             <permissions>
@@ -1066,7 +1058,6 @@
          <!-- Actions Menu for Create in Browse screen -->
          <action-group id="browse_create_menu">
             <action idref="create_content" />
-            <action idref="create_form" />
             <action idref="create_web_form" />      
             <action idref="create_website_wizard" />
             <action idref="create_space" />

config/alfresco/web-client-config.xml

@@ -71,7 +71,7 @@
          <allow-guest-config>false</allow-guest-config>
          
          <!-- the URL to the client Help file -->
-         <help-url>http://www.alfresco.org/help/webclient</help-url>
+         <help-url>http://www.alfresco.com/help/3/enterprise/DMExplorerHelp</help-url>
          
          <!-- the type of edit link to use, NOTE: inline editable will always take precedence -->
          <!-- can be: http|webdav|cifs -->

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_DOCDETAILS          = "showDocDetails";
-   public final static String OUTCOME_SPACEDETAILS = "dialog:showSpaceDetails";
+   public final static String OUTCOME_SPACEDETAILS        = "showSpaceDetails";
-   public final static String OUTCOME_BROWSE       = "browse";
+   public final static String OUTCOME_BROWSE              = "browse";
-   public final static String OUTCOME_MYALFRESCO   = "myalfresco";
+   public final static String OUTCOME_MYALFRESCO          = "myalfresco";
-   public final static String OUTCOME_LOGOUT       = "logout";
+   public final static String OUTCOME_LOGOUT              = "logout";
-   public final static String OUTCOME_DIALOG       = "dialog";
+   public final static String OUTCOME_DIALOG              = "dialog";
-   public final static String OUTCOME_WIZARD       = "wizard";
+   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))
       {

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. */

source/web/WEB-INF/web.xml

@@ -390,11 +390,6 @@
       <servlet-name>JBPMDeployProcessServlet</servlet-name>
       <servlet-class>org.alfresco.web.app.servlet.JBPMDeployProcessServlet</servlet-class>
    </servlet>
-   
-   <servlet>
-      <servlet-name>StatusOKServlet</servlet-name>
-      <servlet-class>org.alfresco.web.app.servlet.StatusOKServlet</servlet-class>
-   </servlet>
 
    <servlet-mapping>
       <servlet-name>Faces Servlet</servlet-name>