abdera-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jmsn...@apache.org
Subject svn commit: r518464 [6/6] - in /incubator/abdera/java/trunk: build/ client/src/main/java/org/apache/abdera/protocol/client/ client/src/test/java/org/apache/abdera/test/client/app/ core/src/main/java/org/apache/abdera/ core/src/main/java/org/apache/abde...
Date Thu, 15 Mar 2007 04:00:35 GMT
Added: incubator/abdera/java/trunk/dependencies/g14n/src/main/resources/org/apache/abdera/g14n/unicode/data/ucd.res
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/dependencies/g14n/src/main/resources/org/apache/abdera/g14n/unicode/data/ucd.res?view=auto&rev=518464
==============================================================================
Binary file - no diff available.

Propchange: incubator/abdera/java/trunk/dependencies/g14n/src/main/resources/org/apache/abdera/g14n/unicode/data/ucd.res
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/abdera/java/trunk/dependencies/g14n/src/test/java/org/apache/abdera/g14n/test/iri/TestBase.java
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/dependencies/g14n/src/test/java/org/apache/abdera/g14n/test/iri/TestBase.java?view=auto&rev=518464
==============================================================================
--- incubator/abdera/java/trunk/dependencies/g14n/src/test/java/org/apache/abdera/g14n/test/iri/TestBase.java (added)
+++ incubator/abdera/java/trunk/dependencies/g14n/src/test/java/org/apache/abdera/g14n/test/iri/TestBase.java Wed Mar 14 21:00:29 2007
@@ -0,0 +1,35 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  The ASF licenses this file to You
+* under the Apache License, Version 2.0 (the "License"); you may not
+* use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+*     http://www.apache.org/licenses/LICENSE-2.0
+*
+* 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.  For additional information regarding
+* copyright in this work, please see the NOTICE file in the top level
+* directory of this distribution.
+*/
+package org.apache.abdera.g14n.test.iri;
+
+import junit.framework.TestCase;
+
+public abstract class TestBase extends TestCase {
+
+  protected static String string(int... chars) {
+    try {
+      byte[] b = new byte[chars.length];
+      for (int n = 0; n < chars.length; n++) b[n] = (byte)chars[n];
+      return new String(b,"utf-8");
+    } catch (Exception e ) {
+      e.printStackTrace();
+    }
+    return null;
+  }
+  
+}

Added: incubator/abdera/java/trunk/dependencies/g14n/src/test/java/org/apache/abdera/g14n/test/iri/TestIDNA.java
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/dependencies/g14n/src/test/java/org/apache/abdera/g14n/test/iri/TestIDNA.java?view=auto&rev=518464
==============================================================================
--- incubator/abdera/java/trunk/dependencies/g14n/src/test/java/org/apache/abdera/g14n/test/iri/TestIDNA.java (added)
+++ incubator/abdera/java/trunk/dependencies/g14n/src/test/java/org/apache/abdera/g14n/test/iri/TestIDNA.java Wed Mar 14 21:00:29 2007
@@ -0,0 +1,44 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  The ASF licenses this file to You
+* under the Apache License, Version 2.0 (the "License"); you may not
+* use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+*     http://www.apache.org/licenses/LICENSE-2.0
+*
+* 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.  For additional information regarding
+* copyright in this work, please see the NOTICE file in the top level
+* directory of this distribution.
+*/
+package org.apache.abdera.g14n.test.iri;
+
+import org.apache.abdera.g14n.test.iri.TestBase;
+import org.apache.abdera.g14n.test.iri.TestPunycode;
+import org.apache.abdera.g14n.iri.IDNA;
+
+public class TestIDNA extends TestBase {
+
+  public static void testPunycode() throws Exception {
+    
+    for (TestPunycode.Test test: TestPunycode.Test.values()) {
+      
+      String out = IDNA.toASCII(test.in);
+      String in = IDNA.toUnicode(out);
+      
+      if (test == TestPunycode.Test.H || test == TestPunycode.Test.S) {
+        assertFalse(out.equalsIgnoreCase("xn--" + test.out));
+      } else {
+        assertTrue(out.equalsIgnoreCase("xn--" + test.out));
+        assertTrue(in.equalsIgnoreCase(test.in));
+      }
+
+    }
+    
+  }
+  
+}

Added: incubator/abdera/java/trunk/dependencies/g14n/src/test/java/org/apache/abdera/g14n/test/iri/TestIRI.java
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/dependencies/g14n/src/test/java/org/apache/abdera/g14n/test/iri/TestIRI.java?view=auto&rev=518464
==============================================================================
--- incubator/abdera/java/trunk/dependencies/g14n/src/test/java/org/apache/abdera/g14n/test/iri/TestIRI.java (added)
+++ incubator/abdera/java/trunk/dependencies/g14n/src/test/java/org/apache/abdera/g14n/test/iri/TestIRI.java Wed Mar 14 21:00:29 2007
@@ -0,0 +1,205 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  The ASF licenses this file to You
+* under the Apache License, Version 2.0 (the "License"); you may not
+* use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+*     http://www.apache.org/licenses/LICENSE-2.0
+*
+* 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.  For additional information regarding
+* copyright in this work, please see the NOTICE file in the top level
+* directory of this distribution.
+*/
+package org.apache.abdera.g14n.test.iri;
+
+import java.net.URI;
+
+import org.apache.abdera.g14n.iri.IRI;
+import org.apache.abdera.g14n.unicode.Normalizer;
+
+
+import junit.framework.TestCase;
+
+public class TestIRI extends TestCase {
+
+  public static void testSimple() throws Exception {
+    IRI iri = new IRI("http://validator.w3.org/check?uri=http%3A%2F%2Fr\u00E9sum\u00E9.example.org");
+    assertEquals(iri.toString(),"http://validator.w3.org/check?uri=http%3A%2F%2Fr\u00E9sum\u00E9.example.org");
+    assertEquals(iri.toURI().toString(),"http://validator.w3.org/check?uri=http://r%C3%A9sum%C3%A9.example.org");   
+  }
+
+  public static void testSimple2() throws Exception {
+    IRI iri = new IRI("http://www.example.org/red%09ros\u00E9#red");
+    assertEquals(iri.toURI().toString(),"http://www.example.org/red%09ros%C3%A9#red");
+  }
+  
+  
+  public static void testNotSoSimple() throws Exception {
+    IRI iri = new IRI("http://example.com/\uD800\uDF00\uD800\uDF01\uD800\uDF02");
+    assertEquals(iri.toURI().toString(),"http://example.com/%F0%90%8C%80%F0%90%8C%81%F0%90%8C%82");
+  }
+    
+  public static void testURItoIRI() throws Exception {
+    URI uri = new URI("http://www.example.org/D%C3%BCrst");
+    IRI iri = new IRI(uri);
+    assertEquals(iri.toString(),"http://www.example.org/D\u00FCrst");
+  }
+  
+  public static void testURItoIRI2() throws Exception {
+    URI uri = new URI("http://www.example.org/D%FCrst");
+    IRI iri = new IRI(uri, "windows-1252");
+    assertEquals(iri.toString(),"http://www.example.org/D\u00FCrst");
+  }
+
+  public static void testURItoIRI3() throws Exception {
+    URI uri = new URI("http://xn--99zt52a.example.org/%e2%80%ae");
+    IRI iri = new IRI(uri);
+    assertEquals(iri.toString(),"http://xn--99zt52a.example.org/%E2%80%AE");
+  }
+
+  public static void testIRItoURI() throws Exception {
+    IRI iri = new IRI("http://\u7D0D\u8C46.example.org/%E2%80%AE");
+    URI uri = iri.toURI();
+    assertEquals(uri.toString(),"http://xn--99zt52a.example.org/%E2%80%AE");
+  }
+  
+
+  public static void testComparison() throws Exception {
+    IRI iri1 = new IRI("http://www.example.org/");
+    IRI iri2 = new IRI("http://www.example.org/..");
+    IRI iri3 = new IRI("http://www.Example.org:80");
+    
+    assertFalse(iri1.equals(iri2)); // false
+    assertFalse(iri1.equals(iri3)); // false
+    assertFalse(iri2.equals(iri1)); // false
+    assertFalse(iri2.equals(iri3)); // false
+    assertFalse(iri3.equals(iri1)); // false
+    assertFalse(iri3.equals(iri2)); // false
+    
+    
+    assertTrue(iri1.normalize().equals(iri2.normalize()));
+    assertTrue(iri1.normalize().equals(iri3.normalize()));
+    assertTrue(iri2.normalize().equals(iri1.normalize()));
+    assertTrue(iri2.normalize().equals(iri3.normalize()));
+    assertTrue(iri3.normalize().equals(iri1.normalize()));
+    assertTrue(iri3.normalize().equals(iri2.normalize()));
+    
+    assertTrue(iri1.equivalent(iri2));
+    assertTrue(iri1.equivalent(iri3));
+    assertTrue(iri2.equivalent(iri1));
+    assertTrue(iri2.equivalent(iri3));
+    assertTrue(iri3.equivalent(iri1));
+    assertTrue(iri3.equivalent(iri2));
+  }
+  
+  
+  public static void testUCN() throws Exception {
+    IRI iri1 = new IRI("http://www.example.org/r\u00E9sum\u00E9.html");
+    IRI iri2 = new IRI("http://www.example.org/re\u0301sume\u0301.html", Normalizer.Form.C);
+    assertEquals(iri1,iri2);
+  }
+  
+  public static void testPercent() throws Exception {
+      IRI iri1 = new IRI("http://example.org/~user");
+      IRI iri2 = new IRI("http://example.org/%7euser");
+      IRI iri3 = new IRI("http://example.org/%7Euser");
+      assertTrue(iri1.normalize().equals(iri2.normalize()));
+      assertTrue(iri1.normalize().equals(iri3.normalize()));
+  }
+  
+  public static void testIDN() throws Exception {
+    IRI iri1 = new IRI("http://r\u00E9sum\u00E9.example.org");
+    IRI iri2 = new IRI("http://xn--rsum-bpad.example.org");
+    assertTrue(iri1.equivalent(iri2));
+  }
+  
+  public static void testRelative() throws Exception{
+    IRI base = new IRI("http://example.org/foo/");
+    
+    assertEquals(base.resolve("/").toString(),"http://example.org/");
+    assertEquals(base.resolve("/test").toString(),"http://example.org/test");
+    assertEquals(base.resolve("test").toString(),"http://example.org/foo/test");
+    assertEquals(base.resolve("../test").toString(),"http://example.org/test");
+    assertEquals(base.resolve("./test").toString(),"http://example.org/foo/test");
+    assertEquals(base.resolve("test/test/../../").toString(),"http://example.org/foo/");
+    assertEquals(base.resolve("?test").toString(),"http://example.org/foo/?test");
+    assertEquals(base.resolve("#test").toString(),"http://example.org/foo/#test");
+    assertEquals(base.resolve(".").toString(),"http://example.org/foo/");
+  }
+
+  /**
+   * Try a variety of URI schemes.  If any problematic schemes pop up, 
+   * we should add a test for 'em here
+   */
+  public static void testSchemes() throws Exception {
+    
+    IRI iri = new IRI("http://a:b@c.org:80/d/e?f#g");
+    assertEquals(iri.getScheme(), "http");
+    assertEquals(iri.getUserInfo(), "a:b");
+    assertEquals(iri.getHost(),"c.org");
+    assertEquals(iri.getPort(),80);
+    assertEquals(iri.getPath(),"/d/e");
+    assertEquals(iri.getQuery(), "f");
+    assertEquals(iri.getFragment(),"g");
+    
+    iri = new IRI("https://a:b@c.org:80/d/e?f#g");
+    assertEquals(iri.getScheme(), "https");
+    assertEquals(iri.getUserInfo(), "a:b");
+    assertEquals(iri.getHost(),"c.org");
+    assertEquals(iri.getPort(),80);
+    assertEquals(iri.getPath(),"/d/e");
+    assertEquals(iri.getQuery(), "f");
+    assertEquals(iri.getFragment(),"g");
+    
+    iri = new IRI("ftp://a:b@c.org:80/d/e?f#g");
+    assertEquals(iri.getScheme(), "ftp");
+    assertEquals(iri.getUserInfo(), "a:b");
+    assertEquals(iri.getHost(),"c.org");
+    assertEquals(iri.getPort(),80);
+    assertEquals(iri.getPath(),"/d/e");
+    assertEquals(iri.getQuery(), "f");
+    assertEquals(iri.getFragment(),"g");
+    
+    iri = new IRI("mailto:joe@example.org?subject=foo");
+    assertEquals(iri.getScheme(), "mailto");
+    assertEquals(iri.getUserInfo(), null);
+    assertEquals(iri.getHost(),null);
+    assertEquals(iri.getPort(),-1);
+    assertEquals(iri.getPath(),"joe@example.org");
+    assertEquals(iri.getQuery(), "subject=foo");
+    assertEquals(iri.getFragment(),null);
+    
+    iri = new IRI("tag:example.org,2006:foo");
+    assertEquals(iri.getScheme(), "tag");
+    assertEquals(iri.getUserInfo(), null);
+    assertEquals(iri.getHost(),null);
+    assertEquals(iri.getPort(),-1);
+    assertEquals(iri.getPath(),"example.org,2006:foo");
+    assertEquals(iri.getQuery(), null);
+    assertEquals(iri.getFragment(),null);
+    
+    iri = new IRI("urn:lsid:ibm.com:example:82437234964354895798234d");
+    assertEquals(iri.getScheme(), "urn");
+    assertEquals(iri.getUserInfo(), null);
+    assertEquals(iri.getHost(),null);
+    assertEquals(iri.getPort(),-1);
+    assertEquals(iri.getPath(),"lsid:ibm.com:example:82437234964354895798234d");
+    assertEquals(iri.getQuery(), null);
+    assertEquals(iri.getFragment(),null);
+    
+    iri = new IRI("data:image/gif;base64,R0lGODdhMAAwAPAAAAAAAP");
+    assertEquals(iri.getScheme(), "data");
+    assertEquals(iri.getUserInfo(), null);
+    assertEquals(iri.getHost(),null);
+    assertEquals(iri.getPort(),-1);
+    assertEquals(iri.getPath(),"image/gif;base64,R0lGODdhMAAwAPAAAAAAAP");
+    assertEquals(iri.getQuery(), null);
+    assertEquals(iri.getFragment(),null);
+    
+  }
+}

