jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ju...@apache.org
Subject svn commit: r896419 - in /jackrabbit/branches/2.0: ./ jackrabbit-jca/src/main/rar/META-INF/ jackrabbit-jcr-commons/ jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/ jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/ jackrabb...
Date Wed, 06 Jan 2010 12:33:17 GMT
Author: jukka
Date: Wed Jan  6 12:33:16 2010
New Revision: 896419

URL: http://svn.apache.org/viewvc?rev=896419&view=rev
Log:
2.0: Merged revisions 894150, 894151 and 89408 (JCR-2447 and JCR-2448)

Modified:
    jackrabbit/branches/2.0/   (props changed)
    jackrabbit/branches/2.0/NOTICE.txt
    jackrabbit/branches/2.0/README.txt
    jackrabbit/branches/2.0/jackrabbit-jca/src/main/rar/META-INF/NOTICE.txt
    jackrabbit/branches/2.0/jackrabbit-jcr-commons/pom.xml
    jackrabbit/branches/2.0/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/Jcr2spiRepositoryFactory.java
    jackrabbit/branches/2.0/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/AbstractJCR2SPITest.java
    jackrabbit/branches/2.0/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/AbstractRepositoryService.java

Propchange: jackrabbit/branches/2.0/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan  6 12:33:16 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:891629,892253,892263
+/jackrabbit/trunk:891595,891629,892253,892263,894150-894151,896408

Modified: jackrabbit/branches/2.0/NOTICE.txt
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.0/NOTICE.txt?rev=896419&r1=896418&r2=896419&view=diff
==============================================================================
--- jackrabbit/branches/2.0/NOTICE.txt (original)
+++ jackrabbit/branches/2.0/NOTICE.txt Wed Jan  6 12:33:16 2010
@@ -1,5 +1,5 @@
 Apache Jackrabbit
-Copyright 2009 The Apache Software Foundation
+Copyright 2010 The Apache Software Foundation
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).

Modified: jackrabbit/branches/2.0/README.txt
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.0/README.txt?rev=896419&r1=896418&r2=896419&view=diff
==============================================================================
--- jackrabbit/branches/2.0/README.txt (original)
+++ jackrabbit/branches/2.0/README.txt Wed Jan  6 12:33:16 2010
@@ -27,7 +27,7 @@
 License (see also LICENSE.txt)
 ==============================
 
-Collective work: Copyright 2009 The Apache Software Foundation.
+Collective work: Copyright 2010 The Apache Software Foundation.
 
 Licensed to the Apache Software Foundation (ASF) under one or more
 contributor license agreements.  See the NOTICE file distributed with

Modified: jackrabbit/branches/2.0/jackrabbit-jca/src/main/rar/META-INF/NOTICE.txt
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.0/jackrabbit-jca/src/main/rar/META-INF/NOTICE.txt?rev=896419&r1=896418&r2=896419&view=diff
==============================================================================
--- jackrabbit/branches/2.0/jackrabbit-jca/src/main/rar/META-INF/NOTICE.txt (original)
+++ jackrabbit/branches/2.0/jackrabbit-jca/src/main/rar/META-INF/NOTICE.txt Wed Jan  6 12:33:16
2010
@@ -1,5 +1,5 @@
 Apache Jackrabbit
-Copyright 2009 The Apache Software Foundation
+Copyright 2010 The Apache Software Foundation
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).

Modified: jackrabbit/branches/2.0/jackrabbit-jcr-commons/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.0/jackrabbit-jcr-commons/pom.xml?rev=896419&r1=896418&r2=896419&view=diff
==============================================================================
--- jackrabbit/branches/2.0/jackrabbit-jcr-commons/pom.xml (original)
+++ jackrabbit/branches/2.0/jackrabbit-jcr-commons/pom.xml Wed Jan  6 12:33:16 2010
@@ -26,11 +26,12 @@
   <parent>
     <groupId>org.apache.jackrabbit</groupId>
     <artifactId>jackrabbit-parent</artifactId>
-    <version>2.0-SNAPSHOT</version>
+    <version>2.0-beta5</version>
     <relativePath>../jackrabbit-parent/pom.xml</relativePath>
   </parent>
   <artifactId>jackrabbit-jcr-commons</artifactId>
   <name>Jackrabbit JCR Commons</name>
+  <version>2.0-beta5-r892254</version>
   <description>General purpose classes for use with the JCR API</description>
   <packaging>bundle</packaging>
 

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=896419&r1=896418&r2=896419&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
Wed Jan  6 12:33:16 2010
@@ -227,6 +227,7 @@
         private final int itemCacheSize;
         private final int pollTimeOut;
         private final Map<?, ?> parameters;
+        private RepositoryService repositoryService;
 
         public RepositoryConfigImpl(RepositoryServiceFactory serviceFactory, Map<?, ?>
parameters)
                 throws RepositoryException {
@@ -252,7 +253,10 @@
         }
 
         public RepositoryService getRepositoryService() throws RepositoryException {
-            return serviceFactory.createRepositoryService(parameters);
+            if (repositoryService == null) {
+                repositoryService = serviceFactory.createRepositoryService(parameters);
+            }
+            return repositoryService;
         }
 
         // -----------------------------------------------------< private >---

Modified: jackrabbit/branches/2.0/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/AbstractJCR2SPITest.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.0/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/AbstractJCR2SPITest.java?rev=896419&r1=896418&r2=896419&view=diff
==============================================================================
--- jackrabbit/branches/2.0/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/AbstractJCR2SPITest.java
(original)
+++ jackrabbit/branches/2.0/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/AbstractJCR2SPITest.java
Wed Jan  6 12:33:16 2010
@@ -99,7 +99,9 @@
             }
 
             @Override
-            protected QNodeDefinition createRootNodeDefinition() throws RepositoryException
{
+            protected QNodeDefinition createRootNodeDefinition(SessionInfo sessionInfo)
+                    throws RepositoryException {
+
                 return AbstractJCR2SPITest.this.createRootNodeDefinition();
             }
 

Modified: jackrabbit/branches/2.0/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/AbstractRepositoryService.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.0/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/AbstractRepositoryService.java?rev=896419&r1=896418&r2=896419&view=diff
==============================================================================
--- jackrabbit/branches/2.0/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/AbstractRepositoryService.java
(original)
+++ jackrabbit/branches/2.0/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/AbstractRepositoryService.java
Wed Jan  6 12:33:16 2010
@@ -223,11 +223,12 @@
 
     /**
      * Create the root node definition.
-     *
+     * @param sessionInfo  the session info.
      * @return the root node definition for a workspace.
      * @throws RepositoryException if an error occurs.
      */
-    protected abstract QNodeDefinition createRootNodeDefinition() throws RepositoryException;
+    protected abstract QNodeDefinition createRootNodeDefinition(SessionInfo sessionInfo)
+            throws RepositoryException;
 
     //---------------------< may be overwritten by subclasses>------------------
 
@@ -425,7 +426,7 @@
         if (nodeId.getUniqueID() == null && nodeId.getPath().denotesRoot()) {
             synchronized (this) {
                 if (rootNodeDefinition == null) {
-                    rootNodeDefinition = createRootNodeDefinition();
+                    rootNodeDefinition = createRootNodeDefinition(sessionInfo);
                 }
                 return rootNodeDefinition;
             }



Mime
View raw message