[aperture-commit] SF.net SVN: aperture:[2069] aperture/trunk

[<my...@us...>]

Revision: 2069
          http://aperture.svn.sourceforge.net/aperture/?rev=2069&view=rev
Author:   mylka
Date:     2009-09-09 23:58:25 +0000 (Wed, 09 Sep 2009)

Log Message:
-----------
2150183 - a z subcrawler based by the UncompressInputStream ripped from a 'httpclient' library done by Ronald Thalaer from a swiss company called "Innovations" that code is LGPL and therefore the 'compress' subcrawler has been created in a separate module

Modified Paths:
--------------
    aperture/trunk/core/crawler/pom.xml
    aperture/trunk/default/crawler/pom.xml
    aperture/trunk/default/crawler/src/main/resources/org/semanticdesktop/aperture/crawler/impl/defaults.xml
    aperture/trunk/default/crawler/src/main/resources/org/semanticdesktop/aperture/subcrawler/impl/defaults.xml
    aperture/trunk/default/crawler/src/test/java/org/semanticdesktop/aperture/subcrawler/impl/TestDefaultSubCrawlerRegistry.java
    aperture/trunk/pom.xml
    aperture/trunk/runtime/default/src/main/java/org/semanticdesktop/aperture/runtime/bundle/ApertureRuntimeActivator.java
    aperture/trunk/test/integration/src/test/java/org/semanticdesktop/aperture/runtime/AbstractApertureInOsgiTest.java

Added Paths:
-----------
    aperture/trunk/core/crawler/compress/
    aperture/trunk/core/crawler/compress/src/
    aperture/trunk/core/crawler/compress/src/main/
    aperture/trunk/core/crawler/compress/src/main/java/
    aperture/trunk/core/crawler/compress/src/main/java/org/
    aperture/trunk/core/crawler/compress/src/main/java/org/semanticdesktop/
    aperture/trunk/core/crawler/compress/src/main/java/org/semanticdesktop/aperture/
    aperture/trunk/core/crawler/compress/src/main/java/org/semanticdesktop/aperture/subcrawler/
    aperture/trunk/core/crawler/compress/src/main/java/org/semanticdesktop/aperture/subcrawler/compress/
    aperture/trunk/core/crawler/compress/src/main/java/org/semanticdesktop/aperture/subcrawler/compress/bundle/
    aperture/trunk/core/crawler/compress/src/main/java/org/semanticdesktop/aperture/subcrawler/compress/bundle/CompressSubCrawlerActivator.java
    aperture/trunk/core/crawler/compress/src/main/test/
    aperture/trunk/core/crawler/compress/src/main/test/org/
    aperture/trunk/core/crawler/compress/src/main/test/org/semanticdesktop/
    aperture/trunk/core/crawler/compress/src/main/test/org/semanticdesktop/aperture/
    aperture/trunk/core/crawler/compress/src/main/test/org/semanticdesktop/aperture/subcrawler/
    aperture/trunk/core/crawler/compress/src/main/test/org/semanticdesktop/aperture/subcrawler/compress/
    aperture/trunk/core/crawler/compress/src/main/test/org/semanticdesktop/aperture/subcrawler/compress/CompressSubCrawlerTest.java
    aperture/trunk/core/crawler/compress/src/test/
    aperture/trunk/core/crawler/compress/src/test/java/
    aperture/trunk/core/crawler/compress/src/test/java/org/
    aperture/trunk/core/crawler/compress/src/test/java/org/semanticdesktop/
    aperture/trunk/core/crawler/compress/src/test/java/org/semanticdesktop/aperture/
    aperture/trunk/core/crawler/compress/src/test/java/org/semanticdesktop/aperture/subcrawler/
    aperture/trunk/core/crawler/compress/src/test/java/org/semanticdesktop/aperture/subcrawler/ArchiveSubCrawlerTestBase.java
    aperture/trunk/core/crawler/compress/src/test/java/org/semanticdesktop/aperture/subcrawler/compress/
    aperture/trunk/core/crawler/compress/src/test/java/org/semanticdesktop/aperture/subcrawler/compress/CompressSubCrawlerTest.java

