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