abdera-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jmsn...@apache.org
Subject svn commit: r518464 [1/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
Author: jmsnell
Date: Wed Mar 14 21:00:29 2007
New Revision: 518464

URL: http://svn.apache.org/viewvc?view=rev&rev=518464
Log:
First step towards separating the IRI/IDNA/Unicode stuff off to it's own project.

Added:
    incubator/abdera/java/trunk/dependencies/g14n/
    incubator/abdera/java/trunk/dependencies/g14n/src/
    incubator/abdera/java/trunk/dependencies/g14n/src/main/
    incubator/abdera/java/trunk/dependencies/g14n/src/main/java/
    incubator/abdera/java/trunk/dependencies/g14n/src/main/java/org/
    incubator/abdera/java/trunk/dependencies/g14n/src/main/java/org/apache/
    incubator/abdera/java/trunk/dependencies/g14n/src/main/java/org/apache/abdera/
    incubator/abdera/java/trunk/dependencies/g14n/src/main/java/org/apache/abdera/g14n/
    incubator/abdera/java/trunk/dependencies/g14n/src/main/java/org/apache/abdera/g14n/ChainableBitSet.java
    incubator/abdera/java/trunk/dependencies/g14n/src/main/java/org/apache/abdera/g14n/io/
    incubator/abdera/java/trunk/dependencies/g14n/src/main/java/org/apache/abdera/g14n/io/ByteArrayCodepointIterator.java
    incubator/abdera/java/trunk/dependencies/g14n/src/main/java/org/apache/abdera/g14n/io/CharArrayCodepointIterator.java
    incubator/abdera/java/trunk/dependencies/g14n/src/main/java/org/apache/abdera/g14n/io/CharBufferCodepointIterator.java
    incubator/abdera/java/trunk/dependencies/g14n/src/main/java/org/apache/abdera/g14n/io/CharSequenceCodepointIterator.java
    incubator/abdera/java/trunk/dependencies/g14n/src/main/java/org/apache/abdera/g14n/io/CharUtils.java
    incubator/abdera/java/trunk/dependencies/g14n/src/main/java/org/apache/abdera/g14n/io/CodepointIterator.java
    incubator/abdera/java/trunk/dependencies/g14n/src/main/java/org/apache/abdera/g14n/io/DynamicPushbackInputStream.java
    incubator/abdera/java/trunk/dependencies/g14n/src/main/java/org/apache/abdera/g14n/io/FilterCodepointIterator.java
    incubator/abdera/java/trunk/dependencies/g14n/src/main/java/org/apache/abdera/g14n/io/InvalidCharacterException.java
    incubator/abdera/java/trunk/dependencies/g14n/src/main/java/org/apache/abdera/g14n/io/PeekAheadInputStream.java
    incubator/abdera/java/trunk/dependencies/g14n/src/main/java/org/apache/abdera/g14n/io/ReadWriteByteChannel.java
    incubator/abdera/java/trunk/dependencies/g14n/src/main/java/org/apache/abdera/g14n/io/RestrictedCodepointIterator.java
    incubator/abdera/java/trunk/dependencies/g14n/src/main/java/org/apache/abdera/g14n/io/RewindableInputStream.java
    incubator/abdera/java/trunk/dependencies/g14n/src/main/java/org/apache/abdera/g14n/iri/
    incubator/abdera/java/trunk/dependencies/g14n/src/main/java/org/apache/abdera/g14n/iri/AbstractScheme.java
    incubator/abdera/java/trunk/dependencies/g14n/src/main/java/org/apache/abdera/g14n/iri/Constants.java
    incubator/abdera/java/trunk/dependencies/g14n/src/main/java/org/apache/abdera/g14n/iri/DefaultScheme.java
    incubator/abdera/java/trunk/dependencies/g14n/src/main/java/org/apache/abdera/g14n/iri/Escaping.java
    incubator/abdera/java/trunk/dependencies/g14n/src/main/java/org/apache/abdera/g14n/iri/HttpScheme.java
    incubator/abdera/java/trunk/dependencies/g14n/src/main/java/org/apache/abdera/g14n/iri/HttpsScheme.java
    incubator/abdera/java/trunk/dependencies/g14n/src/main/java/org/apache/abdera/g14n/iri/IDNA.java
    incubator/abdera/java/trunk/dependencies/g14n/src/main/java/org/apache/abdera/g14n/iri/IRI.java
    incubator/abdera/java/trunk/dependencies/g14n/src/main/java/org/apache/abdera/g14n/iri/IRISyntaxException.java
    incubator/abdera/java/trunk/dependencies/g14n/src/main/java/org/apache/abdera/g14n/iri/Nameprep.java
    incubator/abdera/java/trunk/dependencies/g14n/src/main/java/org/apache/abdera/g14n/iri/NameprepCodepointIterator.java
    incubator/abdera/java/trunk/dependencies/g14n/src/main/java/org/apache/abdera/g14n/iri/Punycode.java
    incubator/abdera/java/trunk/dependencies/g14n/src/main/java/org/apache/abdera/g14n/iri/Scheme.java
    incubator/abdera/java/trunk/dependencies/g14n/src/main/java/org/apache/abdera/g14n/iri/SchemeRegistry.java
    incubator/abdera/java/trunk/dependencies/g14n/src/main/java/org/apache/abdera/g14n/lang/
    incubator/abdera/java/trunk/dependencies/g14n/src/main/java/org/apache/abdera/g14n/lang/InvalidLangTagSyntax.java
    incubator/abdera/java/trunk/dependencies/g14n/src/main/java/org/apache/abdera/g14n/lang/Lang.java
    incubator/abdera/java/trunk/dependencies/g14n/src/main/java/org/apache/abdera/g14n/unicode/
    incubator/abdera/java/trunk/dependencies/g14n/src/main/java/org/apache/abdera/g14n/unicode/Normalizer.java
    incubator/abdera/java/trunk/dependencies/g14n/src/main/java/org/apache/abdera/g14n/unicode/UnicodeCharacterDatabase.java
    incubator/abdera/java/trunk/dependencies/g14n/src/main/resources/
    incubator/abdera/java/trunk/dependencies/g14n/src/main/resources/org/
    incubator/abdera/java/trunk/dependencies/g14n/src/main/resources/org/apache/
    incubator/abdera/java/trunk/dependencies/g14n/src/main/resources/org/apache/abdera/
    incubator/abdera/java/trunk/dependencies/g14n/src/main/resources/org/apache/abdera/g14n/
    incubator/abdera/java/trunk/dependencies/g14n/src/main/resources/org/apache/abdera/g14n/iri/
    incubator/abdera/java/trunk/dependencies/g14n/src/main/resources/org/apache/abdera/g14n/iri/data/
    incubator/abdera/java/trunk/dependencies/g14n/src/main/resources/org/apache/abdera/g14n/iri/data/B2.dat
    incubator/abdera/java/trunk/dependencies/g14n/src/main/resources/org/apache/abdera/g14n/unicode/
    incubator/abdera/java/trunk/dependencies/g14n/src/main/resources/org/apache/abdera/g14n/unicode/data/
    incubator/abdera/java/trunk/dependencies/g14n/src/main/resources/org/apache/abdera/g14n/unicode/data/CompositionExclusions-3.2.0.txt
    incubator/abdera/java/trunk/dependencies/g14n/src/main/resources/org/apache/abdera/g14n/unicode/data/UnicodeData-3.2.0.txt
    incubator/abdera/java/trunk/dependencies/g14n/src/main/resources/org/apache/abdera/g14n/unicode/data/ucd.res   (with props)
    incubator/abdera/java/trunk/dependencies/g14n/src/test/
    incubator/abdera/java/trunk/dependencies/g14n/src/test/java/
    incubator/abdera/java/trunk/dependencies/g14n/src/test/java/org/
    incubator/abdera/java/trunk/dependencies/g14n/src/test/java/org/apache/
    incubator/abdera/java/trunk/dependencies/g14n/src/test/java/org/apache/abdera/
    incubator/abdera/java/trunk/dependencies/g14n/src/test/java/org/apache/abdera/g14n/
    incubator/abdera/java/trunk/dependencies/g14n/src/test/java/org/apache/abdera/g14n/test/
    incubator/abdera/java/trunk/dependencies/g14n/src/test/java/org/apache/abdera/g14n/test/iri/
    incubator/abdera/java/trunk/dependencies/g14n/src/test/java/org/apache/abdera/g14n/test/iri/TestBase.java
    incubator/abdera/java/trunk/dependencies/g14n/src/test/java/org/apache/abdera/g14n/test/iri/TestIDNA.java
    incubator/abdera/java/trunk/dependencies/g14n/src/test/java/org/apache/abdera/g14n/test/iri/TestIRI.java
    incubator/abdera/java/trunk/dependencies/g14n/src/test/java/org/apache/abdera/g14n/test/iri/TestLang.java
    incubator/abdera/java/trunk/dependencies/g14n/src/test/java/org/apache/abdera/g14n/test/iri/TestNFKC.java
    incubator/abdera/java/trunk/dependencies/g14n/src/test/java/org/apache/abdera/g14n/test/iri/TestNameprep.java
    incubator/abdera/java/trunk/dependencies/g14n/src/test/java/org/apache/abdera/g14n/test/iri/TestPunycode.java
    incubator/abdera/java/trunk/dependencies/g14n/src/test/java/org/apache/abdera/g14n/test/iri/TestSuite.java
Removed:
    incubator/abdera/java/trunk/core/src/main/java/org/apache/abdera/util/ChainableBitSet.java
    incubator/abdera/java/trunk/core/src/main/java/org/apache/abdera/util/io/
    incubator/abdera/java/trunk/core/src/main/java/org/apache/abdera/util/iri/
    incubator/abdera/java/trunk/core/src/main/java/org/apache/abdera/util/lang/
    incubator/abdera/java/trunk/core/src/main/java/org/apache/abdera/util/unicode/
    incubator/abdera/java/trunk/core/src/test/java/org/apache/abdera/test/iri/
Modified:
    incubator/abdera/java/trunk/build/build.xml
    incubator/abdera/java/trunk/client/src/main/java/org/apache/abdera/protocol/client/Client.java
    incubator/abdera/java/trunk/client/src/main/java/org/apache/abdera/protocol/client/CommonsClient.java
    incubator/abdera/java/trunk/client/src/test/java/org/apache/abdera/test/client/app/AppTest.java
    incubator/abdera/java/trunk/core/src/main/java/org/apache/abdera/Abdera.java
    incubator/abdera/java/trunk/core/src/main/java/org/apache/abdera/model/Categories.java
    incubator/abdera/java/trunk/core/src/main/java/org/apache/abdera/model/Category.java
    incubator/abdera/java/trunk/core/src/main/java/org/apache/abdera/model/Collection.java
    incubator/abdera/java/trunk/core/src/main/java/org/apache/abdera/model/Content.java
    incubator/abdera/java/trunk/core/src/main/java/org/apache/abdera/model/Document.java
    incubator/abdera/java/trunk/core/src/main/java/org/apache/abdera/model/Element.java
    incubator/abdera/java/trunk/core/src/main/java/org/apache/abdera/model/ElementWrapper.java
    incubator/abdera/java/trunk/core/src/main/java/org/apache/abdera/model/Entry.java
    incubator/abdera/java/trunk/core/src/main/java/org/apache/abdera/model/Feed.java
    incubator/abdera/java/trunk/core/src/main/java/org/apache/abdera/model/Generator.java
    incubator/abdera/java/trunk/core/src/main/java/org/apache/abdera/model/IRIElement.java
    incubator/abdera/java/trunk/core/src/main/java/org/apache/abdera/model/Link.java
    incubator/abdera/java/trunk/core/src/main/java/org/apache/abdera/model/Person.java
    incubator/abdera/java/trunk/core/src/main/java/org/apache/abdera/model/Source.java
    incubator/abdera/java/trunk/core/src/main/java/org/apache/abdera/model/Workspace.java
    incubator/abdera/java/trunk/core/src/main/java/org/apache/abdera/parser/Parser.java
    incubator/abdera/java/trunk/core/src/main/java/org/apache/abdera/util/AbderaResult.java
    incubator/abdera/java/trunk/core/src/main/java/org/apache/abdera/util/AbstractParser.java
    incubator/abdera/java/trunk/core/src/main/java/org/apache/abdera/util/URIHelper.java
    incubator/abdera/java/trunk/core/src/test/java/org/apache/abdera/test/core/TestSuite.java
    incubator/abdera/java/trunk/dependencies/deps.properties
    incubator/abdera/java/trunk/examples/src/main/java/org/apache/abdera/examples/appclient/Main.java
    incubator/abdera/java/trunk/examples/src/main/java/org/apache/abdera/examples/appserver/SimpleProvider.java
    incubator/abdera/java/trunk/examples/src/main/java/org/apache/abdera/examples/simple/Create.java
    incubator/abdera/java/trunk/extensions/src/main/java/org/apache/abdera/ext/bidi/BidiHelper.java
    incubator/abdera/java/trunk/extensions/src/main/java/org/apache/abdera/ext/history/FeedPagingHelper.java
    incubator/abdera/java/trunk/extensions/src/main/java/org/apache/abdera/ext/json/JSONWriter.java
    incubator/abdera/java/trunk/extensions/src/main/java/org/apache/abdera/ext/media/MediaCategory.java
    incubator/abdera/java/trunk/extensions/src/main/java/org/apache/abdera/ext/media/MediaContent.java
    incubator/abdera/java/trunk/extensions/src/main/java/org/apache/abdera/ext/media/MediaCopyright.java
    incubator/abdera/java/trunk/extensions/src/main/java/org/apache/abdera/ext/media/MediaCredit.java
    incubator/abdera/java/trunk/extensions/src/main/java/org/apache/abdera/ext/media/MediaPlayer.java
    incubator/abdera/java/trunk/extensions/src/main/java/org/apache/abdera/ext/media/MediaRating.java
    incubator/abdera/java/trunk/extensions/src/main/java/org/apache/abdera/ext/media/MediaThumbnail.java
    incubator/abdera/java/trunk/extensions/src/main/java/org/apache/abdera/ext/thread/InReplyTo.java
    incubator/abdera/java/trunk/extensions/src/main/java/org/apache/abdera/ext/thread/ThreadHelper.java
    incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMCategories.java
    incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMCategory.java
    incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMCollection.java
    incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMContent.java
    incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMDiv.java
    incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMDocument.java
    incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMElement.java
    incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMEntry.java
    incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMFactory.java
    incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMFeed.java
    incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMGenerator.java
    incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMIRI.java
    incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMLink.java
    incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMParser.java
    incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMPerson.java
    incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMSource.java
    incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMText.java
    incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMWorkspace.java
    incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/util/ResolveFunction.java
    incubator/abdera/java/trunk/parser/src/test/java/org/apache/abdera/test/parser/stax/AtomConformanceTest.java
    incubator/abdera/java/trunk/parser/src/test/java/org/apache/abdera/test/parser/stax/BaseParserTestCase.java
    incubator/abdera/java/trunk/parser/src/test/java/org/apache/abdera/test/parser/stax/FOMTest.java
    incubator/abdera/java/trunk/parser/src/test/java/org/apache/abdera/test/parser/stax/FeedParserTest.java
    incubator/abdera/java/trunk/parser/src/test/java/org/apache/abdera/test/parser/stax/FeedValidatorTest.java
    incubator/abdera/java/trunk/protocol/src/main/java/org/apache/abdera/protocol/Response.java
    incubator/abdera/java/trunk/protocol/src/main/java/org/apache/abdera/protocol/util/AbstractResponse.java
    incubator/abdera/java/trunk/protocol/src/main/java/org/apache/abdera/protocol/util/EncodingUtil.java
    incubator/abdera/java/trunk/security/src/main/java/org/apache/abdera/security/util/servlet/SecurityFilter.java
    incubator/abdera/java/trunk/security/src/main/java/org/apache/abdera/security/xmlsec/XmlSignature.java
    incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/provider/AbstractProvider.java
    incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/provider/AbstractRequestContext.java
    incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/provider/RequestContext.java
    incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/servlet/HttpServletRequestContext.java
    incubator/abdera/java/trunk/server/src/test/java/org/apache/abdera/test/server/UtilityTest.java

Modified: incubator/abdera/java/trunk/build/build.xml
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/build/build.xml?view=diff&rev=518464&r1=518463&r2=518464
==============================================================================
--- incubator/abdera/java/trunk/build/build.xml (original)
+++ incubator/abdera/java/trunk/build/build.xml Wed Mar 14 21:00:29 2007
@@ -15,7 +15,7 @@
   copyright in this work, please see the NOTICE file in the top level
   directory of this distribution. -->
 <project name="abdera" default="build" basedir="..">
-<!--
+  <!--
 
   abdera Build
     targets:
@@ -78,45 +78,56 @@
   <property name="client.jar" value="${dist}/${ant.project.name}.client.${version}.jar" />
   <property name="examples" value="${basedir}/examples" />
   <property name="examples.work" value="${work}/examples" />
-  <property name="examples.src" value="${examples}/src/main/java" /> 
+  <property name="examples.src" value="${examples}/src/main/java" />
   <property name="debug" value="on" />
-  
+
   <property environment="env" />
-      
+
   <property name="dependencies" value="${basedir}/dependencies" />
   <property name="dependencies.work" value="${dependencies}/work" />
   <property name="json.src" value="${dependencies}/json/src" />
-  <property name="json.src.java"
-            value="${json.src}/main/java" />
+  <property name="json.src.java" value="${json.src}/main/java" />
   <property name="json.version" value="1.0" />
-
   <property name="json.jar" value="${dependencies}/json-${json.version}.jar" />
 
+  <property name="g14n.src" value="${dependencies}/g14n/src" />
+  <property name="g14n.src.java" value="${g14n.src}/main/java" />
+  <property name="g14n.src.resources" value="${g14n.src}/main/resources" />
+  <property name="g14n.version" value="0.2.2" />
+  <property name="g14n.jar" value="${dependencies}/abdera-g14n-${g14n.version}.jar" />
+
   <property file="${dependencies}/deps.properties" />
-  
+
   <path id="jar.dependencies">
     <fileset dir="${dependencies}" includes="**/*.jar" />
+    <fileset file="${g14n.jar}" />
+    <fileset file="${json.jar}" />
   </path>
- 
+
   <target name="compile.dependencies">
     <mkdir dir="${dependencies.work}/json" />
 
     <!-- build json -->
-    <javac srcdir="${json.src.java}"
-           destdir="${dependencies.work}/json"
-           debug="${debug}" />
-
-    <jar destfile="${json.jar}"
-         basedir="${dependencies.work}/json"
-         includes="org/json/*.class" />
+    <javac srcdir="${json.src.java}" destdir="${dependencies.work}/json" debug="${debug}" />
+
+    <jar destfile="${json.jar}" basedir="${dependencies.work}/json" includes="org/json/*.class" />
+
+
+    <mkdir dir="${dependencies.work}/g14n" />
+    <javac srcdir="${g14n.src.java}" destdir="${dependencies.work}/g14n" debug="${debug}" />
+    <copy todir="${dependencies.work}/g14n">
+      <fileset dir="${g14n.src.resources}" includes="**/*" />
+    </copy>
+    <jar destfile="${g14n.jar}" basedir="${dependencies.work}/g14n" includes="org/apache/abdera/g14n/**/*" />
+
   </target>
- 
+
   <target name="dependencies">
     <path id="">
       <fileset dir="dependencies" includes="*.jar" />
     </path>
   </target>
-  
+
   <target name="init">
     <echo>
 =====================================================
@@ -136,12 +147,11 @@
       <not>
         <and>
           <available file="${dependencies}/${geronimo.activation.jar}" />
-          <available file="${dependencies}/${geronimo.servlet.jar}" />          
+          <available file="${dependencies}/${geronimo.servlet.jar}" />
           <available file="${dependencies}/${axiom.api.jar}" />
           <available file="${dependencies}/${axiom.impl.jar}" />
           <available file="${dependencies}/${jaxen.jar}" />
           <available file="${dependencies}/${log4j.jar}" />
-          <!--available file="${dependencies}/${stax.jar}" /-->
           <available file="${dependencies}/${stax.api.jar}" />
           <available file="${dependencies}/${commons.logging.jar}" />
           <available file="${dependencies}/${commons.codec.jar}" />
@@ -155,7 +165,7 @@
       </not>
     </condition>
     <condition property="do.security">
-      <istrue value="${env.ABDERA_XMLSECURITY}"/>
+      <istrue value="${env.ABDERA_XMLSECURITY}" />
     </condition>
     <condition property="do.download.security">
       <and>
@@ -168,34 +178,27 @@
         </not>
       </and>
     </condition>
-    
+
     <mkdir dir="${work}" />
     <manifest file="${work}/MANIFEST.MF">
-    <attribute name="Specification-Title" value="Apache Abdera"/>
-    <attribute name="Specification-Version" value="${version}"/>
-    <attribute name="Specification-Vendor" value="The Apache Software Foundation - Incubator"/>
-    <attribute name="Implementation-Title" value="org.apache.abdera"/>
-    <attribute name="Implementation-Version" value="${version}"/> 
-    <attribute name="Implementation-Vendor" value="The Apache Software Foundation - Incubator"/>
+      <attribute name="Specification-Title" value="Apache Abdera" />
+      <attribute name="Specification-Version" value="${version}" />
+      <attribute name="Specification-Vendor" value="The Apache Software Foundation - Incubator" />
+      <attribute name="Implementation-Title" value="org.apache.abdera" />
+      <attribute name="Implementation-Version" value="${version}" />
+      <attribute name="Implementation-Vendor" value="The Apache Software Foundation - Incubator" />
     </manifest>
-    
+
     <echo>Building Security? ${do.security}</echo>
-    
-    <antcall target="download"/>
+
+    <antcall target="download" />
     <antcall target="downloadsecurity" />
   </target>
-  
-  <target name="compile.core" depends="init">
+
+  <target name="compile.core" depends="init,compile.dependencies">
     <mkdir dir="${core.work}" />
-    <javac srcdir="${core.src}"
-           destdir="${core.work}"
-           classpathref="jar.dependencies"
-           debug="${debug}" />
-    <javac srcdir="${core.test}"
-           destdir="${test}" 
-           classpathref="jar.dependencies"
-           classpath="${core.work}"
-           debug="${debug}" />
+    <javac srcdir="${core.src}" destdir="${core.work}" classpathref="jar.dependencies" debug="${debug}" />
+    <javac srcdir="${core.test}" destdir="${test}" classpathref="jar.dependencies" classpath="${core.work}" debug="${debug}" />
     <mkdir dir="${core.work}/META-INF" />
     <copy todir="${core.work}">
       <fileset dir="${core.resources}" includes="**/*" />
@@ -207,14 +210,10 @@
       </fileset>
     </copy>
   </target>
-  
+
   <target name="compile.protocol" depends="init">
     <mkdir dir="${protocol.work}" />
-    <javac srcdir="${protocol.src}"
-           destdir="${protocol.work}"
-           classpathref="jar.dependencies"
-           classpath="${core.work}"
-           debug="${debug}" />
+    <javac srcdir="${protocol.src}" destdir="${protocol.work}" classpathref="jar.dependencies" classpath="${core.work}" debug="${debug}" />
     <mkdir dir="${protocol.work}/META-INF" />
     <copy todir="${protocol.work}/META-INF">
       <fileset dir="${basedir}">
@@ -223,19 +222,11 @@
       </fileset>
     </copy>
   </target>
-  
+
   <target name="compile.parser" depends="init,compile.core">
     <mkdir dir="${parser.work}" />
-    <javac srcdir="${parser.src}"
-           destdir="${parser.work}"
-           classpathref="jar.dependencies" 
-           classpath="${core.work}"
-           debug="${debug}" />
-    <javac srcdir="${parser.test.java}"
-           destdir="${test}"
-           classpathref="jar.dependencies"
-           classpath="${core.work};${parser.work}"
-           debug="${debug}" />
+    <javac srcdir="${parser.src}" destdir="${parser.work}" classpathref="jar.dependencies" classpath="${core.work}" debug="${debug}" />
+    <javac srcdir="${parser.test.java}" destdir="${test}" classpathref="jar.dependencies" classpath="${core.work};${parser.work}" debug="${debug}" />
     <mkdir dir="${parser.work}/META-INF" />
     <copy todir="${parser.work}/META-INF">
       <fileset dir="${basedir}">
@@ -248,23 +239,15 @@
     </copy>
     <copy todir="${test}">
       <fileset dir="${parser.test.resources}">
-        <include name="**"/>
+        <include name="**" />
       </fileset>
     </copy>
   </target>
-  
+
   <target name="compile.extensions" depends="init, compile.core, compile.parser, compile.dependencies, compile.client">
     <mkdir dir="${extensions.work}" />
-    <javac srcdir="${extensions.src}"
-           destdir="${extensions.work}"
-           classpathref="jar.dependencies"
-           classpath="${core.work};${parser.work};${client.work};${protocol.work}"
-           debug="${debug}" />
-    <javac srcdir="${extensions.test.java}"
-           destdir="${test}"
-           classpathref="jar.dependencies"
-           classpath="${core.work};${parser.work};${extensions.work};${client.work};${protocol.work}"
-           debug="${debug}" />
+    <javac srcdir="${extensions.src}" destdir="${extensions.work}" classpathref="jar.dependencies" classpath="${core.work};${parser.work};${client.work};${protocol.work}" debug="${debug}" />
+    <javac srcdir="${extensions.test.java}" destdir="${test}" classpathref="jar.dependencies" classpath="${core.work};${parser.work};${extensions.work};${client.work};${protocol.work}" debug="${debug}" />
     <mkdir dir="${extensions.work}/META-INF" />
     <copy todir="${extensions.work}/META-INF">
       <fileset dir="${basedir}">
@@ -279,14 +262,10 @@
       <fileset dir="${extensions.test.resources}" includes="**/*" />
     </copy>
   </target>
-  
+
   <target name="compile.server" depends="init, compile.core, compile.protocol">
     <mkdir dir="${server.work}" />
-    <javac srcdir="${server.src}"
-           destdir="${server.work}"
-           classpathref="jar.dependencies"
-           classpath="${core.work};${protocol.work}"
-           debug="${debug}" />
+    <javac srcdir="${server.src}" destdir="${server.work}" classpathref="jar.dependencies" classpath="${core.work};${protocol.work}" debug="${debug}" />
     <mkdir dir="${server.work}/META-INF" />
     <copy todir="${server.work}/META-INF">
       <fileset dir="${basedir}">
@@ -294,20 +273,12 @@
         <include name="NOTICE" />
       </fileset>
     </copy>
-  </target>  
-  
+  </target>
+
   <target name="compile.security" depends="init, compile.core" if="do.security">
     <mkdir dir="${security.work}" />
-    <javac srcdir="${security.src}"
-           destdir="${security.work}"
-           classpathref="jar.dependencies"
-           classpath="${core.work}"
-           debug="${debug}" />
-    <javac srcdir="${security.test.java}"
-           destdir="${test}"
-           classpathref="jar.dependencies"
-           classpath="${core.work};${parser.work};${security.work};${protocol.work}:${client.work}"
-           debug="${debug}" />
+    <javac srcdir="${security.src}" destdir="${security.work}" classpathref="jar.dependencies" classpath="${core.work}" debug="${debug}" />
+    <javac srcdir="${security.test.java}" destdir="${test}" classpathref="jar.dependencies" classpath="${core.work};${parser.work};${security.work};${protocol.work}:${client.work}" debug="${debug}" />
     <mkdir dir="${security.work}/META-INF" />
     <copy todir="${test}">
       <fileset dir="${security.test.resources}" includes="**/*" />
@@ -322,16 +293,8 @@
 
   <target name="compile.client" depends="init,compile.core, compile.protocol">
     <mkdir dir="${client.work}" />
-    <javac srcdir="${client.src}"
-           destdir="${client.work}"
-           classpathref="jar.dependencies"
-           classpath="${core.work};${protocol.work}"
-           debug="${debug}" />
-    <javac srcdir="${client.test.java}"
-           destdir="${test}"
-           classpathref="jar.dependencies"
-           classpath="${core.work};${parser.work};${extensions.work};${client.work};${protocol.work}"
-           debug="${debug}" />
+    <javac srcdir="${client.src}" destdir="${client.work}" classpathref="jar.dependencies" classpath="${core.work};${protocol.work}" debug="${debug}" />
+    <javac srcdir="${client.test.java}" destdir="${test}" classpathref="jar.dependencies" classpath="${core.work};${parser.work};${extensions.work};${client.work};${protocol.work}" debug="${debug}" />
     <mkdir dir="${client.work}/META-INF" />
     <copy todir="${client.work}/META-INF">
       <fileset dir="${basedir}">
@@ -340,75 +303,51 @@
       </fileset>
     </copy>
   </target>
-  
+
   <target name="compile.examples" depends="init,compile.core,compile.parser,compile.protocol,compile.server,compile.extensions,compile.security">
     <echo>Make sure the example code compiles...</echo>
     <mkdir dir="${examples.work}" />
-    <javac srcdir="${examples.src}"
-           destdir="${examples.work}"
-           classpathref="jar.dependencies"
-           classpath="${core.work};${parser.work};${protocol.work};${client.work};${server.work};${extensions.work};${security.work}"
-           debug="${debug}">
+    <javac srcdir="${examples.src}" destdir="${examples.work}" classpathref="jar.dependencies" classpath="${core.work};${parser.work};${protocol.work};${client.work};${server.work};${extensions.work};${security.work}" debug="${debug}">
       <exclude unless="do.security" name="**/security/*.java" />
     </javac>
     <delete dir="${examples.work}" />
   </target>
-  
-  <target name="build" depends="init,compile.core,compile.parser,compile.protocol,compile.server,compile.extensions,compile.client,compile.security,compile.examples"></target>
+
+  <target name="build" depends="init,compile.core,compile.parser,compile.protocol,compile.server,compile.extensions,compile.client,compile.security,compile.examples">
+  </target>
 
   <target name="docs" depends="init">
-    <javadoc packagenames="org.apache.abdera.*"
-             excludepackagenames="org.apache.abdera.util,org.apache.abdera.ext.*.impl,org.apache.abdera.parser.**,org.apache.abdera.security.**"
-             sourcepath="${core.src}:${extensions.src}:${security.src}:${server.src}:${parser.src}:${client.src}:${protocol.src}" 
-             destdir="${javadocs}"
-             windowtitle="Abdera"
-             classpathref="jar.dependencies" />
-    <replaceregexp match="Generated by javadoc (.*) on (.*) --"
-                   replace="Generated by javadoc --"
-                   flags="g"
-                   byline="true">
-      <fileset dir="${javadocs}" includes="**/*.html"/>
+    <javadoc packagenames="org.apache.abdera.*" excludepackagenames="org.apache.abdera.util,org.apache.abdera.ext.*.impl,org.apache.abdera.parser.**,org.apache.abdera.security.**" sourcepath="${core.src}:${extensions.src}:${security.src}:${server.src}:${parser.src}:${client.src}:${protocol.src}" destdir="${javadocs}" windowtitle="Abdera" classpathref="jar.dependencies" />
+    <replaceregexp match="Generated by javadoc (.*) on (.*) --" replace="Generated by javadoc --" flags="g" byline="true">
+      <fileset dir="${javadocs}" includes="**/*.html" />
     </replaceregexp>
-    <copy  todir="${docs}">
+    <copy todir="${docs}">
       <fileset dir="${basedir}/docs/" includes="*.html" />
     </copy>
   </target>
-  
+
   <target name="test" depends="build, download_feedvalidator_tests">
     <echo>Running Core Tests...</echo>
-    <java classpathref="jar.dependencies" 
-          classpath="${core.work}:${parser.work}:${server.work}:${test}"
-          classname="org.apache.abdera.test.core.TestSuite"
-          fork="yes" />
+    <java classpathref="jar.dependencies" classpath="${core.work}:${parser.work}:${server.work}:${test}" classname="org.apache.abdera.test.core.TestSuite" fork="yes" />
 
     <echo>Running Stax Parser Tests...</echo>
-    <java classpathref="jar.dependencies" 
-          classpath="${core.work}:${parser.work}:${server.work}:${test}"
-          classname="org.apache.abdera.test.parser.stax.TestSuite"
-          fork="yes" />
+    <java classpathref="jar.dependencies" classpath="${core.work}:${parser.work}:${server.work}:${test}" classname="org.apache.abdera.test.parser.stax.TestSuite" fork="yes" />
 
     <echo>Running Client Tests...</echo>
-    <java classpathref="jar.dependencies"
-          classpath="${core.work}:${parser.work}:${server.work}:${client.work}:${protocol.work}:${test}"
-          classname="org.apache.abdera.test.client.TestSuite"
-          fork="yes" />
+    <java classpathref="jar.dependencies" classpath="${core.work}:${parser.work}:${server.work}:${client.work}:${protocol.work}:${test}" classname="org.apache.abdera.test.client.TestSuite" fork="yes" />
 
     <echo>Running Extension Tests...</echo>
-    <java classpathref="jar.dependencies"
-          classpath="${core.work}:${parser.work}:${server.work}:${extensions.work}:${test}"
-          classname="org.apache.abdera.test.ext.TestSuite"
-          fork="yes" />
-    
+    <java classpathref="jar.dependencies" classpath="${core.work}:${parser.work}:${server.work}:${extensions.work}:${test}" classname="org.apache.abdera.test.ext.TestSuite" fork="yes" />
+
     <antcall target="test.security" />
-    
+
   </target>
-  
+
   <target name="test.security" if="do.security">
     <echo>Running Security Tests...</echo>
-    <java classpathref="jar.dependencies"
-          classpath="${core.work}:${parser.work}:${server.work}:${security.work}:${client.work}:${protocol.work}:${test}"
-          classname="org.apache.abdera.test.security.TestSuite"
-          fork="yes"><arg line="${bouncycastle.provider}"/></java>
+    <java classpathref="jar.dependencies" classpath="${core.work}:${parser.work}:${server.work}:${security.work}:${client.work}:${protocol.work}:${test}" classname="org.apache.abdera.test.security.TestSuite" fork="yes">
+      <arg line="${bouncycastle.provider}" />
+    </java>
   </target>
 
   <target name="clean">
@@ -417,35 +356,36 @@
     <delete dir="${dist}" />
     <delete dir="${dependencies.work}" />
     <delete file="${json.jar}" />
-    <delete> 
+    <delete file="${g14n.jar}" />
+    <delete>
       <fileset dir="${basedir}" includes="*.zip" />
       <fileset dir="${basedir}" includes="*.md5" />
     </delete>
   </target>
-  
+
   <target name="dist" depends="clean,build,test,docs">
     <mkdir dir="${dist}" />
     <mkdir dir="${dist_lib}" />
-    <jar destfile="${core.jar}"   basedir="${core.work}" manifest="${work}/MANIFEST.MF" />
+    <jar destfile="${core.jar}" basedir="${core.work}" manifest="${work}/MANIFEST.MF" />
     <jar destfile="${parser.jar}" basedir="${parser.work}" manifest="${work}/MANIFEST.MF" />
     <jar destfile="${protocol.jar}" basedir="${protocol.work}" manifest="${work}/MANIFEST.MF" />
-    <jar destfile="${server.jar}" basedir="${server.work}" manifest="${work}/MANIFEST.MF" />    
+    <jar destfile="${server.jar}" basedir="${server.work}" manifest="${work}/MANIFEST.MF" />
     <jar destfile="${extensions.jar}" basedir="${extensions.work}" manifest="${work}/MANIFEST.MF" />
     <jar destfile="${client.jar}" basedir="${client.work}" manifest="${work}/MANIFEST.MF" />
     <antcall target="dist.security" />
     <copy todir="${dist_lib}">
-      <fileset dir="${dependencies}"  />
+      <fileset dir="${dependencies}" />
     </copy>
     <delete dir="${work}" />
     <delete dir="${test}" />
   </target>
-  
+
   <target name="dist.security" if="do.security">
     <jar destfile="${security.jar}" basedir="${security.work}" manifest="${work}/MANIFEST.MF" />
   </target>
-  
-  <target name="zip" depends="retro"> 
-    <mkdir dir="${work}/dist/${ant.project.name}.${version}"/>
+
+  <target name="zip" depends="retro">
+    <mkdir dir="${work}/dist/${ant.project.name}.${version}" />
     <mkdir dir="${work}/dist/${ant.project.name}.${version}/examples" />
     <copy todir="${work}/dist/${ant.project.name}.${version}">
       <fileset dir="${dist}">
@@ -472,12 +412,11 @@
     <copy todir="${work}/dist/${ant.project.name}.${version}/examples">
       <fileset dir="${basedir}/examples" includes="**/*" excludes="**/pom.xml" />
     </copy>
-    <zip destfile="${basedir}/${ant.project.name}.${version}.zip" 
-         basedir="${work}/dist/" />
+    <zip destfile="${basedir}/${ant.project.name}.${version}.zip" basedir="${work}/dist/" />
     <checksum file="${basedir}/${ant.project.name}.${version}.zip" fileext=".md5" />
     <delete dir="${work}/dist/${ant.project.name}.${version}" />
-    <mkdir dir="${work}/dist/${ant.project.name}.${version}.jdk142"/>
-    <mkdir dir="${work}/dist/${ant.project.name}.${version}.jdk142/examples"/>
+    <mkdir dir="${work}/dist/${ant.project.name}.${version}.jdk142" />
+    <mkdir dir="${work}/dist/${ant.project.name}.${version}.jdk142/examples" />
     <copy todir="${work}/dist/${ant.project.name}.${version}.jdk142">
       <fileset dir="${dist}">
         <include name="**/*.jar" />
@@ -499,13 +438,12 @@
       </fileset>
     </copy>
     <copy todir="${work}/dist/${ant.project.name}.${version}.jdk142/examples">
-      <fileset dir="${basedir}/examples" includes="**/*" excludes="**/pom.xml"/>
+      <fileset dir="${basedir}/examples" includes="**/*" excludes="**/pom.xml" />
     </copy>
-    <zip destfile="${basedir}/${ant.project.name}.${version}.jdk142.zip" 
-         basedir="${work}/dist/" />
+    <zip destfile="${basedir}/${ant.project.name}.${version}.jdk142.zip" basedir="${work}/dist/" />
     <checksum file="${basedir}/${ant.project.name}.${version}.jdk142.zip" fileext=".md5" />
     <delete dir="${work}/dist/${ant.project.name}.${version}.jdk142" />
-    <mkdir dir="${work}/dist/${ant.project.name}.${version}.src"/>
+    <mkdir dir="${work}/dist/${ant.project.name}.${version}.src" />
     <copy todir="${work}/dist/${ant.project.name}.${version}.src">
       <fileset dir="${basedir}">
         <exclude name="dist/**/*" />
@@ -522,85 +460,51 @@
         <exclude name="**/dependencies/work/json/**/*" />
       </fileset>
     </copy>
-    <zip destfile="${basedir}/${ant.project.name}.${version}.src.zip"
-         basedir="${work}/dist/" />
+    <zip destfile="${basedir}/${ant.project.name}.${version}.src.zip" basedir="${work}/dist/" />
     <checksum file="${basedir}/${ant.project.name}.${version}.src.zip" fileext=".md5" />
     <delete dir="${work}" />
   </target>
 
   <target name="downloadsecurity" if="do.download.security">
     <parallel>
-    <get src="${xmlsecurity.dir}/${xmlsecurity.jar}"
-         dest="${dependencies}/${xmlsecurity.jar}"
-         usetimestamp="true" />
-    <get src="${bouncycastle.dir}/${bouncycastle.jar}"
-         dest="${dependencies}/${bouncycastle.jar}"
-         usetimestamp="true" />
+      <get src="${xmlsecurity.dir}/${xmlsecurity.jar}" dest="${dependencies}/${xmlsecurity.jar}" usetimestamp="true" />
+      <get src="${bouncycastle.dir}/${bouncycastle.jar}" dest="${dependencies}/${bouncycastle.jar}" usetimestamp="true" />
     </parallel>
   </target>
   <target name="download" if="do.download">
     <echo>Downloading project dependencies.  This may take a moment</echo>
     <parallel>
-      <get src="${geronimo.activation.dir}/${geronimo.activation.jar}"
-           dest="${dependencies}/${geronimo.activation.jar}"
-           usetimestamp="true" />
-      <get src="${geronimo.servlet.dir}/${geronimo.servlet.jar}"
-           dest="${dependencies}/${geronimo.servlet.jar}"
-           usetimestamp="true" />      
-      <get src="${axiom.dir}/${axiom.api.jar}"
-           dest="${dependencies}/${axiom.api.jar}"
-           usetimestamp="true" />
-      <get src="${axiom.dir}/${axiom.impl.jar}"
-           dest="${dependencies}/${axiom.impl.jar}"
-           usetimestamp="true" />
-      <get src="${jaxen.dir}/${jaxen.jar}"
-           dest="${dependencies}/${jaxen.jar}"
-           usetimestamp="true" />
-      <get src="${log4j.dir}/${log4j.jar}"
-           dest="${dependencies}/${log4j.jar}"
-           usetimestamp="true" />
+      <get src="${geronimo.activation.dir}/${geronimo.activation.jar}" dest="${dependencies}/${geronimo.activation.jar}" usetimestamp="true" />
+      <get src="${geronimo.servlet.dir}/${geronimo.servlet.jar}" dest="${dependencies}/${geronimo.servlet.jar}" usetimestamp="true" />
+      <get src="${axiom.dir}/${axiom.api.jar}" dest="${dependencies}/${axiom.api.jar}" usetimestamp="true" />
+      <get src="${axiom.dir}/${axiom.impl.jar}" dest="${dependencies}/${axiom.impl.jar}" usetimestamp="true" />
+      <get src="${jaxen.dir}/${jaxen.jar}" dest="${dependencies}/${jaxen.jar}" usetimestamp="true" />
+      <get src="${log4j.dir}/${log4j.jar}" dest="${dependencies}/${log4j.jar}" usetimestamp="true" />
       <!--get src="${stax.dir}/${stax.jar}"
            dest="${dependencies}/${stax.jar}"
            usetimestamp="true" /-->
-      <get src="${stax.dir}/${stax.api.jar}"
-           dest="${dependencies}/${stax.api.jar}"
-           usetimestamp="true" />
-      <get src="${commons.logging.dir}/${commons.logging.jar}"
-           dest="${dependencies}/${commons.logging.jar}"
-           usetimestamp="true" />
-      <get src="${commons.codec.dir}/${commons.codec.jar}"
-           dest="${dependencies}/${commons.codec.jar}"
-           usetimestamp="true" />
-      <get src="${commons.httpclient.dir}/${commons.httpclient.jar}"
-           dest="${dependencies}/${commons.httpclient.jar}"
-           usetimestamp="true" />
-      <get src="${junit.dir}/${junit.jar}"
-           dest="${dependencies}/${junit.jar}"
-           usetimestamp="true" />
-      <get src="${wstx.dir}/${wstx.jar}"
-           dest="${dependencies}/${wstx.jar}"
-           usetimestamp="true" />
-      <get src="${jetty.dir}/${jetty.jar}"
-           dest="${dependencies}/${jetty.jar}"
-           usetimestamp="true" />
-      <get src="${jetty-util.dir}/${jetty-util.jar}"
-           dest="${dependencies}/${jetty-util.jar}"
-           usetimestamp="true" />
-      <get src="${json.dir}/${json.zip}"
-           dest="${dependencies}/${json.zip}"
-           usetimestamp="true" />
+      <get src="${stax.dir}/${stax.api.jar}" dest="${dependencies}/${stax.api.jar}" usetimestamp="true" />
+      <get src="${commons.logging.dir}/${commons.logging.jar}" dest="${dependencies}/${commons.logging.jar}" usetimestamp="true" />
+      <get src="${commons.codec.dir}/${commons.codec.jar}" dest="${dependencies}/${commons.codec.jar}" usetimestamp="true" />
+      <get src="${commons.httpclient.dir}/${commons.httpclient.jar}" dest="${dependencies}/${commons.httpclient.jar}" usetimestamp="true" />
+      <get src="${junit.dir}/${junit.jar}" dest="${dependencies}/${junit.jar}" usetimestamp="true" />
+      <get src="${wstx.dir}/${wstx.jar}" dest="${dependencies}/${wstx.jar}" usetimestamp="true" />
+      <get src="${jetty.dir}/${jetty.jar}" dest="${dependencies}/${jetty.jar}" usetimestamp="true" />
+      <get src="${jetty-util.dir}/${jetty-util.jar}" dest="${dependencies}/${jetty-util.jar}" usetimestamp="true" />
+      <get src="${json.dir}/${json.zip}" dest="${dependencies}/${json.zip}" usetimestamp="true" />
     </parallel>
     <mkdir dir="${json.src}/main/java/org/json" />
-    <unzip src="${dependencies}/${json.zip}" 
-           dest="${json.src}" overwrite="true" />
+    <unzip src="${dependencies}/${json.zip}" dest="${json.src}" overwrite="true" />
     <copy todir="${json.src}/main/java/org/json" overwrite="true">
       <fileset dir="${json.src}/apache/json" />
     </copy>
     <delete dir="${json.src}/apache" />
   </target>
-  
+
   <target name="clean-downloads" depends="init">
-    <delete><fileset dir="${dependencies}" includes="**/*.jar" /></delete>
+    <delete>
+      <fileset dir="${dependencies}" includes="**/*.jar" />
+    </delete>
   </target>
 
   <target name="site-docs" depends="docs">
@@ -609,7 +513,7 @@
       <fileset dir="${javadocs}" />
     </copy>
   </target>
-  
+
   <target name="retro" depends="dist">
     <property name="retrozip" value="${basedir}/build/tools/${retroweaver.zip}" />
     <property name="retro" value="${basedir}/build/tools/retroweaver-1.2.3" />
@@ -620,21 +524,23 @@
     <property name="retro_server.jar" value="${dist}/${ant.project.name}.server.${version}.retro.jar" />
     <property name="retro_client.jar" value="${dist}/${ant.project.name}.client.${version}.retro.jar" />
     <condition property="do.download.retroweaver">
-      <not><available file="${retrozip}"/></not>
+      <not>
+        <available file="${retrozip}" />
+      </not>
     </condition>
     <antcall target="go_retro" />
     <path id="jar.retro">
       <fileset dir="${retro}/release" includes="**/*.jar" />
-    </path>    
+    </path>
     <echo>Retroweaving the Jars...</echo>
     <java classpathref="jar.retro" classname="com.rc.retroweaver.Weaver" fork="yes">
       <arg line="-jar &quot;${core.jar}&quot; &quot;${retro_core.jar}&quot;" />
     </java>
     <java classpathref="jar.retro" classname="com.rc.retroweaver.Weaver" fork="yes">
-      <arg line="-jar &quot;${parser.jar}&quot; &quot;${retro_parser.jar}&quot;"/>
+      <arg line="-jar &quot;${parser.jar}&quot; &quot;${retro_parser.jar}&quot;" />
     </java>
     <java classpathref="jar.retro" classname="com.rc.retroweaver.Weaver" fork="yes">
-      <arg line="-jar &quot;${protocol.jar}&quot; &quot;${retro_protocol.jar}&quot;"/>
+      <arg line="-jar &quot;${protocol.jar}&quot; &quot;${retro_protocol.jar}&quot;" />
     </java>
     <java classpathref="jar.retro" classname="com.rc.retroweaver.Weaver" fork="yes">
       <arg line="-jar &quot;${server.jar}&quot; &quot;${retro_server.jar}&quot;" />
@@ -648,34 +554,25 @@
     <antcall target="retro.security" />
     <copy todir="${dist_lib}" file="${retro}/release/retroweaver-rt-1.2.3.jar" />
   </target>
-  
+
   <target name="retro.security" if="do.security">
     <property name="retro_security.jar" value="${dist}/${ant.project.name}.security.${version}.retro.jar" />
     <java classpathref="jar.retro" classname="com.rc.retroweaver.Weaver" fork="yes">
       <arg line="-jar &quot;${security.jar}&quot; &quot;${retro_security.jar}&quot;" />
     </java>
-    <get src="${bouncycastle.dir}/${bouncycastle.jar.retro}"
-         dest="${dependencies}/${bouncycastle.jar.retro}"
-         usetimestamp="true" ignoreerrors="true"/>
+    <get src="${bouncycastle.dir}/${bouncycastle.jar.retro}" dest="${dependencies}/${bouncycastle.jar.retro}" usetimestamp="true" ignoreerrors="true" />
   </target>
-  
+
   <target name="go_retro" if="do.download.retroweaver">
     <echo>Downloading Retroweaver...</echo>
     <mkdir dir="${basedir}/build/tools" />
-    <get src="${retroweaver.dir}/${retroweaver.zip}"
-         dest="${basedir}/build/tools/${retroweaver.zip}"
-         usetimestamp="true" />
-    <unzip src="${basedir}/build/tools/${retroweaver.zip}"
-           dest="${basedir}/build/tools/" overwrite="true"/>
-  </target>
-  
-  <target name="download_feedvalidator_tests" 
-    depends="init" if="do.download.feedvalidator.tests" >
+    <get src="${retroweaver.dir}/${retroweaver.zip}" dest="${basedir}/build/tools/${retroweaver.zip}" usetimestamp="true" />
+    <unzip src="${basedir}/build/tools/${retroweaver.zip}" dest="${basedir}/build/tools/" overwrite="true" />
+  </target>
+
+  <target name="download_feedvalidator_tests" depends="init" if="do.download.feedvalidator.tests">
     <mkdir dir="${parser.test.resources}/feedvalidator.org" />
-    <exec 
-      failifexecutionfails="false"
-      dir="${parser.test.resources}/feedvalidator.org" 
-      executable="svn">
+    <exec failifexecutionfails="false" dir="${parser.test.resources}/feedvalidator.org" executable="svn">
       <arg line="co https://svn.sourceforge.net/svnroot/feedvalidator/trunk/feedvalidator/testcases/atom testcases/atom" />
     </exec>
   </target>

Modified: incubator/abdera/java/trunk/client/src/main/java/org/apache/abdera/protocol/client/Client.java
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/client/src/main/java/org/apache/abdera/protocol/client/Client.java?view=diff&rev=518464&r1=518463&r2=518464
==============================================================================
--- incubator/abdera/java/trunk/client/src/main/java/org/apache/abdera/protocol/client/Client.java (original)
+++ incubator/abdera/java/trunk/client/src/main/java/org/apache/abdera/protocol/client/Client.java Wed Mar 14 21:00:29 2007
@@ -110,13 +110,13 @@
   public ClientResponse head(
     String uri, 
     RequestOptions options) {
-      return execute("HEAD", uri, null, options);
+      return execute("HEAD", uri, (RequestEntity)null, options);
   }
   
   public ClientResponse get(
     String uri, 
     RequestOptions options) {
-      return execute("GET", uri, null, options);
+      return execute("GET", uri, (RequestEntity)null, options);
   }
   
   public ClientResponse post(
@@ -164,7 +164,7 @@
   public ClientResponse delete(
     String uri, 
     RequestOptions options) {
-      return execute("DELETE", uri, null, options);
+      return execute("DELETE", uri, (RequestEntity)null, options);
   }
   
   public ClientResponse head(String uri) {
@@ -231,6 +231,18 @@
     RequestEntity entity, 
     RequestOptions options);
 
+  public abstract ClientResponse execute(
+    String method,
+    String uri,
+    Base base,
+    RequestOptions options);
+  
+  public abstract ClientResponse execute(
+    String method,
+    String uri,
+    InputStream in,
+    RequestOptions options);
+  
   /**
    * Register a new authentication scheme.
    * 

Modified: incubator/abdera/java/trunk/client/src/main/java/org/apache/abdera/protocol/client/CommonsClient.java
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/client/src/main/java/org/apache/abdera/protocol/client/CommonsClient.java?view=diff&rev=518464&r1=518463&r2=518464
==============================================================================
--- incubator/abdera/java/trunk/client/src/main/java/org/apache/abdera/protocol/client/CommonsClient.java (original)
+++ incubator/abdera/java/trunk/client/src/main/java/org/apache/abdera/protocol/client/CommonsClient.java Wed Mar 14 21:00:29 2007
@@ -17,14 +17,17 @@
 */
 package org.apache.abdera.protocol.client;
 
+import java.io.InputStream;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.util.List;
 
 import org.apache.abdera.Abdera;
+import org.apache.abdera.model.Base;
 import org.apache.abdera.protocol.client.cache.Cache;
 import org.apache.abdera.protocol.client.cache.CacheDisposition;
 import org.apache.abdera.protocol.client.cache.CachedResponse;
+import org.apache.abdera.protocol.client.util.BaseRequestEntity;
 import org.apache.abdera.protocol.client.util.MethodHelper;
 import org.apache.abdera.protocol.util.CacheControlUtil;
 import org.apache.abdera.util.Version;
@@ -35,6 +38,7 @@
 import org.apache.commons.httpclient.auth.AuthPolicy;
 import org.apache.commons.httpclient.auth.AuthScope;
 import org.apache.commons.httpclient.cookie.CookiePolicy;
+import org.apache.commons.httpclient.methods.InputStreamRequestEntity;
 import org.apache.commons.httpclient.methods.RequestEntity;
 import org.apache.commons.httpclient.params.HttpClientParams;
 
@@ -112,6 +116,34 @@
       }
     }
     return false;