Added: aperture/trunk/core/crawler/compress/src/main/java/org/semanticdesktop/aperture/subcrawler/compress/bundle/CompressSubCrawlerActivator.java
===================================================================
--- aperture/trunk/core/crawler/compress/src/main/java/org/semanticdesktop/aperture/subcrawler/compress/bundle/CompressSubCrawlerActivator.java	                        (rev 0)
+++ aperture/trunk/core/crawler/compress/src/main/java/org/semanticdesktop/aperture/subcrawler/compress/bundle/CompressSubCrawlerActivator.java	2009-09-09 23:58:25 UTC (rev 2069)
@@ -0,0 +1,25 @@
+package org.semanticdesktop.aperture.subcrawler.compress.bundle;
+
+import java.util.Hashtable;
+
+import org.osgi.framework.BundleActivator;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.ServiceRegistration;
+import org.semanticdesktop.aperture.subcrawler.SubCrawlerFactory;
+import org.semanticdesktop.aperture.subcrawler.compress.CompressSubCrawlerFactory;
+
+
+public class CompressSubCrawlerActivator implements BundleActivator {
+
+    private ServiceRegistration registration;
+
+    public void start(BundleContext context) throws Exception {
+        registration = context.registerService(SubCrawlerFactory.class
+                .getName(), new CompressSubCrawlerFactory(), new Hashtable());
+    }
+
+    public void stop(BundleContext context) throws Exception {
+        registration.unregister();
+    }
+    
+}


Property changes on: aperture/trunk/core/crawler/compress/src/main/java/org/semanticdesktop/aperture/subcrawler/compress/bundle/CompressSubCrawlerActivator.java
___________________________________________________________________
Added: svn:mime-type
   + text/plain

Added: aperture/trunk/core/crawler/compress/src/main/test/org/semanticdesktop/aperture/subcrawler/compress/CompressSubCrawlerTest.java
===================================================================
--- aperture/trunk/core/crawler/compress/src/main/test/org/semanticdesktop/aperture/subcrawler/compress/CompressSubCrawlerTest.java	                        (rev 0)
+++ aperture/trunk/core/crawler/compress/src/main/test/org/semanticdesktop/aperture/subcrawler/compress/CompressSubCrawlerTest.java	2009-09-09 23:58:25 UTC (rev 2069)
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2008 Aduna and Deutsches Forschungszentrum fuer Kuenstliche Intelligenz DFKI GmbH.
+ * All rights reserved.
+ * 
+ * Licensed under the Aperture BSD-style license.
+ */
+package org.semanticdesktop.aperture.subcrawler.compress;
+
+import org.semanticdesktop.aperture.rdf.RDFContainer;
+import org.semanticdesktop.aperture.subcrawler.ArchiveSubCrawlerTestBase;
+
+/**
+ * A test case for the compress subcrawler
+ */
+public class CompressSubCrawlerTest extends ArchiveSubCrawlerTestBase {
+    
+    private RDFContainer metadata;
+    
+    private static final String FILE_NAME = "compress-txt-compresstest.txt.Z";
+    
+    /**
+     * A basic test if the extraction actually works
+     * @throws Exception
+     */
+    public void testCompressTest() throws Exception {
+        CompressSubCrawler subCrawler = new CompressSubCrawler();
+        CompressorSubCrawlerHandler handler = new CompressorSubCrawlerHandler();
+        metadata = subCrawl(FILE_NAME, subCrawler, handler);
+        doBasicCompressorTest(metadata.getModel(), FILE_NAME, "compress-txt-compresstest.txt","compress");
+ 
+        // the extracted text is as follows, this means that the decompression works
+        assertEquals("This is a text file for Aperture\n", handler.getExtractedString());
+        
+        validate(metadata);
+        metadata.dispose();
+        metadata = null;
+    }
+    
+    public void testCompressTestIncremental() throws Exception {
+        testCrawlerIncremental(new CompressSubCrawlerFactory(), "TestCompressSubCrawlerCombination.tmpDir", FILE_NAME, ".Z",1);
+    }
+}
+
+


