jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ju...@apache.org
Subject svn commit: r1043623 - in /jackrabbit/branches/2.2: ./ jackrabbit-core/ jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/pdf/ jackrabbit-core/src/main/resources/org/apache/jackrabbit/core/query/lucene/ jackrabbit-core/src/test/java/org/ap...
Date Wed, 08 Dec 2010 19:24:01 GMT
Author: jukka
Date: Wed Dec  8 19:24:00 2010
New Revision: 1043623

URL: http://svn.apache.org/viewvc?rev=1043623&view=rev
Log:
2.2: Merged revisions 1043616 and 1043618 (JCR-2828 and JCR-2838)

Added:
    jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/pdf/
      - copied from r1043618, jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/pdf/
    jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/pdf/PDF2XHTML.java
      - copied unchanged from r1043618, jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/pdf/PDF2XHTML.java
    jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/pdf/PDFParser.java
      - copied unchanged from r1043618, jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/pdf/PDFParser.java
Modified:
    jackrabbit/branches/2.2/   (props changed)
    jackrabbit/branches/2.2/jackrabbit-core/pom.xml
    jackrabbit/branches/2.2/jackrabbit-core/src/main/resources/org/apache/jackrabbit/core/query/lucene/tika-config.xml
    jackrabbit/branches/2.2/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/TestAll.java

Propchange: jackrabbit/branches/2.2/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec  8 19:24:00 2010
@@ -2,4 +2,4 @@
 /jackrabbit/sandbox/JCR-1456:774917-886178
 /jackrabbit/sandbox/JCR-2170:812417-816332
 /jackrabbit/sandbox/tripod-JCR-2209:795441-795863
-/jackrabbit/trunk:1038201,1038203,1038205,1038657,1039064,1039347,1039408,1039422-1039423,1039888,1039946,1040033,1040090,1040459,1040601,1040606,1040661,1040958,1041379,1041439,1041761,1042643,1042647,1042978-1042982,1043084-1043086,1043088,1043343,1043357-1043358,1043430,1043554
+/jackrabbit/trunk:1038201,1038203,1038205,1038657,1039064,1039347,1039408,1039422-1039423,1039888,1039946,1040033,1040090,1040459,1040601,1040606,1040661,1040958,1041379,1041439,1041761,1042643,1042647,1042978-1042982,1043084-1043086,1043088,1043343,1043357-1043358,1043430,1043554,1043616,1043618

Modified: jackrabbit/branches/2.2/jackrabbit-core/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.2/jackrabbit-core/pom.xml?rev=1043623&r1=1043622&r2=1043623&view=diff
==============================================================================
--- jackrabbit/branches/2.2/jackrabbit-core/pom.xml (original)
+++ jackrabbit/branches/2.2/jackrabbit-core/pom.xml Wed Dec  8 19:24:00 2010
@@ -246,6 +246,11 @@ org.apache.jackrabbit.test.api.Shareable
       </exclusions>
     </dependency>
     <dependency>
+      <groupId>edu.ucar</groupId>
+      <artifactId>netcdf</artifactId>
+      <version>4.2-min</version>
+    </dependency>
+    <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
     </dependency>

Modified: jackrabbit/branches/2.2/jackrabbit-core/src/main/resources/org/apache/jackrabbit/core/query/lucene/tika-config.xml
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.2/jackrabbit-core/src/main/resources/org/apache/jackrabbit/core/query/lucene/tika-config.xml?rev=1043623&r1=1043622&r2=1043623&view=diff
==============================================================================
--- jackrabbit/branches/2.2/jackrabbit-core/src/main/resources/org/apache/jackrabbit/core/query/lucene/tika-config.xml
(original)
+++ jackrabbit/branches/2.2/jackrabbit-core/src/main/resources/org/apache/jackrabbit/core/query/lucene/tika-config.xml
Wed Dec  8 19:24:00 2010
@@ -23,6 +23,11 @@
 
     <parser class="org.apache.tika.parser.DefaultParser"/>
 
+    <parser class="org.apache.jackrabbit.core.query.pdf.PDFParser">
+      <!-- JCR-2838: Override the faulty PDF parser in Tika 0.8 -->
+      <mime>application/pdf</mime>
+    </parser>
+
     <parser class="org.apache.tika.parser.EmptyParser">
       <!-- Disable package extraction as it's too resource-intensive -->
       <mime>application/x-archive</mime>

Modified: jackrabbit/branches/2.2/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/TestAll.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.2/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/TestAll.java?rev=1043623&r1=1043622&r2=1043623&view=diff
==============================================================================
--- jackrabbit/branches/2.2/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/TestAll.java
(original)
+++ jackrabbit/branches/2.2/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/TestAll.java
Wed Dec  8 19:24:00 2010
@@ -58,19 +58,21 @@ public class TestAll extends TestCase {
         suite.addTestSuite(ConcurrentReorderTest.class);
         suite.addTestSuite(ConcurrentAddRemoveNodeTest.class);
 
-        if (Boolean.getBoolean("org.apache.jackrabbit.test.integration")) {
-            suite.addTestSuite(ConcurrencyTest.class);
-            // suite.addTestSuite(ConcurrencyTest3.class);
-            suite.addTestSuite(ConcurrentVersioningTest.class);
-            // suite.addTestSuite(ConcurrentVersioningWithTransactionsTest.class);
-            suite.addTestSuite(ConcurrentCheckinMixedTransactionTest.class);
-            suite.addTestSuite(ConcurrentLoginTest.class);
-            suite.addTestSuite(ConcurrentNodeModificationTest.class);
-            suite.addTestSuite(ConcurrentReadWriteTest.class);
-            suite.addTestSuite(ConcurrentRenameTest.class);
-            suite.addTestSuite(ConcurrentSaveTest.class);
-            suite.addTestSuite(ConcurrentWorkspaceCopyTest.class);
-        }
+// TODO: These tests pass, but they cause some instability in other
+//       parts of the test suite, most likely due to uncleaned test data
+//        if (Boolean.getBoolean("org.apache.jackrabbit.test.integration")) {
+//            suite.addTestSuite(ConcurrencyTest.class);
+//            // suite.addTestSuite(ConcurrencyTest3.class);
+//            suite.addTestSuite(ConcurrentVersioningTest.class);
+//            // suite.addTestSuite(ConcurrentVersioningWithTransactionsTest.class);
+//            suite.addTestSuite(ConcurrentCheckinMixedTransactionTest.class);
+//            suite.addTestSuite(ConcurrentLoginTest.class);
+//            suite.addTestSuite(ConcurrentNodeModificationTest.class);
+//            suite.addTestSuite(ConcurrentReadWriteTest.class);
+//            suite.addTestSuite(ConcurrentRenameTest.class);
+//            suite.addTestSuite(ConcurrentSaveTest.class);
+//            suite.addTestSuite(ConcurrentWorkspaceCopyTest.class);
+//        }
 
         suite.addTestSuite(UserPerWorkspaceSecurityManagerTest.class);
 



Mime
View raw message