Fix content transformer unit tests

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

config/alfresco/content-services-context.xml

@@ -148,6 +148,21 @@
       </property>
    </bean>
    
+   <!-- Import the OpenOffice extractor worker from the third party subsystem -->
+   <bean id="extracter.worker.OpenOffice" class="org.alfresco.repo.management.ManagedSubsystemProxyFactory">
+      <property name="sourceApplicationContextFactory">
+         <ref bean="thirdparty" />
+      </property>
+      <property name="sourceBeanName">
+         <value>extracter.worker.OpenOffice</value>
+      </property>
+      <property name="interfaces">
+         <list>
+            <value>org.alfresco.repo.content.metadata.OpenOfficeMetadataWorker</value>
+         </list>
+      </property>
+   </bean>
+
    <!-- Content Metadata Extractors -->
    <bean id="extracter.PDFBox"        class="org.alfresco.repo.content.metadata.PdfBoxMetadataExtracter"        parent="baseMetadataExtracter" />
    <bean id="extracter.Office"        class="org.alfresco.repo.content.metadata.OfficeMetadataExtracter"        parent="baseMetadataExtracter" />
@@ -155,22 +170,9 @@
    <bean id="extracter.Html"          class="org.alfresco.repo.content.metadata.HtmlMetadataExtracter"          parent="baseMetadataExtracter" />
    <bean id="extracter.MP3"           class="org.alfresco.repo.content.metadata.MP3MetadataExtracter"           parent="baseMetadataExtracter" />
    <bean id="extracter.OpenDocument"  class="org.alfresco.repo.content.metadata.OpenDocumentMetadataExtracter"  parent="baseMetadataExtracter" />
-   <bean id="extracter.OpenOffice"    class="org.alfresco.repo.content.metadata.OpenOfficeMetadataExtracter"    parent="baseMetadataExtracter" >
+   <bean id="extracter.OpenOffice" class="org.alfresco.repo.content.metadata.OpenOfficeMetadataExtracter" parent="baseMetadataExtracter">
       <property name="worker">
-         <!-- Import the OpenOffice extractor worker from the third party subsystem -->
+         <ref bean="extracter.worker.OpenOffice" />
-         <bean class="org.alfresco.repo.management.ManagedSubsystemProxyFactory">
-            <property name="sourceApplicationContextFactory">
-               <ref bean="thirdparty" />
-            </property>
-            <property name="sourceBeanName">
-               <value>extracter.worker.OpenOffice</value>
-            </property>
-            <property name="interfaces">
-               <list>
-                  <value>org.alfresco.repo.content.metadata.OpenOfficeMetadataWorker</value>
-               </list>
-            </property>
-         </bean>
       </property>
       <property name="supportedMimetypes">
          <list>
@@ -336,23 +338,24 @@
       </property>
    </bean>
 
-   <bean id="transformer.OpenOffice" class="org.alfresco.repo.content.transform.ProxyContentTransformer"
+   <!-- Import the OpenOffice transformer worker from the third party subsystem -->
-      parent="baseContentTransformer">
+   <bean id="transformer.worker.OpenOffice" class="org.alfresco.repo.management.ManagedSubsystemProxyFactory">
+      <property name="sourceApplicationContextFactory">
+         <ref bean="thirdparty" />
+      </property>
+      <property name="sourceBeanName">
+         <value>transformer.worker.OpenOffice</value>
+      </property>
+      <property name="interfaces">
+         <list>
+            <value>org.alfresco.repo.content.transform.ContentTransformerWorker</value>
+         </list>
+      </property>
+   </bean>
+
+   <bean id="transformer.OpenOffice" class="org.alfresco.repo.content.transform.ProxyContentTransformer" parent="baseContentTransformer">
       <property name="worker">
