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/action-services-context.xml

@@ -482,7 +482,23 @@
     	<property name="publicAction">
     	    <value>false</value>
     	</property>
-    </bean>
+    </bean>
+    
+    <bean id="avm-deploy-snapshot" class="org.alfresco.repo.avm.actions.AVMDeploySnapshotAction" parent="action-executer">
+    	<property name="deploymentService">
+    	    <ref bean="DeploymentService"/>
+    	</property>
+      <property name="contentService">
+          <ref bean="ContentService"/>
+      </property>
+      <property name="nodeService">
+          <ref bean="NodeService"/>
+      </property>
+    	<property name="publicAction">
+    	    <value>false</value>
+    	</property>
+    </bean>
+    
     <!-- Scheduled action helper beans -->
     
     <!-- Base template action definition -->

config/alfresco/clt-context.xml

@@ -2,6 +2,9 @@
 <!DOCTYPE beans PUBLIC '-//SPRING//DTD BEAN//EN' 'http://www.springframework.org/dtd/spring-beans.dtd'>
 
 <beans>
+    <!-- Client Ticket Holder -->
+    <bean id="clientTicketHolder" class="org.alfresco.repo.remote.ClientTicketHolderGlobal"/>
+
     <!-- Remote AVM interface -->
     <bean id="avmRemote" class="org.alfresco.repo.remote.AVMRemoteImpl">
         <property name="avmRemoteTransport">
@@ -11,7 +14,7 @@
     
     <bean id="avmRemoteTransport" class="org.springframework.remoting.rmi.RmiProxyFactoryBean">
         <property name="serviceUrl">
-            <value>rmi://localhost:1313/avm</value>
+            <value>rmi://localhost:50500/avm</value>
         </property>
         <property name="serviceInterface">
             <value>org.alfresco.service.cmr.remote.AVMRemoteTransport</value>
@@ -29,7 +32,7 @@
 
     <bean id="avmSyncServiceTransport" class="org.springframework.remoting.rmi.RmiProxyFactoryBean">
         <property name="serviceUrl">
-            <value>rmi://localhost:1313/avmsync</value>
+            <value>rmi://localhost:50500/avmsync</value>
         </property>
         <property name="serviceInterface">
             <value>org.alfresco.service.cmr.remote.AVMSyncServiceTransport</value>
@@ -41,7 +44,7 @@
     
     <bean id="authenticationService" class="org.springframework.remoting.rmi.RmiProxyFactoryBean">
         <property name="serviceUrl">
-            <value>rmi://localhost:1313/authentication</value>
+            <value>rmi://localhost:50500/authentication</value>
         </property>
         <property name="serviceInterface">
             <value>org.alfresco.service.cmr.security.AuthenticationService</value>
@@ -53,7 +56,7 @@
     
     <bean id="repoRemoteTransport" class="org.springframework.remoting.rmi.RmiProxyFactoryBean">
         <property name="serviceUrl">
-            <value>rmi://localhost:1313/repo</value>
+            <value>rmi://localhost:50500/repo</value>
         </property>
         <property name="serviceInterface">
             <value>org.alfresco.service.cmr.remote.RepoRemoteTransport</value>

config/alfresco/messages/action-config.properties

@@ -115,6 +115,16 @@ avm-undo-list.title=Make a list of Nodes in a store transparent to staging.
 avm-undo-list.description=This acts as a mistake eraser for a user's sandbox.
 avm-undo-list.node-list.display-label=The string encoded list of nodes to revert.
 
+avm-deploy-snapshot.title=Deploy a snapshot to a remote server.
+avm-deploy-snapshot.description=This deploys a website snapshot to a remote server.
+avm-deploy-snapshot.website.display-label=NodeRef of the website the deploy is occurring from.
+avm-deploy-snapshot.target-server.display-label=The name or IP address of the remote server to deploy to.
+avm-deploy-snapshot.default-rmi-port.display-label=The default RMI port to connect to if it is not supplied in target-server parameter.
+avm-deploy-snapshot.remote-username.display-label=The username to connect as.
+avm-deploy-snapshot.remote-password.display-label=The password for the remote-username.
+avm-deploy-snapshot.deploy-callback.display-label=The DeploymentCallback listener object.
+avm-deploy-snapshot.delay.display-label=An optional delay to apply to the start of a deployment.
+
 start-avm-workflow.title=Start a WCM Workflow
 start-avm-workflow.description=Starts a workflow expecting an AVM workflow package
 start-avm-workflow.store-name.display-label=Store name for start task

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>

config/alfresco/public-services-context.xml

