You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by re...@apache.org on 2007/10/29 17:21:41 UTC
svn commit: r589720 - in /jackrabbit/trunk/jackrabbit-jcr2spi/src: main/java/org/apache/jackrabbit/jcr2spi/ main/java/org/apache/jackrabbit/jcr2spi/config/ test/java/org/apache/jackrabbit/jcr2spi/

Author: reschke
Date: Mon Oct 29 09:21:40 2007
New Revision: 589720

URL: http://svn.apache.org/viewvc?rev=589720&view=rev
Log:
JCR-1152: parametrize RepositoryConfig.getValueFactory so that a NamePathResolver can be specified (this is an intermediate step towards removing the method).

Modified:
    jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/SessionImpl.java
    jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/config/RepositoryConfig.java
    jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/AbstractRepositoryConfig.java

Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/SessionImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/SessionImpl.java?rev=589720&r1=589719&r2=589720&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/SessionImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/SessionImpl.java Mon Oct 29 09:21:40 2007
@@ -718,7 +718,7 @@
      * @see ManagerProvider#getJcrValueFactory()
      */
     public ValueFactory getJcrValueFactory() throws RepositoryException {
-        return config.getValueFactory();
+        return config.getValueFactory(getNamePathResolver());
     }
 
     //--------------------------------------------------------------------------

Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/config/RepositoryConfig.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/config/RepositoryConfig.java?rev=589720&r1=589719&r2=589720&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/config/RepositoryConfig.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/config/RepositoryConfig.java Mon Oct 29 09:21:40 2007
@@ -16,6 +16,7 @@
  */
 package org.apache.jackrabbit.jcr2spi.config;
 
+import org.apache.jackrabbit.conversion.NamePathResolver;
 import org.apache.jackrabbit.spi.RepositoryService;
 
 import javax.jcr.RepositoryException;
@@ -33,7 +34,7 @@
 
     public RepositoryService getRepositoryService() throws RepositoryException;
 
-    public ValueFactory getValueFactory() throws RepositoryException;
+    public ValueFactory getValueFactory(NamePathResolver resolver) throws RepositoryException;
 
     public String getDefaultWorkspaceName();
 

Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/AbstractRepositoryConfig.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/AbstractRepositoryConfig.java?rev=589720&r1=589719&r2=589720&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/AbstractRepositoryConfig.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/AbstractRepositoryConfig.java Mon Oct 29 09:21:40 2007
@@ -18,6 +18,7 @@
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.apache.jackrabbit.conversion.NamePathResolver;
 import org.apache.jackrabbit.jcr2spi.config.RepositoryConfig;
 import org.apache.jackrabbit.jcr2spi.config.CacheBehaviour;
 import org.apache.jackrabbit.value.ValueFactoryImplEx;
@@ -32,7 +33,7 @@
 
     private static Logger log = LoggerFactory.getLogger(AbstractRepositoryConfig.class);
 
-    public ValueFactory getValueFactory() throws RepositoryException {
+    public ValueFactory getValueFactory(NamePathResolver resolver) throws RepositoryException {
         return ValueFactoryImplEx.getInstance();
     }