svn commit: r1195510 - in /tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser: microsoft/POIFSContainerDetector.java pkg/ZipContainerDetector.java

[ju...@apache.org]

Author: jukka
Date: Mon Oct 31 15:13:09 2011
New Revision: 1195510

URL: http://svn.apache.org/viewvc?rev=1195510&view=rev
Log:
TIKA-565: Improved OSGi bundling

Annotate custom Detectors as OSGi services

Modified:
    tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/microsoft/POIFSContainerDetector.java
    tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/pkg/ZipContainerDetector.java

Modified: tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/microsoft/POIFSContainerDetector.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/microsoft/POIFSContainerDetector.java?rev=1195510&r1=1195509&r2=1195510&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/microsoft/POIFSContainerDetector.java (original)
+++ tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/microsoft/POIFSContainerDetector.java Mon Oct 31 15:13:09 2011
@@ -23,6 +23,8 @@ import java.util.Collections;
 import java.util.HashSet;
 import java.util.Set;
 
+import org.apache.felix.scr.annotations.Component;
+import org.apache.felix.scr.annotations.Service;
 import org.apache.poi.poifs.filesystem.DirectoryNode;
 import org.apache.poi.poifs.filesystem.Entry;
 import org.apache.poi.poifs.filesystem.NPOIFSFileSystem;
@@ -39,6 +41,7 @@ import static org.apache.tika.mime.Media
  * This should work for all OLE2 documents, whether
  *  they are ones supported by POI or not.
  */
+@Component @Service(Detector.class)
 public class POIFSContainerDetector implements Detector {
 
     /**

Modified: tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/pkg/ZipContainerDetector.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/pkg/ZipContainerDetector.java?rev=1195510&r1=1195509&r2=1195510&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/pkg/ZipContainerDetector.java (original)
+++ tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/pkg/ZipContainerDetector.java Mon Oct 31 15:13:09 2011
@@ -21,6 +21,8 @@ import java.io.InputStream;
 
 import org.apache.commons.compress.archivers.zip.ZipArchiveEntry;
 import org.apache.commons.compress.archivers.zip.ZipFile;
+import org.apache.felix.scr.annotations.Component;
+import org.apache.felix.scr.annotations.Service;
 import org.apache.poi.extractor.ExtractorFactory;
 import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
 import org.apache.poi.openxml4j.opc.OPCPackage;
@@ -39,6 +41,7 @@ import org.apache.tika.parser.iwork.IWor
  * A detector that works on a Zip document
  *  to figure out exactly what the file is
  */
+@Component @Service(Detector.class)
 public class ZipContainerDetector implements Detector {
     /**
      * Serial version UID