+  }
+  
+  public ClientResponse execute(
+    String method,
+    String uri,
+    Base base,
+    RequestOptions options) {
+      RequestEntity re = new BaseRequestEntity(base);
+      return execute(method,uri,re,options);
+  }
+    
+  public ClientResponse execute(
+    String method,
+    String uri,
+    InputStream in,
+    RequestOptions options) {
+      RequestEntity re = null;
+      try {
+        if (options.getContentType() != null) { 
+          re = new InputStreamRequestEntity(
+            in, options.getContentType().toString());
+        } else {
+          re = new InputStreamRequestEntity(in);
+        }
+      } catch (Exception e) {
+        re = new InputStreamRequestEntity(in);
+      }
+      return execute(method,uri,re,options);
   }
   
   @Override

Modified: incubator/abdera/java/trunk/client/src/test/java/org/apache/abdera/test/client/app/AppTest.java
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/client/src/test/java/org/apache/abdera/test/client/app/AppTest.java?view=diff&rev=518464&r1=518463&r2=518464
==============================================================================
--- incubator/abdera/java/trunk/client/src/test/java/org/apache/abdera/test/client/app/AppTest.java (original)
+++ incubator/abdera/java/trunk/client/src/test/java/org/apache/abdera/test/client/app/AppTest.java Wed Mar 14 21:00:29 2007
@@ -48,7 +48,7 @@
 import org.apache.abdera.protocol.client.ClientResponse;
 import org.apache.abdera.test.client.JettyTest;
 import org.apache.abdera.util.MimeTypeHelper;
