jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ju...@apache.org
Subject svn commit: r897961 - in /jackrabbit/branches/2.0: ./ jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/ jackrabbit-jcr2dav/ jackrabbit-jcr2dav/src/ jackrabbit-jcr2dav/src/main/ jackrabbit-jcr2dav/src/main/java/ jackrabbit-jcr2dav/src/...
Date Mon, 11 Jan 2010 17:32:39 GMT
Author: jukka
Date: Mon Jan 11 17:32:38 2010
New Revision: 897961

URL: http://svn.apache.org/viewvc?rev=897961&view=rev
Log:
2.0: Merged revisions 896513, 896857, 896870 and 896876 (JCR-2439, JCR-2451 and JCR-2453)

Added:
    jackrabbit/branches/2.0/jackrabbit-jcr2dav/   (props changed)
      - copied from r896857, jackrabbit/trunk/jackrabbit-jcr2dav/
    jackrabbit/branches/2.0/jackrabbit-jcr2dav/pom.xml
      - copied unchanged from r896857, jackrabbit/trunk/jackrabbit-jcr2dav/pom.xml
    jackrabbit/branches/2.0/jackrabbit-jcr2dav/src/
      - copied from r896857, jackrabbit/trunk/jackrabbit-jcr2dav/src/
    jackrabbit/branches/2.0/jackrabbit-jcr2dav/src/main/
      - copied from r896857, jackrabbit/trunk/jackrabbit-jcr2dav/src/main/
    jackrabbit/branches/2.0/jackrabbit-jcr2dav/src/main/java/
      - copied from r896857, jackrabbit/trunk/jackrabbit-jcr2dav/src/main/java/
    jackrabbit/branches/2.0/jackrabbit-jcr2dav/src/main/java/org/
      - copied from r896857, jackrabbit/trunk/jackrabbit-jcr2dav/src/main/java/org/
    jackrabbit/branches/2.0/jackrabbit-jcr2dav/src/main/java/org/apache/
      - copied from r896857, jackrabbit/trunk/jackrabbit-jcr2dav/src/main/java/org/apache/
    jackrabbit/branches/2.0/jackrabbit-jcr2dav/src/main/java/org/apache/jackrabbit/
      - copied from r896857, jackrabbit/trunk/jackrabbit-jcr2dav/src/main/java/org/apache/jackrabbit/
    jackrabbit/branches/2.0/jackrabbit-jcr2dav/src/main/java/org/apache/jackrabbit/jcr2dav/
      - copied from r896857, jackrabbit/trunk/jackrabbit-jcr2dav/src/main/java/org/apache/jackrabbit/jcr2dav/
    jackrabbit/branches/2.0/jackrabbit-jcr2dav/src/main/java/org/apache/jackrabbit/jcr2dav/Jcr2davRepositoryFactory.java
      - copied unchanged from r896857, jackrabbit/trunk/jackrabbit-jcr2dav/src/main/java/org/apache/jackrabbit/jcr2dav/Jcr2davRepositoryFactory.java
    jackrabbit/branches/2.0/jackrabbit-jcr2dav/src/main/resources/
      - copied from r896857, jackrabbit/trunk/jackrabbit-jcr2dav/src/main/resources/
    jackrabbit/branches/2.0/jackrabbit-jcr2dav/src/main/resources/META-INF/
      - copied from r896857, jackrabbit/trunk/jackrabbit-jcr2dav/src/main/resources/META-INF/
    jackrabbit/branches/2.0/jackrabbit-jcr2dav/src/main/resources/META-INF/services/
      - copied from r896857, jackrabbit/trunk/jackrabbit-jcr2dav/src/main/resources/META-INF/services/
    jackrabbit/branches/2.0/jackrabbit-jcr2dav/src/main/resources/META-INF/services/javax.jcr.RepositoryFactory
      - copied unchanged from r896857, jackrabbit/trunk/jackrabbit-jcr2dav/src/main/resources/META-INF/services/javax.jcr.RepositoryFactory
Modified:
    jackrabbit/branches/2.0/   (props changed)
    jackrabbit/branches/2.0/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/GenericRepositoryFactory.java
    jackrabbit/branches/2.0/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/JcrUtils.java
    jackrabbit/branches/2.0/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/Jcr2spiRepositoryFactory.java
    jackrabbit/branches/2.0/jackrabbit-spi2dav/pom.xml
    jackrabbit/branches/2.0/pom.xml

Propchange: jackrabbit/branches/2.0/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan 11 17:32:38 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:891595,891629,892253,892263,894150-894151,896408,896532,896940
+/jackrabbit/trunk:891595,891629,892253,892263,894150-894151,896408,896513,896532,896857,896870,896876,896940

Modified: jackrabbit/branches/2.0/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/GenericRepositoryFactory.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.0/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/GenericRepositoryFactory.java?rev=897961&r1=897960&r2=897961&view=diff
==============================================================================
--- jackrabbit/branches/2.0/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/GenericRepositoryFactory.java
(original)
+++ jackrabbit/branches/2.0/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/GenericRepositoryFactory.java
Mon Jan 11 17:32:38 2010
@@ -124,20 +124,11 @@
                 }
                 parameters.put("org.apache.jackrabbit.repository.home", home);
                 parameters.put("org.apache.jackrabbit.repository.conf", conf);
