- JCR L2 Document View Import

- Move ISO9705 to util

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2020 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

source/java/org/alfresco/repo/search/DocumentNavigator.java

@@ -36,6 +36,7 @@ import org.alfresco.service.namespace.NamespacePrefixResolver;
 import org.alfresco.service.namespace.QName;
 import org.alfresco.service.namespace.QNamePattern;
 import org.alfresco.service.namespace.RegexQNamePattern;
+import org.alfresco.util.ISO9075;
 import org.jaxen.DefaultNavigator;
 import org.jaxen.JaxenException;
 import org.jaxen.UnsupportedAxisException;

source/java/org/alfresco/repo/search/ISO9075.java

@@ -1,226 +0,0 @@
-/*
- * Copyright (C) 2005 Alfresco, Inc.
- *
- * Licensed under the Mozilla Public License version 1.1 
- * with a permitted attribution clause. You may obtain a
- * copy of the License at
- *
- *   http://www.alfresco.org/legal/license.txt
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
- * either express or implied. See the License for the specific
- * language governing permissions and limitations under the
- * License.
- */
-package org.alfresco.repo.search;
-
-import java.util.Collection;
-
-import org.alfresco.service.namespace.NamespaceException;
-import org.alfresco.service.namespace.NamespacePrefixResolver;
-import org.alfresco.service.namespace.NamespaceService;
-import org.alfresco.service.namespace.QName;
-
-import com.sun.org.apache.xerces.internal.util.XMLChar;
-
-/**
- * Support for the ISO 9075 encoding of XML element names.
- * 
- * @author Andy Hind
- */
-public class ISO9075
-{
-    /*
-     * Mask for hex encoding
-     */
-    private static final int MASK = (1 << 4) - 1;
-
-    /*
-     * Digits used string encoding
-     */
-    private static final char[] DIGITS = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e',
-            'f' };
-
-    /**
-     * Private constructor
-     * 
-     */
-    private ISO9075()
-    {
-        super();
-    }
-
-    /**
-     * Encode a string according to ISO 9075
-     * 
-     * @param toEncode
-     * @return
-     */
-    public static String encode(String toEncode)
-    {
-        if ((toEncode == null) || (toEncode.length() == 0))
-        {
-            return toEncode;
-        }
-        else if (XMLChar.isValidName(toEncode) && (toEncode.indexOf("_x") == -1))
-        {
-            return toEncode;
-        }
-        else
-        {
-            StringBuilder builder = new StringBuilder(toEncode.length());
-            for (int i = 0; i < toEncode.length(); i++)
-            {
-                char c = toEncode.charAt(i);
-                // First requires special test
-                if (i == 0)
-                {
-                    if (XMLChar.isNCNameStart(c))
-                    {
-                        // The first character may be the _ at the start of an
-                        // encoding pattern
-                        if (matchesEncodedPattern(toEncode, i))
-                        {
-                            // Encode the first _
-                            encode('_', builder);
-                        }
-                        else
-                        {
-                            // Just append
-                            builder.append(c);
-                        }
-                    }
-                    else
-                    {
-                        // Encode an invalid start character for an XML element
-                        // name.
-                        encode(c, builder);
-                    }
-                }
-                else if (!XMLChar.isNCName(c))
-                {
-                    encode(c, builder);
-                }
-                else
-                {
-                    if (matchesEncodedPattern(toEncode, i))
-                    {
-                        // '_' must be encoded
-                        encode('_', builder);
-                    }
-                    else
-                    {
-                        builder.append(c);
-                    }
-                }
-            }
-            return builder.toString();
-        }
-
-    }
-
-    private static boolean matchesEncodedPattern(String string, int position)
-    {
-        return (string.length() >= position + 6)
-                && (string.charAt(position) == '_') && (string.charAt(position + 1) == 'x')
-                && isHexChar(string.charAt(position + 2)) && isHexChar(string.charAt(position + 3))
-                && isHexChar(string.charAt(position + 4)) && isHexChar(string.charAt(position + 5))
-                && (string.charAt(position + 6) == '_');
-    }
-
-    private static boolean isHexChar(char c)
-    {
-        switch (c)
-        {
-        case '0':
-        case '1':
-        case '2':
-        case '3':
-        case '4':
-        case '5':
-        case '6':
-        case '7':
-        case '8':
-        case '9':
-        case 'a':
-        case 'b':
-        case 'c':
-        case 'd':
-        case 'e':
-        case 'f':
-        case 'A':
-        case 'B':
-        case 'C':
-        case 'D':
-        case 'E':
-        case 'F':
-            return true;
-        default:
-            return false;
-        }
-    }
-
-    public static String decode(String toDecode)
-    {
-        if ((toDecode == null) || (toDecode.length() < 7) || (toDecode.indexOf("_x") < 0))
-        {
-            return toDecode;
-        }
-        StringBuffer decoded = new StringBuffer();
-        for (int i = 0, l = toDecode.length(); i < l; i++)
-        {
-            if (matchesEncodedPattern(toDecode, i))
-            {
-                decoded.append(((char) Integer.parseInt(toDecode.substring(i + 2, i + 6), 16)));
-                i += 6;
-            }
-            else
-            {
-                decoded.append(toDecode.charAt(i));
-            }
-        }
-        return decoded.toString();
-    }
-
-    private static void encode(char c, StringBuilder builder)
-    {
-        char[] buf = new char[] { '_', 'x', '0', '0', '0', '0', '_' };
-        int charPos = 6;
-        do
-        {
-            buf[--charPos] = DIGITS[c & MASK];
-            c >>>= 4;
-        }
-        while (c != 0);
-        builder.append(buf);
-    }
-
-    public static String getXPathName(QName qName, NamespacePrefixResolver nspr)
-    {
-
-        Collection<String> prefixes = nspr.getPrefixes(qName.getNamespaceURI());
-        if (prefixes.size() == 0)
-        {
-            throw new NamespaceException("A namespace prefix is not registered for uri " + qName.getNamespaceURI());
-        }
-        String prefix = prefixes.iterator().next();
-        if (prefix.equals(NamespaceService.DEFAULT_PREFIX))
-        {
-            return ISO9075.encode(qName.getLocalName());
-        }
-        else
-        {
-            return prefix + ":" + ISO9075.encode(qName.getLocalName());
-        }
-
-    }
-
-    public static String getXPathName(QName qName)
-    {
-
-        return "{" + qName.getNamespaceURI() + "}" + ISO9075.encode(qName.getLocalName());
-
-    }
-}

