incubator-sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fmesc...@apache.org
Subject svn commit: r654512 - in /incubator/sling/trunk: jcr/jackrabbit-server/NOTICE jcr/jackrabbit-server/pom.xml jcr/jackrabbit-text-extractors/ launchpad/app/pom.xml launchpad/jcrapp/pom.xml pom.xml
Date Thu, 08 May 2008 12:44:19 GMT
Author: fmeschbe
Date: Thu May  8 05:44:18 2008
New Revision: 654512

URL: http://svn.apache.org/viewvc?rev=654512&view=rev
Log:
SLING-437 Merge jackrabbit-text-extractors into jackrabbit-server

Removed:
    incubator/sling/trunk/jcr/jackrabbit-text-extractors/
Modified:
    incubator/sling/trunk/jcr/jackrabbit-server/NOTICE
    incubator/sling/trunk/jcr/jackrabbit-server/pom.xml
    incubator/sling/trunk/launchpad/app/pom.xml
    incubator/sling/trunk/launchpad/jcrapp/pom.xml
    incubator/sling/trunk/pom.xml

Modified: incubator/sling/trunk/jcr/jackrabbit-server/NOTICE
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/jcr/jackrabbit-server/NOTICE?rev=654512&r1=654511&r2=654512&view=diff
==============================================================================
--- incubator/sling/trunk/jcr/jackrabbit-server/NOTICE (original)
+++ incubator/sling/trunk/jcr/jackrabbit-server/NOTICE Thu May  8 05:44:18 2008
@@ -7,3 +7,8 @@
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
 Licensed under the Apache License 2.0.
+
+
+TODO TODO TODO TODO TODO TODO TODO
+Add License information on enclosed libraries !!
+TODO TODO TODO TODO TODO TODO TODO

Modified: incubator/sling/trunk/jcr/jackrabbit-server/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/jcr/jackrabbit-server/pom.xml?rev=654512&r1=654511&r2=654512&view=diff
==============================================================================
--- incubator/sling/trunk/jcr/jackrabbit-server/pom.xml (original)
+++ incubator/sling/trunk/jcr/jackrabbit-server/pom.xml Thu May  8 05:44:18 2008
@@ -75,7 +75,7 @@
                             javax.security.*,
                             org.apache.commons.collections.*,
                             org.apache.jackrabbit.api,
-                            org.apache.jackrabbit.extractor, org.osgi.*,
+                            org.osgi.*,
                             org.slf4j, org.xml.sax, org.xml.sax.helpers
                         </Import-Package>
                         <DynamicImport-Package>*</DynamicImport-Package>
@@ -83,10 +83,20 @@
                         <!-- Embedd some libraries -->
                         <Embed-Transitive>true</Embed-Transitive>
                         <Embed-Dependency>
+                            <!-- core repository implementation -->
                             jackrabbit-jcr-rmi; jackrabbit-core;
                             jackrabbit-jcr-commons;
                             jackrabbit-spi-commons; jackrabbit-spi;
-                            lucene-core; derby; concurrent
+                            lucene-core; derby; concurrent,
+                            
+                            <!-- jackrabbit text extraction -->
+                            jackrabbit-text-extractors,
+                            tm-extractors,
+                            pdfbox;version=0.7.1,
+                            poi;version=3.0.1-FINAL,
+                            poi-scratchpad;version=3.0.1-FINAL,
+                            nekohtml,
+                            xercesImpl
                         </Embed-Dependency>
                     </instructions>
                 </configuration>
@@ -107,27 +117,65 @@
             <version>2.0.0-incubator-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
+        
+        <!-- The core repository implementation -->
         <dependency>
             <groupId>org.apache.jackrabbit</groupId>
-            <artifactId>jackrabbit-jcr-rmi</artifactId>
+            <artifactId>jackrabbit-core</artifactId>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.jackrabbit</groupId>
-            <artifactId>jackrabbit-core</artifactId>
+            <artifactId>jackrabbit-jcr-commons</artifactId>
             <scope>compile</scope>
         </dependency>
+
+        <!-- Export embedded repositories through RMI -->
         <dependency>
             <groupId>org.apache.jackrabbit</groupId>
-            <artifactId>jackrabbit-jcr-commons</artifactId>
+            <artifactId>jackrabbit-jcr-rmi</artifactId>
             <scope>compile</scope>
         </dependency>
 
