Merged HEAD-QA to HEAD (4.2) (including moving test classes into sepa…

…rate folders) 51903 to 54309 git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@54310 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
Alfresco · Aug 20, 2013 · ab4ca71 · ab4ca71
1 parent 0a36e2a
commit ab4ca71
Show file tree

Hide file tree

Showing 1,576 changed files with 36,379 additions and 8,563 deletions.
diff --git a/.classpath b/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="source/java"/>
-	<classpathentry kind="src" path="source/test"/>
+	<classpathentry kind="src" path="source/test-java"/>
 	<classpathentry exported="true" kind="lib" path="config"/>
 	<classpathentry exported="true" kind="lib" path="source/test-resources"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>

diff --git a/config/alfresco/action-services-context.xml b/config/alfresco/action-services-context.xml
@@ -314,10 +314,10 @@
             <ref bean="actionService" />
         </property>
         <property name="lockService">
-        	<ref bean="LockService"/>
+         <ref bean="LockService"/>
         </property>        
         <property name="baseNodeService">
-        	<ref bean="nodeService"/>
+         <ref bean="nodeService"/>
         </property>
         <property name="mlAwareNodeService">
             <ref bean="mlAwareNodeService"/>
@@ -503,8 +503,9 @@
     </bean>
 
     <bean id="set-property-value" class="org.alfresco.repo.action.executer.SetPropertyValueActionExecuter" parent="action-executer">
+        <property name="adhocPropertiesAllowed" value="true"/>
         <property name="publicAction">
-            <value>false</value>
+            <value>true</value>
         </property>
         <property name="nodeService">
             <ref bean="NodeService"></ref>
@@ -778,7 +779,19 @@
           <value>false</value>
       </property>
     </bean>
-
+
+    <bean id="ignore-inherited-rules" class="org.alfresco.repo.rule.UnlinkRules" parent="action-executer">
+      <property name="nodeService">
+          <ref bean="NodeService"/>
+      </property>
+      <property name="ruleService">
+          <ref bean="ruleService"/>
+      </property>
+      <property name="publicAction">
+          <value>false</value>
+      </property>
+   </bean>
+
     <bean id="reorder-rules" class="org.alfresco.repo.rule.ReorderRules" parent="action-executer">
       <property name="nodeService">
           <ref bean="NodeService"/>

diff --git a/config/alfresco/activiti-context.xml b/config/alfresco/activiti-context.xml
@@ -51,19 +51,22 @@
         class="org.alfresco.repo.workflow.activiti.variable.ScriptNodeListVariableType">
         <property name="serviceRegistry" ref="ServiceRegistry" />
     </bean>
-
-
-    <!-- BPMN Parse listener which adds tasklisteners to all userTasks -->
-    <bean id="activitiParseListener"
-        class="org.alfresco.repo.workflow.activiti.AlfrescoBpmnParseListener">
-        <property name="createTaskListener" ref="activitiCreateTaskListener" />
-        <property name="completeTaskListener" ref="activitiCompleteTaskListener" />
-        <property name="processCreateListener" ref="activitiProcessCreateListener" />
-        <property name="tenantService" ref="tenantService" />
-        <property name="deployWorkflowsInTenant">
-        	<value>${system.workflow.deployWorkflowsInTenant}</value>
-        </property>
-    </bean>
+
+    <bean id="activitiProcessParseHandler" class="org.alfresco.repo.workflow.activiti.AlfrescoProcessBpmnParseHandler">
+       <property name="processCreateListener" ref="activitiProcessCreateListener" />
+       <property name="tenantService" ref="tenantService" />
+       <property name="multiTenancyEnabled" value="${system.workflow.deployWorkflowsInTenant}" />
+   	</bean>
+
+    	<bean id="activitiCallActivityParseHandler" class="org.alfresco.repo.workflow.activiti.AlfrescoCallActivityBpmnParseHandler">
+		<property name="tenantService" ref="tenantService" />
+      <property name="multiTenancyEnabled" value="${system.workflow.deployWorkflowsInTenant}" />
+	</bean>
+
+   	<bean id="activitiUserTaskParseHandler" class="org.alfresco.repo.workflow.activiti.AlfrescoUserTaskBpmnParseHandler">
+		<property name="createTaskListener" ref="activitiCreateTaskListener" />
+		<property name="completeTaskListener" ref="activitiCompleteTaskListener" />
+	</bean>
 
     <!-- -->
     <!-- Activiti Process Engine -->
@@ -88,11 +91,13 @@
                 <ref bean="activitiScriptNodeListType" />
             </list>
         </property>
