Merged V3.2 to HEAD

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

config/alfresco/bootstrap-context.xml

@@ -296,14 +296,26 @@
    
     <import resource="classpath*:alfresco/extension/bootstrap/*-context.xml" />
     
-    <!--  Start third party transformer Subsystem, 
+    <!--  Start third party transformer Subsystem. -->
-          stated here so the index recovery can use open office transformation  -->
     <bean id="thirdparty" class="org.alfresco.repo.management.subsystems.ChildApplicationContextFactory" parent="abstractPropertyBackedBean">
         <property name="autoStart">
             <value>true</value>
         </property>
     </bean>
 
+    <bean id="OOoDirect" class="org.alfresco.repo.management.subsystems.ChildApplicationContextFactory" parent="abstractPropertyBackedBean">
+        <property name="autoStart">
+            <value>true</value>
+        </property>
+    </bean>
+
+
+    <!-- Bootstrap any enterprise contexts -->
+    <!-- This is placed at this point because we need the enterprise OOoJodConverter subsystem started
+         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 -->
     

config/alfresco/content-services-context.xml

@@ -179,10 +179,10 @@
       </property>
    </bean>
    
-   <!-- Import the OpenOffice extractor worker from the third party subsystem -->
+   <!-- Import the OpenOffice extractor worker from the OOoDirect subsystem -->
    <bean id="extracter.worker.OpenOffice" class="org.alfresco.repo.management.subsystems.SubsystemProxyFactory">
       <property name="sourceApplicationContextFactory">
-         <ref bean="thirdparty" />
+         <ref bean="OOoDirect" />
       </property>
       <property name="sourceBeanName">
          <value>extracter.worker.OpenOffice</value>
@@ -388,10 +388,10 @@
       </property>
    </bean>
 
-   <!-- Import the OpenOffice transformer worker from the third party subsystem -->
+   <!-- Import the OpenOffice transformer worker from the OOoDirect subsystem -->
    <bean id="transformer.worker.OpenOffice" class="org.alfresco.repo.management.subsystems.SubsystemProxyFactory">
       <property name="sourceApplicationContextFactory">
-         <ref bean="thirdparty" />
+         <ref bean="OOoDirect" />
       </property>
       <property name="sourceBeanName">
          <value>transformer.worker.OpenOffice</value>

config/alfresco/subsystems/OOoDirect/default/openoffice-transform-context.xml

@@ -11,6 +11,9 @@
       <property name="failOnError">
          <value>false</value>
       </property>
+      <property name="enabled">
+         <value>${ooo.enabled}</value>
+      </property>
    </bean>
 
    <!--  We have to convert the user directory to an Open Office compatible URI -->

config/alfresco/subsystems/OOoDirect/default/openoffice-transform.properties

@@ -0,0 +1,6 @@
+# External executable locations
+ooo.exe=soffice
+
+# This property determines whether the OOoDirect services are available.
+# Allowed values: "true" or "false"
+ooo.enabled=true

config/alfresco/subsystems/thirdparty/default/openoffice-transform.properties

@@ -1,2 +0,0 @@
-# External executable locations
-ooo.exe=soffice