jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mdue...@apache.org
Subject svn commit: r1159301 - in /jackrabbit/sandbox/jackrabbit-mk: jackrabbit-jcr2spi/ jackrabbit-parent/ jackrabbit-spi2microkernel/ jackrabbit-spi2microkernel/src/test/resources/
Date Thu, 18 Aug 2011 16:27:51 GMT
Author: mduerig
Date: Thu Aug 18 16:27:50 2011
New Revision: 1159301

URL: http://svn.apache.org/viewvc?rev=1159301&view=rev
Log:
Microkernel based Jackrabbit prototype (WIP)
- upgrade dependencies
- switch to logback

Added:
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi2microkernel/src/test/resources/logback-test.xml
Removed:
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi2microkernel/src/test/resources/log4j.xml
Modified:
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/pom.xml
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-parent/pom.xml
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi2microkernel/pom.xml

Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/pom.xml?rev=1159301&r1=1159300&r2=1159301&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/pom.xml (original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/pom.xml Thu Aug 18 16:27:50 2011
@@ -104,9 +104,8 @@
       <artifactId>commons-collections</artifactId>
     </dependency>
     <dependency>
-      <groupId>concurrent</groupId>
-      <artifactId>concurrent</artifactId>
-      <scope>test</scope>
+      <groupId>commons-io</groupId>
+      <artifactId>commons-io</artifactId>
     </dependency>
     <dependency>
       <groupId>junit</groupId>
@@ -119,11 +118,6 @@
       <version>2.3-JR3-MICROKERNEL</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>ch.qos.logback</groupId>
-      <artifactId>logback-classic</artifactId>
-      <scope>test</scope>
-    </dependency>    
   </dependencies>
 
 </project>

Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-parent/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-parent/pom.xml?rev=1159301&r1=1159300&r2=1159301&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-parent/pom.xml (original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-parent/pom.xml Thu Aug 18 16:27:50 2011
@@ -40,8 +40,6 @@
   <properties>
     <slf4j.version>1.6.1</slf4j.version>
     <logback.version>0.9.27</logback.version>
-    <jetty.version>6.1.22</jetty.version>
-    <tika.version>0.9</tika.version>
   </properties>
 
   <url>http://jackrabbit.apache.org/</url>
@@ -117,9 +115,6 @@
       </plugin>
     </plugins>
     <pluginManagement>
-      <!-- JCRSITE-9: Fix versions of key Maven plugins      -->
-      <!-- Note that many plugin versions are set already in -->
-      <!-- the Apache parent POM.                            -->
       <plugins>
         <plugin>
           <artifactId>maven-surefire-plugin</artifactId>
@@ -162,11 +157,6 @@
         <scope>provided</scope>
       </dependency>
       <dependency>
-        <groupId>org.apache.jackrabbit</groupId>
-        <artifactId>jackrabbit-jcr-benchmark</artifactId>
-        <version>1.5.0</version>
-      </dependency>
-      <dependency>
         <groupId>concurrent</groupId>
         <artifactId>concurrent</artifactId>
         <version>1.3.4</version>
@@ -179,12 +169,7 @@
       <dependency>
         <groupId>commons-io</groupId>
         <artifactId>commons-io</artifactId>
-        <version>1.4</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.geronimo.specs</groupId>
-        <artifactId>geronimo-jta_1.0.1B_spec</artifactId>
-        <version>1.0.1</version>
+        <version>2.0.1</version>
       </dependency>
       <dependency>
         <groupId>org.slf4j</groupId>
@@ -204,122 +189,12 @@
       <dependency>
         <groupId>commons-httpclient</groupId>
         <artifactId>commons-httpclient</artifactId>
-        <version>3.0</version>
-        <!-- JCR-683: Exclude bad transitive dependencies -->
-        <exclusions>
-          <exclusion>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-          </exclusion>
-        </exclusions>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.lucene</groupId>
-        <artifactId>lucene-core</artifactId>
-        <version>3.0.3</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.tika</groupId>
-        <artifactId>tika-core</artifactId>
-        <version>${tika.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.tika</groupId>
-        <artifactId>tika-parsers</artifactId>
-        <version>${tika.version}</version>
-        <exclusions>
-          <!-- Exclude the NetCDF and the related commons-httpclient -->
-          <!-- libraries since the related NetCDF and HDF file       -->
-          <!-- formats are not widely used beyond scientific data.   -->
-          <exclusion>
-            <groupId>edu.ucar</groupId>
-            <artifactId>netcdf</artifactId>
-          </exclusion>
-          <exclusion>
-            <groupId>commons-httpclient</groupId>
-            <artifactId>commons-httpclient</artifactId>
-          </exclusion>
-          <!-- Exclude the Apache MIME4J library as it's used for    -->
-          <!-- parsing raw email messages and mbox files, which are  -->
-          <!-- typically only needed by a file-based email system.   -->
-          <exclusion>
-            <groupId>org.apache.james</groupId>
-            <artifactId>apache-mime4j</artifactId>
-          </exclusion>
-          <!-- Exclude the Commons Compress library as we don't want -->
-          <!-- to parse compressed archives like zips by default.    -->
-          <exclusion>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-compress</artifactId>
-          </exclusion>
-          <!-- Exclude the ASM library as it's only used for parsing -->
-          <!-- Java class files, for which there's typically no need -->
-          <!-- in a content repository.                              -->
-          <exclusion>
-            <groupId>asm</groupId>
-            <artifactId>asm</artifactId>
-          </exclusion>
-          <!-- Exclude the extractor library for EXIF and other      -->
-          <!-- image metadata as we normally don't want to parse     -->
-          <!-- images for full text indexing.                        -->
-          <exclusion>
-            <groupId>com.drewnoakes</groupId>
-            <artifactId>metadata-extractor</artifactId>
-          </exclusion>
-          <!-- Exclude the Rome library as we normally don't want to -->
-          <!-- parse RSS and Atom feeds for full text indexing.      -->
-          <exclusion>
-            <groupId>rome</groupId>
-            <artifactId>rome</artifactId>
-          </exclusion>
-          <!-- Exclude the Boilerpipe library as we don't use the    -->
-          <!-- BoilerpipeContentHandler functionality from Tika.     -->
-          <exclusion>
-            <groupId>de.l3s.boilerpipe</groupId>
-            <artifactId>boilerpipe</artifactId>
-          </exclusion>
-        </exclusions>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.derby</groupId>
-        <artifactId>derby</artifactId>
-        <version>10.5.3.0_1</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.geronimo.specs</groupId>
-        <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
-        <version>1.0</version>
-      </dependency>
-      <dependency>
-        <groupId>javax.servlet</groupId>
-        <artifactId>servlet-api</artifactId>
-        <version>2.3</version>
-        <scope>provided</scope>
-      </dependency>
-      <dependency>
-        <groupId>commons-fileupload</groupId>
-        <artifactId>commons-fileupload</artifactId>
-        <version>1.2.1</version>
-      </dependency>
-      <dependency>
-        <groupId>org.mortbay.jetty</groupId>
-        <artifactId>jetty</artifactId>
-        <version>${jetty.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.mortbay.jetty</groupId>
-        <artifactId>jsp-2.1-jetty</artifactId>
-        <version>${jetty.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.mortbay.jetty</groupId>
-        <artifactId>jetty-util</artifactId>
-        <version>${jetty.version}</version>
+        <version>3.1</version>
       </dependency>
       <dependency>
         <groupId>cglib</groupId>
         <artifactId>cglib</artifactId>
-        <version>2.1_3</version>
+        <version>2.2</version>
       </dependency>
       <dependency>
         <groupId>org.easymock</groupId>

Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi2microkernel/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi2microkernel/pom.xml?rev=1159301&r1=1159300&r2=1159301&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi2microkernel/pom.xml (original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi2microkernel/pom.xml Thu Aug 18 16:27:50
2011
@@ -81,15 +81,8 @@
 
         <!-- test dependencies -->
         <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-log4j12</artifactId>
-            <version>1.6.1  </version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>log4j</groupId>
-            <artifactId>log4j</artifactId>
-            <version>1.2.16</version>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-classic</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>

Added: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi2microkernel/src/test/resources/logback-test.xml
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi2microkernel/src/test/resources/logback-test.xml?rev=1159301&view=auto
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi2microkernel/src/test/resources/logback-test.xml
(added)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi2microkernel/src/test/resources/logback-test.xml
Thu Aug 18 16:27:50 2011
@@ -0,0 +1,23 @@
+<configuration>
+
+    <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>%date{HH:mm:ss.SSS} %-5level %-40([%thread] %F:%L) %msg%n</pattern>
+        </encoder>
+    </appender>
+
+    <appender name="file" class="ch.qos.logback.core.FileAppender">
+        <file>unit-tests.log</file>
+        <encoder>
+            <pattern>%date{HH:mm:ss.SSS} %-5level %-40([%thread] %F:%L) %msg%n</pattern>
+        </encoder>
+    </appender>
+
+    <root level="DEBUG">
+        <!--
+        <appender-ref ref="console"/>
+        -->
+        <appender-ref ref="file"/>
+    </root>
+
+</configuration>



Mime
View raw message