Property changes on: aperture/trunk/core/crawler/compress/src/main/test/org/semanticdesktop/aperture/subcrawler/compress/CompressSubCrawlerTest.java
___________________________________________________________________
Added: svn:mime-type
   + text/plain

Added: aperture/trunk/core/crawler/compress/src/test/java/org/semanticdesktop/aperture/subcrawler/ArchiveSubCrawlerTestBase.java
===================================================================
--- aperture/trunk/core/crawler/compress/src/test/java/org/semanticdesktop/aperture/subcrawler/ArchiveSubCrawlerTestBase.java	                        (rev 0)
+++ aperture/trunk/core/crawler/compress/src/test/java/org/semanticdesktop/aperture/subcrawler/ArchiveSubCrawlerTestBase.java	2009-09-09 23:58:25 UTC (rev 2069)
@@ -0,0 +1,127 @@
+/*
+ * Copyright (c) 2008 Aduna and Deutsches Forschungszentrum fuer Kuenstliche Intelligenz DFKI GmbH.
+ * All rights reserved.
+ * 
+ * Licensed under the Aperture BSD-Style license
+ */
+package org.semanticdesktop.aperture.subcrawler;
+
+import info.aduna.io.ResourceUtil;
+
+import java.io.File;
+
+import org.ontoware.rdf2go.model.Model;
+import org.semanticdesktop.aperture.TestIncrementalCrawlerHandler;
+import org.semanticdesktop.aperture.accessor.AccessData;
+import org.semanticdesktop.aperture.accessor.base.AccessDataImpl;
+import org.semanticdesktop.aperture.accessor.file.FileAccessorFactory;
+import org.semanticdesktop.aperture.accessor.impl.DataAccessorRegistryImpl;
+import org.semanticdesktop.aperture.crawler.filesystem.FileSystemCrawler;
+import org.semanticdesktop.aperture.datasource.filesystem.FileSystemDataSource;
+import org.semanticdesktop.aperture.rdf.RDFContainer;
+import org.semanticdesktop.aperture.subcrawler.impl.SubCrawlerRegistryImpl;
+import org.semanticdesktop.aperture.util.FileUtil;
+import org.semanticdesktop.aperture.util.IOUtil;
+
+/**
+ * This is a lame ripoff copy of the same class from the normal sub-archive module.
+ * I didn't want to create yet another module to accomodate this single class.
+ * And you all code quality purists, please have mercy on my lame hacker soul. 
+ * 
+ * @author antheque
+ *
+ */
+public class ArchiveSubCrawlerTestBase extends SubCrawlerTestBase {
+
+    /**
+     * Tests the incremental crawling
+     * @param factory
+     * @param subdirName
+     * @param resourceName
+     * @param fileExtension
+     * @param numberOfEntries
+     * @throws Exception
+     */
+    public void testCrawlerIncremental(SubCrawlerFactory factory, String subdirName, String resourceName, String fileExtension, int numberOfEntries) throws Exception {
+        File tmpDir = new File(System.getProperty("java.io.tmpdir"), subdirName).getCanonicalFile();
+        try {
+            // create a temporary folder containing a temporary file
+            // unfortunately there is no File.createTempDir
+            
+            FileUtil.deltree(tmpDir);
+            assertTrue(tmpDir.mkdir());
+    
+            // put two files in it
+            File tmpFile1 = File.createTempFile("file-", ".txt", tmpDir);
+            IOUtil.writeString("test file 1", tmpFile1);
+    
+            File tmpFile2 = File.createTempFile("file-", ".txt", tmpDir);
+            IOUtil.writeString("test file 2", tmpFile2);
+    
+            File tmpFile4 = File.createTempFile("file-skipme-", ".txt", tmpDir);
+            IOUtil.writeString("test file 4", tmpFile4);
+    
+            // put another folder containing another file in it
+            File subDir = new File(tmpDir, "subdir");
+            subDir.mkdir();
+    
+            File tmpFile3 = File.createTempFile("file-", fileExtension, subDir);
+            IOUtil.writeStream(ResourceUtil.getInputStream(DOCS_PATH + resourceName), tmpFile3);        
+            
+            // create a DataSource
+            RDFContainer configuration = createRDFContainer("urn:test:dummySource");
+            FileSystemDataSource dataSource = new FileSystemDataSource();
+            dataSource.setConfiguration(configuration);
+            
+            dataSource.setRootFolder(tmpDir.getAbsolutePath());
+            
+            // create a Crawler for this DataSource
+            FileSystemCrawler crawler = new FileSystemCrawler();
+            AccessData accessData = new AccessDataImpl();
+            crawler.setAccessData(accessData);
+            
+            crawler.setDataSource(dataSource);
+            // setup a DataAccessorRegistry
+            DataAccessorRegistryImpl registry = new DataAccessorRegistryImpl();
+            registry.add(new FileAccessorFactory());
+            crawler.setDataAccessorRegistry(registry);
+    
+            SubCrawlerRegistry subCrawlerRegistry = new SubCrawlerRegistryImpl();
+            subCrawlerRegistry.add(factory);
+            // setup a CrawlerHandler
+            TestIncrementalCrawlerHandler crawlerHandler = new TestIncrementalCrawlerHandler(subCrawlerRegistry);
+            crawler.setCrawlerHandler(crawlerHandler);
+    
+            // start Crawling
+            crawler.crawl();
+            
+            // inspect results (we have 6 files + the compressed entries)
+            assertNewModUnmodDel(crawlerHandler, 6 + numberOfEntries, 0, 0, 0);
+            assertTrue(accessData.getStoredIDs().size() == 6 + numberOfEntries);
+            
+            crawler.crawl();
+            // recursive touching, the file has been reported as unmodified
+            assertTrue(crawlerHandler.getUnchangedObjects().contains(toURI(tmpFile3).toString()));
+            assertNewModUnmodDel(crawlerHandler, 0, 0, 6 + numberOfEntries, 0);
+            assertTrue(accessData.getStoredIDs().size() == 6 + numberOfEntries);
+            
+            // recursive removal
+            safelySleep(1200); //for some sanity ,it seems that a fast server is able to run two crawls in the same second
+            tmpFile3.delete();
+            crawler.crawl();
+            
+            // the folder has been modified, ten resources have been deleted (zip file + 9 zip entries inside)
+            assertNewModUnmodDel(crawlerHandler, 0, 1, 4, 1 + numberOfEntries);
+            assertTrue(accessData.getStoredIDs().size() == 5);
+    
+            Model model = crawlerHandler.getModel();
+    
+            model.close();
+            configuration.getModel().close();
+        } finally {
+        FileUtil.deltree(tmpDir);
+        }
+    }
+    
+}
+


