jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ju...@apache.org
Subject svn commit: r544223 - in /jackrabbit/branches/1.3/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/nodetype/compact: CompactNodeTypeDefReader.java CompactNodeTypeDefWriter.java
Date Mon, 04 Jun 2007 19:55:02 GMT
Author: jukka
Date: Mon Jun  4 12:55:00 2007
New Revision: 544223

URL: http://svn.apache.org/viewvc?view=rev&rev=544223
Log:
1.3: Merged revision 534843 (JCR-895)

Modified:
    jackrabbit/branches/1.3/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/nodetype/compact/CompactNodeTypeDefReader.java
    jackrabbit/branches/1.3/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/nodetype/compact/CompactNodeTypeDefWriter.java

Modified: jackrabbit/branches/1.3/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/nodetype/compact/CompactNodeTypeDefReader.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/1.3/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/nodetype/compact/CompactNodeTypeDefReader.java?view=diff&rev=544223&r1=544222&r2=544223
==============================================================================
--- jackrabbit/branches/1.3/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/nodetype/compact/CompactNodeTypeDefReader.java
(original)
+++ jackrabbit/branches/1.3/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/nodetype/compact/CompactNodeTypeDefReader.java
Mon Jun  4 12:55:00 2007
@@ -30,6 +30,7 @@
 import org.apache.jackrabbit.name.QName;
 import org.apache.jackrabbit.name.NameFormat;
 import org.apache.jackrabbit.util.name.NamespaceMapping;
+import org.apache.jackrabbit.util.ISO9075;
 import org.apache.jackrabbit.value.ValueHelper;
 import org.apache.jackrabbit.value.ValueFactoryImpl;
 
@@ -632,7 +633,7 @@
      */
     private QName toQName(String stringName) throws ParseException {
         try {
-            return NameFormat.parse(stringName, nsMapping);
+            return ISO9075.decode(NameFormat.parse(stringName, nsMapping));
         } catch (NameException e) {
             lexer.fail("Error while parsing '" + stringName + "'", e);
             return null;

Modified: jackrabbit/branches/1.3/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/nodetype/compact/CompactNodeTypeDefWriter.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/1.3/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/nodetype/compact/CompactNodeTypeDefWriter.java?view=diff&rev=544223&r1=544222&r2=544223
==============================================================================
--- jackrabbit/branches/1.3/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/nodetype/compact/CompactNodeTypeDefWriter.java
(original)
+++ jackrabbit/branches/1.3/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/nodetype/compact/CompactNodeTypeDefWriter.java
Mon Jun  4 12:55:00 2007
@@ -35,6 +35,7 @@
 import org.apache.jackrabbit.core.value.InternalValue;
 import org.apache.jackrabbit.name.NamespaceResolver;
 import org.apache.jackrabbit.name.QName;
+import org.apache.jackrabbit.util.ISO9075;
 
 /**
  * Prints node type defs in a compact notation
@@ -378,7 +379,7 @@
                 prefix += ":";
             }
 
-            String resolvedName = prefix + qname.getLocalName();
+            String resolvedName = prefix + ISO9075.encode(qname).getLocalName();
 
             // check for '-' and '+'
             if (resolvedName.indexOf('-') >= 0 || resolvedName.indexOf('+') >= 0) {



Mime
View raw message