You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by ju...@apache.org on 2008/09/17 14:32:35 UTC
svn commit: r696274 - in /jackrabbit/branches/1.4/jackrabbit-core: ./
RELEASE-NOTES.txt
src/main/java/org/apache/jackrabbit/core/NamespaceRegistryImpl.java
Author: jukka
Date: Wed Sep 17 05:32:34 2008
New Revision: 696274
URL: http://svn.apache.org/viewvc?rev=696274&view=rev
Log:
1.4: Merged revision 678788 (JCR-1687)
Modified:
jackrabbit/branches/1.4/jackrabbit-core/ (props changed)
jackrabbit/branches/1.4/jackrabbit-core/RELEASE-NOTES.txt
jackrabbit/branches/1.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/NamespaceRegistryImpl.java
Propchange: jackrabbit/branches/1.4/jackrabbit-core/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Sep 17 05:32:34 2008
@@ -1 +1 @@
-/jackrabbit/trunk/jackrabbit-core:653417,654078,654514,655917,656240,656655,656664,658583,668147,672125,679389,680135,681031,681287,682409,686688,691181,691550,694164
+/jackrabbit/trunk/jackrabbit-core:653417,654078,654514,655917,656240,656655,656664,658583,668147,672125,678788,679389,680135,681031,681287,682409,686688,691181,691550,694164
Modified: jackrabbit/branches/1.4/jackrabbit-core/RELEASE-NOTES.txt
URL: http://svn.apache.org/viewvc/jackrabbit/branches/1.4/jackrabbit-core/RELEASE-NOTES.txt?rev=696274&r1=696273&r2=696274&view=diff
==============================================================================
--- jackrabbit/branches/1.4/jackrabbit-core/RELEASE-NOTES.txt (original)
+++ jackrabbit/branches/1.4/jackrabbit-core/RELEASE-NOTES.txt Wed Sep 17 05:32:34 2008
@@ -56,6 +56,7 @@
[JCR-1651] Node.addNode(String, String) doesn't prevent use of mixin ...
[JCR-1657] Cluster revision entries should be retrieved in order
[JCR-1664] JNDI Referencable Issues
+ [JCR-1687] NamespaceRegistryImpl.getNameResolver/getPathResolver always ...
[JCR-1701] InfiniteLoop in bundle binding
[JCR-1704] Indexing rules inheritance doesn't work
[JCR-1708] Impossible to import a string containing _x0020_ with ...
Modified: jackrabbit/branches/1.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/NamespaceRegistryImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/1.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/NamespaceRegistryImpl.java?rev=696274&r1=696273&r2=696274&view=diff
==============================================================================
--- jackrabbit/branches/1.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/NamespaceRegistryImpl.java (original)
+++ jackrabbit/branches/1.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/NamespaceRegistryImpl.java Wed Sep 17 05:32:34 2008
@@ -21,8 +21,6 @@
import org.apache.jackrabbit.core.fs.FileSystem;
import org.apache.jackrabbit.core.fs.FileSystemResource;
import org.apache.jackrabbit.spi.commons.namespace.AbstractNamespaceResolver;
-import org.apache.jackrabbit.spi.commons.conversion.NameResolver;
-import org.apache.jackrabbit.spi.commons.conversion.PathResolver;
import org.apache.jackrabbit.spi.Name;
import org.apache.jackrabbit.util.XMLChar;
import org.slf4j.Logger;
@@ -84,10 +82,6 @@
private int lastIndex = 0;
- private NameResolver nameResolver;
-
- private PathResolver pathResolver;
-
private final FileSystem nsRegStore;
/**
@@ -283,14 +277,6 @@
}
}
- public NameResolver getNameResolver() {
- return nameResolver;
- }
-
- public PathResolver getPathResolver() {
- return pathResolver;
- }
-
/**
* Returns a prefix that is unique among the already registered prefixes.
*