source/java/org/alfresco/repo/search/ISO9075Test.java

@@ -1,73 +0,0 @@
-/*
- * Copyright (C) 2005 Alfresco, Inc.
- *
- * Licensed under the Mozilla Public License version 1.1 
- * with a permitted attribution clause. You may obtain a
- * copy of the License at
- *
- *   http://www.alfresco.org/legal/license.txt
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
- * either express or implied. See the License for the specific
- * language governing permissions and limitations under the
- * License.
- */
-package org.alfresco.repo.search;
-
-import junit.framework.TestCase;
-
-public class ISO9075Test extends TestCase
-{
-
-    public ISO9075Test()
-    {
-        super();
-    }
-
-    public ISO9075Test(String arg0)
-    {
-        super(arg0);
-    }
-
-    public void testEncoding()
-    {
-        assertEquals("MyDocuments", ISO9075.encode("MyDocuments"));
-        assertEquals("My_Documents", ISO9075.encode("My_Documents"));
-        assertEquals("My_x0020_Documents", ISO9075.encode("My Documents"));
-        assertEquals("My_x0020Documents", ISO9075.encode("My_x0020Documents"));
-        assertEquals("My_x005f_x0020_Documents", ISO9075.encode("My_x0020_Documents"));
-        assertEquals("_x005f_x0020_Documents", ISO9075.encode("_x0020_Documents"));
-        assertEquals("_x0040__x005f_x0020_Documents", ISO9075.encode("@_x0020_Documents"));
-        assertEquals("Andy_x0027_s_x0020_Bits_x0020__x0026__x0020_Bobs_x0020__xabcd__x005c_", ISO9075
-                .encode("Andy's Bits & Bobs \uabcd\\"));
-        assertEquals(
-                "_x0020__x0060__x00ac__x00a6__x0021__x0022__x00a3__x0024__x0025__x005e__x0026__x002a__x0028__x0029_-__x003d__x002b__x0009__x000a__x005c__x0000__x005b__x005d__x007b__x007d__x003b__x0027__x0023__x003a__x0040__x007e__x002c_._x002f__x003c__x003e__x003f__x005c__x007c_",
-                ISO9075.encode(" `<60><>!\"<EFBFBD>$%^&*()-_=+\t\n\\\u0000[]{};'#:@~,./<>?\\|"));
-        assertEquals("\u0123_x4567_\u8900_xabcd__xefff__xT65A_", ISO9075.encode("\u0123\u4567\u8900\uabcd\uefff_xT65A_"));
-        
-    }
-
-    public void testDeEncoding()
-    {
-        assertEquals("MyDocuments", ISO9075.decode("MyDocuments"));
-        assertEquals("My_Documents", ISO9075.decode("My_Documents"));
-        assertEquals("My Documents", ISO9075.decode("My_x0020_Documents"));
-        assertEquals("My_x0020Documents", ISO9075.decode("My_x0020Documents"));
-        assertEquals("My_x0020_Documents", ISO9075.decode("My_x005f_x0020_Documents"));
-        assertEquals("_x0020_Documents", ISO9075.decode("_x005f_x0020_Documents"));
-        assertEquals("@_x0020_Documents", ISO9075.decode("_x0040__x005f_x0020_Documents"));
-        assertEquals("Andy's Bits & Bobs \uabcd", ISO9075
-                .decode("Andy_x0027_s_x0020_Bits_x0020__x0026__x0020_Bobs_x0020__xabcd_"));
-        assertEquals("Andy's Bits & Bobs \uabcd\\", ISO9075
-                .decode("Andy_x0027_s_x0020_Bits_x0020__x0026__x0020_Bobs_x0020__xabcd__x005c_"));
-        assertEquals(
-                " `<60><>!\"<EFBFBD>$%^&*()-_=+\t\n\\\u0000[]{};'#:@~,./<>?\\|",
-                ISO9075
-                        .decode("_x0020__x0060__x00ac__x00a6__x0021__x0022__x00a3__x0024__x0025__x005e__x0026__x002a__x0028__x0029_-__x003d__x002b__x0009__x000a__x005c__x0000__x005b__x005d__x007b__x007d__x003b__x0027__x0023__x003a__x0040__x007e__x002c_._x002f__x003c__x003e__x003f__x005c__x007c_"));
-        assertEquals("\u0123\u4567\u8900\uabcd\uefff_xT65A_", ISO9075.decode("\u0123_x4567_\u8900_xabcd__xefff__xT65A_"));
-        System.out.println(" `<60><>!\"<EFBFBD>$%^&*()-_=+\t\n\\\u0000[]{};'#:@~,./<>?\\|\u0123\u4567\u8900\uabcd\uefff_xT65A_");
-    }
-
-}