Property changes on: aperture/trunk/core/crawler/compress/src/test/java/org/semanticdesktop/aperture/subcrawler/ArchiveSubCrawlerTestBase.java
___________________________________________________________________
Added: svn:mime-type
   + text/plain

Added: aperture/trunk/core/crawler/compress/src/test/java/org/semanticdesktop/aperture/subcrawler/compress/CompressSubCrawlerTest.java
===================================================================
--- aperture/trunk/core/crawler/compress/src/test/java/org/semanticdesktop/aperture/subcrawler/compress/CompressSubCrawlerTest.java	                        (rev 0)
+++ aperture/trunk/core/crawler/compress/src/test/java/org/semanticdesktop/aperture/subcrawler/compress/CompressSubCrawlerTest.java	2009-09-09 23:58:25 UTC (rev 2069)
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2008 Aduna and Deutsches Forschungszentrum fuer Kuenstliche Intelligenz DFKI GmbH.
+ * All rights reserved.
+ * 
+ * Licensed under the Aperture BSD-style license.
+ */
+package org.semanticdesktop.aperture.subcrawler.compress;
+
+import org.semanticdesktop.aperture.rdf.RDFContainer;
+import org.semanticdesktop.aperture.subcrawler.ArchiveSubCrawlerTestBase;
+
+/**
+ * A test case for the compress subcrawler
+ */
+public class CompressSubCrawlerTest extends ArchiveSubCrawlerTestBase {
+    
+    private RDFContainer metadata;
+    
+    private static final String FILE_NAME = "compress-txt-compresstest.txt.Z";
+    
+    /**
+     * A basic test if the extraction actually works
+     * @throws Exception
+     */
+    public void testCompressTest() throws Exception {
+        CompressSubCrawler subCrawler = new CompressSubCrawler();
+        CompressorSubCrawlerHandler handler = new CompressorSubCrawlerHandler();
+        metadata = subCrawl(FILE_NAME, subCrawler, handler);
+        doBasicCompressorTest(metadata.getModel(), FILE_NAME, "compress-txt-compresstest.txt","compress");
+ 
+        // the extracted text is as follows, this means that the decompression works
+        assertEquals("This is a text file for Aperture\n", handler.getExtractedString());
+        
+        validate(metadata);
+        metadata.dispose();
+        metadata = null;
+    }
+    
+    public void testCompressTestIncremental() throws Exception {
+        testCrawlerIncremental(new CompressSubCrawlerFactory(), "TestCompressSubCrawlerCombination.tmpDir", FILE_NAME, ".Z",1);
+    }
+}
+
+


