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 2006/05/26 13:21:25 UTC
svn commit: r409645 -
/jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/core/nodetype/NodeTypeManagerImpl.java
Author: jukka
Date: Fri May 26 04:21:24 2006
New Revision: 409645
URL: http://svn.apache.org/viewvc?rev=409645&view=rev
Log:
1.0: Merged revison 390805: JCR-383
Modified:
jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/core/nodetype/NodeTypeManagerImpl.java
Modified: jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/core/nodetype/NodeTypeManagerImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/core/nodetype/NodeTypeManagerImpl.java?rev=409645&r1=409644&r2=409645&view=diff
==============================================================================
--- jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/core/nodetype/NodeTypeManagerImpl.java (original)
+++ jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/core/nodetype/NodeTypeManagerImpl.java Fri May 26 04:21:24 2006
@@ -21,6 +21,7 @@
import org.apache.jackrabbit.name.QName;
import org.apache.jackrabbit.name.UnknownPrefixException;
import org.apache.jackrabbit.util.IteratorHelper;
+import org.apache.jackrabbit.util.name.NamespaceMapping;
import org.apache.jackrabbit.api.JackrabbitNodeTypeManager;
import org.apache.jackrabbit.core.nodetype.compact.CompactNodeTypeDefReader;
import org.apache.jackrabbit.core.nodetype.compact.ParseException;
@@ -356,8 +357,9 @@
return registerNodeTypes(new InputSource(in));
} else if (contentType.equalsIgnoreCase(
JackrabbitNodeTypeManager.TEXT_X_JCR_CND)) {
+ NamespaceMapping mapping = new NamespaceMapping(nsResolver);
CompactNodeTypeDefReader reader = new CompactNodeTypeDefReader(
- new InputStreamReader(in), "cnd input stream");
+ new InputStreamReader(in), "cnd input stream", mapping);
return registerNodeTypes(reader.getNodeTypeDefs());
} else {
throw new UnsupportedOperationException(