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/05/04 16:58:20 UTC
svn commit: r940885 - in /mina/vysper/trunk/server:
core/src/main/java/org/apache/vysper/mina/codec/
core/src/main/java/org/apache/vysper/xmpp/modules/core/base/handler/
core/src/main/java/org/apache/vysper/xmpp/protocol/
core/src/main/java/org/apache/...
Author: ngn
Date: Tue May 4 14:58:19 2010
New Revision: 940885
URL: http://svn.apache.org/viewvc?rev=940885&view=rev
Log:
Merging in new nbxml module
Removed:
mina/vysper/trunk/server/core/src/test/java/org/apache/vysper/mina/codec/XMLStreamTokenizerTestCase.java
mina/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/protocol/ProtocolWorkerAquireTestCase.java
Modified:
mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/mina/codec/XMPPProtocolCodecFactory.java
mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/core/base/handler/StreamStartHandler.java
mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/protocol/ProtocolWorker.java
mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/server/response/ServerErrorResponses.java
mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/server/response/ServerResponses.java
mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/stanza/Stanza.java
mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/stanza/StanzaBuilder.java
mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/writer/DenseStanzaLogRenderer.java
mina/vysper/trunk/server/core/src/test/java/org/apache/vysper/stanzasession/StanzaSessionTestCase.java
mina/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/modules/core/sasl/handler/AbortHandlerTestCase.java
mina/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0199_xmppping/AbstractIntegrationTestCase.java
mina/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/protocol/ProtocolInitiatedTestCase.java
mina/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/protocol/ProtocolWorkerProcessTestCase.java
mina/vysper/trunk/server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/stanzas/Delay.java
mina/vysper/trunk/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/ErrorStanzaGenerator.java
Modified: mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/mina/codec/XMPPProtocolCodecFactory.java
URL: http://svn.apache.org/viewvc/mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/mina/codec/XMPPProtocolCodecFactory.java?rev=940885&r1=940884&r2=940885&view=diff
==============================================================================
--- mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/mina/codec/XMPPProtocolCodecFactory.java (original)
+++ mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/mina/codec/XMPPProtocolCodecFactory.java Tue May 4 14:58:19 2010
@@ -23,7 +23,7 @@ import org.apache.mina.core.session.IoSe
import org.apache.mina.filter.codec.ProtocolCodecFactory;
import org.apache.mina.filter.codec.ProtocolDecoder;
import org.apache.mina.filter.codec.ProtocolEncoder;
-import org.apache.vysper.xml.decoder.XMLStreamTokenizer;
+import org.apache.vysper.xml.decoder.XMPPDecoder;
/**
* factory class for Vysper-specific encoder and decoder
@@ -37,6 +37,6 @@ public class XMPPProtocolCodecFactory im
}
public ProtocolDecoder getDecoder(IoSession s) throws Exception {
- return new XMLStreamTokenizer(new StanzaBuilderFactory());
+ return new XMPPDecoder(new StanzaBuilderFactory());
}
}
Modified: mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/core/base/handler/StreamStartHandler.java
URL: http://svn.apache.org/viewvc/mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/core/base/handler/StreamStartHandler.java?rev=940885&r1=940884&r2=940885&view=diff
==============================================================================
--- mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/core/base/handler/StreamStartHandler.java (original)
+++ mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/core/base/handler/StreamStartHandler.java Tue May 4 14:58:19 2010
@@ -60,7 +60,8 @@ public class StreamStartHandler implemen
public ResponseStanzaContainer execute(Stanza stanza, ServerRuntimeContext serverRuntimeContext, boolean isOutboundStanza, SessionContext sessionContext, SessionStateHolder sessionStateHolder) {
XMLElementVerifier xmlElementVerifier = stanza.getVerifier();
- boolean jabberNamespace = xmlElementVerifier.namespacePresent(NamespaceURIs.HTTP_ETHERX_JABBER_ORG_STREAMS);
+ boolean jabberNamespace = NamespaceURIs.HTTP_ETHERX_JABBER_ORG_STREAMS.equals(stanza.getNamespaceURI());
+
boolean clientCall = xmlElementVerifier.namespacePresent(NamespaceURIs.JABBER_CLIENT);
boolean serverCall = xmlElementVerifier.namespacePresent(NamespaceURIs.JABBER_SERVER);
Modified: mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/protocol/ProtocolWorker.java
URL: http://svn.apache.org/viewvc/mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/protocol/ProtocolWorker.java?rev=940885&r1=940884&r2=940885&view=diff
==============================================================================
--- mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/protocol/ProtocolWorker.java (original)
+++ mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/protocol/ProtocolWorker.java Tue May 4 14:58:19 2010
@@ -19,8 +19,11 @@
*/
package org.apache.vysper.xmpp.protocol;
-import org.apache.vysper.xmpp.parser.ParsingException;
-import org.apache.vysper.xmpp.parser.StreamParser;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.vysper.xmpp.addressing.Entity;
import org.apache.vysper.xmpp.protocol.exception.TLSException;
import org.apache.vysper.xmpp.protocol.worker.AuthenticatedProtocolWorker;
import org.apache.vysper.xmpp.protocol.worker.EncryptedProtocolWorker;
@@ -29,21 +32,15 @@ import org.apache.vysper.xmpp.protocol.w
import org.apache.vysper.xmpp.protocol.worker.InitiatedProtocolWorker;
import org.apache.vysper.xmpp.protocol.worker.StartedProtocolWorker;
import org.apache.vysper.xmpp.protocol.worker.UnconnectedProtocolWorker;
+import org.apache.vysper.xmpp.server.ServerRuntimeContext;
import org.apache.vysper.xmpp.server.SessionContext;
import org.apache.vysper.xmpp.server.SessionState;
-import org.apache.vysper.xmpp.server.ServerRuntimeContext;
import org.apache.vysper.xmpp.stanza.Stanza;
import org.apache.vysper.xmpp.stanza.XMPPCoreStanza;
-import org.apache.vysper.xmpp.addressing.Entity;
import org.apache.vysper.xmpp.writer.DenseStanzaLogRenderer;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.List;
-
/**
* responsible for high-level XMPP protocol logic for client-server sessions
* determines start, end and jabber conditions.
@@ -74,25 +71,6 @@ public class ProtocolWorker implements S
stateWorker.put(SessionState.CLOSED, new EndOrClosedProtocolWorker());
}
- /**
- * reads next stanza from stream, if the worker is used in a pull szenario (testing).
- * @param sessionContext
- * @param streamParser
- * @return new stanza
- */
- public Stanza aquireStanza(SessionContext sessionContext, StreamParser streamParser) {
- Stanza stanza = null;
- try {
- stanza = streamParser.getNextStanza();
- } catch (ParsingException e) {
- responseWriter.handleParsingException(sessionContext, e);
- return null;
- }
-
- if (stanza == null) return null; // no next stanza for the moment
-
- return stanza;
- }
/**
* executes the handler for a stanza, handles Protocol exceptions.
Modified: mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/server/response/ServerErrorResponses.java
URL: http://svn.apache.org/viewvc/mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/server/response/ServerErrorResponses.java?rev=940885&r1=940884&r2=940885&view=diff
==============================================================================
--- mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/server/response/ServerErrorResponses.java (original)
+++ mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/server/response/ServerErrorResponses.java Tue May 4 14:58:19 2010
@@ -65,13 +65,10 @@ public class ServerErrorResponses
if (languageCode == null) languageCode = "en_US";
StanzaBuilder stanzaBuilder = new StanzaBuilder("error");
- stanzaBuilder.startInnerElement(definedErrorCondition.value())
- .addNamespaceAttribute(NamespaceURIs.URN_IETF_PARAMS_XML_NS_XMPP_STREAMS)
- .endInnerElement();
+ stanzaBuilder.startInnerElement(definedErrorCondition.value(), NamespaceURIs.URN_IETF_PARAMS_XML_NS_XMPP_STREAMS).endInnerElement();
if (descriptiveText != null) {
- stanzaBuilder.startInnerElement("text")
- .addNamespaceAttribute(NamespaceURIs.URN_IETF_PARAMS_XML_NS_XMPP_STREAMS)
+ stanzaBuilder.startInnerElement("text", NamespaceURIs.URN_IETF_PARAMS_XML_NS_XMPP_STREAMS)
.addAttribute(NamespaceURIs.XML, "lang", languageCode)
.addText(descriptiveText)
.endInnerElement();
Modified: mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/server/response/ServerResponses.java
URL: http://svn.apache.org/viewvc/mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/server/response/ServerResponses.java?rev=940885&r1=940884&r2=940885&view=diff
==============================================================================
--- mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/server/response/ServerResponses.java (original)
+++ mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/server/response/ServerResponses.java Tue May 4 14:58:19 2010
@@ -63,7 +63,7 @@ public class ServerResponses {
public StanzaBuilder getStreamOpener(boolean forClient, Entity from, String xmlLang, XMPPVersion version, String sessionId, Stanza innerStanza) {
StanzaBuilder stanzaBuilder = new StanzaBuilder("stream", NamespaceURIs.HTTP_ETHERX_JABBER_ORG_STREAMS, "stream")
- .addNamespaceAttribute(forClient ? NamespaceURIs.JABBER_CLIENT : NamespaceURIs.JABBER_SERVER)
+ .declareNamespace("", forClient ? NamespaceURIs.JABBER_CLIENT : NamespaceURIs.JABBER_SERVER)
.addAttribute("from", from.getFullQualifiedName());
if (xmlLang != null) stanzaBuilder.addAttribute(NamespaceURIs.XML, "lang", xmlLang);
if (version != null) stanzaBuilder.addAttribute("version", version.toString());
Modified: mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/stanza/Stanza.java
URL: http://svn.apache.org/viewvc/mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/stanza/Stanza.java?rev=940885&r1=940884&r2=940885&view=diff
==============================================================================
--- mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/stanza/Stanza.java (original)
+++ mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/stanza/Stanza.java Tue May 4 14:58:19 2010
@@ -20,17 +20,19 @@
package org.apache.vysper.xmpp.stanza;
+import java.util.List;
+import java.util.Map;
+
import org.apache.vysper.xml.fragment.Attribute;
import org.apache.vysper.xml.fragment.XMLElement;
import org.apache.vysper.xml.fragment.XMLFragment;
import org.apache.vysper.xmpp.addressing.Entity;
-import org.apache.vysper.xmpp.addressing.EntityImpl;
import org.apache.vysper.xmpp.addressing.EntityFormatException;
+import org.apache.vysper.xmpp.addressing.EntityImpl;
import org.apache.vysper.xmpp.modules.core.base.handler.XMPPCoreStanzaHandler;
+import org.apache.vysper.xmpp.protocol.NamespaceURIs;
import org.apache.vysper.xmpp.writer.DenseStanzaLogRenderer;
-import java.util.List;
-
/**
* immutable container for all data contained in an XMPP stanza.
* it is surrounded by a family of classes used to build, parse, verify and process stanzas
@@ -40,13 +42,22 @@ import java.util.List;
public class Stanza extends XMLElement {
public Stanza(String namespaceURI, String name, String namespacePrefix, List<Attribute> attributes, List<XMLFragment> innerFragments) {
- super(namespaceURI, name, namespacePrefix, attributes, innerFragments);
+ this(namespaceURI, name, namespacePrefix, attributes, innerFragments, null);
}
+ public Stanza(String namespaceURI, String name, String namespacePrefix, List<Attribute> attributes, List<XMLFragment> innerFragments, Map<String, String> namespaces) {
+ super(namespaceURI, name, namespacePrefix, attributes, innerFragments, namespaces);
+ }
+
public Stanza(String namespaceURI, String name, String namespacePrefix, Attribute[] attributes, XMLFragment[] innerFragments) {
- super(namespaceURI, name, namespacePrefix, attributes, innerFragments);
+ this(namespaceURI, name, namespacePrefix, attributes, innerFragments, null);
+ }
+
+ public Stanza(String namespaceURI, String name, String namespacePrefix, Attribute[] attributes, XMLFragment[] innerFragments, Map<String, String> namespaces) {
+ super(namespaceURI, name, namespacePrefix, attributes, innerFragments, namespaces);
}
+
public Entity getTo() {
return parseEntityAttribute("to");
}
@@ -63,10 +74,9 @@ public class Stanza extends XMLElement {
}
public Entity parseEntityAttribute(String attributeName) {
- boolean isPresent = getVerifier().attributePresent(attributeName);
EntityImpl entity = null;
- if (isPresent) {
- String attributeValue = getAttributeValue(attributeName);
+ String attributeValue = getAttributeValue(attributeName);
+ if(attributeValue != null) {
try {
entity = EntityImpl.parse(attributeValue);
} catch (EntityFormatException e) {
Modified: mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/stanza/StanzaBuilder.java
URL: http://svn.apache.org/viewvc/mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/stanza/StanzaBuilder.java?rev=940885&r1=940884&r2=940885&view=diff
==============================================================================
--- mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/stanza/StanzaBuilder.java (original)
+++ mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/stanza/StanzaBuilder.java Tue May 4 14:58:19 2010
@@ -23,6 +23,7 @@ package org.apache.vysper.xmpp.stanza;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
+import java.util.Map;
import org.apache.vysper.xml.fragment.AbstractXMLElementBuilder;
import org.apache.vysper.xml.fragment.Attribute;
@@ -207,19 +208,26 @@ public class StanzaBuilder extends Abstr
public StanzaBuilder(String stanzaName, String namespaceURI, String namespacePrefix) {
super(stanzaName, namespaceURI, namespacePrefix);
}
-
+
+ public StanzaBuilder(String stanzaName, String namespaceURI,
+ String namespacePrefix, List<Attribute> attributes,
+ List<XMLFragment> innerFragments) {
+ super(stanzaName, namespaceURI, namespacePrefix, attributes, null, innerFragments);
+ }
+
public StanzaBuilder(String stanzaName, String namespaceURI,
String namespacePrefix, List<Attribute> attributes,
+ Map<String, String> namespaces,
List<XMLFragment> innerFragments) {
- super(stanzaName, namespaceURI, namespacePrefix, attributes, innerFragments);
+ super(stanzaName, namespaceURI, namespacePrefix, attributes, namespaces, innerFragments);
}
- protected XMLElement createElement(String namespaceURI, String name, String namespacePrefix, List<Attribute> attributes, List<XMLFragment> innerFragments) {
+ protected XMLElement createElement(String namespaceURI, String name, String namespacePrefix, List<Attribute> attributes, Map<String, String> namespaces, List<XMLFragment> innerFragments) {
// when creating the first element, make it a stanza
if (currentElement == null) {
- return new Stanza(namespaceURI, name, namespacePrefix, attributes, innerFragments);
+ return new Stanza(namespaceURI, name, namespacePrefix, attributes, innerFragments, namespaces);
} else {
- return new XMLElement(namespaceURI, name, namespacePrefix, attributes, innerFragments);
+ return new XMLElement(namespaceURI, name, namespacePrefix, attributes, innerFragments, namespaces);
}
}
}
Modified: mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/writer/DenseStanzaLogRenderer.java
URL: http://svn.apache.org/viewvc/mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/writer/DenseStanzaLogRenderer.java?rev=940885&r1=940884&r2=940885&view=diff
==============================================================================
--- mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/writer/DenseStanzaLogRenderer.java (original)
+++ mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/writer/DenseStanzaLogRenderer.java Tue May 4 14:58:19 2010
@@ -82,26 +82,25 @@ public class DenseStanzaLogRenderer {
if ("query".equals(firstInnerElement.getName())) {
renderIQQuery(stringBuilder, firstInnerElement);
} else {
- renderAttribute(stringBuilder, firstInnerElement, NamespaceAttribute.XMLNS);
+ renderNamespace(stringBuilder, firstInnerElement);
}
}
}
private static void renderIQQuery(StringBuilder stringBuilder, XMLElement queryElement) {
- Attribute attribute = queryElement.getAttribute(NamespaceAttribute.XMLNS);
- if (attribute == null) {
- stringBuilder.append(ELEMENT_SEPARATOR).append("?").append(NamespaceAttribute.XMLNS).append("?");
+ String nsUri = queryElement.getNamespaceURI();
+ if (nsUri == null) {
+ stringBuilder.append(ELEMENT_SEPARATOR).append("?").append("xmlns").append("?");
return;
}
- String xmlns = attribute.getValue();
- if (!xmlns.startsWith("http://jabber.org/protocol/disco")) {
- renderAttribute(stringBuilder, queryElement, NamespaceAttribute.XMLNS);
+ if (!nsUri.startsWith("http://jabber.org/protocol/disco")) {
+ renderNamespace(stringBuilder, queryElement);
return;
}
stringBuilder.append(ELEMENT_SEPARATOR).append("disco");
- if (xmlns.equals("http://jabber.org/protocol/disco#items")) {
+ if (nsUri.equals("http://jabber.org/protocol/disco#items")) {
stringBuilder.append(ELEMENT_SEPARATOR).append("items");
- } else if (xmlns.equals("http://jabber.org/protocol/disco#info")) {
+ } else if (nsUri.equals("http://jabber.org/protocol/disco#info")) {
stringBuilder.append(ELEMENT_SEPARATOR).append("info");
List<XMLElement> features = queryElement.getInnerElementsNamed("feature");
if (features != null) for (XMLElement feature : features) {
@@ -198,6 +197,14 @@ public class DenseStanzaLogRenderer {
}
+ private static void renderNamespace(StringBuilder stringBuilder, XMLElement element) {
+ String ns = element.getNamespaceURI();
+ if (ns != null) {
+ renderAttributeForm(stringBuilder, "xmlns", ns);
+ }
+ }
+
+
private static void renderAttribute(StringBuilder stringBuilder, XMLElement element, String attributeName) {
String attributeValue = element.getAttributeValue(attributeName);
if (attributeValue != null) {
Modified: mina/vysper/trunk/server/core/src/test/java/org/apache/vysper/stanzasession/StanzaSessionTestCase.java
URL: http://svn.apache.org/viewvc/mina/vysper/trunk/server/core/src/test/java/org/apache/vysper/stanzasession/StanzaSessionTestCase.java?rev=940885&r1=940884&r2=940885&view=diff
==============================================================================
--- mina/vysper/trunk/server/core/src/test/java/org/apache/vysper/stanzasession/StanzaSessionTestCase.java (original)
+++ mina/vysper/trunk/server/core/src/test/java/org/apache/vysper/stanzasession/StanzaSessionTestCase.java Tue May 4 14:58:19 2010
@@ -71,7 +71,7 @@ public class StanzaSessionTestCase exten
new StanzaBuilder("stream", "http://etherx.jabber.org/streams", "stream")
.addAttribute("from", "me@vysper.org")
.addAttribute("to", "vysper.org")
- .addNamespaceAttribute("jabber:client")
+ .declareNamespace("", "jabber:client")
.build()
);
Stanza stanza = waitForStanza(session);
@@ -90,7 +90,7 @@ public class StanzaSessionTestCase exten
new StanzaBuilder("stream", "http://etherx.jabber.org/streams", "stream")
.addAttribute("from", "me@vysper.org")
.addAttribute("to", "vysper.org")
- .addNamespaceAttribute("jabber:client")
+ .declareNamespace("", "jabber:client")
.build()
);
stanza = waitForStanza(session);
Modified: mina/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/modules/core/sasl/handler/AbortHandlerTestCase.java
URL: http://svn.apache.org/viewvc/mina/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/modules/core/sasl/handler/AbortHandlerTestCase.java?rev=940885&r1=940884&r2=940885&view=diff
==============================================================================
--- mina/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/modules/core/sasl/handler/AbortHandlerTestCase.java (original)
+++ mina/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/modules/core/sasl/handler/AbortHandlerTestCase.java Tue May 4 14:58:19 2010
@@ -116,8 +116,7 @@ public class AbortHandlerTestCase extend
}
private StanzaBuilder createAbort() {
- StanzaBuilder stanzaBuilder = new StanzaBuilder("abort");
- stanzaBuilder.addNamespaceAttribute(NamespaceURIs.URN_IETF_PARAMS_XML_NS_XMPP_SASL);
+ StanzaBuilder stanzaBuilder = new StanzaBuilder("abort", NamespaceURIs.URN_IETF_PARAMS_XML_NS_XMPP_SASL);
return stanzaBuilder;
}
Modified: mina/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0199_xmppping/AbstractIntegrationTestCase.java
URL: http://svn.apache.org/viewvc/mina/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0199_xmppping/AbstractIntegrationTestCase.java?rev=940885&r1=940884&r2=940885&view=diff
==============================================================================
--- mina/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0199_xmppping/AbstractIntegrationTestCase.java (original)
+++ mina/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0199_xmppping/AbstractIntegrationTestCase.java Tue May 4 14:58:19 2010
@@ -25,6 +25,7 @@ import java.net.ServerSocket;
import junit.framework.TestCase;
+import org.apache.vysper.mina.StanzaLoggingFilter;
import org.apache.vysper.mina.TCPEndpoint;
import org.apache.vysper.storage.StorageProviderRegistry;
import org.apache.vysper.storage.inmemory.MemoryStorageProviderRegistry;
@@ -104,10 +105,14 @@ public abstract class AbstractIntegratio
connectionConfiguration.setSecurityMode(ConnectionConfiguration.SecurityMode.required);
connectionConfiguration.setSASLAuthenticationEnabled(true);
connectionConfiguration.setDebuggerEnabled(false);
+ connectionConfiguration.setKeystorePath("src/main/config/bogus_mina_tls.cert");
+ connectionConfiguration.setTruststorePath("src/main/config/bogus_mina_tls.cert");
+ connectionConfiguration.setTruststorePassword("boguspw");
+
XMPPConnection.DEBUG_ENABLED = true;
XMPPConnection client = new XMPPConnection(connectionConfiguration);
-
+
client.connect();
client.login(username, password);
Modified: mina/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/protocol/ProtocolInitiatedTestCase.java
URL: http://svn.apache.org/viewvc/mina/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/protocol/ProtocolInitiatedTestCase.java?rev=940885&r1=940884&r2=940885&view=diff
==============================================================================
--- mina/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/protocol/ProtocolInitiatedTestCase.java (original)
+++ mina/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/protocol/ProtocolInitiatedTestCase.java Tue May 4 14:58:19 2010
@@ -20,6 +20,7 @@
package org.apache.vysper.xmpp.protocol;
+import org.apache.vysper.xml.fragment.Renderer;
import org.apache.vysper.xml.fragment.XMLElementVerifier;
import org.apache.vysper.xmpp.server.SessionState;
import org.apache.vysper.xmpp.server.XMPPVersion;
@@ -39,6 +40,7 @@ public class ProtocolInitiatedTestCase e
Stanza recordedResponse = sessionContext.getNextRecordedResponse();
XMLElementVerifier responseVerifier = recordedResponse.getVerifier();
+
assertTrue(responseVerifier.nameEquals("stream"));
assertTrue(responseVerifier.attributeEquals(NamespaceURIs.XML, "lang", "fr"));
@@ -163,7 +165,7 @@ public class ProtocolInitiatedTestCase e
public void testProcessClientStreamOpeningResponse_MissingMainNamespace() {
// we do not supply "http://etherx.jabber.org/streams"
StanzaBuilder stanzaBuilder = new StanzaBuilder("stream")
- .addNamespaceAttribute(NamespaceURIs.JABBER_CLIENT)
+ .declareNamespace("", NamespaceURIs.JABBER_CLIENT)
.addAttribute(NamespaceURIs.XML, "lang", "en_UK")
.addAttribute("version", XMPPVersion.VERSION_1_0.toString());
protocolWorker.processStanza(sessionContext.getServerRuntimeContext(), sessionContext, stanzaBuilder.build(), sessionStateHolder);
Modified: mina/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/protocol/ProtocolWorkerProcessTestCase.java
URL: http://svn.apache.org/viewvc/mina/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/protocol/ProtocolWorkerProcessTestCase.java?rev=940885&r1=940884&r2=940885&view=diff
==============================================================================
--- mina/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/protocol/ProtocolWorkerProcessTestCase.java (original)
+++ mina/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/protocol/ProtocolWorkerProcessTestCase.java Tue May 4 14:58:19 2010
@@ -169,7 +169,7 @@ public class ProtocolWorkerProcessTestCa
StanzaBuilder stanzaBuilder = StanzaBuilder.createIQStanza(null, null, IQStanzaType.GET, "test");
// we set a different from user name 'ernest'!
stanzaBuilder.addAttribute("from", new EntityImpl("ernest", server.getDomain(), null).getFullQualifiedName());
- stanzaBuilder.startInnerElement("query").addNamespaceAttribute("jabber:iq:roster").endInnerElement();
+ stanzaBuilder.startInnerElement("query", "jabber:iq:roster").endInnerElement();
protocolWorker.processStanza(sessionContext.getServerRuntimeContext(), sessionContext, stanzaBuilder.build(), sessionStateHolder);
Modified: mina/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/vysper/trunk/server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/stanzas/Delay.java?rev=940885&r1=940884&r2=940885&view=diff
==============================================================================
--- mina/vysper/trunk/server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/stanzas/Delay.java (original)
+++ mina/vysper/trunk/server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/stanzas/Delay.java Tue May 4 14:58:19 2010
@@ -23,7 +23,6 @@ import java.util.Arrays;
import java.util.Calendar;
import org.apache.vysper.xml.fragment.Attribute;
-import org.apache.vysper.xml.fragment.NamespaceAttribute;
import org.apache.vysper.xml.fragment.XMLElement;
import org.apache.vysper.xmpp.addressing.Entity;
import org.apache.vysper.xmpp.datetime.DateTimeProfile;
@@ -33,7 +32,6 @@ public class Delay extends XMLElement {
public Delay(Entity from, Calendar timestamp) {
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()))
), null);
Modified: mina/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/vysper/trunk/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/ErrorStanzaGenerator.java?rev=940885&r1=940884&r2=940885&view=diff
==============================================================================
--- mina/vysper/trunk/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/ErrorStanzaGenerator.java (original)
+++ mina/vysper/trunk/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/ErrorStanzaGenerator.java Tue May 4 14:58:19 2010
@@ -19,8 +19,6 @@
*/
package org.apache.vysper.xmpp.modules.extension.xep0060_pubsub.handler;
-import org.apache.vysper.xml.fragment.Attribute;
-import org.apache.vysper.xml.fragment.NamespaceAttribute;
import org.apache.vysper.xml.fragment.XMLElement;
import org.apache.vysper.xml.fragment.XMLFragment;
import org.apache.vysper.xmpp.addressing.Entity;
@@ -173,7 +171,7 @@ public class ErrorStanzaGenerator {
* @return the <elementName xmlns="namespace"/> element
*/
private XMLElement createXMLElement(String elementName, String namespace) {
- XMLElement element = new XMLElement(namespace, elementName, null, new Attribute[] {new NamespaceAttribute(namespace)}, (XMLFragment[])null);
+ XMLElement element = new XMLElement(namespace, elementName, null, null, (XMLFragment[])null);
return element;
}