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

config/alfresco/model/wcmAppModel.xml

@@ -32,6 +32,20 @@
                <title>Default Webapp</title>
                <type>d:text</type>
             </property>
+            <property name="wca:deployto">
+               <title>Deploy To</title>
+               <type>d:text</type>
+               <multiple>true</multiple>
+            </property>
+            <property name="wca:selecteddeployto">
+               <title>Servers Selected For Deployment</title>
+               <type>d:text</type>
+               <multiple>true</multiple>
+            </property>
+            <property name="wca:selecteddeployversion">
+               <title>Snapshot Version Selected For Deployment</title>
+               <type>d:int</type>
+            </property>
          </properties>
          <associations>
             <child-association name="wca:webuser">
@@ -67,6 +81,17 @@
                   <many>true</many>
                </target>
             </child-association>
+            <child-association name="wca:deploymentreport">
+               <source>
+                  <mandatory>false</mandatory>
+                  <many>false</many>
+               </source>
+               <target>
+                  <class>wca:deploymentreport</class>
+                  <mandatory>false</mandatory>
+                  <many>true</many>
+               </target>
+            </child-association>
          </associations>
       </type>
       
@@ -181,6 +206,42 @@
          <title>XForms Capture Form Folder</title>
 	      <parent>cm:folder</parent>
       </type>
+      
+      <type name="wca:deploymentreport">
+         <title>Website Deployment Report</title>
+         <parent>cm:content</parent>
+         <properties>
+            <property name="wca:deployserver">
+               <title>Server Deployed To</title>
+               <type>d:text</type>
+               <mandatory>true</mandatory>
+            </property>
+            <property name="wca:deployversion">
+               <title>Snapshot Version Deployed</title>
+               <type>d:int</type>
+               <mandatory>true</mandatory>
+            </property>
+            <property name="wca:deploystarttime">
+               <title>Time Deploy Started</title>
+               <type>d:datetime</type>
+               <mandatory>true</mandatory>
+            </property>
+            <property name="wca:deployendtime">
+               <title>Time Deploy Finished</title>
+               <type>d:datetime</type>
+               <mandatory>true</mandatory>
+            </property>
+            <property name="wca:deploysuccessful">
+               <title>Deployment Successful</title>
+               <type>d:boolean</type>
+               <default>false</default>
+            </property>
+            <property name="wca:deployfailedreason">
+               <title>Failure Reason</title>
+               <type>d:text</type>
+            </property>
+         </properties>
+      </type>
 	</types>
 
 	<aspects>