-         <!-- Import the OpenOffice transformer worker from the third party subsystem -->
+         <ref bean="transformer.worker.OpenOffice" />
-         <bean class="org.alfresco.repo.management.ManagedSubsystemProxyFactory">
-            <property name="sourceApplicationContextFactory">
-               <ref bean="thirdparty" />
-            </property>
-            <property name="sourceBeanName">
-               <value>transformer.worker.OpenOffice</value>
-            </property>
-            <property name="interfaces">
-               <list>
-                  <value>org.alfresco.repo.content.transform.ContentTransformerWorker</value>
-               </list>
-            </property>
-         </bean>
       </property>
    </bean>
 

source/java/org/alfresco/repo/content/metadata/OpenOfficeMetadataExtracterTest.java

@@ -22,7 +22,6 @@
  * http://www.alfresco.com/legal/licensing" */
 package org.alfresco.repo.content.metadata;
 
-import net.sf.jooreports.openoffice.connection.OpenOfficeConnection;
 
 /**
  * @author Jesper Steen Møller
@@ -36,14 +35,11 @@ public class OpenOfficeMetadataExtracterTest extends AbstractMetadataExtracterTe
     {
         super.setUp();
         
-        OpenOfficeConnection connection = (OpenOfficeConnection) ctx.getBean("openOfficeConnection");
+        OpenOfficeMetadataWorker worker = (OpenOfficeMetadataWorker) ctx.getBean("extracter.worker.OpenOffice");
         
         extracter = new OpenOfficeMetadataExtracter();
         extracter.setMimetypeService(mimetypeMap);
         extracter.setDictionaryService(dictionaryService);
-        DefaultOpenOfficeMetadataWorker worker = new DefaultOpenOfficeMetadataWorker();
-        worker.setConnection(connection);
-        worker.setMimetypeService(mimetypeMap);
         extracter.setWorker(worker);
         extracter.init();
     }

source/java/org/alfresco/repo/content/transform/OpenOfficeContentTransformerTest.java

@@ -26,8 +26,6 @@ package org.alfresco.repo.content.transform;
 
 import java.io.File;
 
-import net.sf.jooreports.openoffice.connection.OpenOfficeConnection;
-
 import org.alfresco.repo.content.MimetypeMap;
 import org.alfresco.repo.content.filestore.FileContentReader;
 import org.alfresco.repo.content.filestore.FileContentWriter;
@@ -45,7 +43,7 @@ public class OpenOfficeContentTransformerTest extends AbstractContentTransformer
 {
     private static String MIMETYPE_RUBBISH = "text/rubbish";
     
-    private OpenOfficeContentTransformerWorker worker;
+    private ContentTransformerWorker worker;
     private ContentTransformer transformer;
     
     @Override
@@ -53,16 +51,10 @@ public class OpenOfficeContentTransformerTest extends AbstractContentTransformer
     {
         super.setUp();
         
-        OpenOfficeConnection connection = (OpenOfficeConnection) ctx.getBean("openOfficeConnection");
+        this.worker = (ContentTransformerWorker) ctx.getBean("transformer.worker.OpenOffice");
-        
-        this.worker = new OpenOfficeContentTransformerWorker();
-        worker.setMimetypeService(mimetypeService);
-        worker.setConnection(connection);
-        worker.setDocumentFormatsConfiguration("classpath:alfresco/mimetype/openoffice-document-formats.xml");
-        worker.afterPropertiesSet();
         ProxyContentTransformer transformer = new ProxyContentTransformer();
         transformer.setMimetypeService(mimetypeService);
-        transformer.setWorker(worker);
+        transformer.setWorker(this.worker);
         this.transformer = transformer;
     }
     

source/java/org/alfresco/repo/content/transform/magick/ImageMagickContentTransformerTest.java

@@ -59,6 +59,7 @@ public class ImageMagickContentTransformerTest extends AbstractContentTransforme
         
         ProxyContentTransformer transformer = new ProxyContentTransformer();
         transformer.setMimetypeService(mimetypeService);
+        transformer.setWorker(worker);
         this.transformer = transformer;
         
     }