source/java/org/alfresco/repo/search/NodeServiceXPath.java

@@ -31,6 +31,7 @@ import org.alfresco.service.cmr.search.SearchParameters;
 import org.alfresco.service.namespace.NamespacePrefixResolver;
 import org.alfresco.service.namespace.QName;
 import org.alfresco.service.namespace.QNamePattern;
+import org.alfresco.util.ISO9075;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.jaxen.BaseXPath;

source/java/org/alfresco/repo/search/SearcherComponentTest.java

@@ -41,6 +41,7 @@ import org.alfresco.service.namespace.DynamicNamespacePrefixResolver;
 import org.alfresco.service.namespace.QName;
 import org.alfresco.service.transaction.TransactionService;
 import org.alfresco.util.ApplicationContextHelper;
+import org.alfresco.util.ISO9075;
 import org.springframework.context.ApplicationContext;
 
 /**

source/java/org/alfresco/repo/search/impl/lucene/LuceneCategoryServiceImpl.java

@@ -27,7 +27,6 @@ import java.util.Set;
 
 import org.alfresco.error.AlfrescoRuntimeException;
 import org.alfresco.model.ContentModel;
-import org.alfresco.repo.search.ISO9075;
 import org.alfresco.repo.search.IndexerException;
 import org.alfresco.service.cmr.dictionary.DictionaryService;
 import org.alfresco.service.cmr.repository.ChildAssociationRef;
@@ -40,6 +39,7 @@ import org.alfresco.service.cmr.search.ResultSet;
 import org.alfresco.service.cmr.search.ResultSetRow;
 import org.alfresco.service.namespace.NamespacePrefixResolver;
 import org.alfresco.service.namespace.QName;
+import org.alfresco.util.ISO9075;
 import org.bouncycastle.crypto.paddings.ISO7816d4Padding;
 
 public class LuceneCategoryServiceImpl implements CategoryService

source/java/org/alfresco/repo/search/impl/lucene/LuceneIndexerImpl.java

@@ -38,7 +38,6 @@ import javax.transaction.xa.XAResource;
 
 import org.alfresco.model.ContentModel;
 import org.alfresco.repo.content.MimetypeMap;
-import org.alfresco.repo.search.ISO9075;
 import org.alfresco.repo.search.IndexerException;
 import org.alfresco.repo.search.impl.lucene.fts.FTSIndexerAware;
 import org.alfresco.repo.search.impl.lucene.fts.FullTextSearchIndexer;
@@ -63,6 +62,7 @@ import org.alfresco.service.cmr.repository.datatype.DefaultTypeConverter;
 import org.alfresco.service.cmr.search.ResultSetRow;
 import org.alfresco.service.namespace.QName;
 import org.alfresco.util.EqualsHelper;
+import org.alfresco.util.ISO9075;
 import org.apache.log4j.Logger;
 import org.apache.lucene.document.Document;
 import org.apache.lucene.document.Field;

source/java/org/alfresco/repo/search/impl/lucene/LuceneSearcherImpl.java

@@ -28,7 +28,6 @@ import java.util.Set;
 
 import org.alfresco.repo.search.CannedQueryDef;
 import org.alfresco.repo.search.EmptyResultSet;
-import org.alfresco.repo.search.ISO9075;
 import org.alfresco.repo.search.Indexer;
 import org.alfresco.repo.search.QueryRegisterComponent;
 import org.alfresco.repo.search.SearcherException;
@@ -48,6 +47,7 @@ import org.alfresco.service.cmr.search.SearchParameters;
 import org.alfresco.service.cmr.search.SearchService;
 import org.alfresco.service.namespace.NamespacePrefixResolver;
 import org.alfresco.service.namespace.QName;
+import org.alfresco.util.ISO9075;
 import org.alfresco.util.SearchLanguageConversion;
 import org.apache.lucene.search.Hits;
 import org.apache.lucene.search.Query;

source/java/org/alfresco/repo/search/impl/lucene/LuceneTest.java

@@ -39,7 +39,6 @@ import org.alfresco.model.ContentModel;
 import org.alfresco.repo.dictionary.DictionaryDAO;
 import org.alfresco.repo.dictionary.M2Model;
 import org.alfresco.repo.node.BaseNodeServiceTest;
-import org.alfresco.repo.search.ISO9075;
 import org.alfresco.repo.search.QueryParameterDefImpl;
 import org.alfresco.repo.search.QueryRegisterComponent;
 import org.alfresco.repo.search.impl.lucene.fts.FullTextSearchIndexer;
@@ -72,6 +71,7 @@ import org.alfresco.service.namespace.QName;
 import org.alfresco.service.transaction.TransactionService;
 import org.alfresco.util.ApplicationContextHelper;
 import org.alfresco.util.CachingDateFormat;
+import org.alfresco.util.ISO9075;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.springframework.context.ApplicationContext;