Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)

59732: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
      59504: MNT-10255: Merged DEV to V4.2-BUG-FIX (4.2.1).
          59393: MNT-10255 Mac OS -CIFS: Collaborator/editor can delete content created by other site members after editing.
                 - In ScenarioTempDeleteShuffle.createInstance() was added check: (operation instanceof MoveFileOperation).


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62175 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

source/java/org/alfresco/web/ui/repo/tag/PageTag.java

@@ -17,9 +17,7 @@
  * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
  */
  
-/*
+/* Enterprise overlay */
- * There is an Enterprise overlay for this file
- */
 
 package org.alfresco.web.ui.repo.tag;
 
@@ -74,8 +72,8 @@ public class PageTag extends TagSupport
       // ajax pickers
       "/scripts/ajax/picker.js",
       "/scripts/ajax/tagger.js",
-       // validation handling
+      // validation handling
-       "/scripts/validation.js"
+      "/scripts/validation.js"
    };
    
    private final static String[] CSS = 
@@ -88,20 +86,10 @@ public class PageTag extends TagSupport
  * Please ensure you understand the terms of the license before changing the contents of this file.
  */
    
-   private final static String ALF_LOGO_HTTP  = "http://www.alfresco.com/assets/images/logos/community-4.2.png";
-   private final static String ALF_LOGO_HTTPS = "https://www.alfresco.com/assets/images/logos/community-4.2.png";
    private final static String ALF_URL   = "http://www.alfresco.com";
-   private final static String ALF_TEXT  = "Alfresco Community";
+   private final static String ALF_LOGO  = "/images/logo/alfresco_enterprise.gif";
-   private final static String ALF_COPY  = "Supplied free of charge with " +
+   private final static String ALF_TEXT  = "Alfresco Enterprise";
-        "<a class='footer' href='http://www.alfresco.com/services/support/communityterms/#support'>no support</a>, " +
+   private final static String ALF_COPY  = "Certified and supported. Alfresco Software Inc. &copy; 2005-2014 All rights reserved.";
-        "<a class='footer' href='http://www.alfresco.com/services/support/communityterms/#certification'>no certification</a>, " +
-        "<a class='footer' href='http://www.alfresco.com/services/support/communityterms/#maintenance'>no maintenance</a>, " +
-        "<a class='footer' href='http://www.alfresco.com/services/support/communityterms/#warranty'>no warranty</a> and " +
-        "<a class='footer' href='http://www.alfresco.com/services/support/communityterms/#indemnity'>no indemnity</a> by " +
-        "<a class='footer' href='http://www.alfresco.com'>Alfresco</a> or its " +
-        "<a class='footer' href='http://www.alfresco.com/partners/'>Certified Partners</a>. " +
-        "<a class='footer' href='http://www.alfresco.com/services/support/'>Click here for support</a>. " +
-        "Alfresco Software Inc. &copy; 2005-2014 All rights reserved.";
    
    private final static Log logger = LogFactory.getLog(PageTag.class);
    private static String alfresco = null;
@@ -340,12 +328,12 @@ public class PageTag extends TagSupport
    {
       if (PageTag.alfresco == null)
       {
-         final HttpServletRequest req = (HttpServletRequest)pageContext.getRequest();
+         final String reqPath = ((HttpServletRequest)pageContext.getRequest()).getContextPath();
          PageTag.alfresco = ("<center><table style='margin: 0px auto;'><tr><td>" +
                              "<a href='" + ALF_URL + "'>" +
-                             "<img style='vertical-align:middle;border-width:0px;' width='176' height='26' alt='' title='" + ALF_TEXT + 
+                             "<img style='vertical-align:middle;border-width:0px;' width='164' height='26' alt='' title='" + ALF_TEXT + 
-                             "' src='" + ("http".equals(req.getScheme()) ? ALF_LOGO_HTTP : ALF_LOGO_HTTPS) + 
+                             "' src='" + reqPath + ALF_LOGO + "'/>" +
-                             "'>" +"</a></td><td align='center'>" +
+                             "</a></td><td align='center'>" +
                              "<span class='footer'>" + ALF_COPY +
                              "</span></td><td></td></tr></table></center>");
       }

source/web/WEB-INF/web.xml

@@ -100,7 +100,7 @@
       <param-value>false</param-value>
    </context-param>
    
-   <!-- Activiti context param placeholder -->
+   <context-param><param-name>productionMode</param-name><param-value>true</param-value><description>Vaadin production mode</description></context-param>
 
    <filter>
       <filter-name>CMIS security context cleaning filter</filter-name>
@@ -380,7 +380,7 @@
         <listener-class>com.sun.xml.ws.transport.http.servlet.WSServletContextListener</listener-class>
    </listener> 
    
-   <!-- Activiti listener placeholder -->
+   <listener><listener-class>org.springframework.web.context.request.RequestContextListener</listener-class></listener>
 
 
    <!-- Faces Servlet -->
@@ -631,7 +631,7 @@
       </init-param>
    </servlet>
    
-   <!-- Activiti servlet placeholder -->
+   <servlet><servlet-name>Vaadin Application Servlet</servlet-name><servlet-class>org.activiti.explorer.servlet.ExplorerApplicationServlet</servlet-class></servlet>
 	
    <servlet-mapping>
       <servlet-name>Faces Servlet</servlet-name>
@@ -831,7 +831,8 @@
    </servlet-mapping>
    CMISTCK -->
    
-   <!-- Activiti servlet mapping placeholder -->
+   <servlet-mapping><servlet-name>Vaadin Application Servlet</servlet-name><url-pattern>/activiti-admin/*</url-pattern></servlet-mapping>
+   <servlet-mapping><servlet-name>Vaadin Application Servlet</servlet-name><url-pattern>/VAADIN/*</url-pattern></servlet-mapping>
 
    <session-config>
       <session-timeout>60</session-timeout>

source/web/jsp/dialog/about.jsp

@@ -186,27 +186,11 @@
                            </tr>
                            <tr>
                               <td width="50%" align="right">
-                                 Language and translation packs:
+                                 Supported language packs:
                               </td>
                               <td>&nbsp;&#8226;&nbsp;</td>
                               <td width="50%">
-                                 Camille B&eacute;gnis,
+                                 French, German, Italian, (European) Spanish and Japanese.
-                                 Andrejus Chaliapinas,
-                                 Laurent Genier,
-                                 Antti Jokipii,
-                                 Henning Kristensen,
-                                 Betty Mai,
-                                 Fabian Mandelbaum,
-                                 Theodoros Papageorgiou,
-                                 Helio Silvio Piccinatto,
-                                 Gian Luca Farina Perseu,
-                                 Alex Revesz,
-                                 Christian Roy,
-                                 Philippe Seillier,
-                                 Frank Shipley,
-                                 Michiel Steltman,
-                                 Gert Thiel,
-                                 cnalfresco
                               </td>
                            </tr>
                         </table>