svn commit: r942216 - in /mina/vysper/trunk/server/core: ./ src/main/java/org/apache/vysper/xmpp/parser/ src/test/java/org/apache/vysper/xmpp/parser/ src/test/java/org/apache/vysper/xmpp/server/response/

[ngn]

Author: ngn
Date: Fri May  7 20:55:03 2010
New Revision: 942216

URL: http://svn.apache.org/viewvc?rev=942216&view=rev
Log:
Removing dependency on nekopull parser (VYSPER-195)

Removed:
    
mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/parser/AbstractNekopullStreamParser.java
    
mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/parser/InputStreamParser.java
    
mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/parser/StringStreamParser.java
    
mina/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/parser/AbstractStreamParserTestCase.java
    
mina/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/parser/StringStreamParserTestCase.java
Modified:
    mina/vysper/trunk/server/core/pom.xml
    
mina/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/server/response/ServerResponsesTestCase.java

Modified: mina/vysper/trunk/server/core/pom.xml
URL: 
http://svn.apache.org/viewvc/mina/vysper/trunk/server/core/pom.xml?rev=942216&r1=942215&r2=942216&view=diff
==============================================================================
--- mina/vysper/trunk/server/core/pom.xml (original)
+++ mina/vysper/trunk/server/core/pom.xml Fri May  7 20:55:03 2010
@@ -53,12 +53,6 @@
     </dependency>
 
     <dependency>
-      <groupId>org.cyberneko.pull</groupId>
-      <artifactId>nekopull</artifactId>
-      <optional>true</optional>
-    </dependency>
-
-    <dependency>
       <groupId>javax.jcr</groupId>
       <artifactId>jcr</artifactId>
     </dependency>

Modified: 
mina/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/server/response/ServerResponsesTestCase.java
URL: 
http://svn.apache.org/viewvc/mina/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/server/response/ServerResponsesTestCase.java?rev=942216&r1=942215&r2=942216&view=diff
==============================================================================
--- 
mina/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/server/response/ServerResponsesTestCase.java
 (original)
+++ 
mina/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/server/response/ServerResponsesTestCase.java
 Fri May  7 20:55:03 2010
@@ -20,33 +20,33 @@
 
 package org.apache.vysper.xmpp.server.response;
 
-import org.apache.vysper.xmpp.parser.ParsingException;
-import org.apache.vysper.xmpp.stanza.Stanza;
-import org.apache.vysper.xmpp.parser.StringStreamParser;
-import org.apache.vysper.xmpp.authorization.SASLMechanism;
-import org.apache.vysper.xmpp.authorization.Anonymous;
-import org.apache.vysper.xmpp.authorization.Plain;
-import org.apache.vysper.xmpp.authorization.External;
+import java.util.ArrayList;
+import java.util.List;
+
 import junit.framework.TestCase;
 
-import java.util.List;
-import java.util.ArrayList;
+import org.apache.vysper.xmpp.authorization.Anonymous;
+import org.apache.vysper.xmpp.authorization.External;
+import org.apache.vysper.xmpp.authorization.Plain;
+import org.apache.vysper.xmpp.authorization.SASLMechanism;
+import org.apache.vysper.xmpp.parser.ParsingException;
+import org.apache.vysper.xmpp.protocol.NamespaceURIs;
+import org.apache.vysper.xmpp.stanza.Stanza;
+import org.apache.vysper.xmpp.stanza.StanzaBuilder;
 
 /**
  */
 public class ServerResponsesTestCase extends TestCase {
 
     public void testFeaturesForAuthentication() throws ParsingException {
-        StringStreamParser parser = new StringStreamParser(
-                "<features>" +
-                  "<mechanisms xmlns='urn:ietf:params:xml:ns:xmpp-sasl'>" +
-                    "<mechanism>EXTERNAL</mechanism>" +
-                    "<mechanism>PLAIN</mechanism>" +
-                    "<mechanism>ANONYMOUS</mechanism>" +
-                  "</mechanisms>" +
-                "</features>");
 
-        Stanza stanza = parser.getNextStanza();
+        Stanza stanza = new StanzaBuilder("features")
+               .startInnerElement("mechanisms", 
NamespaceURIs.URN_IETF_PARAMS_XML_NS_XMPP_SASL)
+                       .startInnerElement("mechanism", 
NamespaceURIs.URN_IETF_PARAMS_XML_NS_XMPP_SASL).addText("EXTERNAL").endInnerElement()
+                       .startInnerElement("mechanism", 
NamespaceURIs.URN_IETF_PARAMS_XML_NS_XMPP_SASL).addText("PLAIN").endInnerElement()
+                       .startInnerElement("mechanism", 
NamespaceURIs.URN_IETF_PARAMS_XML_NS_XMPP_SASL).addText("ANONYMOUS").endInnerElement()
+               .endInnerElement()
+               .build();
 
 
         List<SASLMechanism> mechanismList = new ArrayList<SASLMechanism>();