-import org.apache.abdera.util.iri.IRI;
+import org.apache.abdera.g14n.iri.IRI;
 
 /**
  * Test to make sure that we can operate as a simple APP client

Modified: incubator/abdera/java/trunk/core/src/main/java/org/apache/abdera/Abdera.java
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/core/src/main/java/org/apache/abdera/Abdera.java?view=diff&rev=518464&r1=518463&r2=518464
==============================================================================
--- incubator/abdera/java/trunk/core/src/main/java/org/apache/abdera/Abdera.java (original)
+++ incubator/abdera/java/trunk/core/src/main/java/org/apache/abdera/Abdera.java Wed Mar 14 21:00:29 2007
@@ -155,22 +155,14 @@
    * Return a new instance of org.apache.abdera.factory.Factory
    */
   private Factory newFactory() {
-    try {
-      return ServiceUtil.newFactoryInstance(this);
-    } catch (NoClassDefFoundError n) {
-      return null;  // Don't die if the component is not available
-    }
+    return ServiceUtil.newFactoryInstance(this);
   }
     
   /**
    * Return a new instance of org.apache.abdera.parser.Parser
    */
   private Parser newParser() {
-    try {
-      return ServiceUtil.newParserInstance(this);
-    } catch (NoClassDefFoundError n) {
-      return null;  // Don't die if the component is not available
-    }
+    return ServiceUtil.newParserInstance(this);
   }
     
   /**

Modified: incubator/abdera/java/trunk/core/src/main/java/org/apache/abdera/model/Categories.java
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/core/src/main/java/org/apache/abdera/model/Categories.java?view=diff&rev=518464&r1=518463&r2=518464
==============================================================================
--- incubator/abdera/java/trunk/core/src/main/java/org/apache/abdera/model/Categories.java (original)
+++ incubator/abdera/java/trunk/core/src/main/java/org/apache/abdera/model/Categories.java Wed Mar 14 21:00:29 2007
@@ -19,8 +19,8 @@
 
 import java.util.List;
 
-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;
 
 /**
  * The Atom Publishing Protocol introduces the notion of a "Category Document"

Modified: incubator/abdera/java/trunk/core/src/main/java/org/apache/abdera/model/Category.java
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/core/src/main/java/org/apache/abdera/model/Category.java?view=diff&rev=518464&r1=518463&r2=518464
==============================================================================
--- incubator/abdera/java/trunk/core/src/main/java/org/apache/abdera/model/Category.java (original)
+++ incubator/abdera/java/trunk/core/src/main/java/org/apache/abdera/model/Category.java Wed Mar 14 21:00:29 2007
@@ -17,8 +17,8 @@
 */
 package org.apache.abdera.model;
 