Property changes on: aperture/trunk/core/crawler/compress/src/test/java/org/semanticdesktop/aperture/subcrawler/compress/CompressSubCrawlerTest.java
___________________________________________________________________
Added: svn:mime-type
   + text/plain

Modified: aperture/trunk/core/crawler/pom.xml
===================================================================
--- aperture/trunk/core/crawler/pom.xml	2009-09-09 18:18:41 UTC (rev 2068)
+++ aperture/trunk/core/crawler/pom.xml	2009-09-09 23:58:25 UTC (rev 2069)
@@ -16,6 +16,7 @@
 
 	<modules>
 		<module>archive</module>
+		<module>compress</module>
 		<module>core</module>
 		<module>filesystem</module>
 		<module>ical</module>

Modified: aperture/trunk/default/crawler/pom.xml
===================================================================
--- aperture/trunk/default/crawler/pom.xml	2009-09-09 18:18:41 UTC (rev 2068)
+++ aperture/trunk/default/crawler/pom.xml	2009-09-09 23:58:25 UTC (rev 2069)
@@ -61,6 +61,10 @@
 		</dependency>
 		<dependency>
 			<groupId>org.semanticdesktop.aperture</groupId>
+			<artifactId>aperture-crawler-sub-compress</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.semanticdesktop.aperture</groupId>
 			<artifactId>aperture-crawler-sub-mime</artifactId>
 		</dependency>
 		<dependency>

Modified: aperture/trunk/default/crawler/src/main/resources/org/semanticdesktop/aperture/crawler/impl/defaults.xml
===================================================================
--- aperture/trunk/default/crawler/src/main/resources/org/semanticdesktop/aperture/crawler/impl/defaults.xml	2009-09-09 18:18:41 UTC (rev 2068)
+++ aperture/trunk/default/crawler/src/main/resources/org/semanticdesktop/aperture/crawler/impl/defaults.xml	2009-09-09 23:58:25 UTC (rev 2069)
@@ -14,7 +14,7 @@
 		<name>org.semanticdesktop.aperture.crawler.mbox.MboxCrawlerFactory</name>
 	</crawlerFactory>
 	<crawlerFactory>
-		<name>org.semanticdesktop.aperture.crawler.ical.IcalCrawlerFactory.</name>
+		<name>org.semanticdesktop.aperture.crawler.ical.IcalCrawlerFactory</name>
 	</crawlerFactory>
 	<crawlerFactory>
 		<name>org.semanticdesktop.aperture.outlook.OutlookCrawlerFactory</name>