-            } else if ("http".equalsIgnoreCase(scheme)
-                    || "https".equalsIgnoreCase(scheme)){
-                parameters.put(
-                        "org.apache.jackrabbit.spi.RepositoryServiceFactory",
-                        "org.apache.jackrabbit.spi2davex.Spi2davexRepositoryServiceFactory");
-                parameters.put(
-                        "org.apache.jackrabbit.spi2davex.uri", parameter);
             } else {
-                throw new RepositoryException(
-                        "Unsupported repository URI: " + parameter);
+                return null;
             }
         } catch (URISyntaxException e) {
-            throw new RepositoryException(
-                    "Invalid repository URI: " + parameter, e);
+            return null;
         }
 
         return JcrUtils.getRepository(parameters);

Modified: jackrabbit/branches/2.0/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/JcrUtils.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.0/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/JcrUtils.java?rev=897961&r1=897960&r2=897961&view=diff
==============================================================================
--- jackrabbit/branches/2.0/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/JcrUtils.java
(original)
+++ jackrabbit/branches/2.0/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/JcrUtils.java
Mon Jan 11 17:32:38 2010
@@ -458,7 +458,7 @@
     public static Node putFile(
             Node parent, String name, String mime, InputStream data)
             throws RepositoryException {
-        return putFile(parent, name, mime, Calendar.getInstance(), data);
+        return putFile(parent, name, mime, data, Calendar.getInstance());
     }
 
     /**
@@ -492,15 +492,15 @@
      * @param parent parent node
      * @param name name of the file
      * @param mime media type of the file
-     * @param date date of last modification
      * @param data binary content of the file
+     * @param date date of last modification
      * @return the child node
      * @throws RepositoryException if the child node can not be created
      *                             or updated
      */
     public static Node putFile(
-            Node parent, String name, String mime, Calendar date,
-            InputStream data) throws RepositoryException {
+            Node parent, String name, String mime,
+            InputStream data, Calendar date) throws RepositoryException {
         Binary binary =
             parent.getSession().getValueFactory().createBinary(data);
         try {

Propchange: jackrabbit/branches/2.0/jackrabbit-jcr2dav/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Jan 11 17:32:38 2010
@@ -0,0 +1,5 @@
+target
+.*
+*.iml
+*.ipr
+*.iws

Modified: jackrabbit/branches/2.0/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/Jcr2spiRepositoryFactory.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.0/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/Jcr2spiRepositoryFactory.java?rev=897961&r1=897960&r2=897961&view=diff
==============================================================================
--- jackrabbit/branches/2.0/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/Jcr2spiRepositoryFactory.java
(original)
+++ jackrabbit/branches/2.0/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/Jcr2spiRepositoryFactory.java
Mon Jan 11 17:32:38 2010
@@ -221,7 +221,7 @@
         }
     }
 
-    private static class RepositoryConfigImpl implements RepositoryConfig {
+    public static class RepositoryConfigImpl implements RepositoryConfig {
         private final RepositoryServiceFactory serviceFactory;
         private final CacheBehaviour cacheBehaviour;
         private final int itemCacheSize;

Modified: jackrabbit/branches/2.0/jackrabbit-spi2dav/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.0/jackrabbit-spi2dav/pom.xml?rev=897961&r1=897960&r2=897961&view=diff
==============================================================================
--- jackrabbit/branches/2.0/jackrabbit-spi2dav/pom.xml (original)
+++ jackrabbit/branches/2.0/jackrabbit-spi2dav/pom.xml Mon Jan 11 17:32:38 2010
@@ -80,6 +80,14 @@
           <groupId>xerces</groupId>
           <artifactId>xercesImpl</artifactId>
         </exclusion>
+        <exclusion>
+          <groupId>org.apache.tika</groupId>
+          <artifactId>tika-core</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>commons-fileupload</groupId>
+          <artifactId>commons-fileupload</artifactId>
+        </exclusion>
       </exclusions>
     </dependency>
     <dependency>
@@ -95,10 +103,6 @@
       <artifactId>servlet-api</artifactId>
     </dependency>
     <dependency>
-      <groupId>commons-httpclient</groupId>
-      <artifactId>commons-httpclient</artifactId>
-    </dependency>
-    <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
       <scope>test</scope>

Modified: jackrabbit/branches/2.0/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.0/pom.xml?rev=897961&r1=897960&r2=897961&view=diff
==============================================================================
--- jackrabbit/branches/2.0/pom.xml (original)
+++ jackrabbit/branches/2.0/pom.xml Mon Jan 11 17:32:38 2010
@@ -50,6 +50,7 @@
     <module>jackrabbit-jcr2spi</module>
     <module>jackrabbit-spi2jcr</module>
     <module>jackrabbit-spi2dav</module>
+    <module>jackrabbit-jcr2dav</module>
     <module>jackrabbit-jcr-client</module>
     <module>jackrabbit-standalone</module>
   </modules>



Mime
View raw message