-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;
 
 /**
  * <p>Provides categorization informaton for a feed or entry</p>

Modified: incubator/abdera/java/trunk/core/src/main/java/org/apache/abdera/model/Collection.java
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/core/src/main/java/org/apache/abdera/model/Collection.java?view=diff&rev=518464&r1=518463&r2=518464
==============================================================================
--- incubator/abdera/java/trunk/core/src/main/java/org/apache/abdera/model/Collection.java (original)
+++ incubator/abdera/java/trunk/core/src/main/java/org/apache/abdera/model/Collection.java Wed Mar 14 21:00:29 2007
@@ -21,8 +21,8 @@
 
 import javax.activation.MimeType;
 
-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;
 
 /**
  * <p>Represents an collection element in an Atom Publishing Protocol 

Modified: incubator/abdera/java/trunk/core/src/main/java/org/apache/abdera/model/Content.java
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/core/src/main/java/org/apache/abdera/model/Content.java?view=diff&rev=518464&r1=518463&r2=518464
==============================================================================
--- incubator/abdera/java/trunk/core/src/main/java/org/apache/abdera/model/Content.java (original)
+++ incubator/abdera/java/trunk/core/src/main/java/org/apache/abdera/model/Content.java Wed Mar 14 21:00:29 2007
@@ -22,8 +22,8 @@
 import javax.activation.MimeTypeParseException;
 
 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;
 
 /**
  * <p>Represents an atom:content element.</p>

Modified: incubator/abdera/java/trunk/core/src/main/java/org/apache/abdera/model/Document.java
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/core/src/main/java/org/apache/abdera/model/Document.java?view=diff&rev=518464&r1=518463&r2=518464
==============================================================================
--- incubator/abdera/java/trunk/core/src/main/java/org/apache/abdera/model/Document.java (original)
+++ incubator/abdera/java/trunk/core/src/main/java/org/apache/abdera/model/Document.java Wed Mar 14 21:00:29 2007
@@ -23,8 +23,8 @@
 import javax.activation.MimeType;
 import javax.activation.MimeTypeParseException;
 
-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;
 
 /**
  * <p>The top level artifact of the Feed Object Model.  The Parser component

Modified: incubator/abdera/java/trunk/core/src/main/java/org/apache/abdera/model/Element.java
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/core/src/main/java/org/apache/abdera/model/Element.java?view=diff&rev=518464&r1=518463&r2=518464
==============================================================================
--- incubator/abdera/java/trunk/core/src/main/java/org/apache/abdera/model/Element.java (original)
+++ incubator/abdera/java/trunk/core/src/main/java/org/apache/abdera/model/Element.java Wed Mar 14 21:00:29 2007
@@ -22,10 +22,10 @@
 
 import javax.xml.namespace.QName;
 
-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;
 
 /**
  * Root interface for all elements in the Feed Object Model

Modified: incubator/abdera/java/trunk/core/src/main/java/org/apache/abdera/model/ElementWrapper.java
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/core/src/main/java/org/apache/abdera/model/ElementWrapper.java?view=diff&rev=518464&r1=518463&r2=518464
==============================================================================
--- incubator/abdera/java/trunk/core/src/main/java/org/apache/abdera/model/ElementWrapper.java (original)
+++ incubator/abdera/java/trunk/core/src/main/java/org/apache/abdera/model/ElementWrapper.java Wed Mar 14 21:00:29 2007
@@ -26,10 +26,10 @@
 import javax.xml.namespace.QName;
 
 import org.apache.abdera.factory.Factory;
-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;
 
 public abstract class ElementWrapper 
   implements Element {

Modified: incubator/abdera/java/trunk/core/src/main/java/org/apache/abdera/model/Entry.java
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/core/src/main/java/org/apache/abdera/model/Entry.java?view=diff&rev=518464&r1=518463&r2=518464
==============================================================================
--- incubator/abdera/java/trunk/core/src/main/java/org/apache/abdera/model/Entry.java (original)
+++ incubator/abdera/java/trunk/core/src/main/java/org/apache/abdera/model/Entry.java Wed Mar 14 21:00:29 2007
@@ -24,8 +24,8 @@
 import javax.activation.MimeType;
 import javax.activation.MimeTypeParseException;
 
-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;
 
 /**
  * <p>Represents an Atom Entry element.</p>

Modified: incubator/abdera/java/trunk/core/src/main/java/org/apache/abdera/model/Feed.java
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/core/src/main/java/org/apache/abdera/model/Feed.java?view=diff&rev=518464&r1=518463&r2=518464
==============================================================================
--- incubator/abdera/java/trunk/core/src/main/java/org/apache/abdera/model/Feed.java (original)
+++ incubator/abdera/java/trunk/core/src/main/java/org/apache/abdera/model/Feed.java Wed Mar 14 21:00:29 2007
@@ -20,7 +20,7 @@
 import java.util.Comparator;
 import java.util.List;
 
-import org.apache.abdera.util.iri.IRISyntaxException;
+import org.apache.abdera.g14n.iri.IRISyntaxException;
 
 /**
  * <p>Represents an Atom Feed Element</p>

Modified: incubator/abdera/java/trunk/core/src/main/java/org/apache/abdera/model/Generator.java
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/core/src/main/java/org/apache/abdera/model/Generator.java?view=diff&rev=518464&r1=518463&r2=518464
==============================================================================
--- incubator/abdera/java/trunk/core/src/main/java/org/apache/abdera/model/Generator.java (original)
+++ incubator/abdera/java/trunk/core/src/main/java/org/apache/abdera/model/Generator.java Wed Mar 14 21:00:29 2007
@@ -17,8 +17,8 @@
 */
 package org.apache.abdera.model;
 