Modified: aperture/trunk/default/crawler/src/main/resources/org/semanticdesktop/aperture/subcrawler/impl/defaults.xml
===================================================================
--- aperture/trunk/default/crawler/src/main/resources/org/semanticdesktop/aperture/subcrawler/impl/defaults.xml	2009-09-09 18:18:41 UTC (rev 2068)
+++ aperture/trunk/default/crawler/src/main/resources/org/semanticdesktop/aperture/subcrawler/impl/defaults.xml	2009-09-09 23:58:25 UTC (rev 2069)
@@ -17,6 +17,9 @@
 		<name>org.semanticdesktop.aperture.subcrawler.bzip2.BZip2SubCrawlerFactory</name>
 	</subCrawlerFactory>
 	<subCrawlerFactory>
+		<name>org.semanticdesktop.aperture.subcrawler.compress.CompressSubCrawlerFactory</name>
+	</subCrawlerFactory>
+	<subCrawlerFactory>
 		<name>org.semanticdesktop.aperture.subcrawler.mime.MimeSubCrawlerFactory</name>
 	</subCrawlerFactory>
 </subCrawlerFactories>
\ No newline at end of file

Modified: aperture/trunk/default/crawler/src/test/java/org/semanticdesktop/aperture/subcrawler/impl/TestDefaultSubCrawlerRegistry.java
===================================================================
--- aperture/trunk/default/crawler/src/test/java/org/semanticdesktop/aperture/subcrawler/impl/TestDefaultSubCrawlerRegistry.java	2009-09-09 18:18:41 UTC (rev 2068)
+++ aperture/trunk/default/crawler/src/test/java/org/semanticdesktop/aperture/subcrawler/impl/TestDefaultSubCrawlerRegistry.java	2009-09-09 23:58:25 UTC (rev 2069)
@@ -12,12 +12,13 @@
 
     public void testRegistry() {
         DefaultSubCrawlerRegistry registry = new DefaultSubCrawlerRegistry();
-        assertEquals(6, registry.getAll().size());
+        assertEquals(7, registry.getAll().size());
         assertEquals(1, registry.get("text/x-vcard").size());
         assertEquals(1, registry.get("application/zip").size());
         assertEquals(1, registry.get("application/gzip").size());
         assertEquals(1, registry.get("application/bzip2").size());
         assertEquals(1, registry.get("application/x-tar").size());
+        assertEquals(1, registry.get("application/x-compress").size());
         assertEquals(1, registry.get("message/rfc822").size());
         assertEquals(1, registry.get("message/news").size());
     }

Modified: aperture/trunk/pom.xml
===================================================================
--- aperture/trunk/pom.xml	2009-09-09 18:18:41 UTC (rev 2068)
+++ aperture/trunk/pom.xml	2009-09-09 23:58:25 UTC (rev 2069)
@@ -177,6 +177,11 @@
 			</dependency>
 			<dependency>
 				<groupId>org.semanticdesktop.aperture</groupId>
