inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-14 17:58:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix content transformer unit tests

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13879 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Dave Ward
2009-04-07 10:19:35 +00:00
parent 8986debad5
commit 5351ed6aa3
4 changed files with 39 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
config/alfresco/content-services-context.xml
View File

@@ -148,17 +148,8 @@
</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" />
<bean id="extracter.Mail" class="org.alfresco.repo.content.metadata.MailMetadataExtracter" parent="baseMetadataExtracter" />
<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" >
<property name="worker">
<!-- Import the OpenOffice extractor worker from the third party subsystem -->
<bean class="org.alfresco.repo.management.ManagedSubsystemProxyFactory">
<bean id="extracter.worker.OpenOffice" class="org.alfresco.repo.management.ManagedSubsystemProxyFactory">
<property name="sourceApplicationContextFactory">
<ref bean="thirdparty" />
</property>
@@ -171,6 +162,17 @@
</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" />
<bean id="extracter.Mail" class="org.alfresco.repo.content.metadata.MailMetadataExtracter" parent="baseMetadataExtracter" />
<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">
<property name="worker">
<ref bean="extracter.worker.OpenOffice" />
</property>
<property name="supportedMimetypes">
<list>
@@ -336,11 +338,8 @@
</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 -->
<bean class="org.alfresco.repo.management.ManagedSubsystemProxyFactory">
<bean id="transformer.worker.OpenOffice" class="org.alfresco.repo.management.ManagedSubsystemProxyFactory">
<property name="sourceApplicationContextFactory">
<ref bean="thirdparty" />
</property>
@@ -353,6 +352,10 @@
</list>
</property>
</bean>
<bean id="transformer.OpenOffice" class="org.alfresco.repo.content.transform.ProxyContentTransformer" parent="baseContentTransformer">
<property name="worker">
<ref bean="transformer.worker.OpenOffice" />
</property>
</bean>

6
source/java/org/alfresco/repo/content/metadata/OpenOfficeMetadataExtracterTest.java
View File

@@ -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();
}

14
source/java/org/alfresco/repo/content/transform/OpenOfficeContentTransformerTest.java
View File

@@ -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 = new OpenOfficeContentTransformerWorker();
worker.setMimetypeService(mimetypeService);
worker.setConnection(connection);
worker.setDocumentFormatsConfiguration("classpath:alfresco/mimetype/openoffice-document-formats.xml");
worker.afterPropertiesSet();
this.worker = (ContentTransformerWorker) ctx.getBean("transformer.worker.OpenOffice");
ProxyContentTransformer transformer = new ProxyContentTransformer();
transformer.setMimetypeService(mimetypeService);
transformer.setWorker(worker);
transformer.setWorker(this.worker);
this.transformer = transformer;
}

1
source/java/org/alfresco/repo/content/transform/magick/ImageMagickContentTransformerTest.java
View File

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