-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;
 
 
 /**

Modified: incubator/abdera/java/trunk/core/src/main/java/org/apache/abdera/model/IRIElement.java
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/core/src/main/java/org/apache/abdera/model/IRIElement.java?view=diff&rev=518464&r1=518463&r2=518464
==============================================================================
--- incubator/abdera/java/trunk/core/src/main/java/org/apache/abdera/model/IRIElement.java (original)
+++ incubator/abdera/java/trunk/core/src/main/java/org/apache/abdera/model/IRIElement.java Wed Mar 14 21:00:29 2007
@@ -17,8 +17,8 @@
 */
 package org.apache.abdera.model;
 
-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;
 
 /**
  * <p>The IRI interface provides a common base for a set of feed and 

Modified: incubator/abdera/java/trunk/core/src/main/java/org/apache/abdera/model/Link.java
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/core/src/main/java/org/apache/abdera/model/Link.java?view=diff&rev=518464&r1=518463&r2=518464
==============================================================================
--- incubator/abdera/java/trunk/core/src/main/java/org/apache/abdera/model/Link.java (original)
+++ incubator/abdera/java/trunk/core/src/main/java/org/apache/abdera/model/Link.java Wed Mar 14 21:00:29 2007
@@ -20,8 +20,8 @@
 import javax.activation.MimeType;
 import javax.activation.MimeTypeParseException;
 
-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;
 
 /**
  * <p>Represents an Atom Link element.</p>

Modified: incubator/abdera/java/trunk/core/src/main/java/org/apache/abdera/model/Person.java
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/core/src/main/java/org/apache/abdera/model/Person.java?view=diff&rev=518464&r1=518463&r2=518464
==============================================================================
--- incubator/abdera/java/trunk/core/src/main/java/org/apache/abdera/model/Person.java (original)
+++ incubator/abdera/java/trunk/core/src/main/java/org/apache/abdera/model/Person.java Wed Mar 14 21:00:29 2007
@@ -17,8 +17,8 @@
 */
 package org.apache.abdera.model;
 