+        <!-- Text Extractor support -->
         <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-simple</artifactId>
+            <groupId>org.apache.jackrabbit</groupId>
+            <artifactId>jackrabbit-text-extractors</artifactId>
+            <version>1.4</version>
         </dependency>
-
+        <dependency>
+            <groupId>org.apache.poi</groupId>
+            <artifactId>poi</artifactId>
+            <version>3.0.1-FINAL</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.poi</groupId>
+            <artifactId>poi-scratchpad</artifactId>
+            <version>3.0.1-FINAL</version>
+        </dependency>
+        <dependency>
+            <groupId>pdfbox</groupId>
+            <artifactId>pdfbox</artifactId>
+            <version>0.7.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.textmining</groupId>
+            <artifactId>tm-extractors</artifactId>
+            <version>0.4</version>
+        </dependency>
+        
+        <!-- Neko HTML Dependencies for bundle inclusion -->
+        <dependency>
+            <groupId>xerces</groupId>
+            <artifactId>xercesImpl</artifactId>
+            <version>2.8.1</version>
+        </dependency>
+        <dependency>
+            <groupId>nekohtml</groupId>
+            <artifactId>nekohtml</artifactId>
+            <version>0.9.4</version>
+        </dependency>
+        
         <!-- OSGi Libraries -->
         <dependency>
             <groupId>org.apache.felix</groupId>
@@ -138,16 +186,20 @@
             <artifactId>org.osgi.compendium</artifactId>
         </dependency>
 
+        <!-- Testing -->
         <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-simple</artifactId>
         </dependency>
-
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.framework</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+        </dependency>
 
     </dependencies>
 

Modified: incubator/sling/trunk/launchpad/app/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/app/pom.xml?rev=654512&r1=654511&r2=654512&view=diff
==============================================================================
--- incubator/sling/trunk/launchpad/app/pom.xml (original)
+++ incubator/sling/trunk/launchpad/app/pom.xml Thu May  8 05:44:18 2008
@@ -382,14 +382,6 @@
             <optional>true</optional>
         </dependency>
         <dependency>
-            <groupId>org.apache.sling</groupId>
-            <artifactId>
-                org.apache.sling.jcr.jackrabbit-text-extractors
-            </artifactId>
-            <version>1.4.0-0003-incubator-SNAPSHOT</version>
-            <optional>true</optional>
-        </dependency>
-        <dependency>
             <groupId>org.apache.jackrabbit</groupId>
             <artifactId>jackrabbit-jcr-commons</artifactId>
             <optional>true</optional>

Modified: incubator/sling/trunk/launchpad/jcrapp/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/jcrapp/pom.xml?rev=654512&r1=654511&r2=654512&view=diff
==============================================================================
--- incubator/sling/trunk/launchpad/jcrapp/pom.xml (original)
+++ incubator/sling/trunk/launchpad/jcrapp/pom.xml Thu May  8 05:44:18 2008
@@ -182,14 +182,14 @@
         </dependency>
         <dependency>
             <groupId>org.apache.sling</groupId>
-            <artifactId>org.apache.sling.jcr.jackrabbit.server</artifactId>
+            <artifactId>org.apache.sling.jcr.jackrabbit.api</artifactId>
             <version>2.0.0-incubator-SNAPSHOT</version>
             <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.apache.sling</groupId>
-            <artifactId>org.apache.sling.jcr.jackrabbit-text-extractors</artifactId>
-            <version>1.4.0-0003-incubator-SNAPSHOT</version>
+            <artifactId>org.apache.sling.jcr.jackrabbit.server</artifactId>
+            <version>2.0.0-incubator-SNAPSHOT</version>
             <optional>true</optional>
         </dependency>
         <dependency>

Modified: incubator/sling/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/pom.xml?rev=654512&r1=654511&r2=654512&view=diff
==============================================================================
--- incubator/sling/trunk/pom.xml (original)
+++ incubator/sling/trunk/pom.xml Thu May  8 05:44:18 2008
@@ -85,7 +85,6 @@
         <module>jcr/jackrabbit-api</module>
         <module>jcr/jackrabbit-client</module>
         <module>jcr/jackrabbit-server</module>
-        <module>jcr/jackrabbit-text-extractors</module>
         <module>jcr/ocm</module>
         <module>jcr/resource</module>
         <module>jcr/webdav</module>



Mime
View raw message