@@ -767,6 +767,7 @@
                 <value>getAspects</value>
                 <value>hasAspect</value>
                 <value>getAPath</value>
+                <value>getGuid</value>
             </list>
         </property>
     </bean>
@@ -813,6 +814,7 @@
                 <value>renameStore</value>
                 <value>getSystemStore</value>
                 <value>revert</value>
+                <value>setGuid</value>
             </list>
         </property>
     </bean>
@@ -888,22 +890,41 @@
         </property>
     </bean>
 
-	<!--
-    <bean id="AVMSyncService" class="org.springframework.aop.framework.ProxyFactoryBean">
-	    <property name="proxyInterfaces">
-            <value>org.alfresco.service.cmr.avmsync.AVMSyncService</value>
+	 <!-- Deployment Service. -->
+	
+	 <bean id="deploymentService" class="org.alfresco.repo.deploy.DeploymentServiceImpl">
+        <property name="avmService">
+            <ref bean="avmService"/>
         </property>
-        <property name="target">
-            <ref bean="avmSyncService"/>
+	 </bean>
+
+    <bean id="deploymentServiceReadTxnAdvisor" class="org.springframework.aop.support.NameMatchMethodPointcutAdvisor">
+        <property name="advice">
+            <ref bean="retryingReadTxnAdvice"/>
         </property>
-        <property name="interceptorNames">
+        <property name="mappedNames">
             <list>
-                <idref local="AVMSyncService_transaction"/>
-                <idref local="AVMSyncService_descriptor"/>
+            	<value>deployDifference</value>
+            	<value>deployDifferenceFS</value>
+            </list>
+        </property>
+    </bean>
+
+    <bean id="DeploymentService" class="org.springframework.aop.framework.ProxyFactoryBean">
+	    <property name="proxyInterfaces">
+            <list>
+                <value>org.alfresco.service.cmr.avm.deploy.DeploymentService</value>
+            </list>
+        </property>
+        <property name="targetName">
+            <value>deploymentService</value>
+        </property>
+        <property name="interceptorNames">
+            <list>
+                <value>deploymentServiceReadTxnAdvisor</value>
             </list>
         </property>
     </bean>
-    -->
     
     <!-- Workflow Service -->
     
@@ -1079,4 +1100,4 @@
         </property>
     </bean>
     
-</beans>
+</beans>

config/alfresco/remote-avm-test-context.xml

@@ -6,7 +6,7 @@
     <!-- Remote authentication service. -->
     <bean id="authenticationService" class="org.springframework.remoting.rmi.RmiProxyFactoryBean">
         <property name="serviceUrl">
-            <value>rmi://localhost:1313/authentication</value>
+            <value>rmi://localhost:50500/authentication</value>
         </property>
         <property name="serviceInterface">
             <value>org.alfresco.service.cmr.security.AuthenticationService</value>
@@ -16,17 +16,23 @@
         </property>
     </bean>
 
+    <!-- Client Ticket Holder Bean. -->
+    <bean id="clientTicketHolder" class="org.alfresco.repo.remote.ClientTicketHolderGlobal"/>
+
 	<!-- Remote interface for AVM. -->
 	<bean id="avmRemote" class="org.alfresco.repo.remote.AVMRemoteImpl">
 	    <property name="avmRemoteTransport">
 	        <ref bean="avmRemoteTransport"/>
 	    </property>
+	    <property name="clientTicketHolder">
+	        <ref bean="clientTicketHolder"/>
+	    </property>
 	</bean>
 
 	<!-- RMI Proxy bean for avmRemoteTransport -->
 	<bean id="avmRemoteTransport" class="org.springframework.remoting.rmi.RmiProxyFactoryBean">
 		<property name="serviceUrl">
-			<value>rmi://localhost:1313/avm</value>
+			<value>rmi://localhost:50500/avm</value>
 		</property>
 		<property name="serviceInterface">
 			<value>org.alfresco.service.cmr.remote.AVMRemoteTransport</value>
@@ -40,11 +46,14 @@
 	    <property name="avmSyncServiceTransport">
 	    	<ref bean="avmSyncServiceTransport"/>
 	    </property>
+	    <property name="clientTicketHolder">
+	        <ref bean="clientTicketHolder"/>
+	    </property>
 	</bean>
 
     <bean id="avmSyncServiceTransport" class="org.springframework.remoting.rmi.RmiProxyFactoryBean">
         <property name="serviceUrl">
-            <value>rmi://localhost:1313/avmsync</value>
+            <value>rmi://localhost:50500/avmsync</value>
         </property>
         <property name="serviceInterface">
             <value>org.alfresco.service.cmr.remote.AVMSyncServiceTransport</value>