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/22 14:09:41 UTC
svn commit: r883073 - in /mina/sandbox/vysper/trunk:
nbxml/src/main/java/org/apache/vysper/xmpp/xmlfragment/
nbxml/src/test/java/org/apache/vysper/xmpp/xmlfragment/
server/core/src/main/java/org/apache/vysper/xmpp/parser/
server/core/src/main/java/org/...
Author: ngn
Date: Sun Nov 22 13:09:40 2009
New Revision: 883073
URL: http://svn.apache.org/viewvc?rev=883073&view=rev
Log:
Add namespaceURI to the XMLElement constructor. This is part of the large change to get full namespace support into XML parser. More changes to follow.
Modified:
mina/sandbox/vysper/trunk/nbxml/src/main/java/org/apache/vysper/xmpp/xmlfragment/FragmentFactory.java
mina/sandbox/vysper/trunk/nbxml/src/main/java/org/apache/vysper/xmpp/xmlfragment/XMLElement.java
mina/sandbox/vysper/trunk/nbxml/src/main/java/org/apache/vysper/xmpp/xmlfragment/XMLElementBuilder.java
mina/sandbox/vysper/trunk/nbxml/src/test/java/org/apache/vysper/xmpp/xmlfragment/RendererTestCase.java
mina/sandbox/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/parser/AbstractNekopullStreamParser.java
mina/sandbox/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/stanza/Stanza.java
mina/sandbox/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/stanza/StanzaBuilder.java
mina/sandbox/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/stanza/XMPPCoreStanza.java
mina/sandbox/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/stanza/dataforms/DataFormEncoder.java
mina/sandbox/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/xmldecoder/XMLRawToFragmentConverter.java
mina/sandbox/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/protocol/CallTestStanzaHandler.java
mina/sandbox/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/protocol/StanzaHandlerLookupTestCase.java
mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/stanzas/AbstractInviteDecline.java
mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/stanzas/Delay.java
mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/stanzas/History.java
mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/stanzas/Item.java
mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/stanzas/Password.java
mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/stanzas/Status.java
mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/stanzas/X.java
mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/AbstractMUCHandlerTestCase.java
mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/AbstractMUCMessageHandlerTestCase.java
mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/MUCMessageHandlerTestCase.java
mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/MUCPresenceHandlerEnterRoomTestCase.java
mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/MUCSubjectMessageHandlerTestCase.java
mina/sandbox/vysper/trunk/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/ErrorStanzaGenerator.java
mina/sandbox/vysper/trunk/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/owner/PubSubOwnerDeleteNodeHandler.java
mina/sandbox/vysper/trunk/server/extensions/xep0060-pubsub/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/disco/PubSubDiscoItemsTestCase.java
Modified: mina/sandbox/vysper/trunk/nbxml/src/main/java/org/apache/vysper/xmpp/xmlfragment/FragmentFactory.java
URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/nbxml/src/main/java/org/apache/vysper/xmpp/xmlfragment/FragmentFactory.java?rev=883073&r1=883072&r2=883073&view=diff
==============================================================================
--- mina/sandbox/vysper/trunk/nbxml/src/main/java/org/apache/vysper/xmpp/xmlfragment/FragmentFactory.java (original)
+++ mina/sandbox/vysper/trunk/nbxml/src/main/java/org/apache/vysper/xmpp/xmlfragment/FragmentFactory.java Sun Nov 22 13:09:40 2009
@@ -30,9 +30,14 @@
*/
public class FragmentFactory {
public static XMLElement createElementWithInnerText(String name, String text) {
- return new XMLElement(name, null, null, asList(new XMLText(text)));
+ return createElementWithInnerText(null, name, text);
}
+ public static XMLElement createElementWithInnerText(String namespaceURI, String name, String text) {
+ return new XMLElement(namespaceURI, name, null, null, asList(new XMLText(text)));
+ }
+
+
public static List<XMLFragment> asList(XMLFragment xmlFragment) {
List<XMLFragment> xmlFragments = new ArrayList<XMLFragment>();
if (xmlFragment != null) xmlFragments.add(xmlFragment);
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=883073&r1=883072&r2=883073&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 Sun Nov 22 13:09:40 2009
@@ -42,6 +42,7 @@
* if the namespace is 'http://ns.org', then element name b is prefixed with a.
* NOTE: the namespace value must NOT be "b"!
*/
+ private String namespaceURI;
private String namespacePrefix;
private NamespaceResolver nsResolver;
@@ -50,12 +51,13 @@
private List<XMLFragment> innerFragments;
protected XMLElementVerifier xmlElementVerifier;
- public XMLElement(String name, String namespacePrefix, Attribute[] attributes, XMLFragment[] innerFragments) {
- this(name, namespacePrefix, FragmentFactory.asList(attributes), FragmentFactory.asList(innerFragments));
+ public XMLElement(String namespaceURI, String name, String namespacePrefix, Attribute[] attributes, XMLFragment[] innerFragments) {
+ this(namespaceURI, name, namespacePrefix, FragmentFactory.asList(attributes), FragmentFactory.asList(innerFragments));
}
- public XMLElement(String name, String namespacePrefix, List<Attribute> attributes, List<XMLFragment> innerFragments) {
- this.namespacePrefix = namespacePrefix == null ? NamespaceAttribute.DEFAULT_NAMESPACE : namespacePrefix;
+ 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.name = name;
this.attributes = (attributes == null) ? Collections.EMPTY_LIST : Collections.unmodifiableList(attributes);
this.innerFragments = (innerFragments == null) ? Collections.EMPTY_LIST : Collections.unmodifiableList(innerFragments);
@@ -87,7 +89,12 @@
* @return The namespace URI for the element.
*/
public String getNamespaceURI() {
- return nsResolver.resolveUri(namespacePrefix);
+ // TODO clean up
+ if(namespaceURI != null) {
+ return namespaceURI;
+ } else {
+ return nsResolver.resolveUri(namespacePrefix);
+ }
}
public List<Attribute> getAttributes() {
Modified: mina/sandbox/vysper/trunk/nbxml/src/main/java/org/apache/vysper/xmpp/xmlfragment/XMLElementBuilder.java
URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/nbxml/src/main/java/org/apache/vysper/xmpp/xmlfragment/XMLElementBuilder.java?rev=883073&r1=883072&r2=883073&view=diff
==============================================================================
--- mina/sandbox/vysper/trunk/nbxml/src/main/java/org/apache/vysper/xmpp/xmlfragment/XMLElementBuilder.java (original)
+++ mina/sandbox/vysper/trunk/nbxml/src/main/java/org/apache/vysper/xmpp/xmlfragment/XMLElementBuilder.java Sun Nov 22 13:09:40 2009
@@ -67,7 +67,7 @@
ElementStruct element = new ElementStruct();
element.attributes = new ArrayList<Attribute>();
element.innerFragments = new ArrayList<XMLFragment>();
- element.element = new XMLElement(name, namespacePrefix, element.attributes, element.innerFragments);
+ element.element = new XMLElement(namespaceURI, name, namespacePrefix, element.attributes, element.innerFragments);
currentElement = element;
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=883073&r1=883072&r2=883073&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 Sun Nov 22 13:09:40 2009
@@ -24,40 +24,40 @@
public class RendererTestCase extends TestCase {
public void testRenderAttribute() {
- XMLElement elm = new XMLElement("foo", null, new Attribute[]{new Attribute("attr1", "value1")}, null);
+ XMLElement elm = new XMLElement(null, "foo", null, new Attribute[]{new Attribute("attr1", "value1")}, null);
assertEquals("<foo attr1=\"value1\"></foo>", new Renderer(elm).getComplete());
}
// & must be escaped
public void testRenderAttributeWithAmpersand() {
- XMLElement elm = new XMLElement("foo", null, new Attribute[]{new Attribute("attr1", "val&ue1")}, null);
+ XMLElement elm = new XMLElement(null, "foo", null, new Attribute[]{new Attribute("attr1", "val&ue1")}, null);
assertEquals("<foo attr1=\"val&ue1\"></foo>", new Renderer(elm).getComplete());
}
public void testRenderAttributeWithQuot() {
- XMLElement elm = new XMLElement("foo", null, new Attribute[]{new Attribute("attr1", "val\"ue1")}, null);
+ XMLElement elm = new XMLElement(null, "foo", null, new Attribute[]{new Attribute("attr1", "val\"ue1")}, null);
assertEquals("<foo attr1=\"val"ue1\"></foo>", new Renderer(elm).getComplete());
}
public void testRenderAttributeWithApos() {
- XMLElement elm = new XMLElement("foo", null, new Attribute[]{new Attribute("attr1", "val'ue1")}, null);
+ XMLElement elm = new XMLElement(null, "foo", null, new Attribute[]{new Attribute("attr1", "val'ue1")}, null);
assertEquals("<foo attr1=\"val'ue1\"></foo>", new Renderer(elm).getComplete());
}
// > is not required to be escaped, but we do so to make sure
public void testRenderAttributeWithGt() {
- XMLElement elm = new XMLElement("foo", null, new Attribute[]{new Attribute("attr1", "val>ue1")}, null);
+ XMLElement elm = new XMLElement(null, "foo", null, new Attribute[]{new Attribute("attr1", "val>ue1")}, null);
assertEquals("<foo attr1=\"val>ue1\"></foo>", new Renderer(elm).getComplete());
}
// < must be escaped
public void testRenderAttributeWithLt() {
- XMLElement elm = new XMLElement("foo", null, new Attribute[]{new Attribute("attr1", "val<ue1")}, null);
+ XMLElement elm = new XMLElement(null, "foo", null, new Attribute[]{new Attribute("attr1", "val<ue1")}, null);
assertEquals("<foo attr1=\"val<ue1\"></foo>", new Renderer(elm).getComplete());
}
public void testRenderNamespacedAttribute() {
- XMLElement elm = new XMLElement("foo", null, new Attribute[]{
+ XMLElement elm = new XMLElement(null, "foo", null, new Attribute[]{
new Attribute("http://example.com", "attr1", "value1"),
new NamespaceAttribute("pr1", "http://example.com")
}, null);
@@ -66,14 +66,14 @@
// make sure we render the xml namespace correctly, e.g for xml:lang
public void testRenderXmlNamespacedAttribute() {
- XMLElement elm = new XMLElement("foo", null, new Attribute[]{
+ XMLElement elm = new XMLElement(null, "foo", null, new Attribute[]{
new Attribute(NamespaceURIs.XML, "lang", "sv")
}, null);
assertEquals("<foo xml:lang=\"sv\"></foo>", new Renderer(elm).getComplete());
}
public void testRenderUndeclaredNamespacedAttribute() {
- XMLElement elm = new XMLElement("foo", null, new Attribute[]{
+ XMLElement elm = new XMLElement(null, "foo", null, new Attribute[]{
new Attribute("http://example.com", "attr1", "value1")
}, null);
try {
@@ -85,47 +85,47 @@
}
public void testRenderNonNamespaceElement() {
- XMLElement elm = new XMLElement("foo", null, (Attribute[])null, null);
+ XMLElement elm = new XMLElement(null, "foo", null, (Attribute[])null, null);
assertEquals("<foo></foo>", new Renderer(elm).getComplete());
}
public void testRenderDefaultNamespaceElement() {
- XMLElement elm = new XMLElement("foo", null, new Attribute[]{
+ XMLElement elm = new XMLElement(null, "foo", null, new Attribute[]{
new NamespaceAttribute("http://example.com")
}, null);
assertEquals("<foo xmlns=\"http://example.com\"></foo>", new Renderer(elm).getComplete());
}
public void testRenderPrefixedNamespaceElement() {
- XMLElement elm = new XMLElement("foo", "pr", new Attribute[]{
+ XMLElement elm = new XMLElement(null, "foo", "pr", new Attribute[]{
new NamespaceAttribute("pr", "http://example.com")
}, null);
assertEquals("<pr:foo xmlns:pr=\"http://example.com\"></pr:foo>", new Renderer(elm).getComplete());
}
public void testRenderSimpleText() {
- XMLElement elm = new XMLElement("foo", null, null, new XMLFragment[]{
+ XMLElement elm = new XMLElement(null, "foo", null, null, new XMLFragment[]{
new XMLText("bar")
});
assertEquals("<foo>bar</foo>", new Renderer(elm).getComplete());
}
public void testRenderTextWithAmpersand() {
- XMLElement elm = new XMLElement("foo", null, null, new XMLFragment[]{
+ XMLElement elm = new XMLElement(null, "foo", null, null, new XMLFragment[]{
new XMLText("ba&r")
});
assertEquals("<foo>ba&r</foo>", new Renderer(elm).getComplete());
}
public void testRenderTextWithGt() {
- XMLElement elm = new XMLElement("foo", null, null, new XMLFragment[]{
+ XMLElement elm = new XMLElement(null, "foo", null, null, new XMLFragment[]{
new XMLText("ba>r")
});
assertEquals("<foo>ba>r</foo>", new Renderer(elm).getComplete());
}
public void testRenderTextWithLt() {
- XMLElement elm = new XMLElement("foo", null, null, new XMLFragment[]{
+ XMLElement elm = new XMLElement(null, "foo", null, null, new XMLFragment[]{
new XMLText("ba<r")
});
assertEquals("<foo>ba<r</foo>", new Renderer(elm).getComplete());
Modified: mina/sandbox/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/parser/AbstractNekopullStreamParser.java
URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/parser/AbstractNekopullStreamParser.java?rev=883073&r1=883072&r2=883073&view=diff
==============================================================================
--- mina/sandbox/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/parser/AbstractNekopullStreamParser.java (original)
+++ mina/sandbox/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/parser/AbstractNekopullStreamParser.java Sun Nov 22 13:09:40 2009
@@ -135,7 +135,7 @@
if (!fillDeep(startElementEvent.element.rawname, xmlFragments)) throw new ParsingException("XML end element not found as expected");
}
- return new Stanza(name, null, stanzaAttributes, xmlFragments);
+ return new Stanza(null, name, null, stanzaAttributes, xmlFragments);
}
private boolean fillDeep(String name, List<XMLFragment> xmlFragments) throws ParsingException {
@@ -157,7 +157,7 @@
fillDeep(elementEvent.element.rawname, xmlInnerFragments); // (return value can be savely ignored)
// create element with all collected data
- XMLElement xmlInnerElement = new XMLElement(innerName, namespaceURI, stanzaAttributes, xmlInnerFragments);
+ XMLElement xmlInnerElement = new XMLElement(namespaceURI, innerName, null, stanzaAttributes, xmlInnerFragments);
xmlFragments.add(xmlInnerElement);
} else {
return name.equals(elementEvent.element.rawname); // succeed if exact end element found and all is balanced
Modified: mina/sandbox/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/stanza/Stanza.java
URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/stanza/Stanza.java?rev=883073&r1=883072&r2=883073&view=diff
==============================================================================
--- mina/sandbox/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/stanza/Stanza.java (original)
+++ mina/sandbox/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/stanza/Stanza.java Sun Nov 22 13:09:40 2009
@@ -39,12 +39,12 @@
*/
public class Stanza extends XMLElement {
- public Stanza(String name, String namespacePrefix, List<Attribute> attributes, List<XMLFragment> innerFragments) {
- super(name, namespacePrefix, attributes, innerFragments);
+ public Stanza(String namespaceURI, String name, String namespacePrefix, List<Attribute> attributes, List<XMLFragment> innerFragments) {
+ super(namespaceURI, name, namespacePrefix, attributes, innerFragments);
}
- public Stanza(String name, String namespacePrefix, Attribute[] attributes, XMLFragment[] innerFragments) {
- super(name, namespacePrefix, attributes, innerFragments);
+ public Stanza(String namespaceURI, String name, String namespacePrefix, Attribute[] attributes, XMLFragment[] innerFragments) {
+ super(namespaceURI, name, namespacePrefix, attributes, innerFragments);
}
public Entity getTo() {
Modified: mina/sandbox/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/stanza/StanzaBuilder.java
URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/stanza/StanzaBuilder.java?rev=883073&r1=883072&r2=883073&view=diff
==============================================================================
--- mina/sandbox/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/stanza/StanzaBuilder.java (original)
+++ mina/sandbox/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/stanza/StanzaBuilder.java Sun Nov 22 13:09:40 2009
@@ -213,9 +213,9 @@
element.attributes = new ArrayList<Attribute>();
element.innerFragments = new ArrayList<XMLFragment>();
if (isStanza) {
- element.element = new Stanza(name, namespacePrefix, element.attributes, element.innerFragments);
+ element.element = new Stanza(namespaceURI, name, namespacePrefix, element.attributes, element.innerFragments);
} else {
- element.element = new XMLElement(name, namespacePrefix, element.attributes, element.innerFragments);
+ element.element = new XMLElement(namespaceURI, name, namespacePrefix, element.attributes, element.innerFragments);
}
currentElement = element;
Modified: mina/sandbox/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/stanza/XMPPCoreStanza.java
URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/stanza/XMPPCoreStanza.java?rev=883073&r1=883072&r2=883073&view=diff
==============================================================================
--- mina/sandbox/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/stanza/XMPPCoreStanza.java (original)
+++ mina/sandbox/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/stanza/XMPPCoreStanza.java Sun Nov 22 13:09:40 2009
@@ -44,7 +44,7 @@
}
public XMPPCoreStanza(Stanza stanza) {
- super(stanza.getName(), stanza.getNamespacePrefix(), stanza.getAttributes(), stanza.getInnerFragments());
+ super(stanza.getNamespaceURI(), stanza.getName(), stanza.getNamespacePrefix(), stanza.getAttributes(), stanza.getInnerFragments());
}
@Override
Modified: mina/sandbox/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/stanza/dataforms/DataFormEncoder.java
URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/stanza/dataforms/DataFormEncoder.java?rev=883073&r1=883072&r2=883073&view=diff
==============================================================================
--- mina/sandbox/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/stanza/dataforms/DataFormEncoder.java (original)
+++ mina/sandbox/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/stanza/dataforms/DataFormEncoder.java Sun Nov 22 13:09:40 2009
@@ -43,11 +43,11 @@
while (instructionIterator.hasNext()) {
String instruction = instructionIterator.next();
if (instruction == null) continue;
- childElements.add(createTextOnlyElement("instructions", instruction));
+ childElements.add(createTextOnlyElement(NamespaceURIs.JABBER_X_DATA, "instructions", instruction));
}
if (dataForm.getTitle() != null) {
- childElements.add(createTextOnlyElement("title", dataForm.getTitle()));
+ childElements.add(createTextOnlyElement(NamespaceURIs.JABBER_X_DATA, "title", dataForm.getTitle()));
}
if (dataForm.getType() == DataForm.Type.form) {
@@ -58,7 +58,7 @@
Field field = reportedIterator.next();
reportedFields.add(encodeField(field));
}
- XMLElement reportedElement = new XMLElement("reported", null, null, reportedFields);
+ XMLElement reportedElement = new XMLElement(NamespaceURIs.JABBER_X_DATA, "reported", null, null, reportedFields);
childElements.add(reportedElement);
// all item elements with their values
@@ -69,7 +69,7 @@
for (Field field : itemField) {
itemFields.add(encodeField(field));
}
- XMLElement itemElement = new XMLElement("item", null, null, itemFields);
+ XMLElement itemElement = new XMLElement(NamespaceURIs.JABBER_X_DATA, "item", null, null, itemFields);
childElements.add(itemElement);
}
}
@@ -86,7 +86,7 @@
List<Attribute> attributes = new ArrayList<Attribute>();
attributes.add(new Attribute("type", dataForm.getType().value()));
- return new XMLElement("x", NamespaceURIs.JABBER_X_DATA, attributes, childElements);
+ return new XMLElement(NamespaceURIs.JABBER_X_DATA, "x", NamespaceURIs.JABBER_X_DATA, attributes, childElements);
}
protected XMLElement encodeField(Field field) {
@@ -108,16 +108,16 @@
if (field.getDesc() != null) {
descFragment.add(new XMLText(field.getDesc()));
}
- fieldElements.add(new XMLElement("desc", null, null, descFragment));
+ fieldElements.add(new XMLElement(NamespaceURIs.JABBER_X_DATA, "desc", null, null, descFragment));
if (field.isRequired()) {
- fieldElements.add(createEmptyElement("required"));
+ fieldElements.add(createEmptyElement(NamespaceURIs.JABBER_X_DATA, "required"));
}
Iterator<String> valueIterator = field.getValueIterator();
while (valueIterator.hasNext()) {
String value = valueIterator.next();
- XMLElement valueElement = createTextOnlyElement("value", value);
+ XMLElement valueElement = createTextOnlyElement(NamespaceURIs.JABBER_X_DATA, "value", value);
fieldElements.add(valueElement);
}
@@ -128,19 +128,19 @@
Attribute[] attributes = option.getLabel() == null ? null : new Attribute[]{new Attribute("label", option.getLabel())};
XMLFragment[] elements = option.getValue() == null ? null : new XMLFragment[]{new XMLText(option.getValue())};
- XMLElement optionElement = new XMLElement("option", null, attributes, elements);
+ XMLElement optionElement = new XMLElement(NamespaceURIs.JABBER_X_DATA, "option", null, attributes, elements);
fieldElements.add(optionElement);
}
- return new XMLElement("field", null, fieldAttributes, fieldElements);
+ return new XMLElement(NamespaceURIs.JABBER_X_DATA, "field", null, fieldAttributes, fieldElements);
}
- protected XMLElement createEmptyElement(String elementName) {
- return new XMLElement(elementName, null, (Attribute[])null, (XMLFragment[])null);
+ protected XMLElement createEmptyElement(String namespaceURI, String elementName) {
+ return new XMLElement(namespaceURI, elementName, null, (Attribute[])null, (XMLFragment[])null);
}
- protected XMLElement createTextOnlyElement(String elementName, String text) {
- return new XMLElement(elementName, null, null, new XMLFragment[]{new XMLText(text)});
+ protected XMLElement createTextOnlyElement(String namespaceURI, String elementName, String text) {
+ return new XMLElement(namespaceURI, elementName, null, null, new XMLFragment[]{new XMLText(text)});
}
}
Modified: mina/sandbox/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/xmldecoder/XMLRawToFragmentConverter.java
URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/xmldecoder/XMLRawToFragmentConverter.java?rev=883073&r1=883072&r2=883073&view=diff
==============================================================================
--- mina/sandbox/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/xmldecoder/XMLRawToFragmentConverter.java (original)
+++ mina/sandbox/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/xmldecoder/XMLRawToFragmentConverter.java Sun Nov 22 13:09:40 2009
@@ -102,7 +102,8 @@
} else if (particle.isOpeningOnlyElement()) {
XMLElement incompleteElement = getElementForOpening(particle, createStanza);
List<XMLFragment> innerFragments = convert(particles, particle.getElementName());
- XMLElement completedElement = createElementOrStanza(incompleteElement.getName(), incompleteElement.getAttributes(), incompleteElement.getNamespacePrefix(), innerFragments, createStanza);
+ // TODO revisit namespace handling
+ XMLElement completedElement = createElementOrStanza(null, incompleteElement.getName(), incompleteElement.getAttributes(), incompleteElement.getNamespacePrefix(), innerFragments, createStanza);
fragments.add(completedElement);
} else if (particle.isClosingOnlyElement()) {
String closingElementName = getElementNameForClosingOnly(particle);
@@ -143,10 +144,11 @@
String content = particle.getContentWithoutElement();
List<Attribute> attributes = parseAttributes(content);
elementName = elementName.trim();
- return createElementOrStanza(elementName, attributes, null, (List<XMLFragment>) null, createStanza);
+ // TODO revisit namespace handling
+ return createElementOrStanza(null, elementName, attributes, null, (List<XMLFragment>) null, createStanza);
}
- private XMLElement createElementOrStanza(String elementName, List<Attribute> attributes, String namespacePrefix, List<XMLFragment> innerFragments, boolean createStanza) throws DecodingException {
+ private XMLElement createElementOrStanza(String namespaceURI, String elementName, List<Attribute> attributes, String namespacePrefix, List<XMLFragment> innerFragments, boolean createStanza) throws DecodingException {
int i = elementName.indexOf(":");
if (i >= 1) {
namespacePrefix = elementName.substring(0, i);
@@ -159,10 +161,10 @@
throw new DecodingException("unsupported legal XML: colon at start of element name and no namespace specified");
}
if (createStanza) {
- Stanza stanza = new Stanza(elementName, namespacePrefix, attributes, innerFragments);
+ Stanza stanza = new Stanza(namespaceURI, elementName, namespacePrefix, attributes, innerFragments);
// place for filtering stanzas very early
return stanza;
- } else return new XMLElement(elementName, namespacePrefix, attributes, innerFragments);
+ } else return new XMLElement(namespaceURI, elementName, namespacePrefix, attributes, innerFragments);
}
private List<Attribute> parseAttributes(String content) throws DecodingException {
Modified: mina/sandbox/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/protocol/CallTestStanzaHandler.java
URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/protocol/CallTestStanzaHandler.java?rev=883073&r1=883072&r2=883073&view=diff
==============================================================================
--- mina/sandbox/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/protocol/CallTestStanzaHandler.java (original)
+++ mina/sandbox/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/protocol/CallTestStanzaHandler.java Sun Nov 22 13:09:40 2009
@@ -50,8 +50,8 @@
if (name != null && !name.equals(stanza.getName())) return false;
if (namespaceURI == null) return true;
- boolean elementNamespaceMatches = false;
- if (namespaceURI != null && namespaceURI.equals(stanza.getNamespacePrefix())) elementNamespaceMatches = true;
+ //boolean elementNamespaceMatches = false;
+ //if (namespaceURI != null && namespaceURI.equals(stanza.getNamespacePrefix())) elementNamespaceMatches = true;
boolean outerNamespaceMatches = false;
boolean innerNamespaceMatches = false;
@@ -60,7 +60,7 @@
if (firstInnerElement != null) {
if (namespaceURI != null && namespaceURI.equals(firstInnerElement.getNamespaceURI())) innerNamespaceMatches = true;
}
- return elementNamespaceMatches || outerNamespaceMatches || innerNamespaceMatches;
+ return /*elementNamespaceMatches || */ outerNamespaceMatches || innerNamespaceMatches;
}
public boolean isSessionRequired() {
Modified: mina/sandbox/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/protocol/StanzaHandlerLookupTestCase.java
URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/protocol/StanzaHandlerLookupTestCase.java?rev=883073&r1=883072&r2=883073&view=diff
==============================================================================
--- mina/sandbox/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/protocol/StanzaHandlerLookupTestCase.java (original)
+++ mina/sandbox/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/protocol/StanzaHandlerLookupTestCase.java Sun Nov 22 13:09:40 2009
@@ -54,18 +54,18 @@
stanzaHandlerLookup.addDictionary(upperNamespaceHandlerDictionary);
stanzaHandlerLookup.addDictionary(lowerNamespaceHandlerDictionary);
- Stanza nonExistingStanza = new Stanza("testDictionaryHierarchyNotExist", "testNSURI", new ArrayList<Attribute>(), new ArrayList<XMLFragment>());
+ Stanza nonExistingStanza = new Stanza("testNSURI", "testDictionaryHierarchyNotExist", null, new ArrayList<Attribute>(), new ArrayList<XMLFragment>());
StanzaHandler handler = stanzaHandlerLookup.getHandler(nonExistingStanza);
assertNull("handler not found", handler);
- Stanza existingStanzaNS1 = new Stanza("testDictionaryHierarchy", "testNSURI1", new ArrayList<Attribute>(), new ArrayList<XMLFragment>());
+ Stanza existingStanzaNS1 = new Stanza("testNSURI1", "testDictionaryHierarchy", null, new ArrayList<Attribute>(), new ArrayList<XMLFragment>());
handler = stanzaHandlerLookup.getHandler(existingStanzaNS1);
assertNotNull("handler found in dict1", handler);
assertTrue("verify got called", ((CallTestStanzaHandler)handler).isVerifyCalled());
assertNotSame("lower not found", lowerStanzaHandler, handler);
assertSame("upper found", upperStanzaHandler, handler);
- Stanza existingStanzaNS2 = new Stanza("testDictionaryHierarchy", "testNSURI2", new ArrayList<Attribute>(), new ArrayList<XMLFragment>());
+ Stanza existingStanzaNS2 = new Stanza("testNSURI2", "testDictionaryHierarchy", null, new ArrayList<Attribute>(), new ArrayList<XMLFragment>());
handler = stanzaHandlerLookup.getHandler(existingStanzaNS2);
assertTrue("verify got called", ((CallTestStanzaHandler)handler).isVerifyCalled());
assertNotNull("handler found in dict2", handler);
Modified: mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/stanzas/AbstractInviteDecline.java
URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/stanzas/AbstractInviteDecline.java?rev=883073&r1=883072&r2=883073&view=diff
==============================================================================
--- mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/stanzas/AbstractInviteDecline.java (original)
+++ mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/stanzas/AbstractInviteDecline.java Sun Nov 22 13:09:40 2009
@@ -25,6 +25,7 @@
import org.apache.vysper.xmpp.addressing.Entity;
import org.apache.vysper.xmpp.addressing.EntityFormatException;
import org.apache.vysper.xmpp.addressing.EntityImpl;
+import org.apache.vysper.xmpp.protocol.NamespaceURIs;
import org.apache.vysper.xmpp.xmlfragment.Attribute;
import org.apache.vysper.xmpp.xmlfragment.XMLElement;
import org.apache.vysper.xmpp.xmlfragment.XMLFragment;
@@ -34,11 +35,11 @@
public abstract class AbstractInviteDecline extends XMLElement {
public AbstractInviteDecline(String elmName, XMLElement elm) {
- super(elmName, null, elm.getAttributes(), elm.getInnerFragments());
+ super(NamespaceURIs.XEP0045_MUC, elmName, null, elm.getAttributes(), elm.getInnerFragments());
}
public AbstractInviteDecline(String elmName, Entity from, Entity to, String reason) {
- super(elmName, null,
+ super(NamespaceURIs.XEP0045_MUC, elmName, null,
createAttributes(from, to),
createFragments(reason));
}
@@ -53,7 +54,7 @@
private static List<XMLFragment> createFragments(String reason) {
List<XMLFragment> fragments = new ArrayList<XMLFragment>();
if(reason != null) {
- XMLElement reasonElm = new XMLElement("reason", null, null, new XMLFragment[]{new XMLText(reason)});
+ XMLElement reasonElm = new XMLElement(NamespaceURIs.XEP0045_MUC, "reason", null, null, new XMLFragment[]{new XMLText(reason)});
fragments.add(reasonElm);
}
return fragments;
Modified: mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/stanzas/Delay.java
URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/stanzas/Delay.java?rev=883073&r1=883072&r2=883073&view=diff
==============================================================================
--- mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/stanzas/Delay.java (original)
+++ mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/stanzas/Delay.java Sun Nov 22 13:09:40 2009
@@ -21,7 +21,6 @@
import java.util.Arrays;
import java.util.Calendar;
-import java.util.List;
import org.apache.vysper.xmpp.addressing.Entity;
import org.apache.vysper.xmpp.datetime.DateTimeProfile;
@@ -29,12 +28,11 @@
import org.apache.vysper.xmpp.xmlfragment.Attribute;
import org.apache.vysper.xmpp.xmlfragment.NamespaceAttribute;
import org.apache.vysper.xmpp.xmlfragment.XMLElement;
-import org.apache.vysper.xmpp.xmlfragment.XMLFragment;
public class Delay extends XMLElement {
public Delay(Entity from, Calendar timestamp) {
- super("delay", null, Arrays.asList(
+ super(NamespaceURIs.URN_XMPP_DELAY, "delay", null, Arrays.asList(
new NamespaceAttribute(NamespaceURIs.URN_XMPP_DELAY),
new Attribute("from", from.getFullQualifiedName()),
new Attribute("stamp", DateTimeProfile.getInstance().getDateTimeInUTC(timestamp.getTime()))
Modified: mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/stanzas/History.java
URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/stanzas/History.java?rev=883073&r1=883072&r2=883073&view=diff
==============================================================================
--- mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/stanzas/History.java (original)
+++ mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/stanzas/History.java Sun Nov 22 13:09:40 2009
@@ -58,11 +58,11 @@
}
public History(XMLElement elm) {
- super(ELEMENT_HISTORY, null, elm.getAttributes(), null);
+ super(NamespaceURIs.XEP0045_MUC, ELEMENT_HISTORY, null, elm.getAttributes(), null);
}
public History(Integer maxstanzas, Integer maxchars, Integer seconds, Calendar since) {
- super(ELEMENT_HISTORY, null, createAttributes(maxstanzas, maxchars, seconds, since), null);
+ super(NamespaceURIs.XEP0045_MUC, ELEMENT_HISTORY, null, createAttributes(maxstanzas, maxchars, seconds, since), null);
}
private static List<Attribute> createAttributes(Integer maxstanzas, Integer maxchars, Integer seconds, Calendar since) {
Modified: mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/stanzas/Item.java
URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/stanzas/Item.java?rev=883073&r1=883072&r2=883073&view=diff
==============================================================================
--- mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/stanzas/Item.java (original)
+++ mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/stanzas/Item.java Sun Nov 22 13:09:40 2009
@@ -28,6 +28,7 @@
import org.apache.vysper.xmpp.modules.extension.xep0045_muc.model.Affiliation;
import org.apache.vysper.xmpp.modules.extension.xep0045_muc.model.Occupant;
import org.apache.vysper.xmpp.modules.extension.xep0045_muc.model.Role;
+import org.apache.vysper.xmpp.protocol.NamespaceURIs;
import org.apache.vysper.xmpp.xmlfragment.Attribute;
import org.apache.vysper.xmpp.xmlfragment.XMLElement;
import org.apache.vysper.xmpp.xmlfragment.XMLFragment;
@@ -39,13 +40,13 @@
public class Item extends XMLElement {
public Item(Occupant occupant, boolean includeJid, boolean includeNick) {
- super("item", null,
+ super(NamespaceURIs.XEP0045_MUC, "item", null,
createAttributes(occupant, includeJid, includeNick), null);
}
public Item(Entity jid, String nick, Affiliation affiliation, Role role) {
- super("item", null,
+ super(NamespaceURIs.XEP0045_MUC, "item", null,
createAttributes(jid, nick, affiliation, role), null);
}
Modified: mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/stanzas/Password.java
URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/stanzas/Password.java?rev=883073&r1=883072&r2=883073&view=diff
==============================================================================
--- mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/stanzas/Password.java (original)
+++ mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/stanzas/Password.java Sun Nov 22 13:09:40 2009
@@ -19,6 +19,7 @@
*/
package org.apache.vysper.xmpp.modules.extension.xep0045_muc.stanzas;
+import org.apache.vysper.xmpp.protocol.NamespaceURIs;
import org.apache.vysper.xmpp.xmlfragment.Attribute;
import org.apache.vysper.xmpp.xmlfragment.XMLElement;
import org.apache.vysper.xmpp.xmlfragment.XMLFragment;
@@ -27,7 +28,7 @@
public class Password extends XMLElement {
public Password(String password) {
- super("password", null, null, new XMLFragment[]{new XMLText(password)});
+ super(NamespaceURIs.XEP0045_MUC, "password", null, null, new XMLFragment[]{new XMLText(password)});
}
Modified: mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/stanzas/Status.java
URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/stanzas/Status.java?rev=883073&r1=883072&r2=883073&view=diff
==============================================================================
--- mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/stanzas/Status.java (original)
+++ mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/stanzas/Status.java Sun Nov 22 13:09:40 2009
@@ -22,6 +22,7 @@
import java.util.ArrayList;
import java.util.List;
+import org.apache.vysper.xmpp.protocol.NamespaceURIs;
import org.apache.vysper.xmpp.xmlfragment.Attribute;
import org.apache.vysper.xmpp.xmlfragment.XMLElement;
import org.apache.vysper.xmpp.xmlfragment.XMLFragment;
@@ -91,7 +92,7 @@
}
public Status(StatusCode code, String message) {
- super("status", null,
+ super(NamespaceURIs.XEP0045_MUC, "status", null,
createAttributes(code),
createFragments(message));
}
Modified: mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/stanzas/X.java
URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/stanzas/X.java?rev=883073&r1=883072&r2=883073&view=diff
==============================================================================
--- mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/stanzas/X.java (original)
+++ mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/stanzas/X.java Sun Nov 22 13:09:40 2009
@@ -52,7 +52,7 @@
}
public X(String ns, XMLElement...elements) {
- super("x", null, new Attribute[]{
+ super(ns, "x", null, new Attribute[]{
new NamespaceAttribute(ns)}, elements);
}
@@ -61,7 +61,7 @@
}
public X(String ns, List<XMLElement> elements) {
- super("x", null, new Attribute[]{
+ super(ns, "x", null, new Attribute[]{
new NamespaceAttribute(ns)}, elements.toArray(new XMLElement[]{}));
}
Modified: mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/AbstractMUCHandlerTestCase.java
URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/AbstractMUCHandlerTestCase.java?rev=883073&r1=883072&r2=883073&view=diff
==============================================================================
--- mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/AbstractMUCHandlerTestCase.java (original)
+++ mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/AbstractMUCHandlerTestCase.java Sun Nov 22 13:09:40 2009
@@ -13,6 +13,7 @@
import org.apache.vysper.xmpp.protocol.StanzaHandler;
import org.apache.vysper.xmpp.server.TestSessionContext;
import org.apache.vysper.xmpp.stanza.Stanza;
+import org.apache.vysper.xmpp.xmlfragment.Renderer;
import org.apache.vysper.xmpp.xmlfragment.XMLElement;
/**
@@ -73,6 +74,9 @@
int index = 0;
if(expectedInnerElements != null) {
for(XMLElement expectedInnerElement : expectedInnerElements) {
+ System.out.println(new Renderer(expectedInnerElement).getComplete());
+ System.out.println(new Renderer(innerElements.get(index)).getComplete());
+
assertEquals(expectedInnerElement, innerElements.get(index));
index++;
}
Modified: mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/AbstractMUCMessageHandlerTestCase.java
URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/AbstractMUCMessageHandlerTestCase.java?rev=883073&r1=883072&r2=883073&view=diff
==============================================================================
--- mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/AbstractMUCMessageHandlerTestCase.java (original)
+++ mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/AbstractMUCMessageHandlerTestCase.java Sun Nov 22 13:09:40 2009
@@ -5,6 +5,7 @@
import org.apache.vysper.xmpp.addressing.Entity;
import org.apache.vysper.xmpp.modules.extension.xep0045_muc.model.Room;
import org.apache.vysper.xmpp.modules.extension.xep0045_muc.stanzas.X;
+import org.apache.vysper.xmpp.protocol.NamespaceURIs;
import org.apache.vysper.xmpp.protocol.ProtocolException;
import org.apache.vysper.xmpp.protocol.ResponseStanzaContainer;
import org.apache.vysper.xmpp.protocol.StanzaHandler;
@@ -14,6 +15,7 @@
import org.apache.vysper.xmpp.stanza.StanzaBuilder;
import org.apache.vysper.xmpp.xmlfragment.Attribute;
import org.apache.vysper.xmpp.xmlfragment.XMLElement;
+import org.apache.vysper.xmpp.xmlfragment.XMLElementBuilder;
import org.apache.vysper.xmpp.xmlfragment.XMLFragment;
import org.apache.vysper.xmpp.xmlfragment.XMLSemanticError;
import org.apache.vysper.xmpp.xmlfragment.XMLText;
@@ -66,9 +68,7 @@
Stanza errorStanza = sendMessage(OCCUPANT1_JID, ROOM1_JID,
GROUPCHAT, body);
- XMLText text = new XMLText(body);
- XMLElement expectedBody = new XMLElement("body", null,
- null, new XMLFragment[] { text });
+ XMLElement expectedBody = new XMLElementBuilder("body").addText(body).getFinalElement();
assertMessageErrorStanza(errorStanza, ROOM1_JID, OCCUPANT1_JID, "modify",
expectedErrorName,expectedBody);
Modified: mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/MUCMessageHandlerTestCase.java
URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/MUCMessageHandlerTestCase.java?rev=883073&r1=883072&r2=883073&view=diff
==============================================================================
--- mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/MUCMessageHandlerTestCase.java (original)
+++ mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/MUCMessageHandlerTestCase.java Sun Nov 22 13:09:40 2009
@@ -16,6 +16,7 @@
import org.apache.vysper.xmpp.stanza.Stanza;
import org.apache.vysper.xmpp.xmlfragment.Attribute;
import org.apache.vysper.xmpp.xmlfragment.XMLElement;
+import org.apache.vysper.xmpp.xmlfragment.XMLElementBuilder;
import org.apache.vysper.xmpp.xmlfragment.XMLFragment;
import org.apache.vysper.xmpp.xmlfragment.XMLText;
@@ -84,9 +85,7 @@
// send message to occupant 1 with type groupchat
Stanza errorStanza = sendMessage(OCCUPANT1_JID, new EntityImpl(ROOM1_JID, "Nick 2"), MessageStanzaType.GROUPCHAT, BODY);
- XMLText text = new XMLText(BODY);
- XMLElement expectedBody = new XMLElement("body", null,
- null, new XMLFragment[] { text });
+ XMLElement expectedBody = new XMLElementBuilder("body").addText(BODY).getFinalElement();
assertMessageErrorStanza(errorStanza, ROOM1_JID, OCCUPANT1_JID, "modify",
"bad-request", expectedBody);
Modified: mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/MUCPresenceHandlerEnterRoomTestCase.java
URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/MUCPresenceHandlerEnterRoomTestCase.java?rev=883073&r1=883072&r2=883073&view=diff
==============================================================================
--- mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/MUCPresenceHandlerEnterRoomTestCase.java (original)
+++ mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/MUCPresenceHandlerEnterRoomTestCase.java Sun Nov 22 13:09:40 2009
@@ -23,6 +23,7 @@
import org.apache.vysper.xmpp.xmlfragment.Attribute;
import org.apache.vysper.xmpp.xmlfragment.NamespaceAttribute;
import org.apache.vysper.xmpp.xmlfragment.XMLElement;
+import org.apache.vysper.xmpp.xmlfragment.XMLElementBuilder;
import org.apache.vysper.xmpp.xmlfragment.XMLFragment;
/**
@@ -184,8 +185,7 @@
private void assertPresenceErrorStanza(Stanza response, Entity from, Entity to,
String type, String errorName) {
- Attribute xmlns = new NamespaceAttribute(NamespaceURIs.XEP0045_MUC);
- XMLElement xElement = new XMLElement("x", null, Arrays.asList(xmlns), null);
+ XMLElement xElement = new XMLElementBuilder("x", NamespaceURIs.XEP0045_MUC).getFinalElement();
assertErrorStanza(response, "presence", from, to, type, errorName, xElement);
}
Modified: mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/MUCSubjectMessageHandlerTestCase.java
URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/MUCSubjectMessageHandlerTestCase.java?rev=883073&r1=883072&r2=883073&view=diff
==============================================================================
--- mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/MUCSubjectMessageHandlerTestCase.java (original)
+++ mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/MUCSubjectMessageHandlerTestCase.java Sun Nov 22 13:09:40 2009
@@ -8,6 +8,7 @@
import org.apache.vysper.xmpp.stanza.Stanza;
import org.apache.vysper.xmpp.xmlfragment.Attribute;
import org.apache.vysper.xmpp.xmlfragment.XMLElement;
+import org.apache.vysper.xmpp.xmlfragment.XMLElementBuilder;
import org.apache.vysper.xmpp.xmlfragment.XMLFragment;
import org.apache.vysper.xmpp.xmlfragment.XMLText;
@@ -57,7 +58,7 @@
Stanza error = sendMessage(OCCUPANT1_JID, ROOM2_JID, GROUPCHAT, null, null, SUBJECT);
assertMessageErrorStanza(error, ROOM2_JID, OCCUPANT1_JID, "auth", "forbidden",
- new XMLElement("subject", null, null, new XMLFragment[]{new XMLText(SUBJECT)}));
+ new XMLElementBuilder("subject").addText(SUBJECT).getFinalElement());
assertNull(occupant1Queue.getNext());
assertNull(occupant2Queue.getNext());
Modified: mina/sandbox/vysper/trunk/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/ErrorStanzaGenerator.java
URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/ErrorStanzaGenerator.java?rev=883073&r1=883072&r2=883073&view=diff
==============================================================================
--- mina/sandbox/vysper/trunk/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/ErrorStanzaGenerator.java (original)
+++ mina/sandbox/vysper/trunk/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/ErrorStanzaGenerator.java Sun Nov 22 13:09:40 2009
@@ -173,7 +173,7 @@
* @return the <elementName xmlns="namespace"/> element
*/
private XMLElement createXMLElement(String elementName, String namespace) {
- XMLElement element = new XMLElement(elementName, null, new Attribute[] {new NamespaceAttribute(namespace)}, (XMLFragment[])null);
+ XMLElement element = new XMLElement(namespace, elementName, null, new Attribute[] {new NamespaceAttribute(namespace)}, (XMLFragment[])null);
return element;
}
Modified: mina/sandbox/vysper/trunk/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/owner/PubSubOwnerDeleteNodeHandler.java
URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/owner/PubSubOwnerDeleteNodeHandler.java?rev=883073&r1=883072&r2=883073&view=diff
==============================================================================
--- mina/sandbox/vysper/trunk/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/owner/PubSubOwnerDeleteNodeHandler.java (original)
+++ mina/sandbox/vysper/trunk/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/owner/PubSubOwnerDeleteNodeHandler.java Sun Nov 22 13:09:40 2009
@@ -121,7 +121,7 @@
* @return the XMLElement for inclusion in the delete notification.
*/
private XMLElement createDeleteElement(String nodeName) {
- return new XMLElement("delete", null, new Attribute[] {new Attribute("node", nodeName)}, (XMLFragment[])null);
+ return new XMLElement(null, "delete", null, new Attribute[] {new Attribute("node", nodeName)}, (XMLFragment[])null);
}
}
Modified: mina/sandbox/vysper/trunk/server/extensions/xep0060-pubsub/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/disco/PubSubDiscoItemsTestCase.java
URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/server/extensions/xep0060-pubsub/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/disco/PubSubDiscoItemsTestCase.java?rev=883073&r1=883072&r2=883073&view=diff
==============================================================================
--- mina/sandbox/vysper/trunk/server/extensions/xep0060-pubsub/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/disco/PubSubDiscoItemsTestCase.java (original)
+++ mina/sandbox/vysper/trunk/server/extensions/xep0060-pubsub/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/disco/PubSubDiscoItemsTestCase.java Sun Nov 22 13:09:40 2009
@@ -129,9 +129,9 @@
LeafNode node = new LeafNode(serviceConfiguration, "news", "News", client);
root.add(node);
- XMLElement item1 = new XMLElement("item1","namespace1",(Attribute[])null, (XMLFragment[])null);
- XMLElement item2 = new XMLElement("item2","namespace2",(Attribute[])null, (XMLFragment[])null);
- XMLElement item3 = new XMLElement("item3","namespace3",(Attribute[])null, (XMLFragment[])null);
+ XMLElement item1 = new XMLElement("namespace1", "item1", null,(Attribute[])null, (XMLFragment[])null);
+ XMLElement item2 = new XMLElement("namespace2", "item2", null,(Attribute[])null, (XMLFragment[])null);
+ XMLElement item3 = new XMLElement("namespace3", "item3", null,(Attribute[])null, (XMLFragment[])null);
node.publish(client, relay, "itemid1", item1);
Thread.sleep(10);
node.publish(client, relay, "itemid2", item1); // publish this one with the same id as the next one (overwritten by the next)