You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by ng...@apache.org on 2010/01/03 22:36:27 UTC
svn commit: r895485 - in /mina/sandbox/vysper/branches/nbxml-sax/src:
main/java/org/apache/vysper/xml/decoder/
main/java/org/apache/vysper/xml/fragment/
main/java/org/apache/vysper/xml/sax/
main/java/org/apache/vysper/xml/sax/impl/ test/java/org/apache...
Author: ngn
Date: Sun Jan 3 21:36:27 2010
New Revision: 895485
URL: http://svn.apache.org/viewvc?rev=895485&view=rev
Log:
Clean up
Added:
mina/sandbox/vysper/branches/nbxml-sax/src/main/java/org/apache/vysper/xml/fragment/Namespaces.java
- copied, changed from r888494, mina/sandbox/vysper/branches/nbxml-sax/src/main/java/org/apache/vysper/xml/fragment/NamespaceURIs.java
mina/sandbox/vysper/branches/nbxml-sax/src/main/java/org/apache/vysper/xml/sax/NonBlockingXMLReader.java
- copied, changed from r890796, mina/sandbox/vysper/branches/nbxml-sax/src/main/java/org/apache/vysper/xml/sax/AsyncXMLReader.java
mina/sandbox/vysper/branches/nbxml-sax/src/main/java/org/apache/vysper/xml/sax/impl/DefaultNonBlockingXMLReader.java
- copied, changed from r895086, mina/sandbox/vysper/branches/nbxml-sax/src/main/java/org/apache/vysper/xml/sax/impl/DefaultAsyncXMLReader.java
Removed:
mina/sandbox/vysper/branches/nbxml-sax/src/main/java/org/apache/vysper/xml/fragment/NamespaceURIs.java
mina/sandbox/vysper/branches/nbxml-sax/src/main/java/org/apache/vysper/xml/fragment/SimpleNamespaceResolver.java
mina/sandbox/vysper/branches/nbxml-sax/src/main/java/org/apache/vysper/xml/sax/AsyncXMLReader.java
mina/sandbox/vysper/branches/nbxml-sax/src/main/java/org/apache/vysper/xml/sax/impl/DefaultAsyncXMLReader.java
Modified:
mina/sandbox/vysper/branches/nbxml-sax/src/main/java/org/apache/vysper/xml/decoder/XMPPDecoder.java
mina/sandbox/vysper/branches/nbxml-sax/src/main/java/org/apache/vysper/xml/fragment/NamespaceAttribute.java
mina/sandbox/vysper/branches/nbxml-sax/src/main/java/org/apache/vysper/xml/fragment/StackNamespaceResolver.java
mina/sandbox/vysper/branches/nbxml-sax/src/main/java/org/apache/vysper/xml/fragment/XMLElement.java
mina/sandbox/vysper/branches/nbxml-sax/src/main/java/org/apache/vysper/xml/fragment/XMLElementVerifier.java
mina/sandbox/vysper/branches/nbxml-sax/src/main/java/org/apache/vysper/xml/sax/impl/StackNamespaceResolver2.java
mina/sandbox/vysper/branches/nbxml-sax/src/test/java/org/apache/vysper/xml/fragment/RendererTestCase.java
mina/sandbox/vysper/branches/nbxml-sax/src/test/java/org/apache/vysper/xml/fragment/StackNamespaceResolverTestCase.java
mina/sandbox/vysper/branches/nbxml-sax/src/test/java/org/apache/vysper/xml/fragment/XMLElementTestCase.java
mina/sandbox/vysper/branches/nbxml-sax/src/test/java/org/apache/vysper/xml/sax/AbstractAsyncXMLReaderTestCase.java
mina/sandbox/vysper/branches/nbxml-sax/src/test/java/org/apache/vysper/xml/sax/DefaultAsyncXMLReaderTestCase.java
mina/sandbox/vysper/branches/nbxml-sax/src/test/java/org/apache/vysper/xml/sax/XMPPContentHandlerTestCase.java
Modified: mina/sandbox/vysper/branches/nbxml-sax/src/main/java/org/apache/vysper/xml/decoder/XMPPDecoder.java
URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/branches/nbxml-sax/src/main/java/org/apache/vysper/xml/decoder/XMPPDecoder.java?rev=895485&r1=895484&r2=895485&view=diff
==============================================================================
--- mina/sandbox/vysper/branches/nbxml-sax/src/main/java/org/apache/vysper/xml/decoder/XMPPDecoder.java (original)
+++ mina/sandbox/vysper/branches/nbxml-sax/src/main/java/org/apache/vysper/xml/decoder/XMPPDecoder.java Sun Jan 3 21:36:27 2010
@@ -26,8 +26,8 @@
import org.apache.vysper.charset.CharsetUtil;
import org.apache.vysper.xml.decoder.XMPPContentHandler.StanzaListener;
import org.apache.vysper.xml.fragment.XMLElement;
-import org.apache.vysper.xml.sax.AsyncXMLReader;
-import org.apache.vysper.xml.sax.impl.DefaultAsyncXMLReader;
+import org.apache.vysper.xml.sax.NonBlockingXMLReader;
+import org.apache.vysper.xml.sax.impl.DefaultNonBlockingXMLReader;
/**
* splits xml stream into handy tokens for further processing
@@ -63,10 +63,10 @@
@Override
public boolean doDecode(IoSession ioSession, ByteBuffer byteBuffer, ProtocolDecoderOutput protocolDecoderOutput) throws Exception {
- AsyncXMLReader reader = (AsyncXMLReader) ioSession.getAttribute(SESSION_ATTRIBUTE_NAME);
+ NonBlockingXMLReader reader = (NonBlockingXMLReader) ioSession.getAttribute(SESSION_ATTRIBUTE_NAME);
if (reader == null) {
- reader = new DefaultAsyncXMLReader();
+ reader = new DefaultNonBlockingXMLReader();
reader.setContentHandler(new XMPPContentHandler(builderFactory));
ioSession.setAttribute(SESSION_ATTRIBUTE_NAME, reader);
Modified: mina/sandbox/vysper/branches/nbxml-sax/src/main/java/org/apache/vysper/xml/fragment/NamespaceAttribute.java
URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/branches/nbxml-sax/src/main/java/org/apache/vysper/xml/fragment/NamespaceAttribute.java?rev=895485&r1=895484&r2=895485&view=diff
==============================================================================
--- mina/sandbox/vysper/branches/nbxml-sax/src/main/java/org/apache/vysper/xml/fragment/NamespaceAttribute.java (original)
+++ mina/sandbox/vysper/branches/nbxml-sax/src/main/java/org/apache/vysper/xml/fragment/NamespaceAttribute.java Sun Jan 3 21:36:27 2010
@@ -26,21 +26,16 @@
*/
public class NamespaceAttribute extends Attribute {
- public static final String DEFAULT_NAMESPACE = "";
-
- public static final String XMLNS = "xmlns";
- public static final String XMLNS_AND_COLON = "xmlns:";
-
- private String prefix;
+ private String prefix;
public NamespaceAttribute(String value) {
- super(XMLNS, value);
+ super(Namespaces.XMLNS, value);
prefix = "";
}
public NamespaceAttribute(String nsPrefix, String value) {
- super(XMLNS_AND_COLON + nsPrefix, value);
+ super(Namespaces.XMLNS_AND_COLON + nsPrefix, value);
prefix = nsPrefix;
}
Copied: mina/sandbox/vysper/branches/nbxml-sax/src/main/java/org/apache/vysper/xml/fragment/Namespaces.java (from r888494, mina/sandbox/vysper/branches/nbxml-sax/src/main/java/org/apache/vysper/xml/fragment/NamespaceURIs.java)
URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/branches/nbxml-sax/src/main/java/org/apache/vysper/xml/fragment/Namespaces.java?p2=mina/sandbox/vysper/branches/nbxml-sax/src/main/java/org/apache/vysper/xml/fragment/Namespaces.java&p1=mina/sandbox/vysper/branches/nbxml-sax/src/main/java/org/apache/vysper/xml/fragment/NamespaceURIs.java&r1=888494&r2=895485&rev=895485&view=diff
==============================================================================
--- mina/sandbox/vysper/branches/nbxml-sax/src/main/java/org/apache/vysper/xml/fragment/NamespaceURIs.java (original)
+++ mina/sandbox/vysper/branches/nbxml-sax/src/main/java/org/apache/vysper/xml/fragment/Namespaces.java Sun Jan 3 21:36:27 2010
@@ -24,6 +24,10 @@
*
* @author The Apache MINA Project (dev@mina.apache.org)
*/
-public class NamespaceURIs {
+public class Namespaces {
public static final String XML = "http://www.w3.org/XML/1998/namespace";
+ public static final String DEFAULT_NAMESPACE_PREFIX = "";
+ public static final String DEFAULT_NAMESPACE_URI = "";
+ public static final String XMLNS = "xmlns";
+ public static final String XMLNS_AND_COLON = "xmlns:";
}
Modified: mina/sandbox/vysper/branches/nbxml-sax/src/main/java/org/apache/vysper/xml/fragment/StackNamespaceResolver.java
URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/branches/nbxml-sax/src/main/java/org/apache/vysper/xml/fragment/StackNamespaceResolver.java?rev=895485&r1=895484&r2=895485&view=diff
==============================================================================
--- mina/sandbox/vysper/branches/nbxml-sax/src/main/java/org/apache/vysper/xml/fragment/StackNamespaceResolver.java (original)
+++ mina/sandbox/vysper/branches/nbxml-sax/src/main/java/org/apache/vysper/xml/fragment/StackNamespaceResolver.java Sun Jan 3 21:36:27 2010
@@ -96,7 +96,7 @@
public String resolveUri(String prefix) {
// check for the reserved xml namespace
if(prefix.equals("xml")) {
- return NamespaceURIs.XML;
+ return Namespaces.XML;
} else {
for(int i = elements.size() - 1; i>=0; i--) {
String uri = resolveUri(elements.get(i), prefix);
@@ -140,7 +140,7 @@
private String resolvePrefix(String uri, boolean generatePrefix) {
// check for the reserved xml namespace
- if(uri.equals(NamespaceURIs.XML)) {
+ if(uri.equals(Namespaces.XML)) {
return "xml";
} else {
for(int i = elements.size() - 1; i>=0; i--) {
Modified: mina/sandbox/vysper/branches/nbxml-sax/src/main/java/org/apache/vysper/xml/fragment/XMLElement.java
URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/branches/nbxml-sax/src/main/java/org/apache/vysper/xml/fragment/XMLElement.java?rev=895485&r1=895484&r2=895485&view=diff
==============================================================================
--- mina/sandbox/vysper/branches/nbxml-sax/src/main/java/org/apache/vysper/xml/fragment/XMLElement.java (original)
+++ mina/sandbox/vysper/branches/nbxml-sax/src/main/java/org/apache/vysper/xml/fragment/XMLElement.java Sun Jan 3 21:36:27 2010
@@ -45,8 +45,6 @@
private String namespaceURI;
private String namespacePrefix;
- private NamespaceResolver nsResolver;
-
private List<Attribute> attributes;
private List<XMLFragment> innerFragments;
protected XMLElementVerifier xmlElementVerifier;
@@ -56,14 +54,12 @@
}
public XMLElement(String namespaceURI, String name, String namespacePrefix, List<Attribute> attributes, List<XMLFragment> innerFragments) {
- this.namespaceURI = namespaceURI;
- this.namespacePrefix = namespacePrefix == null ? NamespaceAttribute.DEFAULT_NAMESPACE : namespacePrefix;
+ this.namespaceURI = namespaceURI == null ? Namespaces.DEFAULT_NAMESPACE_URI : namespaceURI;
+ this.namespacePrefix = namespacePrefix == null ? Namespaces.DEFAULT_NAMESPACE_PREFIX : namespacePrefix;
this.name = name;
this.attributes = (attributes == null) ? Collections.EMPTY_LIST : Collections.unmodifiableList(attributes);
this.innerFragments = (innerFragments == null) ? Collections.EMPTY_LIST : Collections.unmodifiableList(innerFragments);
if (name == null) throw new IllegalArgumentException("XMLElement name cannot be null");
-
- nsResolver = new SimpleNamespaceResolver(this);
}
public String getName() {
@@ -80,21 +76,12 @@
return namespacePrefix;
}
- public NamespaceResolver getNamespaceResolver() {
- return nsResolver;
- }
-
/**
* Return the namespace URI.
* @return The namespace URI for the element.
*/
public String getNamespaceURI() {
- // TODO clean up
- if(namespaceURI != null) {
- return namespaceURI;
- } else {
- return nsResolver.resolveUri(namespacePrefix);
- }
+ return namespaceURI;
}
public List<Attribute> getAttributes() {
@@ -126,7 +113,7 @@
public String getXMLLang() {
- return getAttributeValue(NamespaceURIs.XML, "lang");
+ return getAttributeValue(Namespaces.XML, "lang");
}
public List<XMLFragment> getInnerFragments() {
Modified: mina/sandbox/vysper/branches/nbxml-sax/src/main/java/org/apache/vysper/xml/fragment/XMLElementVerifier.java
URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/branches/nbxml-sax/src/main/java/org/apache/vysper/xml/fragment/XMLElementVerifier.java?rev=895485&r1=895484&r2=895485&view=diff
==============================================================================
--- mina/sandbox/vysper/branches/nbxml-sax/src/main/java/org/apache/vysper/xml/fragment/XMLElementVerifier.java (original)
+++ mina/sandbox/vysper/branches/nbxml-sax/src/main/java/org/apache/vysper/xml/fragment/XMLElementVerifier.java Sun Jan 3 21:36:27 2010
@@ -161,17 +161,17 @@
for (Attribute attribute : element.getAttributes()) {
if (attribute.getValue().equals(namespace)
&& attribute.getName().startsWith(
- NamespaceAttribute.XMLNS_AND_COLON)) {
+ Namespaces.XMLNS_AND_COLON)) {
return attribute.getName().substring(
- NamespaceAttribute.XMLNS_AND_COLON.length());
+ Namespaces.XMLNS_AND_COLON.length());
}
}
return null;
}
private boolean isNamespaceAttribute(Attribute attribute) {
- return (attribute.getName().equalsIgnoreCase(NamespaceAttribute.XMLNS) || attribute
- .getName().startsWith(NamespaceAttribute.XMLNS_AND_COLON));
+ return (attribute.getName().equalsIgnoreCase(Namespaces.XMLNS) || attribute
+ .getName().startsWith(Namespaces.XMLNS_AND_COLON));
}
public String getUniqueXMLNSValue() {
@@ -208,7 +208,7 @@
XMLElement xmlElement = ((XMLElement) onlySubelement);
boolean nameEquals = name == null ? xmlElement.getName() == null : name.equals(xmlElement.getName());
- if (namespaceURI == null) namespaceURI = NamespaceAttribute.DEFAULT_NAMESPACE;
+ if (namespaceURI == null) namespaceURI = Namespaces.DEFAULT_NAMESPACE_URI;
return nameEquals && namespaceURI.equals(xmlElement.getNamespaceURI());
}
}
Copied: mina/sandbox/vysper/branches/nbxml-sax/src/main/java/org/apache/vysper/xml/sax/NonBlockingXMLReader.java (from r890796, mina/sandbox/vysper/branches/nbxml-sax/src/main/java/org/apache/vysper/xml/sax/AsyncXMLReader.java)
URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/branches/nbxml-sax/src/main/java/org/apache/vysper/xml/sax/NonBlockingXMLReader.java?p2=mina/sandbox/vysper/branches/nbxml-sax/src/main/java/org/apache/vysper/xml/sax/NonBlockingXMLReader.java&p1=mina/sandbox/vysper/branches/nbxml-sax/src/main/java/org/apache/vysper/xml/sax/AsyncXMLReader.java&r1=890796&r2=895485&rev=895485&view=diff
==============================================================================
--- mina/sandbox/vysper/branches/nbxml-sax/src/main/java/org/apache/vysper/xml/sax/AsyncXMLReader.java (original)
+++ mina/sandbox/vysper/branches/nbxml-sax/src/main/java/org/apache/vysper/xml/sax/NonBlockingXMLReader.java Sun Jan 3 21:36:27 2010
@@ -35,7 +35,7 @@
/**
* @author The Apache MINA Project (dev@mina.apache.org)
*/
-public interface AsyncXMLReader {
+public interface NonBlockingXMLReader {
////////////////////////////////////////////////////////////////////
// Configuration.
Copied: mina/sandbox/vysper/branches/nbxml-sax/src/main/java/org/apache/vysper/xml/sax/impl/DefaultNonBlockingXMLReader.java (from r895086, mina/sandbox/vysper/branches/nbxml-sax/src/main/java/org/apache/vysper/xml/sax/impl/DefaultAsyncXMLReader.java)
URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/branches/nbxml-sax/src/main/java/org/apache/vysper/xml/sax/impl/DefaultNonBlockingXMLReader.java?p2=mina/sandbox/vysper/branches/nbxml-sax/src/main/java/org/apache/vysper/xml/sax/impl/DefaultNonBlockingXMLReader.java&p1=mina/sandbox/vysper/branches/nbxml-sax/src/main/java/org/apache/vysper/xml/sax/impl/DefaultAsyncXMLReader.java&r1=895086&r2=895485&rev=895485&view=diff
==============================================================================
--- mina/sandbox/vysper/branches/nbxml-sax/src/main/java/org/apache/vysper/xml/sax/impl/DefaultAsyncXMLReader.java (original)
+++ mina/sandbox/vysper/branches/nbxml-sax/src/main/java/org/apache/vysper/xml/sax/impl/DefaultNonBlockingXMLReader.java Sun Jan 3 21:36:27 2010
@@ -25,7 +25,7 @@
import java.util.Map;
import org.apache.mina.common.ByteBuffer;
-import org.apache.vysper.xml.sax.AsyncXMLReader;
+import org.apache.vysper.xml.sax.NonBlockingXMLReader;
import org.xml.sax.ContentHandler;
import org.xml.sax.DTDHandler;
import org.xml.sax.EntityResolver;
@@ -39,7 +39,7 @@
/**
* @author The Apache MINA Project (dev@mina.apache.org)
*/
-public class DefaultAsyncXMLReader implements AsyncXMLReader {
+public class DefaultNonBlockingXMLReader implements NonBlockingXMLReader {
private static final String FEATURE_NAMESPACES = "http://xml.org/sax/features/namespaces";
private static final String FEATURE_NAMESPACE_PREFIXES = "http://xml.org/sax/features/namespace-prefixes";
@@ -51,7 +51,7 @@
private Map<String, Boolean> features = new HashMap<String, Boolean>();
- public DefaultAsyncXMLReader() {
+ public DefaultNonBlockingXMLReader() {
// set default features
features.put(FEATURE_NAMESPACES, true);
features.put(FEATURE_NAMESPACE_PREFIXES, false);
Modified: mina/sandbox/vysper/branches/nbxml-sax/src/main/java/org/apache/vysper/xml/sax/impl/StackNamespaceResolver2.java
URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/branches/nbxml-sax/src/main/java/org/apache/vysper/xml/sax/impl/StackNamespaceResolver2.java?rev=895485&r1=895484&r2=895485&view=diff
==============================================================================
--- mina/sandbox/vysper/branches/nbxml-sax/src/main/java/org/apache/vysper/xml/sax/impl/StackNamespaceResolver2.java (original)
+++ mina/sandbox/vysper/branches/nbxml-sax/src/main/java/org/apache/vysper/xml/sax/impl/StackNamespaceResolver2.java Sun Jan 3 21:36:27 2010
@@ -25,13 +25,13 @@
import java.util.Map.Entry;
import org.apache.vysper.xml.fragment.NamespaceResolver;
-import org.apache.vysper.xml.fragment.NamespaceURIs;
+import org.apache.vysper.xml.fragment.Namespaces;
/**
* Naive implementation, will be replaced in later stages of this change
*/
-public class StackNamespaceResolver2 implements NamespaceResolver {
+public class StackNamespaceResolver2 {
private Stack<Map<String, String>> elements = new Stack<Map<String, String>>();
@@ -49,7 +49,7 @@
public String resolveUri(String prefix) {
// check for the reserved xml namespace
if(prefix.equals("xml")) {
- return NamespaceURIs.XML;
+ return Namespaces.XML;
} else {
// walk over the stack backwards
for(int i = elements.size() - 1; i>=0; i--) {
@@ -65,10 +65,8 @@
return null;
}
-
-
public String resolvePrefix(String uri) {
- if(uri.equals(NamespaceURIs.XML)) {
+ if(uri.equals(Namespaces.XML)) {
return "xml";
} else {
// walk over the stack backwards
Modified: mina/sandbox/vysper/branches/nbxml-sax/src/test/java/org/apache/vysper/xml/fragment/RendererTestCase.java
URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/branches/nbxml-sax/src/test/java/org/apache/vysper/xml/fragment/RendererTestCase.java?rev=895485&r1=895484&r2=895485&view=diff
==============================================================================
--- mina/sandbox/vysper/branches/nbxml-sax/src/test/java/org/apache/vysper/xml/fragment/RendererTestCase.java (original)
+++ mina/sandbox/vysper/branches/nbxml-sax/src/test/java/org/apache/vysper/xml/fragment/RendererTestCase.java Sun Jan 3 21:36:27 2010
@@ -21,7 +21,7 @@
import org.apache.vysper.xml.fragment.Attribute;
import org.apache.vysper.xml.fragment.NamespaceAttribute;
-import org.apache.vysper.xml.fragment.NamespaceURIs;
+import org.apache.vysper.xml.fragment.Namespaces;
import org.apache.vysper.xml.fragment.Renderer;
import org.apache.vysper.xml.fragment.XMLElement;
import org.apache.vysper.xml.fragment.XMLElementBuilder;
@@ -76,7 +76,7 @@
// make sure we render the xml namespace correctly, e.g for xml:lang
public void testRenderXmlNamespacedAttribute() {
XMLElement elm = new XMLElement(null, "foo", null, new Attribute[]{
- new Attribute(NamespaceURIs.XML, "lang", "sv")
+ new Attribute(Namespaces.XML, "lang", "sv")
}, null);
assertRendering("<foo xml:lang=\"sv\"></foo>", elm);
}
Modified: mina/sandbox/vysper/branches/nbxml-sax/src/test/java/org/apache/vysper/xml/fragment/StackNamespaceResolverTestCase.java
URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/branches/nbxml-sax/src/test/java/org/apache/vysper/xml/fragment/StackNamespaceResolverTestCase.java?rev=895485&r1=895484&r2=895485&view=diff
==============================================================================
--- mina/sandbox/vysper/branches/nbxml-sax/src/test/java/org/apache/vysper/xml/fragment/StackNamespaceResolverTestCase.java (original)
+++ mina/sandbox/vysper/branches/nbxml-sax/src/test/java/org/apache/vysper/xml/fragment/StackNamespaceResolverTestCase.java Sun Jan 3 21:36:27 2010
@@ -20,7 +20,7 @@
package org.apache.vysper.xml.fragment;
import org.apache.vysper.xml.fragment.Attribute;
-import org.apache.vysper.xml.fragment.NamespaceURIs;
+import org.apache.vysper.xml.fragment.Namespaces;
import org.apache.vysper.xml.fragment.StackNamespaceResolver;
import org.apache.vysper.xml.fragment.XMLElement;
import org.apache.vysper.xml.fragment.XMLElementBuilder;
@@ -128,7 +128,7 @@
public void testPushXmlNamespace() {
- assertEquals(NamespaceURIs.XML, resolver.resolveUri("xml"));
- assertEquals("xml", resolver.resolvePrefix(NamespaceURIs.XML));
+ assertEquals(Namespaces.XML, resolver.resolveUri("xml"));
+ assertEquals("xml", resolver.resolvePrefix(Namespaces.XML));
}
}
Modified: mina/sandbox/vysper/branches/nbxml-sax/src/test/java/org/apache/vysper/xml/fragment/XMLElementTestCase.java
URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/branches/nbxml-sax/src/test/java/org/apache/vysper/xml/fragment/XMLElementTestCase.java?rev=895485&r1=895484&r2=895485&view=diff
==============================================================================
--- mina/sandbox/vysper/branches/nbxml-sax/src/test/java/org/apache/vysper/xml/fragment/XMLElementTestCase.java (original)
+++ mina/sandbox/vysper/branches/nbxml-sax/src/test/java/org/apache/vysper/xml/fragment/XMLElementTestCase.java Sun Jan 3 21:36:27 2010
@@ -27,7 +27,7 @@
import java.util.Collections;
import org.apache.vysper.xml.fragment.Attribute;
-import org.apache.vysper.xml.fragment.NamespaceURIs;
+import org.apache.vysper.xml.fragment.Namespaces;
import org.apache.vysper.xml.fragment.XMLElement;
import org.apache.vysper.xml.fragment.XMLElementBuilder;
import org.apache.vysper.xml.fragment.XMLSemanticError;
@@ -40,7 +40,7 @@
public void testBasicGetters() {
XMLElement xmlElement = new XMLElementBuilder("message", "urn:test").
addAttribute("lang", "de").
- addAttribute(NamespaceURIs.XML, "lang", "cn").
+ addAttribute(Namespaces.XML, "lang", "cn").
addAttribute("xmllang", "en").
build();
@@ -220,21 +220,21 @@
startInnerElement("body").
endInnerElement().
startInnerElement("body").
- addAttribute(NamespaceURIs.XML, "lang", "en").
+ addAttribute(Namespaces.XML, "lang", "en").
endInnerElement().
startInnerElement("body").
- addAttribute(NamespaceURIs.XML, "lang", "de").
+ addAttribute(Namespaces.XML, "lang", "de").
endInnerElement().
addText("body").
addText("t3").
startInnerElement("single").
- addAttribute(NamespaceURIs.XML, "lang", "ru").
+ addAttribute(Namespaces.XML, "lang", "ru").
endInnerElement().
startInnerElement("body_inconsistent").
- addAttribute(NamespaceURIs.XML, "lang", "ru").
+ addAttribute(Namespaces.XML, "lang", "ru").
endInnerElement().
startInnerElement("body_inconsistent").
- addAttribute(NamespaceURIs.XML, "lang", "ru").
+ addAttribute(Namespaces.XML, "lang", "ru").
endInnerElement().
startInnerElement("body_lang_null").
addAttribute("order", "1").
@@ -276,18 +276,18 @@
public void testGetAttribute() {
XMLElement xmlElement = new XMLElementBuilder("test").
addAttribute("foo", "bar").
- addAttribute(NamespaceURIs.XML, "lang", "cn").
+ addAttribute(Namespaces.XML, "lang", "cn").
build();
assertEquals("bar", xmlElement.getAttribute("foo").getValue());
assertNull(xmlElement.getAttribute("http://example.com", "foo"));
assertNull(xmlElement.getAttribute("lang"));
- assertEquals("cn", xmlElement.getAttribute(NamespaceURIs.XML, "lang").getValue());
+ assertEquals("cn", xmlElement.getAttribute(Namespaces.XML, "lang").getValue());
assertEquals("bar", xmlElement.getAttributeValue("foo"));
assertNull(xmlElement.getAttributeValue("http://example.com", "foo"));
assertNull(xmlElement.getAttributeValue("lang"));
- assertEquals("cn", xmlElement.getAttributeValue(NamespaceURIs.XML, "lang"));
+ assertEquals("cn", xmlElement.getAttributeValue(Namespaces.XML, "lang"));
}
Modified: mina/sandbox/vysper/branches/nbxml-sax/src/test/java/org/apache/vysper/xml/sax/AbstractAsyncXMLReaderTestCase.java
URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/branches/nbxml-sax/src/test/java/org/apache/vysper/xml/sax/AbstractAsyncXMLReaderTestCase.java?rev=895485&r1=895484&r2=895485&view=diff
==============================================================================
--- mina/sandbox/vysper/branches/nbxml-sax/src/test/java/org/apache/vysper/xml/sax/AbstractAsyncXMLReaderTestCase.java (original)
+++ mina/sandbox/vysper/branches/nbxml-sax/src/test/java/org/apache/vysper/xml/sax/AbstractAsyncXMLReaderTestCase.java Sun Jan 3 21:36:27 2010
@@ -35,7 +35,7 @@
import org.apache.vysper.xml.sax.TestHandler.StartElementEvent;
import org.apache.vysper.xml.sax.TestHandler.TestEvent;
import org.apache.vysper.xml.sax.impl.Attribute;
-import org.apache.vysper.xml.sax.impl.DefaultAsyncXMLReader;
+import org.apache.vysper.xml.sax.impl.DefaultNonBlockingXMLReader;
import org.apache.vysper.xml.sax.impl.DefaultAttributes;
import org.xml.sax.Attributes;
@@ -106,7 +106,7 @@
protected List<TestEvent> parse(String xml) throws Exception {
TestHandler handler = new TestHandler();
- AsyncXMLReader reader = new DefaultAsyncXMLReader();
+ NonBlockingXMLReader reader = new DefaultNonBlockingXMLReader();
reader.setContentHandler(handler);
reader.setErrorHandler(handler);
Modified: mina/sandbox/vysper/branches/nbxml-sax/src/test/java/org/apache/vysper/xml/sax/DefaultAsyncXMLReaderTestCase.java
URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/branches/nbxml-sax/src/test/java/org/apache/vysper/xml/sax/DefaultAsyncXMLReaderTestCase.java?rev=895485&r1=895484&r2=895485&view=diff
==============================================================================
--- mina/sandbox/vysper/branches/nbxml-sax/src/test/java/org/apache/vysper/xml/sax/DefaultAsyncXMLReaderTestCase.java (original)
+++ mina/sandbox/vysper/branches/nbxml-sax/src/test/java/org/apache/vysper/xml/sax/DefaultAsyncXMLReaderTestCase.java Sun Jan 3 21:36:27 2010
@@ -21,7 +21,7 @@
import org.apache.mina.common.ByteBuffer;
import org.apache.vysper.charset.CharsetUtil;
-import org.apache.vysper.xml.sax.impl.DefaultAsyncXMLReader;
+import org.apache.vysper.xml.sax.impl.DefaultNonBlockingXMLReader;
import org.xml.sax.DTDHandler;
import org.xml.sax.SAXException;
import org.xml.sax.SAXNotRecognizedException;
@@ -35,7 +35,7 @@
public void testParseAfterFatalError() throws Exception {
TestHandler handler = new TestHandler();
- AsyncXMLReader reader = new DefaultAsyncXMLReader();
+ NonBlockingXMLReader reader = new DefaultNonBlockingXMLReader();
reader.setContentHandler(handler);
reader.setErrorHandler(handler);
@@ -54,7 +54,7 @@
public void testParseAfterEndDocument() throws Exception {
TestHandler handler = new TestHandler();
- AsyncXMLReader reader = new DefaultAsyncXMLReader();
+ NonBlockingXMLReader reader = new DefaultNonBlockingXMLReader();
reader.setContentHandler(handler);
reader.setErrorHandler(handler);
@@ -72,7 +72,7 @@
public void testSetDtdHandlerNotSupported() {
try {
- new DefaultAsyncXMLReader().setDTDHandler(new DTDHandler() {
+ new DefaultNonBlockingXMLReader().setDTDHandler(new DTDHandler() {
public void unparsedEntityDecl(String name, String publicId,
String systemId, String notationName) throws SAXException {
}
@@ -88,7 +88,7 @@
public void testGetDtdHandlerNotSupported() {
try {
- new DefaultAsyncXMLReader().getDTDHandler();
+ new DefaultNonBlockingXMLReader().getDTDHandler();
fail("Not supported, must throw RuntimeException");
} catch(RuntimeException e) {
// OK
@@ -96,7 +96,7 @@
}
public void testSetNotRecognizedFeature() throws SAXNotSupportedException {
- DefaultAsyncXMLReader reader = new DefaultAsyncXMLReader();
+ DefaultNonBlockingXMLReader reader = new DefaultNonBlockingXMLReader();
try {
reader.setFeature("http://example.com", true);
fail("Must throw SAXNotRecognizedException");
@@ -106,7 +106,7 @@
}
public void testSetNotSupportedFeature() throws SAXNotRecognizedException {
- DefaultAsyncXMLReader reader = new DefaultAsyncXMLReader();
+ DefaultNonBlockingXMLReader reader = new DefaultNonBlockingXMLReader();
try {
reader.setFeature("http://xml.org/sax/features/namespace-prefixes", true);
fail("Must throw SAXNotSupportedException");
@@ -116,17 +116,17 @@
}
public void testSetFeature() throws SAXNotRecognizedException, SAXNotSupportedException {
- DefaultAsyncXMLReader reader = new DefaultAsyncXMLReader();
+ DefaultNonBlockingXMLReader reader = new DefaultNonBlockingXMLReader();
reader.setFeature("http://xml.org/sax/features/namespaces", true);
}
public void testGetFeature() throws SAXNotRecognizedException, SAXNotSupportedException {
- DefaultAsyncXMLReader reader = new DefaultAsyncXMLReader();
+ DefaultNonBlockingXMLReader reader = new DefaultNonBlockingXMLReader();
assertTrue(reader.getFeature("http://xml.org/sax/features/namespaces"));
}
public void testGetUnknownFeature() throws SAXNotSupportedException {
- DefaultAsyncXMLReader reader = new DefaultAsyncXMLReader();
+ DefaultNonBlockingXMLReader reader = new DefaultNonBlockingXMLReader();
try {
assertTrue(reader.getFeature("http://example.com"));
fail("Must throw SAXNotRecognizedException");
@@ -136,7 +136,7 @@
}
public void testSetFeatureDuringParse() throws Exception {
- DefaultAsyncXMLReader reader = new DefaultAsyncXMLReader();
+ DefaultNonBlockingXMLReader reader = new DefaultNonBlockingXMLReader();
reader.parse(ByteBuffer.wrap("<foo />".getBytes("UTF-8")), CharsetUtil.UTF8_DECODER);
try {
reader.setFeature("http://xml.org/sax/features/namespaces", true);
Modified: mina/sandbox/vysper/branches/nbxml-sax/src/test/java/org/apache/vysper/xml/sax/XMPPContentHandlerTestCase.java
URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/branches/nbxml-sax/src/test/java/org/apache/vysper/xml/sax/XMPPContentHandlerTestCase.java?rev=895485&r1=895484&r2=895485&view=diff
==============================================================================
--- mina/sandbox/vysper/branches/nbxml-sax/src/test/java/org/apache/vysper/xml/sax/XMPPContentHandlerTestCase.java (original)
+++ mina/sandbox/vysper/branches/nbxml-sax/src/test/java/org/apache/vysper/xml/sax/XMPPContentHandlerTestCase.java Sun Jan 3 21:36:27 2010
@@ -30,7 +30,7 @@
import org.apache.vysper.xml.decoder.XMPPContentHandler;
import org.apache.vysper.xml.decoder.XMPPContentHandler.StanzaListener;
import org.apache.vysper.xml.fragment.XMLElement;
-import org.apache.vysper.xml.sax.impl.DefaultAsyncXMLReader;
+import org.apache.vysper.xml.sax.impl.DefaultNonBlockingXMLReader;
/**
* @author The Apache MINA Project (dev@mina.apache.org)
@@ -46,7 +46,7 @@
}
public void test() throws Exception {
- AsyncXMLReader reader = new DefaultAsyncXMLReader();
+ NonBlockingXMLReader reader = new DefaultNonBlockingXMLReader();
XMPPContentHandler handler = new XMPPContentHandler();
TestListener listener = new TestListener();
handler.setListener(listener);
@@ -65,7 +65,7 @@
assertEquals("iq", actual.next().getName());
}
- private void parse(AsyncXMLReader reader, String xml) throws Exception {
+ private void parse(NonBlockingXMLReader reader, String xml) throws Exception {
reader.parse(ByteBuffer.wrap(xml.getBytes("UTF-8")), CharsetUtil.UTF8_DECODER);
}