-        <property name="customPreBPMNParseListeners">
-            <list>
-                <ref bean="activitiParseListener" />
-            </list>
-        </property>
+        <property name="postBpmnParseHandlers">
+           <list>
+               <ref bean="activitiProcessParseHandler" />
+               <ref bean="activitiCallActivityParseHandler" />
+               <ref bean="activitiUserTaskParseHandler" />
+           </list>
+       	</property>
         <property name="unprotectedNodeService" ref="nodeService" />
         <property name="idBlockSize" value="${system.workflow.engine.activiti.idblocksize}"></property>
 
@@ -115,6 +120,12 @@
         <property name="serviceRegistry" ref="ServiceRegistry" />
         <property name="beanRegistry" ref="activitiBeanRegistry" />
     </bean>
+
+    <bean id="baseExecutionListener" class="org.alfresco.repo.workflow.activiti.BaseExecutionListener"
+        abstract="true">
+        <property name="serviceRegistry" ref="ServiceRegistry" />
+        <property name="beanRegistry" ref="activitiBeanRegistry" />
+    </bean>
 
     <!-- Activiti Workflow Engine Factory -->
     <bean id="activitiWorkflowManager"
@@ -217,8 +228,10 @@
         <property name="workflowNotification" ref="workflowNotification" />
     </bean>
 
-    <bean id="activitiProcessCreateListener"
-        class="org.alfresco.repo.workflow.activiti.listener.ProcessStartExecutionListener" />
+    <bean id="activitiProcessCreateListener" class="org.alfresco.repo.workflow.activiti.listener.ProcessStartExecutionListener">
+      <property name="tenantService" ref="tenantService" />
+      <property name="deployWorkflowsInTenant" value="${system.workflow.deployWorkflowsInTenant}" />
+    </bean>
 
     <bean id="activitiRepositoryService" factory-bean="activitiProcessEngine"
         factory-method="getRepositoryService" />

diff --git a/config/alfresco/application-context-highlevel.xml b/config/alfresco/application-context-highlevel.xml
@@ -41,6 +41,7 @@
     <import resource="classpath*:alfresco/flickr-publishing-context.xml" />
     <import resource="classpath*:alfresco/facebook-publishing-context.xml" />
     <import resource="classpath*:alfresco/slideshare-publishing-context.xml" />
+    <import resource="classpath*:alfresco/distributionpolicies-context.xml" />
     <import resource="classpath*:alfresco/slingshot-context.xml" />
     <import resource="classpath*:alfresco/domain/*-context.xml" />
 </beans>
diff --git a/config/alfresco/authentication-services-context.xml b/config/alfresco/authentication-services-context.xml
@@ -239,6 +239,8 @@
 		<property name="interfaces">
 			<list>
 				<value>org.alfresco.repo.security.sync.UserRegistrySynchronizer</value>
+				<value>org.alfresco.repo.security.sync.TestableChainingUserRegistrySynchronizer</value>
+				<value>org.alfresco.repo.security.sync.ChainingUserRegistrySynchronizerStatus</value>
 			</list>
 		</property>
 	</bean>

diff --git a/config/alfresco/authority-services-context.xml b/config/alfresco/authority-services-context.xml
@@ -94,21 +94,13 @@
         <property name="policyComponent">
             <ref bean="policyComponent"/>
         </property>
-        <property name="cannedQueryRegistry">
-            <ref bean="cannedQueryRegistry" />
-        </property>
-        <property name="aclDAO">
-            <ref bean="aclDAO" />
-        </property>
-        <property name="authorityBridgeDAO">
-            <ref bean="authorityBridgeDAO" />
-        </property>
-        <property name="authorityBridgeTableCache">
-            <ref bean="authorityBridgeTableCache" />
-        </property>
-        <property name="useBridgeTable">
-            <value>${authority.useBridgeTable}</value>
-        </property>
+        <property name="cannedQueryRegistry" ref="cannedQueryRegistry" />
+        <property name="cannedQueryDAO" ref="cannedQueryDAO" />
+        <property name="qnameDAO" ref="qnameDAO" />
+        <property name="aclDAO" ref="aclDAO" />
+        <property name="authorityBridgeDAO" ref="authorityBridgeDAO" />
+        <property name="authorityBridgeTableCache" ref="authorityBridgeTableCache" />
+        <property name="useBridgeTable" value="${authority.useBridgeTable}" />
     </bean>
 
     <bean name="authorityBridgeDAO" class="org.alfresco.repo.security.authority.AuthorityBridgeDAOImpl">

diff --git a/config/alfresco/bootstrap-context.xml b/config/alfresco/bootstrap-context.xml
@@ -54,6 +54,9 @@
        <property name="dataSource">
           <ref bean="dataSource"/>
        </property>
+       <property name="appliedPatchDAO">
+          <ref bean="appliedPatchDAO"/>
+       </property>
        <property name="localSessionFactory">
           <ref bean="&amp;sessionFactory"></ref>  <!-- inject the actual factory, not a session -->
        </property>