Added: incubator/abdera/java/trunk/dependencies/g14n/src/test/java/org/apache/abdera/g14n/test/iri/TestLang.java
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/dependencies/g14n/src/test/java/org/apache/abdera/g14n/test/iri/TestLang.java?view=auto&rev=518464
==============================================================================
--- incubator/abdera/java/trunk/dependencies/g14n/src/test/java/org/apache/abdera/g14n/test/iri/TestLang.java (added)
+++ incubator/abdera/java/trunk/dependencies/g14n/src/test/java/org/apache/abdera/g14n/test/iri/TestLang.java Wed Mar 14 21:00:29 2007
@@ -0,0 +1,61 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  The ASF licenses this file to You
+* under the Apache License, Version 2.0 (the "License"); you may not
+* use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+*     http://www.apache.org/licenses/LICENSE-2.0
+*
+* 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.  For additional information regarding
+* copyright in this work, please see the NOTICE file in the top level
+* directory of this distribution.
+*/
+package org.apache.abdera.g14n.test.iri;
+
+import java.util.Locale;
+import org.apache.abdera.g14n.lang.InvalidLangTagSyntax;
+import org.apache.abdera.g14n.lang.Lang;
+
+import junit.framework.TestCase;
+
+public class TestLang extends TestCase {
+
+  public static void testLang() throws Exception {
+    
+    Lang lang = new Lang("en-US-ca");
+    Locale testLocale = new Locale("en", "US", "ca");
+        
+    assertEquals(lang.getPrimary(),"en");
+    assertEquals(lang.getSubtag(0),"US");
+    assertEquals(lang.getSubtag(1),"ca");
+    
+    assertEquals( testLocale, lang.getLocale() );
+    assertEquals(testLocale.toString(), lang.getLocale().toString());
+    assertEquals(testLocale.getDisplayCountry(), lang.getLocale().getDisplayCountry());
+    assertEquals(testLocale.getDisplayLanguage(), lang.getLocale().getDisplayLanguage());
+    assertEquals( testLocale.getDisplayVariant(), lang.getLocale().getDisplayVariant());
+    assertTrue(lang.matches("*"));
+    assertTrue(lang.matches("en"));
+    assertTrue(lang.matches("EN"));
+    assertTrue(lang.matches("en-US"));
+    assertTrue(lang.matches("en-us"));
+    assertTrue(lang.matches("en-US-ca"));
+    assertTrue(lang.matches("en-us-ca"));
+    assertFalse(lang.matches("en-US-ca-bob"));
+    assertFalse(lang.matches("en-US-fr"));
+    
+    Exception e = null;
+    try {
+      lang = new Lang("en_US");
+    } catch (InvalidLangTagSyntax ex) {
+      e = ex;
+    }
+    assertNotNull(e);
+  }
+  
+}

Added: incubator/abdera/java/trunk/dependencies/g14n/src/test/java/org/apache/abdera/g14n/test/iri/TestNFKC.java
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/dependencies/g14n/src/test/java/org/apache/abdera/g14n/test/iri/TestNFKC.java?view=auto&rev=518464
==============================================================================
--- incubator/abdera/java/trunk/dependencies/g14n/src/test/java/org/apache/abdera/g14n/test/iri/TestNFKC.java (added)
+++ incubator/abdera/java/trunk/dependencies/g14n/src/test/java/org/apache/abdera/g14n/test/iri/TestNFKC.java Wed Mar 14 21:00:29 2007
@@ -0,0 +1,39 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  The ASF licenses this file to You
+* under the Apache License, Version 2.0 (the "License"); you may not
+* use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+*     http://www.apache.org/licenses/LICENSE-2.0
+*
+* 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.  For additional information regarding
+* copyright in this work, please see the NOTICE file in the top level
+* directory of this distribution.
+*/
+package org.apache.abdera.g14n.test.iri;
+
+import org.apache.abdera.g14n.test.iri.TestBase;
+import org.apache.abdera.g14n.unicode.Normalizer;
+
+public class TestNFKC extends TestBase {
+
+  public static void testNFKC() throws Exception {
+    
+    // "\xC2\xB5", "\xCE\xBC"
+    String s1 = Normalizer.normalize(string(0xC2,0xB5)).toString();
+    String s2 = string(0xCE,0xBC);
+    assertEquals(s1,s2);
+    
+    // "\xC2\xAA", "\x61"
+    s1 = Normalizer.normalize(string(0xC2,0xAA)).toString();
+    s2 = string(0x61);
+    assertEquals(s1,s2);
+    
+  }
+  
+}