-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;
 
 /**
  * <p>An Atom Person Construct</p>

Modified: incubator/abdera/java/trunk/core/src/main/java/org/apache/abdera/model/Source.java
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/core/src/main/java/org/apache/abdera/model/Source.java?view=diff&rev=518464&r1=518463&r2=518464
==============================================================================
--- incubator/abdera/java/trunk/core/src/main/java/org/apache/abdera/model/Source.java (original)
+++ incubator/abdera/java/trunk/core/src/main/java/org/apache/abdera/model/Source.java Wed Mar 14 21:00:29 2007
@@ -22,8 +22,8 @@
 
 import javax.activation.MimeTypeParseException;
 
-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;
 
 /**
  * <p>Per RFC4287:</p>

Modified: incubator/abdera/java/trunk/core/src/main/java/org/apache/abdera/model/Workspace.java
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/core/src/main/java/org/apache/abdera/model/Workspace.java?view=diff&rev=518464&r1=518463&r2=518464
==============================================================================
--- incubator/abdera/java/trunk/core/src/main/java/org/apache/abdera/model/Workspace.java (original)
+++ incubator/abdera/java/trunk/core/src/main/java/org/apache/abdera/model/Workspace.java Wed Mar 14 21:00:29 2007
@@ -19,7 +19,7 @@
 
 import java.util.List;
 
-import org.apache.abdera.util.iri.IRISyntaxException;
+import org.apache.abdera.g14n.iri.IRISyntaxException;
 
 /**
  * <p>An Atom Publishing Protocol Introspection Document workspace element.</p>

Modified: incubator/abdera/java/trunk/core/src/main/java/org/apache/abdera/parser/Parser.java
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/core/src/main/java/org/apache/abdera/parser/Parser.java?view=diff&rev=518464&r1=518463&r2=518464
==============================================================================
--- incubator/abdera/java/trunk/core/src/main/java/org/apache/abdera/parser/Parser.java (original)
+++ incubator/abdera/java/trunk/core/src/main/java/org/apache/abdera/parser/Parser.java Wed Mar 14 21:00:29 2007
@@ -22,7 +22,7 @@
 
 import org.apache.abdera.model.Document;
 import org.apache.abdera.model.Element;
-import org.apache.abdera.util.iri.IRISyntaxException;
+import org.apache.abdera.g14n.iri.IRISyntaxException;
 
 public interface Parser {
 

Modified: incubator/abdera/java/trunk/core/src/main/java/org/apache/abdera/util/AbderaResult.java
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/core/src/main/java/org/apache/abdera/util/AbderaResult.java?view=diff&rev=518464&r1=518463&r2=518464
==============================================================================
--- incubator/abdera/java/trunk/core/src/main/java/org/apache/abdera/util/AbderaResult.java (original)
+++ incubator/abdera/java/trunk/core/src/main/java/org/apache/abdera/util/AbderaResult.java Wed Mar 14 21:00:29 2007
@@ -29,7 +29,7 @@
 import org.apache.abdera.Abdera;
 import org.apache.abdera.model.Document;
 import org.apache.abdera.model.Element;
-import org.apache.abdera.util.iri.IRISyntaxException;
+import org.apache.abdera.g14n.iri.IRISyntaxException;
 
 /**
  * Provides a simple (and likely somewhat inefficient) implementation of 

Modified: incubator/abdera/java/trunk/core/src/main/java/org/apache/abdera/util/AbstractParser.java
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/core/src/main/java/org/apache/abdera/util/AbstractParser.java?view=diff&rev=518464&r1=518463&r2=518464
==============================================================================
--- incubator/abdera/java/trunk/core/src/main/java/org/apache/abdera/util/AbstractParser.java (original)
+++ incubator/abdera/java/trunk/core/src/main/java/org/apache/abdera/util/AbstractParser.java Wed Mar 14 21:00:29 2007
@@ -27,7 +27,7 @@
 import org.apache.abdera.parser.ParseException;
 import org.apache.abdera.parser.Parser;
 import org.apache.abdera.parser.ParserOptions;
-import org.apache.abdera.util.iri.IRISyntaxException;
+import org.apache.abdera.g14n.iri.IRISyntaxException;
 
 /**
  * Abstract base implementation of Abdera Parser.

Modified: incubator/abdera/java/trunk/core/src/main/java/org/apache/abdera/util/URIHelper.java
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/core/src/main/java/org/apache/abdera/util/URIHelper.java?view=diff&rev=518464&r1=518463&r2=518464
==============================================================================
--- incubator/abdera/java/trunk/core/src/main/java/org/apache/abdera/util/URIHelper.java (original)
+++ incubator/abdera/java/trunk/core/src/main/java/org/apache/abdera/util/URIHelper.java Wed Mar 14 21:00:29 2007
@@ -19,8 +19,8 @@
 
 import java.util.regex.Pattern;
 
-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;
 
 /**
  * Utility methods for working with URI's / IRI's

Modified: incubator/abdera/java/trunk/core/src/test/java/org/apache/abdera/test/core/TestSuite.java
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/core/src/test/java/org/apache/abdera/test/core/TestSuite.java?view=diff&rev=518464&r1=518463&r2=518464
==============================================================================
--- incubator/abdera/java/trunk/core/src/test/java/org/apache/abdera/test/core/TestSuite.java (original)
+++ incubator/abdera/java/trunk/core/src/test/java/org/apache/abdera/test/core/TestSuite.java Wed Mar 14 21:00:29 2007
@@ -18,12 +18,6 @@
 package org.apache.abdera.test.core;
 
 import org.apache.abdera.test.core.CoreTest;
-import org.apache.abdera.test.iri.TestIDNA;
-import org.apache.abdera.test.iri.TestIRI;
-import org.apache.abdera.test.iri.TestLang;
-import org.apache.abdera.test.iri.TestNFKC;
-import org.apache.abdera.test.iri.TestNameprep;
-import org.apache.abdera.test.iri.TestPunycode;
 
 public class TestSuite extends junit.framework.TestSuite {
   public static void main(String[] args) {
@@ -32,11 +26,5 @@
 
   public TestSuite() {
     addTestSuite(CoreTest.class);
-    addTestSuite(TestIDNA.class);
-    addTestSuite(TestIRI.class);
-    addTestSuite(TestLang.class);
-    addTestSuite(TestNameprep.class);
-    addTestSuite(TestNFKC.class);
-    addTestSuite(TestPunycode.class);
   }
 }

Modified: incubator/abdera/java/trunk/dependencies/deps.properties
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/dependencies/deps.properties?view=diff&rev=518464&r1=518463&r2=518464
==============================================================================
--- incubator/abdera/java/trunk/dependencies/deps.properties (original)
+++ incubator/abdera/java/trunk/dependencies/deps.properties Wed Mar 14 21:00:29 2007
@@ -1,9 +1,6 @@
 geronimo.activation.dir=http://www.apache.org/dist/java-repository/org.apache.geronimo.specs/jars
 geronimo.activation.jar=geronimo-activation_1.0.2_spec-1.1.jar
 
-#axiom.dir=http://www.apache.org/dist/java-repository/ws-commons/jars
-#axiom.api.jar=axiom-api-1.0.jar
-#axiom.impl.jar=axiom-impl-1.0.jar
 axiom.dir=http://people.apache.org/~jmsnell
 axiom.api.jar=axiom-api-1.2.1.jar
 axiom.impl.jar=axiom-impl-1.2.1.jar
@@ -15,7 +12,6 @@
 log4j.jar=log4j-1.2.12.jar
 
 stax.dir=http://dist.codehaus.org/stax/jars
-#stax.jar=stax-1.1.2-dev.jar
 stax.api.jar=stax-api-1.0.jar
 
 wstx.dir=http://woodstox.codehaus.org/2.0.5
@@ -79,4 +75,4 @@
 jetty-util.jar=jetty-util-6.0.0rc0.jar
 
 json.dir=http://json.org/java
-json.zip=apache.zip
\ No newline at end of file
+json.zip=apache.zip

Added: incubator/abdera/java/trunk/dependencies/g14n/src/main/java/org/apache/abdera/g14n/ChainableBitSet.java
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/dependencies/g14n/src/main/java/org/apache/abdera/g14n/ChainableBitSet.java?view=auto&rev=518464
==============================================================================
--- incubator/abdera/java/trunk/dependencies/g14n/src/main/java/org/apache/abdera/g14n/ChainableBitSet.java (added)
+++ incubator/abdera/java/trunk/dependencies/g14n/src/main/java/org/apache/abdera/g14n/ChainableBitSet.java Wed Mar 14 21:00:29 2007
@@ -0,0 +1,119 @@
+/*
+* 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;
+
+import java.util.BitSet;
+
+/**
+ * Extension to java.util.BitSet that allows calls to set to be chained, e.g.
+ * bs.set2(1).set(2).set(3), making it easier to define a complex bit set in 
+ * a single declaration.
+ */
+public class ChainableBitSet 
+  extends BitSet {
+
+  private static final long serialVersionUID = -1105957441212997513L;
+
+  public ChainableBitSet and2(BitSet set) {
+    and(set);
+    return this;
+  }
+  
+  public ChainableBitSet addNot2(BitSet set) {
+    andNot(set);
+    return this;
+  }
+  
+  public ChainableBitSet clear2(int index) {
+    clear(index);
+    return this;
+  }
+  
+  public ChainableBitSet clear2(int... indexes) {
+    for (int i : indexes) clear(i);
+    return this;
+  }
+  
+  public ChainableBitSet clear2(int startIndex, int endIndex) {
+    clear(startIndex, endIndex);
+    return this;
+  }
+  
+  public ChainableBitSet flip2(int index) {
+    flip(index);
+    return this;
+  }
+  
+  public ChainableBitSet flip2(int... indexes) {
+    for (int i : indexes) flip(i);
+    return this;
+  }
+  
+  public ChainableBitSet flip2(int startIndex, int endIndex) {
+    flip(startIndex,endIndex);
+    return this;
+  }
+  
+  public ChainableBitSet or2(BitSet set) {
+    or(set);
+    return this;
+  }
+  
+  public ChainableBitSet xor2(BitSet set) {
+    xor(set);
+    return this;
+  }
+  
+  public ChainableBitSet set2(String s) {
+    char[] chars = s.toCharArray();
+    for (char c : chars) set(c);
+    return this;
+  }
+  
+  public ChainableBitSet set2(BitSet set) {
+    this.or(set);
+    return this;
+  }
+  
+  public ChainableBitSet set2(int ... bits) {
+    for (int n : bits) set(n);
+    return this;
+  }
+  
+  public ChainableBitSet set2(int fromIndex, int toIndex) {
+    super.set(fromIndex, toIndex+1);
+    return this;
+  }
+
+  public ChainableBitSet set2(int bitIndex) {
+    super.set(bitIndex);
+    return this;
+  }
+
+  public ChainableBitSet set2(int bitIndex, boolean value) {
+    super.set(bitIndex, value);
+    return this;
+  }
+  
+  public ChainableBitSet set2(BitSet set, boolean value) {
+    if (value) return set2(set);
+    else this.andNot(set);
+    return this;
+  }
+  
+}

