Merged V2.0 to HEAD

5456: (From WCM_DEPLOY)

There were many pure conflicts on license headers, one conflict due to CR-LF and
some other smaller issues to resolve:
-----------------------------------------
Resolved (line endings not cr-lf):
   root\projects\repository\config\alfresco\public-services-context.xml

Reverted:
   root\projects\web-client\source\web\images\icons\ajax_anim.gif

Reverted or Resolved (License text conflicts):
   svn revert root\projects\jndi-client\source\java\org\alfresco\jndi\JndiTest.java
   svn resolved root\projects\jndi-client\source\java\org\alfresco\jndi\AVMFileDirContext.java
   svn revert root\projects\jndi-client\source\java\org\alfresco\jndi\AVMBulkLoader.java
   svn revert root\projects\jndi-client\source\java\org\alfresco\filter\CacheControlFilter.java
   svn revert root\projects\jndi-client\source\java\org\alfresco\filter\CacheControlFilterInfoBean.java
   svn revert -R root\projects\catalina-virtual\source\java\org\alfresco\mbeans
   svn revert root\projects\catalina-virtual\source\java\org\alfresco\catalina\context\AVMStandardContext.java
   svn revert root\projects\catalina-virtual\source\java\org\alfresco\catalina\loader\AVMWebappClassLoader.java
   svn revert root\projects\catalina-virtual\source\java\org\alfresco\catalina\loader\AVMWebappLoader.java
   svn revert root\projects\catalina-virtual\source\java\org\alfresco\catalina\host\AVMResourceBinding.java
   svn resolved root\projects\catalina-virtual\source\java\org\alfresco\catalina\host\AVMHostConfig.java
      - why the change in method naming convention?
   svn resolved root\projects\catalina-virtual\source\java\org\alfresco\catalina\host\AVMHost.java
   svn revert root\projects\catalina-virtual\source\java\org\alfresco\catalina\host\DefaultAVMResourceBinding.java
   svn revert root\projects\catalina-virtual\source\java\org\alfresco\catalina\valve\AVMUrlValveTest.java
   svn resolved root\projects\catalina-virtual\source\java\org\alfresco\catalina\valve\AVMUrlValve.java
   svn revert root\projects\catalina-virtual\source\java\org\alfresco\catalina\host\AVMHostMatch.java

Modified:
   root\projects\web-client\source\java\org\alfresco\web\ui\wcm\component\UIDeployWebsite.java (Kevin to check line 330)


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

source/java/org/alfresco/web/bean/wcm/DeploymentProgressBean.java

@@ -0,0 +1,96 @@
+/*
+ * Copyright (C) 2005-2007 Alfresco Software Limited.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+ * As a special exception to the terms and conditions of version 2.0 of 
+ * the GPL, you may redistribute this Program in connection with Free/Libre 
+ * and Open Source Software ("FLOSS") applications as described in Alfresco's 
+ * FLOSS exception.  You should have recieved a copy of the text describing 
+ * the FLOSS exception, and it is also available here: 
+ * http://www.alfresco.com/legal/licensing
+ */
+package org.alfresco.web.bean.wcm;
+
+import java.io.IOException;
+import java.util.Map;
+import java.util.StringTokenizer;
+
+import javax.faces.context.FacesContext;
+import javax.faces.context.ResponseWriter;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+/**
+ * Bean used by the AJAX callback from the monitor deployment dialog
+ * to track progress of deployments.
+ * 
+ * @author gavinc
+ */
+public class DeploymentProgressBean
+{
+   private static Log logger = LogFactory.getLog(DeploymentProgressBean.class);
+   
+   public void getStatus() throws IOException
+   {
+      FacesContext context = FacesContext.getCurrentInstance();
+      ResponseWriter out = context.getResponseWriter();
+      
+      Map params = context.getExternalContext().getRequestParameterMap();
+      String monitorIds = (String)params.get("ids");
+      
+      if (logger.isDebugEnabled())
+         logger.debug("Retrieving progress status for ids: " + monitorIds);
+      
+      if (monitorIds != null && monitorIds.length() > 0)
+      {
+         StringBuilder xml = new StringBuilder("<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\" ?>");
+         xml.append("<deployment-progess>");
+         
+         StringTokenizer tokenizer = new StringTokenizer(monitorIds, ",");
+         while (tokenizer.hasMoreTokens())
+         {
+            String id = tokenizer.nextToken().trim();
+            
+            // try and find the deployment monitor object in the session
+            DeploymentMonitor monitor = (DeploymentMonitor)context.getExternalContext().
+                  getSessionMap().get(id);
+            
+            if (monitor != null)
+            {
+               if (logger.isDebugEnabled())
+                  logger.debug("Found monitor object for id '" + id + "': " + monitor);
+               
+               xml.append(monitor.toXML());
+               
+               // cleanup the monitor object from the session if it has completed
+               if (monitor.isFinished())
+               {
+                  context.getExternalContext().getSessionMap().remove(id);
+               }
+            }
+         }
+         
+         xml.append("</deployment-progess>");
+         
+         // send the generated XML back to the tree
+         out.write(xml.toString());
+         
+         if (logger.isDebugEnabled())
+            logger.debug("returning XML: " + xml.toString());
+      }
+   }
+}