+				<artifactId>aperture-crawler-sub-compress</artifactId>
+				<version>${aperture.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.semanticdesktop.aperture</groupId>
 				<artifactId>aperture-crawler-sub-vcard</artifactId>
 				<version>${aperture.version}</version>
 			</dependency>
@@ -832,6 +837,13 @@
 				<artifactId>commons-httpclient</artifactId>
 				<version>3.1.0.v20080605-1935_orbit</version>
 			</dependency>
+			
+			<!-- the UncompressInputStream -->
+			<dependency>
+				<groupId>ronaldhttpclient</groupId>
+				<artifactId>uncompressinputstream</artifactId>
+				<version>0.3.3-SNAPSHOT</version>
+			</dependency>
 
 			<!-- Apache POI -->
 			<dependency>

Modified: aperture/trunk/runtime/default/src/main/java/org/semanticdesktop/aperture/runtime/bundle/ApertureRuntimeActivator.java
===================================================================
--- aperture/trunk/runtime/default/src/main/java/org/semanticdesktop/aperture/runtime/bundle/ApertureRuntimeActivator.java	2009-09-09 18:18:41 UTC (rev 2068)
+++ aperture/trunk/runtime/default/src/main/java/org/semanticdesktop/aperture/runtime/bundle/ApertureRuntimeActivator.java	2009-09-09 23:58:25 UTC (rev 2069)
@@ -56,6 +56,7 @@
 import org.semanticdesktop.aperture.security.standard.bundle.StandardSecurityActivator;
 import org.semanticdesktop.aperture.security.swing.bundle.SwingSecurityActivator;
 import org.semanticdesktop.aperture.subcrawler.archive.bundle.ArchiveSubCrawlerActivator;
+import org.semanticdesktop.aperture.subcrawler.compress.bundle.CompressSubCrawlerActivator;
 import org.semanticdesktop.aperture.subcrawler.vcard.bundle.VcardSubCrawlerActivator;
 import org.semanticdesktop.aperture.websites.bibsonomy.bundle.BibsonomyActivator;
 import org.semanticdesktop.aperture.websites.delicious.bundle.DeliciousActivator;
@@ -91,6 +92,7 @@
     private WebCrawlerActivator webCrawlerActivator;
     private VcardSubCrawlerActivator vcardSubCrawlerActivator;
     private ArchiveSubCrawlerActivator zipSubCrawlerActivator;
+    private CompressSubCrawlerActivator compressSubCrawlerActivator;
     private OutlookActivator outlookActivator;
     private BibsonomyActivator bibsonomyActivator;
     private DeliciousActivator deliciousActivator;
@@ -107,7 +109,7 @@
     // detectors
     private FileSystemDetectorActivator fileSystemDetectorActivator;
 
-    // extractors
+    // extractorstar
     private PdfExtractorActivator pdfExtractorActivator;
     private Mp3ExtractorActivator mp3FileExtractorActivator;
     private CorelOfficeExtractorActivator presentationsExtractorActivator;
@@ -225,6 +227,8 @@
         vcardSubCrawlerActivator.start(context);
         zipSubCrawlerActivator = new ArchiveSubCrawlerActivator();
         zipSubCrawlerActivator.start(context);
+        compressSubCrawlerActivator = new CompressSubCrawlerActivator();
+        compressSubCrawlerActivator.start(context);
         
         fileOpenerActivator = new FileOpenerActivator();
         fileOpenerActivator.start(context);
@@ -319,6 +323,9 @@
             zipSubCrawlerActivator = null;
         }
         
+        compressSubCrawlerActivator.stop(context);
+        compressSubCrawlerActivator = null;
+        
         fileOpenerActivator.stop(context);
         fileOpenerActivator = null;
         httpOpenerActivator.stop(context);

Modified: aperture/trunk/test/integration/src/test/java/org/semanticdesktop/aperture/runtime/AbstractApertureInOsgiTest.java
===================================================================
--- aperture/trunk/test/integration/src/test/java/org/semanticdesktop/aperture/runtime/AbstractApertureInOsgiTest.java	2009-09-09 18:18:41 UTC (rev 2068)
+++ aperture/trunk/test/integration/src/test/java/org/semanticdesktop/aperture/runtime/AbstractApertureInOsgiTest.java	2009-09-09 23:58:25 UTC (rev 2069)
@@ -59,6 +59,7 @@
 					"org.semanticdesktop.aperture, aperture-crawler-mail, " + ver(),
 					"org.semanticdesktop.aperture, aperture-crawler-mbox, " + ver(),
 					"org.semanticdesktop.aperture, aperture-crawler-sub-archive, " + ver(),
+					"org.semanticdesktop.aperture, aperture-crawler-sub-compress, " + ver(),
 					"org.semanticdesktop.aperture, aperture-crawler-sub-mime, " + ver(),
 					"org.semanticdesktop.aperture, aperture-crawler-sub-vcard, " + ver(),
 					"org.semanticdesktop.aperture, aperture-crawler-web, " + ver(),
@@ -153,7 +154,8 @@
 				"org.slf4j, jcl-over-slf4j, 1.5.6",
 				"org.slf4j, slf4j-api, 1.5.6", 
 				"pdfbox, pdfbox, 0.7.4.bundle",
-				"org.textmining, tm-extractors, 1.0-aperture.bundle" };
+				"org.textmining, tm-extractors, 1.0-aperture.bundle",
+				"ronaldhttpclient, uncompressinputstream, 0.3.3-SNAPSHOT"};
 	}
     
     public static String [] getOptionalBundles() {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.