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 2009/11/16 09:50:58 UTC
svn commit: r880675 - in /mina/sandbox/vysper/trunk: nbxml/
nbxml/src/main/java/org/ nbxml/src/main/java/org/apache/
nbxml/src/main/java/org/apache/vysper/
nbxml/src/main/java/org/apache/vysper/xmpp/
nbxml/src/main/java/org/apache/vysper/xmpp/xmlfragme...
Author: ngn
Date: Mon Nov 16 08:50:50 2009
New Revision: 880675
URL: http://svn.apache.org/viewvc?rev=880675&view=rev
Log:
Moved XML fragment classes into new module
Added:
mina/sandbox/vysper/trunk/nbxml/src/main/java/org/
mina/sandbox/vysper/trunk/nbxml/src/main/java/org/apache/
mina/sandbox/vysper/trunk/nbxml/src/main/java/org/apache/vysper/
mina/sandbox/vysper/trunk/nbxml/src/main/java/org/apache/vysper/xmpp/
mina/sandbox/vysper/trunk/nbxml/src/main/java/org/apache/vysper/xmpp/xmlfragment/
- copied from r835939, mina/sandbox/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/xmlfragment/
mina/sandbox/vysper/trunk/nbxml/src/test/
mina/sandbox/vysper/trunk/nbxml/src/test/java/
mina/sandbox/vysper/trunk/nbxml/src/test/java/org/
mina/sandbox/vysper/trunk/nbxml/src/test/java/org/apache/
mina/sandbox/vysper/trunk/nbxml/src/test/java/org/apache/vysper/
mina/sandbox/vysper/trunk/nbxml/src/test/java/org/apache/vysper/xmpp/
mina/sandbox/vysper/trunk/nbxml/src/test/java/org/apache/vysper/xmpp/xmlfragment/
- copied from r835939, mina/sandbox/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/xmlfragment/
Removed:
mina/sandbox/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/xmlfragment/
mina/sandbox/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/xmlfragment/
Modified:
mina/sandbox/vysper/trunk/nbxml/ (props changed)
mina/sandbox/vysper/trunk/nbxml/pom.xml
mina/sandbox/vysper/trunk/nbxml/src/main/java/org/apache/vysper/xmpp/xmlfragment/SimpleNamespaceResolver.java
mina/sandbox/vysper/trunk/nbxml/src/main/java/org/apache/vysper/xmpp/xmlfragment/XMLElement.java
mina/sandbox/vysper/trunk/nbxml/src/test/java/org/apache/vysper/xmpp/xmlfragment/RendererTestCase.java
mina/sandbox/vysper/trunk/nbxml/src/test/java/org/apache/vysper/xmpp/xmlfragment/XMLElementTestCase.java
Propchange: mina/sandbox/vysper/trunk/nbxml/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Nov 16 08:50:50 2009
@@ -0,0 +1 @@
+target
Modified: mina/sandbox/vysper/trunk/nbxml/pom.xml
URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/nbxml/pom.xml?rev=880675&r1=880674&r2=880675&view=diff
==============================================================================
--- mina/sandbox/vysper/trunk/nbxml/pom.xml (original)
+++ mina/sandbox/vysper/trunk/nbxml/pom.xml Mon Nov 16 08:50:50 2009
@@ -27,4 +27,14 @@
<artifactId>nbxml</artifactId>
<name>Apache Vysper Non-blocking XML parser</name>
<version>1.0.0-SNAPSHOT</version>
+
+ <dependencies>
+ <!-- Test dependencies -->
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ </dependencies>
</project>
Modified: mina/sandbox/vysper/trunk/nbxml/src/main/java/org/apache/vysper/xmpp/xmlfragment/SimpleNamespaceResolver.java
URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/nbxml/src/main/java/org/apache/vysper/xmpp/xmlfragment/SimpleNamespaceResolver.java?rev=880675&r1=835939&r2=880675&view=diff
==============================================================================
--- mina/sandbox/vysper/trunk/nbxml/src/main/java/org/apache/vysper/xmpp/xmlfragment/SimpleNamespaceResolver.java (original)
+++ mina/sandbox/vysper/trunk/nbxml/src/main/java/org/apache/vysper/xmpp/xmlfragment/SimpleNamespaceResolver.java Mon Nov 16 08:50:50 2009
@@ -20,7 +20,6 @@
package org.apache.vysper.xmpp.xmlfragment;
-import org.apache.vysper.xmpp.protocol.NamespaceURIs;
/**
* Naive implementation, will be replaced in later stages of this change
Modified: mina/sandbox/vysper/trunk/nbxml/src/main/java/org/apache/vysper/xmpp/xmlfragment/XMLElement.java
URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/nbxml/src/main/java/org/apache/vysper/xmpp/xmlfragment/XMLElement.java?rev=880675&r1=835939&r2=880675&view=diff
==============================================================================
--- mina/sandbox/vysper/trunk/nbxml/src/main/java/org/apache/vysper/xmpp/xmlfragment/XMLElement.java (original)
+++ mina/sandbox/vysper/trunk/nbxml/src/main/java/org/apache/vysper/xmpp/xmlfragment/XMLElement.java Mon Nov 16 08:50:50 2009
@@ -27,8 +27,6 @@
import java.util.List;
import java.util.Map;
-import org.apache.vysper.xmpp.protocol.NamespaceURIs;
-
/**
* an immutable xml element specialized for XMPP.
*
Modified: mina/sandbox/vysper/trunk/nbxml/src/test/java/org/apache/vysper/xmpp/xmlfragment/RendererTestCase.java
URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/nbxml/src/test/java/org/apache/vysper/xmpp/xmlfragment/RendererTestCase.java?rev=880675&r1=835939&r2=880675&view=diff
==============================================================================
--- mina/sandbox/vysper/trunk/nbxml/src/test/java/org/apache/vysper/xmpp/xmlfragment/RendererTestCase.java (original)
+++ mina/sandbox/vysper/trunk/nbxml/src/test/java/org/apache/vysper/xmpp/xmlfragment/RendererTestCase.java Mon Nov 16 08:50:50 2009
@@ -19,8 +19,6 @@
*/
package org.apache.vysper.xmpp.xmlfragment;
-import org.apache.vysper.xmpp.protocol.NamespaceURIs;
-
import junit.framework.TestCase;
public class RendererTestCase extends TestCase {
Modified: mina/sandbox/vysper/trunk/nbxml/src/test/java/org/apache/vysper/xmpp/xmlfragment/XMLElementTestCase.java
URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/nbxml/src/test/java/org/apache/vysper/xmpp/xmlfragment/XMLElementTestCase.java?rev=880675&r1=835939&r2=880675&view=diff
==============================================================================
--- mina/sandbox/vysper/trunk/nbxml/src/test/java/org/apache/vysper/xmpp/xmlfragment/XMLElementTestCase.java (original)
+++ mina/sandbox/vysper/trunk/nbxml/src/test/java/org/apache/vysper/xmpp/xmlfragment/XMLElementTestCase.java Mon Nov 16 08:50:50 2009
@@ -21,8 +21,6 @@
import junit.framework.TestCase;
-import org.apache.vysper.xmpp.protocol.NamespaceURIs;
-import org.apache.vysper.xmpp.stanza.StanzaBuilder;
import java.util.List;
import java.util.Map;
@@ -33,11 +31,11 @@
public class XMLElementTestCase extends TestCase {
public void testBasicGetters() {
- XMLElement xmlElement = new StanzaBuilder("message", "urn:test").
+ XMLElement xmlElement = new XMLElementBuilder("message", "urn:test").
addAttribute("lang", "de").
addAttribute(NamespaceURIs.XML, "lang", "cn").
addAttribute("xmllang", "en").
- getFinalStanza();
+ getFinalElement();
assertEquals("message", xmlElement.getName());
assertEquals("urn:test", xmlElement.getNamespaceURI());
@@ -53,7 +51,7 @@
public void testInnerTextGetters() {
- XMLElement xmlElement = new StanzaBuilder("message", "jabber:test").
+ XMLElement xmlElement = new XMLElementBuilder("message", "jabber:test").
addText("t1").
startInnerElement("i1").
endInnerElement().
@@ -62,7 +60,7 @@
startInnerElement("i2").
endInnerElement().
addText("t4").
- getFinalStanza();
+ getFinalElement();
List<XMLText> list = xmlElement.getInnerTexts();
assertEquals(4, list.size());
@@ -79,10 +77,10 @@
// test succeeded
}
- xmlElement = new StanzaBuilder("message", "jabber:test").
+ xmlElement = new XMLElementBuilder("message", "jabber:test").
startInnerElement("i1").
endInnerElement().
- getFinalStanza();
+ getFinalElement();
try {
assertNull(xmlElement.getSingleInnerText());
} catch (XMLSemanticError xmlSemanticError) {
@@ -92,7 +90,7 @@
public void testInnerElementGetters() {
- XMLElement xmlElement = new StanzaBuilder("message", "jabber:test").
+ XMLElement xmlElement = new XMLElementBuilder("message", "jabber:test").
addText("t1").
startInnerElement("i1").
endInnerElement().
@@ -107,7 +105,7 @@
startInnerElement("i3").
endInnerElement().
addText("t4").
- getFinalStanza();
+ getFinalElement();
List<XMLElement> list = xmlElement.getInnerElements();
assertEquals(4, list.size());
@@ -127,22 +125,22 @@
fail("must not raise exception");
}
- xmlElement = new StanzaBuilder("message", "jabber:test").
+ xmlElement = new XMLElementBuilder("message", "jabber:test").
addText("t1").
- getFinalStanza();
+ getFinalElement();
try {
assertNull(xmlElement.getSingleInnerElementsNamed("none"));
} catch (XMLSemanticError xmlSemanticError) {
fail("must not raise error");
}
- xmlElement = new StanzaBuilder("message", "jabber:test").
+ xmlElement = new XMLElementBuilder("message", "jabber:test").
startInnerElement("i").
addAttribute("order", "1").
endInnerElement().
startInnerElement("another").
endInnerElement().
- getFinalStanza();
+ getFinalElement();
try {
XMLElement singleXmlElement = xmlElement.getSingleInnerElementsNamed("i");
assertEquals("i", singleXmlElement.getName());
@@ -150,14 +148,14 @@
fail("must not raise error");
}
- xmlElement = new StanzaBuilder("message", "jabber:test").
+ xmlElement = new XMLElementBuilder("message", "jabber:test").
startInnerElement("i").
addAttribute("order", "1").
endInnerElement().
startInnerElement("i").
addAttribute("order", "2").
endInnerElement().
- getFinalStanza();
+ getFinalElement();
try {
xmlElement.getSingleInnerElementsNamed("i");
fail("must raise error, more than one i-element");
@@ -168,7 +166,7 @@
public void testInnerElementsNamed() {
- XMLElement xmlElement = new StanzaBuilder("message", "jabber:test").
+ XMLElement xmlElement = new XMLElementBuilder("message", "jabber:test").
addText("t1").
startInnerElement("body").
endInnerElement().
@@ -183,7 +181,7 @@
startInnerElement("single").
endInnerElement().
addText("t4").
- getFinalStanza();
+ getFinalElement();
List<XMLElement> list = xmlElement.getInnerElementsNamed("no-exist");
assertEquals(0, list.size());
@@ -211,7 +209,7 @@
public void testLanguageMapping() {
- XMLElement xmlElement = new StanzaBuilder("message", "jabber:test").
+ XMLElement xmlElement = new XMLElementBuilder("message", "jabber:test").
addText("t1").
startInnerElement("body").
endInnerElement().
@@ -239,7 +237,7 @@
addAttribute("order", "2").
endInnerElement().
addText("t4").
- getFinalStanza();
+ getFinalElement();
try {
Map<String,XMLElement> map = xmlElement.getInnerElementsByXMLLangNamed("body");
@@ -270,10 +268,10 @@
}
public void testGetAttribute() {
- XMLElement xmlElement = new StanzaBuilder("test").
+ XMLElement xmlElement = new XMLElementBuilder("test").
addAttribute("foo", "bar").
addAttribute(NamespaceURIs.XML, "lang", "cn").
- getFinalStanza();
+ getFinalElement();
assertEquals("bar", xmlElement.getAttribute("foo").getValue());
assertNull(xmlElement.getAttribute("http://example.com", "foo"));