Added: incubator/abdera/java/trunk/dependencies/g14n/src/test/java/org/apache/abdera/g14n/test/iri/TestNameprep.java
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/dependencies/g14n/src/test/java/org/apache/abdera/g14n/test/iri/TestNameprep.java?view=auto&rev=518464
==============================================================================
--- incubator/abdera/java/trunk/dependencies/g14n/src/test/java/org/apache/abdera/g14n/test/iri/TestNameprep.java (added)
+++ incubator/abdera/java/trunk/dependencies/g14n/src/test/java/org/apache/abdera/g14n/test/iri/TestNameprep.java Wed Mar 14 21:00:29 2007
@@ -0,0 +1,163 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  The ASF licenses this file to You
+* under the Apache License, Version 2.0 (the "License"); you may not
+* use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+*     http://www.apache.org/licenses/LICENSE-2.0
+*
+* 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.  For additional information regarding
+* copyright in this work, please see the NOTICE file in the top level
+* directory of this distribution.
+*/
+package org.apache.abdera.g14n.test.iri;
+
+import org.apache.abdera.g14n.test.iri.TestBase;
+import org.apache.abdera.g14n.io.CharUtils;
+import org.apache.abdera.g14n.iri.Nameprep;
+
+
+public class TestNameprep extends TestBase {
+  
+  enum Test {
+    
+    A("Map to nothing",
+      string('f','o','o',0xC2,0xAD,0xCD,0x8F,0xE1,0xA0,0x86,0xE1,0xA0,0x8B,'b',
+          'a','r',0xE2,0x80,0x8B,0xE2,0x81,0xA0,'b','a','z',0xEF,0xB8,0x80,0xEF,
+          0xB8,0x88,0xEF,0xB8,0x8F,0xEF,0xBB,0xBF),
+      "foobarbaz"),
+    B("Case folding ASCII U+0043 U+0041 U+0046 U+0045", 
+      "CAFE", 
+      "cafe"),
+    C("Case folding 8bit U+00DF (german sharp s)", 
+      string(0xC3,0x9F), 
+      "ss"),
+    D("Case folding U+0130 (turkish capital I with dot)",
+      string(0xC4,0xB0), 
+      string('i',0xCC,0x87)),
+    E("Case folding multibyte U+0143 U+037A",
+      string(0xC5,0x83,0xCD,0xBA),
+      string(0xC5,0x84,0x20,0xCE,0xB9)),
+    F("Case folding U+2121 U+33C6 U+1D7BB",
+      string(0xE2,0x84,0xA1,0xE3,0x8F,0x86,0xF0,0x9D,0x9E,0xBB),
+      string('t','e','l','c',0xE2,0x88,0x95,'k','g',0xCF,0x83)),
+    G("Normalization of U+006a U+030c U+00A0 U+00AA",
+      string(0x6A,0xCC,0x8C,0xC2,0xA0,0xC2,0xAA),
+      string(0xC7,0xB0,'a')),
+    H("Case folding U+1FB7 and normalization",
+      string(0xE1,0xBE,0xB7),
+      string(0xE1,0xBE,0xB6,0xCE,0xB9)),      
+    I("Self-reverting case folding U+01F0 and normalization",
+      string(0xC7,0xB0),
+      string(0xC7,0xB0)),
+    J("Self-reverting case folding U+0390 and normalization",
+      string(0xCE,0x90),
+      string(0xCE,0x90)),
+    K("Self-reverting case folding U+03B0 and normalization",
+      string(0xCE,0xB0),
+      string(0xCE,0xB0)),
+    L("Self-reverting case folding U+1E96 and normalization",
+      string(0xE1,0xBA,0x96),
+      string(0xE1,0xBA,0x96)),
+    M("Self-reverting case folding U+1F56 and normalization",
+      string(0xE1,0xBD,0x96),
+      string(0xE1,0xBD,0x96)),
+    N("ASCII space character U+0020", "\u0020" , "\u0020"),
+    O("Non-ASCII 8bit space character U+00A0", "\u00A0", ""),
+    P("Non-ASCII multibyte space character U+1680", "\u1680", null, false, -1),
+    Q("Non-ASCII multibyte space character U+2000", "\u2000", "\u0020", false, -1),
+    R("Zero Width Space U+200b", "\u200B", ""),
+    S("Non-ASCII multibyte space character U+3000", "\u3000", "\u0020",false,-1),
+    T("ASCII control characters U+0010 U+007F","\u0010\u007F","\u0010\u007F"),
+    U("Non-ASCII 8bit control character U+0085", "\u0085", null, false, -1),
+    V("Non-ASCII multibyte control character U+180E", "\u180E", null, false, -1),
+    W("Zero Width No-Break Space U+FEFF","\uFEFF",""),
+    X("Non-ASCII control character U+1D175",
+      new String(new char[] {
+         CharUtils.getHighSurrogate(0x1D175),
+         CharUtils.getLowSurrogate(0x1D175)}),
+         null,false,-1),    
+    Y("Plane 0 private use character U+F123", "\uF123", null, false, -1),
+    Z("Plane 15 private use character U+F1234", string(0xF3,0xB1,0x88,0xB4), null, false, -1),
+   AA("Plane 16 private use character U+10F234", string(0xF4,0x8F,0x88,0xB4), null, false, -1),
+   AB("Non-character code point U+8FFFE", string(0xF2,0x8F,0x8F,0xBE), null, false, -1),
+   AC("Non-character code point U+10FFFF", string(0xF4,0x8F,0x8F,0x8F), null, false, -1),
+   AD("Surrogate code U+DF42",string(0xED,0xBD,0x82),null,false,-1),  
+   AE("Non-plain text character U+FFFD", string(0xEF,0xBF,0xBD), null, false, -1),
+   AF("Ideographic description character U+2FF5", string(0xE2,0xBF,0xB5), null, false, -1),
+   AG("Display property character U+0341", string(0xCD,0x81), string(0xCC,0x81), false, -1),
+   AH("Left-to-right mark U+200E",string(0xE2,0x80,0x8E),null,false, -1),
+   AI("Deprecated U+202A", string(0xE2,0x80,0xAA), null, false, -1),
+   AJ("Language tagging character U+E0001", string(0xF3,0xA0,0x80,0x81), null, false, -1),
+   AK("Language tagging character U+E0042", string(0xF3,0xA0,0x81,0x82), null, false, -1),
+   AL("Bidi: RandALCat character U+05BE and LCat characters", string('f','o','o',0xD6,0xBE), null, false, -1),
+   AM("Bidi: RandALCat character U+FD50 and LCat characters", string('f','o','o',0xEF,0xB5,0x90), null, false, -1),
+   AN("Bidi: RandALCat character U+FB38 and LCat characters", string('f','o','o',0xEF,0xB9,0xB6), null, false, -1),
+   AO("Bidi: RandALCat without trailing RandALCat U+0627 U+0031", string(0xD8,0xA7,0x31), null, false, -1),
+   AP("Bidi: RandALCat character U+0627 U+0031 U+0628", string(0xD8,0xA7,0x31,0xD8,0xA8), string(0xD8,0xA7,0x31,0xD8,0xA8)),
+   AQ("Unassigned code point U+E0002",string(0xF3,0xA0,0x80,0x82),null,true,-1),
+// AR("Larger test (shrinking)",                                                                                           //      {"Larger test (shrinking)","X\xC2\xAD\xC3\x9F\xC4\xB0\xE2\x84\xA1\x6a\xcc\x8c\xc2\xa0\xc2""\xaa\xce\xb0\xe2\x80\x80", "xssi\xcc\x87" "tel\xc7\xb0 a\xce\xb0 ","Nameprep"}, 
+//  string('X',0xC2,0xAD,0xC3,0x9F,0xC4,0xB0,0xE2,0x84,0xA1,0x6a,0xc,'c',0x8c,0xc2,0xa0,0xc2),
+//  string('x','s','s','i',0xcc,0x87,'t','e','l',0xc7,0xb0,'a',0xce,0xb0), false, 0),
+   AS("Larger test (expanding)",
+      string('X',0xC3,0x9F,0xe3,0x8c,0x96,0xC4,0xB0,0xE2,0x84,0xA1,0xE2,0x92,0x9F,0xE3,0x8c,0x80),
+      string('x','s','s',0xE3,0x82,0xAD,0xE3,0x83,0xAD,0xE3,0x83,0xA1,0xE3,0x83,0xBC,0xE3,0x83,0x88,0xE3,0x83,0xAB,'i',0xCC,0x87,'t','e','l',0x28,'d',0x29,0xE3,0x82,0xA2,0xE3,0x83,0x91,0xE3,0x83,0xBC,0xE3,0x83,0x88)),
+   AT("Case map + normalization", string(0xC2,0xB5), string(0xCE,0xBC)),
+   AU("NFKC test", string(0xC2,0xAA), string(0x61)),
+   AV("nameprep, exposed a bug in libstringprep 0.0.5",
+      string(0xC2,0xAA,0x0A), string(0x61,0x0A)),
+   AW("unassigned code point U+0221", "\u0221", "\u0221", true, 0),
+   AX("unassigned code point U+0221", "\u0221", "\u0221", false, -1),
+   AY("Unassigned code point U+0236", "\u0236", "\u0236", true, 0),
+   AZ("unassigned code point U+0236", "\u0236", "\u0236", false, -1),
+   BA("bidi both RandALCat and LCat  U+0627 U+00AA U+0628",
+      string(0xD8,0xA7,0xC2,0xAA,0xD8,0xA8), null, false, -1);
+    
+    String comment;
+    String in;
+    String out;
+    boolean allowunassigned = true;
+    int rc;
+    
+    Test(
+      String comment, 
+      String in, 
+      String out) {
+      this.comment = comment;
+      this.in = in;
+      this.out = out;
+    }
+    
+    Test(
+      String comment, 
+      String in, 
+      String out, 
+      boolean allowunassigned,
+      int rc) {
+      this.comment = comment;
+      this.in = in;
+      this.out = out;
+      this.allowunassigned = allowunassigned;
+      this.rc = rc;
+    }
+    
+  }
+  
+  public static void testNameprep() throws Exception {
+    for (Test test : Test.values()) {
+      try {
+        String out = Nameprep.prep(test.in,test.allowunassigned);
+        assertEquals(test.out,out);
+      } catch (Exception e) {
+        if (test.rc != -1)
+          fail("Failure in Test #" + test + " not expected");
+      }
+    }
+  }
+    
+}