@@ -308,6 +311,7 @@
                <value>alfresco/workflow/wcmWorkflowModel.xml</value>
                <value>alfresco/workflow/invitation-nominated-workflow-model.xml</value>
                <value>alfresco/workflow/invitation-moderated-workflow-model.xml</value>
+               <value>alfresco/workflow/publishingWorkflowModel.xml</value>
             </list>
         </property>
         <property name="labels">
@@ -375,22 +379,6 @@
          before reindexing begins. -->
     <import resource="classpath*:alfresco/enterprise/bootstrap/*-context.xml" />
 
-
-    <!-- Perform index recovery before applying any patches -->
-    <!-- rebuild the index if required - before we check that it is there -->
-
-    <bean id="indexRecoveryBootstrap" class="org.alfresco.repo.node.index.IndexRecoveryBootstrapBean" >
-       <property name="indexRecoveryComponent">
-           <ref bean="indexRecoveryComponent"/>
-       </property>
-    </bean>
-
-    <bean id="avmIndexRecoveryBootstrap" class="org.alfresco.repo.node.index.IndexRecoveryBootstrapBean" >
-       <property name="indexRecoveryComponent">
-          <ref bean="avmIndexRecoveryComponent"/>
-       </property>
-    </bean>
-
     <!-- This component checks the interconnection between the metadata, indexes and content -->
     <bean id="configurationChecker" class="org.alfresco.repo.admin.ConfigurationChecker">
        <property name="strict">
@@ -435,6 +423,19 @@
         </property>
     </bean>
 
+
+    <bean id="metdataQueryIndexesCheck" class="org.alfresco.repo.admin.patch.OptionalPatchApplicationCheckBootstrapBean">
+        <property name="patchService">
+            <ref bean="PatchService" />
+        </property>
+        <property name="descriptorService">
+            <ref bean="descriptorComponent" />
+        </property>
+        <property name="patch">
+            <ref bean="patch.db-V4.2-metadata-query-indexes" />
+        </property>      
+    </bean>
+
     <!-- Import other Alfresco bootstrap components -->
     <import resource="classpath*:alfresco/alfresco-*-bootstrap-context.xml" />
 
@@ -636,6 +637,9 @@
         <property name="tenantService">
             <ref bean="tenantService" />
         </property>
+        <property name="jobLockService">
+            <ref bean="jobLockService" />
+        </property>
         <property name="clearBatchSize">
             <value>${system.usages.clearBatchSize}</value>
         </property>

diff --git a/config/alfresco/bootstrap/example_javascripts2.acp b/config/alfresco/bootstrap/example_javascripts2.acp
diff --git a/config/alfresco/bootstrap/sharedSpace.xml b/config/alfresco/bootstrap/sharedSpace.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<view:view xmlns:view="http://www.alfresco.org/view/repository/1.0">
+   <cm:folder xmlns:sys="http://www.alfresco.org/model/system/1.0" 
+              xmlns:view="http://www.alfresco.org/view/repository/1.0" 
+              xmlns:app="http://www.alfresco.org/model/application/1.0" 
+              xmlns:cm="http://www.alfresco.org/model/content/1.0" xmlns="" 
+              view:childName="${spaces.shared.childname}">
+
+      <view:acl view:inherit="false">
+         <view:ace view:access="ALLOWED">
+            <view:authority>GROUP_EVERYONE</view:authority>
+            <view:permission>Contributor</view:permission>
+         </view:ace>
+      </view:acl>
+
+      <view:aspects>
+         <app:uifacets/>
+      </view:aspects>
+      <view:properties>
+         <cm:name>${spaces.shared.name}</cm:name>
+         <app:icon>space-icon-default</app:icon>
+         <cm:title>${spaces.shared.title}</cm:title>
+         <cm:description>${spaces.shared.description}</cm:description>
+      </view:properties>
+   </cm:folder>
+</view:view>
diff --git a/config/alfresco/bootstrap/spaces.xml b/config/alfresco/bootstrap/spaces.xml
@@ -134,6 +134,19 @@
             <cm:title>${spaces.user_homes.name}</cm:title>
             <cm:description>${spaces.user_homes.description}</cm:description>
          </cm:folder>
+         <cm:folder view:childName="${spaces.shared.childname}">
+           <view:acl view:inherit="false">
+              <view:ace view:access="ALLOWED">
+                <view:authority>GROUP_EVERYONE</view:authority>
+                <view:permission>Contributor</view:permission>
+              </view:ace>
+            </view:acl>
+            <app:uifacets/>
+            <cm:name>${spaces.shared.name}</cm:name>
+            <app:icon>space-icon-default</app:icon>
+            <cm:title>${spaces.shared.title}</cm:title>
+            <cm:description>${spaces.shared.description}</cm:description>
+         </cm:folder>
          <cm:folder view:childName="${spaces.imap_attachments.childname}">
             <app:uifacets/>
             <cm:name>${spaces.imap_attachments.name}</cm:name>