Added: incubator/abdera/java/trunk/dependencies/g14n/src/main/java/org/apache/abdera/g14n/io/ByteArrayCodepointIterator.java
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/dependencies/g14n/src/main/java/org/apache/abdera/g14n/io/ByteArrayCodepointIterator.java?view=auto&rev=518464
==============================================================================
--- incubator/abdera/java/trunk/dependencies/g14n/src/main/java/org/apache/abdera/g14n/io/ByteArrayCodepointIterator.java (added)
+++ incubator/abdera/java/trunk/dependencies/g14n/src/main/java/org/apache/abdera/g14n/io/ByteArrayCodepointIterator.java Wed Mar 14 21:00:29 2007
@@ -0,0 +1,47 @@
+/*
+* 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.io;
+
+import java.nio.ByteBuffer;
+import java.nio.CharBuffer;
+import java.nio.charset.Charset;
+
+import org.apache.abdera.g14n.io.CharArrayCodepointIterator;
+
+/**
+ * Iterate over Unicode codepoints decoded from an array of bytes
+ */
+public class ByteArrayCodepointIterator 
+  extends CharArrayCodepointIterator {
+  
+  public ByteArrayCodepointIterator(byte[] bytes) {
+    this(bytes,Charset.defaultCharset());
+  }
+  
+  public ByteArrayCodepointIterator(byte[] bytes, String charset) {
+    this(bytes,Charset.forName(charset));
+  }
+  
+  public ByteArrayCodepointIterator(byte[] bytes, Charset charset) {
+    CharBuffer cb = charset.decode(ByteBuffer.wrap(bytes));
+    buffer = cb.array();
+    position = cb.position();
+    limit = cb.limit();
+  }
+
+}