Added: incubator/abdera/java/trunk/dependencies/g14n/src/test/java/org/apache/abdera/g14n/test/iri/TestPunycode.java
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/dependencies/g14n/src/test/java/org/apache/abdera/g14n/test/iri/TestPunycode.java?view=auto&rev=518464
==============================================================================
--- incubator/abdera/java/trunk/dependencies/g14n/src/test/java/org/apache/abdera/g14n/test/iri/TestPunycode.java (added)
+++ incubator/abdera/java/trunk/dependencies/g14n/src/test/java/org/apache/abdera/g14n/test/iri/TestPunycode.java Wed Mar 14 21:00:29 2007
@@ -0,0 +1,73 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  The ASF licenses this file to You
+* under the Apache License, Version 2.0 (the "License"); you may not
+* use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+*     http://www.apache.org/licenses/LICENSE-2.0
+*
+* 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.  For additional information regarding
+* copyright in this work, please see the NOTICE file in the top level
+* directory of this distribution.
+*/
+package org.apache.abdera.g14n.test.iri;
+
+import org.apache.abdera.g14n.test.iri.TestBase;
+import org.apache.abdera.g14n.iri.Punycode;
+
+public class TestPunycode extends TestBase {
+
+  enum Test {
+    A("Arabic (Egyption)","\u0644\u064A\u0647\u0645\u0627\u0628\u062A\u0643\u0644\u0645\u0648\u0634\u0639\u0631\u0628\u064A\u061F","egbpdaj6bu4bxfgehfvwxn"),
+    B("Chinese (simplified)","\u4ED6\u4EEC\u4E3A\u4EC0\u4E48\u4E0D\u8BF4\u4E2D\u6587","ihqwcrb4cv8a8dqg056pqjye"),
+    C("Chinese (traditional)","\u4ED6\u5011\u7232\u4EC0\u9EBD\u4E0D\u8AAA\u4E2D\u6587", "ihqwctvzc91f659drss3x8bo0yb"),
+    D("Czech: Pro<ccaron>prost<ecaron>nemluv<iacute><ccaron>esky", "\u0050\u0072\u006F\u010D\u0070\u0072\u006F\u0073\u0074\u011B\u006E\u0065\u006D\u006C\u0075\u0076\u00ED\u010D\u0065\u0073\u006B\u0079","Proprostnemluvesky-uyb24dma41a"),
+    E("Hebrew","\u05DC\u05DE\u05D4\u05D4\u05DD\u05E4\u05E9\u05D5\u05D8\u05DC\u05D0\u05DE\u05D3\u05D1\u05E8\u05D9\u05DD\u05E2\u05D1\u05E8\u05D9\u05EA","4dbcagdahymbxekheh6e0a7fei0b"),
+    F("Hindi (Devanagari)","\u092F\u0939\u0932\u094B\u0917\u0939\u093F\u0928\u094D\u0926\u0940\u0915\u094D\u092F\u094B\u0902\u0928\u0939\u0940\u0902\u092C\u094B\u0932\u0938\u0915\u0924\u0947\u0939\u0948\u0902","i1baa7eci9glrd9b2ae1bj0hfcgg6iyaf8o0a1dig0cd"),
+    G("Japanese (kanji and hiragana)","\u306A\u305C\u307F\u3093\u306A\u65E5\u672C\u8A9E\u3092\u8A71\u3057\u3066\u304F\u308C\u306A\u3044\u306E\u304B","n8jok5ay5dzabd5bym9f0cm5685rrjetr6pdxa"),
+    H("Korean (Hangul syllables)","\uC138\uACC4\uC758\uBAA8\uB4E0\uC0AC\uB78C\uB4E4\uC774\uD55C\uAD6D\uC5B4\uB97C\uC774\uD574\uD55C\uB2E4\uBA74\uC5BC\uB9C8\uB098\uC88B\uC744\uAE4C","989aomsvi5e83db1d2a355cv1e0vak1dwrv93d5xbh15a0dt30a5jpsd879ccm6fea98c"),
+    I("Russian (Cyrillic)","\u043F\u043E\u0447\u0435\u043C\u0443\u0436\u0435\u043E\u043D\u0438\u043D\u0435\u0433\u043E\u0432\u043E\u0440\u044F\u0442\u043F\u043E\u0440\u0443\u0441\u0441\u043A\u0438","b1abfaaepdrnnbgefbadotcwatmq2g4l"),
+    J("Spanish Porqu<eacute>nopuedensimplementehablarenEspa<ntilde>ol","\u0050\u006F\u0072\u0071\u0075\u00E9\u006E\u006F\u0070\u0075\u0065\u0064\u0065\u006E\u0073\u0069\u006D\u0070\u006C\u0065\u006D\u0065\u006E\u0074\u0065\u0068\u0061\u0062\u006C\u0061\u0072\u0065\u006E\u0045\u0073\u0070\u0061\u00F1\u006F\u006C","PorqunopuedensimplementehablarenEspaol-fmd56a"),    
+    K("Vietnamese","\u0054\u1EA1\u0069\u0073\u0061\u006F\u0068\u1ECD\u006B\u0068\u00F4\u006E\u0067\u0074\u0068\u1EC3\u0063\u0068\u1EC9\u006E\u00F3\u0069\u0074\u0069\u1EBF\u006E\u0067\u0056\u0069\u1EC7\u0074","TisaohkhngthchnitingVit-kjcr8268qyxafd2f1b9g"),
+    L("3<nen>B<gumi><kinpachi><sensei>","\u0033\u5E74\u0042\u7D44\u91D1\u516B\u5148\u751F","3B-ww4c5e180e575a65lsy2b"),
+    M("<amuro><namie>-with-SUPER-MONKEYS","\u5B89\u5BA4\u5948\u7F8E\u6075\u002D\u0077\u0069\u0074\u0068\u002D\u0053\u0055\u0050\u0045\u0052\u002D\u004D\u004F\u004E\u004B\u0045\u0059\u0053","-with-SUPER-MONKEYS-pc58ag80a8qai00g7n9n"),
+    N("Hello-Another-Way-<sorezore><no><basho>","\u0048\u0065\u006C\u006C\u006F\u002D\u0041\u006E\u006F\u0074\u0068\u0065\u0072\u002D\u0057\u0061\u0079\u002D\u305D\u308C\u305E\u308C\u306E\u5834\u6240","Hello-Another-Way--fc4qua05auwb3674vfr0b"),
+    O("<hitotsu><yane><no><shita>2","\u3072\u3068\u3064\u5C4B\u6839\u306E\u4E0B\u0032","2-u9tlzr9756bt3uc0v"),
+    P("Maji<de>Koi<suru>5<byou><mae>","\u004D\u0061\u006A\u0069\u3067\u004B\u006F\u0069\u3059\u308B\u0035\u79D2\u524D","MajiKoi5-783gue6qz075azm5e"),
+    Q("<pafii>de<runba>","\u30D1\u30D5\u30A3\u30FC\u0064\u0065\u30EB\u30F3\u30D0","de-jg4avhby1noc0d"),
+    R("<sono><supiido><de>","\u305D\u306E\u30B9\u30D4\u30FC\u30C9\u3067","d9juau41awczczp"), 
+    S("-> $1.00 <-","\u002D\u003E\u0020\u0024\u0031\u002E\u0030\u0030\u0020\u003C\u002D","-> $1.00 <--")    ;
+    
+    String name;
+    String in;
+    String out;
+    int rc;
+    
+    Test(String name, String in, String out) {
+      this(name,in,out,0);
+    }
+    
+    Test(String name, String in, String out, int rc) {
+      this.name = name;
+      this.in = in;
+      this.out = out;
+      this.rc = rc;
+    }
+  }
+  
+  public static void testPunycode() throws Exception {
+    
+    for (Test test: Test.values()) {
+      String out = Punycode.encode(test.in);
+      String in = Punycode.decode(out);
+      if (!out.equals(test.out)) fail("Failure in test #" + test);
+      if (!in.equals(test.in)) fail("Failure in test #" + test);
+    }
+    
+  }
+}

Added: incubator/abdera/java/trunk/dependencies/g14n/src/test/java/org/apache/abdera/g14n/test/iri/TestSuite.java
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/dependencies/g14n/src/test/java/org/apache/abdera/g14n/test/iri/TestSuite.java?view=auto&rev=518464
==============================================================================
--- incubator/abdera/java/trunk/dependencies/g14n/src/test/java/org/apache/abdera/g14n/test/iri/TestSuite.java (added)
+++ incubator/abdera/java/trunk/dependencies/g14n/src/test/java/org/apache/abdera/g14n/test/iri/TestSuite.java Wed Mar 14 21:00:29 2007
@@ -0,0 +1,34 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  The ASF licenses this file to You
+* under the Apache License, Version 2.0 (the "License"); you may not
+* use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+*     http://www.apache.org/licenses/LICENSE-2.0
+*
+* 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.  For additional information regarding
+* copyright in this work, please see the NOTICE file in the top level
+* directory of this distribution.
+*/
+package org.apache.abdera.g14n.test.iri;
+
+
+public class TestSuite extends junit.framework.TestSuite {
+  public static void main(String[] args) {
+    junit.textui.TestRunner.run(new TestSuite());
+  }
+
+  public TestSuite() {
+    addTestSuite(TestIDNA.class);
+    addTestSuite(TestIRI.class);
+    addTestSuite(TestLang.class);
+    addTestSuite(TestNameprep.class);
+    addTestSuite(TestNFKC.class);
+    addTestSuite(TestPunycode.class);
+  }
+}

Modified: incubator/abdera/java/trunk/examples/src/main/java/org/apache/abdera/examples/appclient/Main.java
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/examples/src/main/java/org/apache/abdera/examples/appclient/Main.java?view=diff&rev=518464&r1=518463&r2=518464
==============================================================================
--- incubator/abdera/java/trunk/examples/src/main/java/org/apache/abdera/examples/appclient/Main.java (original)
+++ incubator/abdera/java/trunk/examples/src/main/java/org/apache/abdera/examples/appclient/Main.java Wed Mar 14 21:00:29 2007
@@ -29,7 +29,7 @@
 import org.apache.abdera.model.Service;
 import org.apache.abdera.protocol.client.Client;
 import org.apache.abdera.protocol.client.CommonsClient;