Added: incubator/abdera/java/trunk/dependencies/g14n/src/main/java/org/apache/abdera/g14n/io/CharArrayCodepointIterator.java
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/dependencies/g14n/src/main/java/org/apache/abdera/g14n/io/CharArrayCodepointIterator.java?view=auto&rev=518464
==============================================================================
--- incubator/abdera/java/trunk/dependencies/g14n/src/main/java/org/apache/abdera/g14n/io/CharArrayCodepointIterator.java (added)
+++ incubator/abdera/java/trunk/dependencies/g14n/src/main/java/org/apache/abdera/g14n/io/CharArrayCodepointIterator.java Wed Mar 14 21:00:29 2007
@@ -0,0 +1,52 @@
+/*
+* 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.io;
+
+import org.apache.abdera.g14n.io.CodepointIterator;
+
+/**
+ * Iterate over Unicode codepoints contained in a char array
+ */
+public class CharArrayCodepointIterator 
+  extends CodepointIterator {
+
+  protected char[] buffer;
+  
+  protected CharArrayCodepointIterator() {}
+  
+  public CharArrayCodepointIterator(char[] buffer) {
+    this(buffer,0,buffer.length);
+  }
+  
+  public CharArrayCodepointIterator(char[] buffer, int n, int e) {
+    this.buffer = buffer;
+    this.position = n;
+    this.limit = Math.min(buffer.length-n,e);
+  }
+  
+  protected char get() {
+    return (position < limit) ? buffer[position++] : (char)-1;
+  }
+  
+  protected char get(int index) {
+    if (index < 0 || index >= limit) 
+      throw new ArrayIndexOutOfBoundsException(index);
+    return buffer[index];
+  }
+  
+}

Added: incubator/abdera/java/trunk/dependencies/g14n/src/main/java/org/apache/abdera/g14n/io/CharBufferCodepointIterator.java
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/dependencies/g14n/src/main/java/org/apache/abdera/g14n/io/CharBufferCodepointIterator.java?view=auto&rev=518464
==============================================================================
--- incubator/abdera/java/trunk/dependencies/g14n/src/main/java/org/apache/abdera/g14n/io/CharBufferCodepointIterator.java (added)
+++ incubator/abdera/java/trunk/dependencies/g14n/src/main/java/org/apache/abdera/g14n/io/CharBufferCodepointIterator.java Wed Mar 14 21:00:29 2007
@@ -0,0 +1,36 @@
+/*
+* 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.io;
+
+import java.nio.CharBuffer;
+
+import org.apache.abdera.g14n.io.CharArrayCodepointIterator;
+
+/**
+ * Iterate over Unicode codepoints in a java.nio.CharBuffer
+ */
+public class CharBufferCodepointIterator 
+  extends CharArrayCodepointIterator {
+
+  public CharBufferCodepointIterator(CharBuffer cb) {
+    buffer = cb.array();
+    position = cb.position();
+    limit = cb.limit();
+  }
+  
+}

Added: incubator/abdera/java/trunk/dependencies/g14n/src/main/java/org/apache/abdera/g14n/io/CharSequenceCodepointIterator.java
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/dependencies/g14n/src/main/java/org/apache/abdera/g14n/io/CharSequenceCodepointIterator.java?view=auto&rev=518464
==============================================================================
--- incubator/abdera/java/trunk/dependencies/g14n/src/main/java/org/apache/abdera/g14n/io/CharSequenceCodepointIterator.java (added)
+++ incubator/abdera/java/trunk/dependencies/g14n/src/main/java/org/apache/abdera/g14n/io/CharSequenceCodepointIterator.java Wed Mar 14 21:00:29 2007
@@ -0,0 +1,48 @@
+/*
+* 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.io;
+
+import org.apache.abdera.g14n.io.CodepointIterator;
+
+/**
+ * Iterate over Unicode codepoints in a CharSequence (e.g. String, StringBuffer, etc)
+ */
+public class CharSequenceCodepointIterator 
+  extends CodepointIterator {
+
+  private CharSequence buffer;
+  
+  public CharSequenceCodepointIterator(CharSequence buffer) {
+    this(buffer,0,buffer.length());
+  }
+  
+  public CharSequenceCodepointIterator(CharSequence buffer, int n, int e) {
+    this.buffer = buffer;
+    this.position = n;
+    this.limit = Math.min(buffer.length()-n,e);
+  }
+  
+  protected char get() {
+    return buffer.charAt(position++);
+  }
+
+  protected char get(int index) {
+    return buffer.charAt(index);
+  }
+  
+}



Mime
View raw message