-import org.apache.abdera.util.iri.IRI;
+import org.apache.abdera.g14n.iri.IRI;
 
 
 public class Main {

Modified: incubator/abdera/java/trunk/examples/src/main/java/org/apache/abdera/examples/appserver/SimpleProvider.java
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/examples/src/main/java/org/apache/abdera/examples/appserver/SimpleProvider.java?view=diff&rev=518464&r1=518463&r2=518464
==============================================================================
--- incubator/abdera/java/trunk/examples/src/main/java/org/apache/abdera/examples/appserver/SimpleProvider.java (original)
+++ incubator/abdera/java/trunk/examples/src/main/java/org/apache/abdera/examples/appserver/SimpleProvider.java Wed Mar 14 21:00:29 2007
@@ -42,7 +42,7 @@
 import org.apache.abdera.protocol.server.provider.ResponseContext;
 import org.apache.abdera.protocol.server.provider.TargetType;
 import org.apache.abdera.util.MimeTypeHelper;
-import org.apache.abdera.util.iri.IRI;
+import org.apache.abdera.g14n.iri.IRI;
 import org.apache.axiom.om.util.Base64;
 
 public class SimpleProvider 

Modified: incubator/abdera/java/trunk/examples/src/main/java/org/apache/abdera/examples/simple/Create.java
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/examples/src/main/java/org/apache/abdera/examples/simple/Create.java?view=diff&rev=518464&r1=518463&r2=518464
==============================================================================
--- incubator/abdera/java/trunk/examples/src/main/java/org/apache/abdera/examples/simple/Create.java (original)
+++ incubator/abdera/java/trunk/examples/src/main/java/org/apache/abdera/examples/simple/Create.java Wed Mar 14 21:00:29 2007
@@ -28,7 +28,7 @@
 import org.apache.abdera.model.Content;
 import org.apache.abdera.model.Entry;
 import org.apache.abdera.model.Feed;
-import org.apache.abdera.util.iri.IRI;
+import org.apache.abdera.g14n.iri.IRI;
 
 
 public class Create {

Modified: incubator/abdera/java/trunk/extensions/src/main/java/org/apache/abdera/ext/bidi/BidiHelper.java
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/extensions/src/main/java/org/apache/abdera/ext/bidi/BidiHelper.java?view=diff&rev=518464&r1=518463&r2=518464
==============================================================================
--- incubator/abdera/java/trunk/extensions/src/main/java/org/apache/abdera/ext/bidi/BidiHelper.java (original)
+++ incubator/abdera/java/trunk/extensions/src/main/java/org/apache/abdera/ext/bidi/BidiHelper.java Wed Mar 14 21:00:29 2007
@@ -21,7 +21,7 @@
 
 import org.apache.abdera.model.Base;
 import org.apache.abdera.model.Element;
-import org.apache.abdera.util.io.CharUtils;
+import org.apache.abdera.g14n.io.CharUtils;
 
 /**
  * <p>This is (hopefully) temporary.  Ideally, this would be wrapped into the 

Modified: incubator/abdera/java/trunk/extensions/src/main/java/org/apache/abdera/ext/history/FeedPagingHelper.java
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/extensions/src/main/java/org/apache/abdera/ext/history/FeedPagingHelper.java?view=diff&rev=518464&r1=518463&r2=518464
==============================================================================
--- incubator/abdera/java/trunk/extensions/src/main/java/org/apache/abdera/ext/history/FeedPagingHelper.java (original)
+++ incubator/abdera/java/trunk/extensions/src/main/java/org/apache/abdera/ext/history/FeedPagingHelper.java Wed Mar 14 21:00:29 2007
@@ -22,8 +22,8 @@
 import org.apache.abdera.model.Element;
 import org.apache.abdera.model.Feed;
 import org.apache.abdera.model.Link;
-import org.apache.abdera.util.iri.IRI;
-import org.apache.abdera.util.iri.IRISyntaxException;
+import org.apache.abdera.g14n.iri.IRI;
+import org.apache.abdera.g14n.iri.IRISyntaxException;
 
 /**
  * Initial support for Mark Nottingham's Feed Paging and Archiving draft 

Modified: incubator/abdera/java/trunk/extensions/src/main/java/org/apache/abdera/ext/json/JSONWriter.java
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/extensions/src/main/java/org/apache/abdera/ext/json/JSONWriter.java?view=diff&rev=518464&r1=518463&r2=518464
==============================================================================
--- incubator/abdera/java/trunk/extensions/src/main/java/org/apache/abdera/ext/json/JSONWriter.java (original)
+++ incubator/abdera/java/trunk/extensions/src/main/java/org/apache/abdera/ext/json/JSONWriter.java Wed Mar 14 21:00:29 2007
@@ -38,7 +38,7 @@
 import org.apache.abdera.model.Workspace;
 import org.apache.abdera.model.Content.Type;
 import org.apache.abdera.util.AbstractNamedWriter;
-import org.apache.abdera.util.iri.IRISyntaxException;
+import org.apache.abdera.g14n.iri.IRISyntaxException;
 import org.apache.abdera.writer.NamedWriter;
 import org.json.JSONArray;
 import org.json.JSONException;

Modified: incubator/abdera/java/trunk/extensions/src/main/java/org/apache/abdera/ext/media/MediaCategory.java
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/extensions/src/main/java/org/apache/abdera/ext/media/MediaCategory.java?view=diff&rev=518464&r1=518463&r2=518464
==============================================================================
--- incubator/abdera/java/trunk/extensions/src/main/java/org/apache/abdera/ext/media/MediaCategory.java (original)
+++ incubator/abdera/java/trunk/extensions/src/main/java/org/apache/abdera/ext/media/MediaCategory.java Wed Mar 14 21:00:29 2007
@@ -22,8 +22,8 @@
 import org.apache.abdera.factory.Factory;
 import org.apache.abdera.model.Element;
 import org.apache.abdera.model.ElementWrapper;
-import org.apache.abdera.util.iri.IRI;
-import org.apache.abdera.util.iri.IRISyntaxException;
+import org.apache.abdera.g14n.iri.IRI;
+import org.apache.abdera.g14n.iri.IRISyntaxException;
 
 public class MediaCategory extends ElementWrapper {
 

Modified: incubator/abdera/java/trunk/extensions/src/main/java/org/apache/abdera/ext/media/MediaContent.java
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/extensions/src/main/java/org/apache/abdera/ext/media/MediaContent.java?view=diff&rev=518464&r1=518463&r2=518464
==============================================================================
--- incubator/abdera/java/trunk/extensions/src/main/java/org/apache/abdera/ext/media/MediaContent.java (original)
+++ incubator/abdera/java/trunk/extensions/src/main/java/org/apache/abdera/ext/media/MediaContent.java Wed Mar 14 21:00:29 2007
@@ -24,8 +24,8 @@
 import org.apache.abdera.factory.Factory;
 import org.apache.abdera.model.Element;
 import org.apache.abdera.model.ExtensibleElementWrapper;
-import org.apache.abdera.util.iri.IRI;
-import org.apache.abdera.util.iri.IRISyntaxException;
+import org.apache.abdera.g14n.iri.IRI;
+import org.apache.abdera.g14n.iri.IRISyntaxException;
 
 public class MediaContent 
   extends ExtensibleElementWrapper {

Modified: incubator/abdera/java/trunk/extensions/src/main/java/org/apache/abdera/ext/media/MediaCopyright.java
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/extensions/src/main/java/org/apache/abdera/ext/media/MediaCopyright.java?view=diff&rev=518464&r1=518463&r2=518464
==============================================================================
--- incubator/abdera/java/trunk/extensions/src/main/java/org/apache/abdera/ext/media/MediaCopyright.java (original)
+++ incubator/abdera/java/trunk/extensions/src/main/java/org/apache/abdera/ext/media/MediaCopyright.java Wed Mar 14 21:00:29 2007
@@ -22,8 +22,8 @@
 import org.apache.abdera.factory.Factory;
 import org.apache.abdera.model.Element;
 import org.apache.abdera.model.ElementWrapper;
-import org.apache.abdera.util.iri.IRI;
-import org.apache.abdera.util.iri.IRISyntaxException;
+import org.apache.abdera.g14n.iri.IRI;
+import org.apache.abdera.g14n.iri.IRISyntaxException;
 
 public class MediaCopyright extends ElementWrapper {
 

Modified: incubator/abdera/java/trunk/extensions/src/main/java/org/apache/abdera/ext/media/MediaCredit.java
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/extensions/src/main/java/org/apache/abdera/ext/media/MediaCredit.java?view=diff&rev=518464&r1=518463&r2=518464
==============================================================================
--- incubator/abdera/java/trunk/extensions/src/main/java/org/apache/abdera/ext/media/MediaCredit.java (original)
+++ incubator/abdera/java/trunk/extensions/src/main/java/org/apache/abdera/ext/media/MediaCredit.java Wed Mar 14 21:00:29 2007
@@ -22,8 +22,8 @@
 import org.apache.abdera.factory.Factory;
 import org.apache.abdera.model.Element;
 import org.apache.abdera.model.ElementWrapper;
-import org.apache.abdera.util.iri.IRI;
-import org.apache.abdera.util.iri.IRISyntaxException;
+import org.apache.abdera.g14n.iri.IRI;
+import org.apache.abdera.g14n.iri.IRISyntaxException;
 
 public class MediaCredit extends ElementWrapper {
 

Modified: incubator/abdera/java/trunk/extensions/src/main/java/org/apache/abdera/ext/media/MediaPlayer.java
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/extensions/src/main/java/org/apache/abdera/ext/media/MediaPlayer.java?view=diff&rev=518464&r1=518463&r2=518464
==============================================================================
--- incubator/abdera/java/trunk/extensions/src/main/java/org/apache/abdera/ext/media/MediaPlayer.java (original)
+++ incubator/abdera/java/trunk/extensions/src/main/java/org/apache/abdera/ext/media/MediaPlayer.java Wed Mar 14 21:00:29 2007
@@ -22,8 +22,8 @@
 import org.apache.abdera.factory.Factory;
 import org.apache.abdera.model.Element;
 import org.apache.abdera.model.ElementWrapper;
-import org.apache.abdera.util.iri.IRI;
-import org.apache.abdera.util.iri.IRISyntaxException;
+import org.apache.abdera.g14n.iri.IRI;
+import org.apache.abdera.g14n.iri.IRISyntaxException;
 
 public class MediaPlayer extends ElementWrapper {
 

Modified: incubator/abdera/java/trunk/extensions/src/main/java/org/apache/abdera/ext/media/MediaRating.java
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/extensions/src/main/java/org/apache/abdera/ext/media/MediaRating.java?view=diff&rev=518464&r1=518463&r2=518464
==============================================================================
--- incubator/abdera/java/trunk/extensions/src/main/java/org/apache/abdera/ext/media/MediaRating.java (original)
+++ incubator/abdera/java/trunk/extensions/src/main/java/org/apache/abdera/ext/media/MediaRating.java Wed Mar 14 21:00:29 2007
@@ -20,8 +20,8 @@
 import org.apache.abdera.factory.Factory;
 import org.apache.abdera.model.Element;
 import org.apache.abdera.model.ElementWrapper;
-import org.apache.abdera.util.iri.IRI;
-import org.apache.abdera.util.iri.IRISyntaxException;
+import org.apache.abdera.g14n.iri.IRI;
+import org.apache.abdera.g14n.iri.IRISyntaxException;
 
 public class MediaRating extends ElementWrapper {
 

Modified: incubator/abdera/java/trunk/extensions/src/main/java/org/apache/abdera/ext/media/MediaThumbnail.java
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/extensions/src/main/java/org/apache/abdera/ext/media/MediaThumbnail.java?view=diff&rev=518464&r1=518463&r2=518464
==============================================================================
--- incubator/abdera/java/trunk/extensions/src/main/java/org/apache/abdera/ext/media/MediaThumbnail.java (original)
+++ incubator/abdera/java/trunk/extensions/src/main/java/org/apache/abdera/ext/media/MediaThumbnail.java Wed Mar 14 21:00:29 2007
@@ -22,8 +22,8 @@
 import org.apache.abdera.factory.Factory;
 import org.apache.abdera.model.Element;
 import org.apache.abdera.model.ElementWrapper;
-import org.apache.abdera.util.iri.IRI;
-import org.apache.abdera.util.iri.IRISyntaxException;
+import org.apache.abdera.g14n.iri.IRI;
+import org.apache.abdera.g14n.iri.IRISyntaxException;
 
 public class MediaThumbnail extends ElementWrapper {
 

Modified: incubator/abdera/java/trunk/extensions/src/main/java/org/apache/abdera/ext/thread/InReplyTo.java
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/extensions/src/main/java/org/apache/abdera/ext/thread/InReplyTo.java?view=diff&rev=518464&r1=518463&r2=518464
==============================================================================
--- incubator/abdera/java/trunk/extensions/src/main/java/org/apache/abdera/ext/thread/InReplyTo.java (original)
+++ incubator/abdera/java/trunk/extensions/src/main/java/org/apache/abdera/ext/thread/InReplyTo.java Wed Mar 14 21:00:29 2007
@@ -23,8 +23,8 @@
 import org.apache.abdera.factory.Factory;
 import org.apache.abdera.model.Element;
 import org.apache.abdera.model.ElementWrapper;
-import org.apache.abdera.util.iri.IRI;
-import org.apache.abdera.util.iri.IRISyntaxException;
+import org.apache.abdera.g14n.iri.IRI;
+import org.apache.abdera.g14n.iri.IRISyntaxException;
 
 public class InReplyTo 
   extends ElementWrapper {

Modified: incubator/abdera/java/trunk/extensions/src/main/java/org/apache/abdera/ext/thread/ThreadHelper.java
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/extensions/src/main/java/org/apache/abdera/ext/thread/ThreadHelper.java?view=diff&rev=518464&r1=518463&r2=518464
==============================================================================
--- incubator/abdera/java/trunk/extensions/src/main/java/org/apache/abdera/ext/thread/ThreadHelper.java (original)
+++ incubator/abdera/java/trunk/extensions/src/main/java/org/apache/abdera/ext/thread/ThreadHelper.java Wed Mar 14 21:00:29 2007
@@ -29,8 +29,8 @@
 import org.apache.abdera.model.Entry;
 import org.apache.abdera.model.Link;
 import org.apache.abdera.model.Source;
-import org.apache.abdera.util.iri.IRI;
-import org.apache.abdera.util.iri.IRISyntaxException;
+import org.apache.abdera.g14n.iri.IRI;
+import org.apache.abdera.g14n.iri.IRISyntaxException;
 
 public final class ThreadHelper {
 

Modified: incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMCategories.java
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMCategories.java?view=diff&rev=518464&r1=518463&r2=518464
==============================================================================
--- incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMCategories.java (original)
+++ incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMCategories.java Wed Mar 14 21:00:29 2007
@@ -25,8 +25,8 @@
 import org.apache.abdera.model.Categories;
 import org.apache.abdera.model.Category;
 import org.apache.abdera.parser.stax.util.FOMHelper;
-import org.apache.abdera.util.iri.IRI;
-import org.apache.abdera.util.iri.IRISyntaxException;
+import org.apache.abdera.g14n.iri.IRI;
+import org.apache.abdera.g14n.iri.IRISyntaxException;
 import org.apache.axiom.om.OMContainer;
 import org.apache.axiom.om.OMElement;
 import org.apache.axiom.om.OMException;

Modified: incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMCategory.java
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMCategory.java?view=diff&rev=518464&r1=518463&r2=518464
==============================================================================
--- incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMCategory.java (original)
+++ incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMCategory.java Wed Mar 14 21:00:29 2007
@@ -21,8 +21,8 @@
 
 import org.apache.abdera.model.Category;
 import org.apache.abdera.util.Constants;
-import org.apache.abdera.util.iri.IRI;
-import org.apache.abdera.util.iri.IRISyntaxException;
+import org.apache.abdera.g14n.iri.IRI;
+import org.apache.abdera.g14n.iri.IRISyntaxException;
 import org.apache.axiom.om.OMContainer;
 import org.apache.axiom.om.OMException;
 import org.apache.axiom.om.OMFactory;

Modified: incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMCollection.java
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMCollection.java?view=diff&rev=518464&r1=518463&r2=518464
==============================================================================
--- incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMCollection.java (original)
+++ incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMCollection.java Wed Mar 14 21:00:29 2007
@@ -29,8 +29,8 @@
 import org.apache.abdera.model.Text;
 import org.apache.abdera.util.Constants;
 import org.apache.abdera.util.MimeTypeHelper;
-import org.apache.abdera.util.iri.IRI;
-import org.apache.abdera.util.iri.IRISyntaxException;
+import org.apache.abdera.g14n.iri.IRI;
+import org.apache.abdera.g14n.iri.IRISyntaxException;
 import org.apache.axiom.om.OMContainer;
 import org.apache.axiom.om.OMElement;
 import org.apache.axiom.om.OMException;

Modified: incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMContent.java
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMContent.java?view=diff&rev=518464&r1=518463&r2=518464
==============================================================================
--- incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMContent.java (original)
+++ incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMContent.java Wed Mar 14 21:00:29 2007
@@ -27,8 +27,8 @@
 import org.apache.abdera.model.Div;
 import org.apache.abdera.model.Element;
 import org.apache.abdera.util.Constants;
-import org.apache.abdera.util.iri.IRI;
-import org.apache.abdera.util.iri.IRISyntaxException;
+import org.apache.abdera.g14n.iri.IRI;
+import org.apache.abdera.g14n.iri.IRISyntaxException;
 import org.apache.axiom.attachments.utils.DataHandlerUtils;
 import org.apache.axiom.om.OMContainer;
 import org.apache.axiom.om.OMElement;

Modified: incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMDiv.java
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMDiv.java?view=diff&rev=518464&r1=518463&r2=518464
==============================================================================
--- incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMDiv.java (original)
+++ incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMDiv.java Wed Mar 14 21:00:29 2007
@@ -26,7 +26,7 @@
 
 import org.apache.abdera.model.Div;
 import org.apache.abdera.util.Constants;
-import org.apache.abdera.util.iri.IRI;
+import org.apache.abdera.g14n.iri.IRI;
 import org.apache.axiom.om.OMContainer;
 import org.apache.axiom.om.OMElement;
 import org.apache.axiom.om.OMException;

Modified: incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMDocument.java
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMDocument.java?view=diff&rev=518464&r1=518463&r2=518464
==============================================================================
--- incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMDocument.java (original)
+++ incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMDocument.java Wed Mar 14 21:00:29 2007
@@ -31,8 +31,8 @@
 import org.apache.abdera.model.Document;
 import org.apache.abdera.model.Element;
 import org.apache.abdera.model.ElementWrapper;
-import org.apache.abdera.util.iri.IRI;
-import org.apache.abdera.util.iri.IRISyntaxException;
+import org.apache.abdera.g14n.iri.IRI;
+import org.apache.abdera.g14n.iri.IRISyntaxException;
 import org.apache.axiom.om.OMComment;
 import org.apache.axiom.om.OMDocType;
 import org.apache.axiom.om.OMDocument;

Modified: incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMElement.java
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMElement.java?view=diff&rev=518464&r1=518463&r2=518464
==============================================================================
--- incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMElement.java (original)
+++ incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMElement.java Wed Mar 14 21:00:29 2007
@@ -50,10 +50,10 @@
 import org.apache.abdera.util.Constants;
 import org.apache.abdera.util.MimeTypeHelper;
 import org.apache.abdera.util.URIHelper;
-import org.apache.abdera.util.iri.IRI;
-import org.apache.abdera.util.iri.IRISyntaxException;
-import org.apache.abdera.util.lang.InvalidLangTagSyntax;
-import org.apache.abdera.util.lang.Lang;
+import org.apache.abdera.g14n.iri.IRI;
+import org.apache.abdera.g14n.iri.IRISyntaxException;
+import org.apache.abdera.g14n.lang.InvalidLangTagSyntax;
+import org.apache.abdera.g14n.lang.Lang;
 import org.apache.axiom.om.OMAttribute;
 import org.apache.axiom.om.OMComment;
 import org.apache.axiom.om.OMContainer;

Modified: incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMEntry.java
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMEntry.java?view=diff&rev=518464&r1=518463&r2=518464
==============================================================================
--- incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMEntry.java (original)
+++ incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMEntry.java Wed Mar 14 21:00:29 2007
@@ -44,8 +44,8 @@
 import org.apache.abdera.parser.stax.util.FOMHelper;
 import org.apache.abdera.util.Constants;
 import org.apache.abdera.util.URIHelper;
-import org.apache.abdera.util.iri.IRI;
-import org.apache.abdera.util.iri.IRISyntaxException;
+import org.apache.abdera.g14n.iri.IRI;
+import org.apache.abdera.g14n.iri.IRISyntaxException;
 import org.apache.axiom.om.OMContainer;
 import org.apache.axiom.om.OMElement;
 import org.apache.axiom.om.OMException;

Modified: incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMFactory.java
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMFactory.java?view=diff&rev=518464&r1=518463&r2=518464
==============================================================================
--- incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMFactory.java (original)
+++ incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMFactory.java Wed Mar 14 21:00:29 2007
@@ -55,7 +55,7 @@
 import org.apache.abdera.util.Constants;
 import org.apache.abdera.util.MimeTypeHelper;
 import org.apache.abdera.util.Version;
-import org.apache.abdera.util.iri.IRISyntaxException;
+import org.apache.abdera.g14n.iri.IRISyntaxException;
 import org.apache.axiom.om.OMContainer;
 import org.apache.axiom.om.OMElement;
 import org.apache.axiom.om.OMFactory;

Modified: incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMFeed.java
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMFeed.java?view=diff&rev=518464&r1=518463&r2=518464
==============================================================================
--- incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMFeed.java (original)
+++ incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMFeed.java Wed Mar 14 21:00:29 2007
@@ -29,8 +29,8 @@
 import org.apache.abdera.model.Feed;
 import org.apache.abdera.model.Source;
 import org.apache.abdera.util.Constants;
-import org.apache.abdera.util.iri.IRI;
-import org.apache.abdera.util.iri.IRISyntaxException;
+import org.apache.abdera.g14n.iri.IRI;
+import org.apache.abdera.g14n.iri.IRISyntaxException;
 import org.apache.axiom.om.OMContainer;
 import org.apache.axiom.om.OMElement;
 import org.apache.axiom.om.OMException;

Modified: incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMGenerator.java
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMGenerator.java?view=diff&rev=518464&r1=518463&r2=518464
==============================================================================
--- incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMGenerator.java (original)
+++ incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMGenerator.java Wed Mar 14 21:00:29 2007
@@ -21,8 +21,8 @@
 
 import org.apache.abdera.model.Generator;
 import org.apache.abdera.util.Constants;
-import org.apache.abdera.util.iri.IRI;
-import org.apache.abdera.util.iri.IRISyntaxException;
+import org.apache.abdera.g14n.iri.IRI;
+import org.apache.abdera.g14n.iri.IRISyntaxException;
 import org.apache.axiom.om.OMContainer;
 import org.apache.axiom.om.OMException;
 import org.apache.axiom.om.OMFactory;

Modified: incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMIRI.java
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMIRI.java?view=diff&rev=518464&r1=518463&r2=518464
==============================================================================
--- incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMIRI.java (original)
+++ incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMIRI.java Wed Mar 14 21:00:29 2007
@@ -21,8 +21,8 @@
 
 import org.apache.abdera.model.IRIElement;
 import org.apache.abdera.util.URIHelper;
-import org.apache.abdera.util.iri.IRI;
-import org.apache.abdera.util.iri.IRISyntaxException;
+import org.apache.abdera.g14n.iri.IRI;
+import org.apache.abdera.g14n.iri.IRISyntaxException;
 import org.apache.axiom.om.OMContainer;
 import org.apache.axiom.om.OMException;
 import org.apache.axiom.om.OMFactory;

Modified: incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMLink.java
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMLink.java?view=diff&rev=518464&r1=518463&r2=518464
==============================================================================
--- incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMLink.java (original)
+++ incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMLink.java Wed Mar 14 21:00:29 2007
@@ -27,8 +27,8 @@
 import org.apache.abdera.model.Link;
 import org.apache.abdera.util.Constants;
 import org.apache.abdera.util.URIHelper;
-import org.apache.abdera.util.iri.IRI;
-import org.apache.abdera.util.iri.IRISyntaxException;
+import org.apache.abdera.g14n.iri.IRI;
+import org.apache.abdera.g14n.iri.IRISyntaxException;
 import org.apache.axiom.om.OMContainer;
 import org.apache.axiom.om.OMException;
 import org.apache.axiom.om.OMFactory;

Modified: incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMParser.java
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMParser.java?view=diff&rev=518464&r1=518463&r2=518464
==============================================================================
--- incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMParser.java (original)
+++ incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMParser.java Wed Mar 14 21:00:29 2007
@@ -31,7 +31,7 @@
 import org.apache.abdera.parser.ParserOptions;
 import org.apache.abdera.parser.stax.util.FOMSniffingInputStream;
 import org.apache.abdera.util.AbstractParser;
-import org.apache.abdera.util.iri.IRI;
+import org.apache.abdera.g14n.iri.IRI;
 import org.apache.axiom.om.OMDocument;
 import org.apache.axiom.om.util.StAXUtils;
 

Modified: incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMPerson.java
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMPerson.java?view=diff&rev=518464&r1=518463&r2=518464
==============================================================================
--- incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMPerson.java (original)
+++ incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMPerson.java Wed Mar 14 21:00:29 2007
@@ -22,8 +22,8 @@
 import org.apache.abdera.model.Element;
 import org.apache.abdera.model.IRIElement;
 import org.apache.abdera.model.Person;
-import org.apache.abdera.util.iri.IRI;
-import org.apache.abdera.util.iri.IRISyntaxException;
+import org.apache.abdera.g14n.iri.IRI;
+import org.apache.abdera.g14n.iri.IRISyntaxException;
 import org.apache.axiom.om.OMContainer;
 import org.apache.axiom.om.OMElement;
 import org.apache.axiom.om.OMException;

Modified: incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMSource.java
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMSource.java?view=diff&rev=518464&r1=518463&r2=518464
==============================================================================
--- incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMSource.java (original)
+++ incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMSource.java Wed Mar 14 21:00:29 2007
@@ -39,8 +39,8 @@
 import org.apache.abdera.parser.stax.util.FOMHelper;
 import org.apache.abdera.util.Constants;
 import org.apache.abdera.util.URIHelper;
-import org.apache.abdera.util.iri.IRI;
-import org.apache.abdera.util.iri.IRISyntaxException;
+import org.apache.abdera.g14n.iri.IRI;
+import org.apache.abdera.g14n.iri.IRISyntaxException;
 import org.apache.axiom.om.OMContainer;
 import org.apache.axiom.om.OMElement;
 import org.apache.axiom.om.OMException;

Modified: incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMText.java
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMText.java?view=diff&rev=518464&r1=518463&r2=518464
==============================================================================
--- incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMText.java (original)
+++ incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMText.java Wed Mar 14 21:00:29 2007
@@ -23,8 +23,8 @@
 import org.apache.abdera.model.Element;
 import org.apache.abdera.model.Text;
 import org.apache.abdera.util.Constants;
-import org.apache.abdera.util.iri.IRI;
-import org.apache.abdera.util.iri.IRISyntaxException;
+import org.apache.abdera.g14n.iri.IRI;
+import org.apache.abdera.g14n.iri.IRISyntaxException;
 import org.apache.axiom.om.OMContainer;
 import org.apache.axiom.om.OMElement;
 import org.apache.axiom.om.OMException;

Modified: incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMWorkspace.java
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMWorkspace.java?view=diff&rev=518464&r1=518463&r2=518464
==============================================================================
--- incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMWorkspace.java (original)
+++ incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMWorkspace.java Wed Mar 14 21:00:29 2007
@@ -25,7 +25,7 @@
 import org.apache.abdera.model.Text;
 import org.apache.abdera.model.Workspace;
 import org.apache.abdera.util.Constants;
-import org.apache.abdera.util.iri.IRISyntaxException;
+import org.apache.abdera.g14n.iri.IRISyntaxException;
 import org.apache.axiom.om.OMContainer;
 import org.apache.axiom.om.OMElement;
 import org.apache.axiom.om.OMException;

Modified: incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/util/ResolveFunction.java
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/util/ResolveFunction.java?view=diff&rev=518464&r1=518463&r2=518464
==============================================================================
--- incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/util/ResolveFunction.java (original)
+++ incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/util/ResolveFunction.java Wed Mar 14 21:00:29 2007
@@ -24,7 +24,7 @@
 
 import org.apache.abdera.model.Document;
 import org.apache.abdera.model.Element;
-import org.apache.abdera.util.iri.IRI;
+import org.apache.abdera.g14n.iri.IRI;
 import org.apache.axiom.om.OMAttribute;
 import org.apache.axiom.om.OMContainer;
 import org.apache.axiom.om.OMNode;

Modified: incubator/abdera/java/trunk/parser/src/test/java/org/apache/abdera/test/parser/stax/AtomConformanceTest.java
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/parser/src/test/java/org/apache/abdera/test/parser/stax/AtomConformanceTest.java?view=diff&rev=518464&r1=518463&r2=518464
==============================================================================
--- incubator/abdera/java/trunk/parser/src/test/java/org/apache/abdera/test/parser/stax/AtomConformanceTest.java (original)
+++ incubator/abdera/java/trunk/parser/src/test/java/org/apache/abdera/test/parser/stax/AtomConformanceTest.java Wed Mar 14 21:00:29 2007
@@ -27,7 +27,7 @@
 import org.apache.abdera.model.Feed;
 import org.apache.abdera.model.Link;
 import org.apache.abdera.model.Text;
-import org.apache.abdera.util.iri.IRI;
+import org.apache.abdera.g14n.iri.IRI;
 import org.apache.axiom.om.OMElement;
 
 public class AtomConformanceTest extends BaseParserTestCase {

Modified: incubator/abdera/java/trunk/parser/src/test/java/org/apache/abdera/test/parser/stax/BaseParserTestCase.java
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/parser/src/test/java/org/apache/abdera/test/parser/stax/BaseParserTestCase.java?view=diff&rev=518464&r1=518463&r2=518464
==============================================================================
--- incubator/abdera/java/trunk/parser/src/test/java/org/apache/abdera/test/parser/stax/BaseParserTestCase.java (original)
+++ incubator/abdera/java/trunk/parser/src/test/java/org/apache/abdera/test/parser/stax/BaseParserTestCase.java Wed Mar 14 21:00:29 2007
@@ -23,7 +23,7 @@
 import org.apache.abdera.model.Document;
 import org.apache.abdera.model.Element;
 import org.apache.abdera.parser.Parser;
-import org.apache.abdera.util.iri.IRI;
+import org.apache.abdera.g14n.iri.IRI;
 
 import java.io.InputStream;
 

Modified: incubator/abdera/java/trunk/parser/src/test/java/org/apache/abdera/test/parser/stax/FOMTest.java
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/parser/src/test/java/org/apache/abdera/test/parser/stax/FOMTest.java?view=diff&rev=518464&r1=518463&r2=518464
==============================================================================
--- incubator/abdera/java/trunk/parser/src/test/java/org/apache/abdera/test/parser/stax/FOMTest.java (original)
+++ incubator/abdera/java/trunk/parser/src/test/java/org/apache/abdera/test/parser/stax/FOMTest.java Wed Mar 14 21:00:29 2007
@@ -63,7 +63,7 @@
 import org.apache.abdera.util.Version;
 import org.apache.abdera.util.filter.BlackListParseFilter;
 import org.apache.abdera.util.filter.WhiteListParseFilter;
-import org.apache.abdera.util.lang.Lang;
+import org.apache.abdera.g14n.lang.Lang;
 import org.apache.abdera.writer.Writer;
 import org.apache.abdera.writer.WriterFactory;
 import org.apache.abdera.xpath.XPath;

Modified: incubator/abdera/java/trunk/parser/src/test/java/org/apache/abdera/test/parser/stax/FeedParserTest.java
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/parser/src/test/java/org/apache/abdera/test/parser/stax/FeedParserTest.java?view=diff&rev=518464&r1=518463&r2=518464
==============================================================================
--- incubator/abdera/java/trunk/parser/src/test/java/org/apache/abdera/test/parser/stax/FeedParserTest.java (original)
+++ incubator/abdera/java/trunk/parser/src/test/java/org/apache/abdera/test/parser/stax/FeedParserTest.java Wed Mar 14 21:00:29 2007
@@ -28,7 +28,7 @@
 import org.apache.abdera.model.Entry;
 import org.apache.abdera.model.Feed;
 import org.apache.abdera.model.Person;
-import org.apache.abdera.util.iri.IRI;
+import org.apache.abdera.g14n.iri.IRI;
 
 public class FeedParserTest extends BaseParserTestCase {
 

Modified: incubator/abdera/java/trunk/parser/src/test/java/org/apache/abdera/test/parser/stax/FeedValidatorTest.java
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/parser/src/test/java/org/apache/abdera/test/parser/stax/FeedValidatorTest.java?view=diff&rev=518464&r1=518463&r2=518464
==============================================================================
--- incubator/abdera/java/trunk/parser/src/test/java/org/apache/abdera/test/parser/stax/FeedValidatorTest.java (original)
+++ incubator/abdera/java/trunk/parser/src/test/java/org/apache/abdera/test/parser/stax/FeedValidatorTest.java Wed Mar 14 21:00:29 2007
@@ -43,8 +43,8 @@
 import org.apache.abdera.model.Source;
 import org.apache.abdera.model.Text;
 import org.apache.abdera.util.URIHelper;
-import org.apache.abdera.util.iri.IRI;
-import org.apache.abdera.util.iri.IRISyntaxException;
+import org.apache.abdera.g14n.iri.IRI;
+import org.apache.abdera.g14n.iri.IRISyntaxException;
 import org.apache.axiom.om.OMException;
 
 public class FeedValidatorTest 

Modified: incubator/abdera/java/trunk/protocol/src/main/java/org/apache/abdera/protocol/Response.java
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/protocol/src/main/java/org/apache/abdera/protocol/Response.java?view=diff&rev=518464&r1=518463&r2=518464
==============================================================================
--- incubator/abdera/java/trunk/protocol/src/main/java/org/apache/abdera/protocol/Response.java (original)
+++ incubator/abdera/java/trunk/protocol/src/main/java/org/apache/abdera/protocol/Response.java Wed Mar 14 21:00:29 2007
@@ -25,8 +25,8 @@
 import javax.activation.MimeTypeParseException;
 
 import org.apache.abdera.protocol.util.ProtocolConstants;
-import org.apache.abdera.util.iri.IRI;
-import org.apache.abdera.util.iri.IRISyntaxException;
+import org.apache.abdera.g14n.iri.IRI;
+import org.apache.abdera.g14n.iri.IRISyntaxException;
 
 public interface Response
   extends ProtocolConstants {

Modified: incubator/abdera/java/trunk/protocol/src/main/java/org/apache/abdera/protocol/util/AbstractResponse.java
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/protocol/src/main/java/org/apache/abdera/protocol/util/AbstractResponse.java?view=diff&rev=518464&r1=518463&r2=518464
==============================================================================
--- incubator/abdera/java/trunk/protocol/src/main/java/org/apache/abdera/protocol/util/AbstractResponse.java (original)
+++ incubator/abdera/java/trunk/protocol/src/main/java/org/apache/abdera/protocol/util/AbstractResponse.java Wed Mar 14 21:00:29 2007
@@ -24,8 +24,8 @@
 
 import org.apache.abdera.protocol.EntityTag;
 import org.apache.abdera.protocol.Response;
-import org.apache.abdera.util.iri.IRI;
-import org.apache.abdera.util.iri.IRISyntaxException;
+import org.apache.abdera.g14n.iri.IRI;
+import org.apache.abdera.g14n.iri.IRISyntaxException;
 
 public abstract class AbstractResponse 
   implements Response {

Modified: incubator/abdera/java/trunk/protocol/src/main/java/org/apache/abdera/protocol/util/EncodingUtil.java
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/protocol/src/main/java/org/apache/abdera/protocol/util/EncodingUtil.java?view=diff&rev=518464&r1=518463&r2=518464
==============================================================================
--- incubator/abdera/java/trunk/protocol/src/main/java/org/apache/abdera/protocol/util/EncodingUtil.java (original)
+++ incubator/abdera/java/trunk/protocol/src/main/java/org/apache/abdera/protocol/util/EncodingUtil.java Wed Mar 14 21:00:29 2007
@@ -25,7 +25,7 @@
 import java.util.zip.GZIPOutputStream;
 import java.util.zip.InflaterInputStream;
 
-import org.apache.abdera.util.unicode.Normalizer;
+import org.apache.abdera.g14n.unicode.Normalizer;
 import org.apache.commons.codec.net.QCodec;
 
 public class EncodingUtil {

Modified: incubator/abdera/java/trunk/security/src/main/java/org/apache/abdera/security/util/servlet/SecurityFilter.java
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/security/src/main/java/org/apache/abdera/security/util/servlet/SecurityFilter.java?view=diff&rev=518464&r1=518463&r2=518464
==============================================================================
--- incubator/abdera/java/trunk/security/src/main/java/org/apache/abdera/security/util/servlet/SecurityFilter.java (original)
+++ incubator/abdera/java/trunk/security/src/main/java/org/apache/abdera/security/util/servlet/SecurityFilter.java Wed Mar 14 21:00:29 2007
@@ -43,7 +43,7 @@
 import org.apache.abdera.model.Element;
 import org.apache.abdera.parser.Parser;
 import org.apache.abdera.security.AbderaSecurity;
-import org.apache.abdera.util.io.RewindableInputStream;
+import org.apache.abdera.g14n.io.RewindableInputStream;
 
 public abstract class SecurityFilter 
   implements Filter {

Modified: incubator/abdera/java/trunk/security/src/main/java/org/apache/abdera/security/xmlsec/XmlSignature.java
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/security/src/main/java/org/apache/abdera/security/xmlsec/XmlSignature.java?view=diff&rev=518464&r1=518463&r2=518464
==============================================================================
--- incubator/abdera/java/trunk/security/src/main/java/org/apache/abdera/security/xmlsec/XmlSignature.java (original)
+++ incubator/abdera/java/trunk/security/src/main/java/org/apache/abdera/security/xmlsec/XmlSignature.java Wed Mar 14 21:00:29 2007
@@ -29,8 +29,8 @@
 import org.apache.abdera.security.SignatureOptions;
 import org.apache.abdera.security.util.Constants;
 import org.apache.abdera.security.util.SignatureBase;
-import org.apache.abdera.util.iri.IRI;
-import org.apache.abdera.util.iri.IRISyntaxException;
+import org.apache.abdera.g14n.iri.IRI;
+import org.apache.abdera.g14n.iri.IRISyntaxException;
 import org.apache.xml.security.exceptions.XMLSecurityException;
 import org.apache.xml.security.keys.KeyInfo;
 import org.apache.xml.security.signature.XMLSignature;

Modified: incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/provider/AbstractProvider.java
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/provider/AbstractProvider.java?view=diff&rev=518464&r1=518463&r2=518464
==============================================================================
--- incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/provider/AbstractProvider.java (original)
+++ incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/provider/AbstractProvider.java Wed Mar 14 21:00:29 2007
@@ -34,7 +34,7 @@
 import org.apache.abdera.model.ExtensibleElement;
 import org.apache.abdera.protocol.util.EncodingUtil;
 import org.apache.abdera.util.MimeTypeHelper;
-import org.apache.abdera.util.iri.IRI;
+import org.apache.abdera.g14n.iri.IRI;
 
 public abstract class AbstractProvider 
   implements Provider {

Modified: incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/provider/AbstractRequestContext.java
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/provider/AbstractRequestContext.java?view=diff&rev=518464&r1=518463&r2=518464
==============================================================================
--- incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/provider/AbstractRequestContext.java (original)
+++ incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/provider/AbstractRequestContext.java Wed Mar 14 21:00:29 2007
@@ -29,8 +29,8 @@
 import org.apache.abdera.parser.ParserOptions;
 import org.apache.abdera.protocol.server.ServiceContext;
 import org.apache.abdera.protocol.util.AbstractRequest;
-import org.apache.abdera.util.iri.IRI;
-import org.apache.abdera.util.iri.IRISyntaxException;
+import org.apache.abdera.g14n.iri.IRI;
+import org.apache.abdera.g14n.iri.IRISyntaxException;
 
 public abstract class AbstractRequestContext 
   extends AbstractRequest

Modified: incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/provider/RequestContext.java
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/provider/RequestContext.java?view=diff&rev=518464&r1=518463&r2=518464
==============================================================================
--- incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/provider/RequestContext.java (original)
+++ incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/provider/RequestContext.java Wed Mar 14 21:00:29 2007
@@ -31,7 +31,7 @@
 import org.apache.abdera.parser.ParserOptions;
 import org.apache.abdera.protocol.Request;
 import org.apache.abdera.protocol.server.ServiceContext;
-import org.apache.abdera.util.iri.IRI;
+import org.apache.abdera.g14n.iri.IRI;
 
 public interface RequestContext 
   extends Request {

Modified: incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/servlet/HttpServletRequestContext.java
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/servlet/HttpServletRequestContext.java?view=diff&rev=518464&r1=518463&r2=518464
==============================================================================
--- incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/servlet/HttpServletRequestContext.java (original)
+++ incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/servlet/HttpServletRequestContext.java Wed Mar 14 21:00:29 2007
@@ -34,8 +34,8 @@
 import org.apache.abdera.protocol.server.provider.AbstractRequestContext;
 import org.apache.abdera.protocol.server.provider.RequestContext;
 import org.apache.abdera.protocol.server.provider.TargetResolver;
-import org.apache.abdera.util.iri.IRI;
-import org.apache.abdera.util.iri.IRISyntaxException;
+import org.apache.abdera.g14n.iri.IRI;
+import org.apache.abdera.g14n.iri.IRISyntaxException;
 
 public class HttpServletRequestContext 
   extends AbstractRequestContext

Modified: incubator/abdera/java/trunk/server/src/test/java/org/apache/abdera/test/server/UtilityTest.java
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/server/src/test/java/org/apache/abdera/test/server/UtilityTest.java?view=diff&rev=518464&r1=518463&r2=518464
==============================================================================
--- incubator/abdera/java/trunk/server/src/test/java/org/apache/abdera/test/server/UtilityTest.java (original)
+++ incubator/abdera/java/trunk/server/src/test/java/org/apache/abdera/test/server/UtilityTest.java Wed Mar 14 21:00:29 2007
@@ -32,7 +32,7 @@
 import org.apache.abdera.protocol.server.provider.TargetType;
 import org.apache.abdera.protocol.server.util.RegexTargetResolver;
 import org.apache.abdera.protocol.server.util.SimpleSubjectResolver;
-import org.apache.abdera.util.iri.IRI;
+import org.apache.abdera.g14n.iri.IRI;
 
 import junit.framework.TestCase;
 



Mime
View raw message