You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@labs.apache.org by be...@apache.org on 2007/11/22 07:08:39 UTC

svn commit: r597307 - in /labs/vysper/src: main/config/ main/java/org/apache/vysper/xmpp/applicationdomains/base/ main/java/org/apache/vysper/xmpp/applicationdomains/base/handler/ main/java/org/apache/vysper/xmpp/applicationdomains/starttls/ main/java/...

Author: berndf
Date: Wed Nov 21 22:08:38 2007
New Revision: 597307

URL: http://svn.apache.org/viewvc?rev=597307&view=rev
Log:
[vysper] "starttls" is now handled and "proceed" responded

Added:
    labs/vysper/src/main/java/org/apache/vysper/xmpp/applicationdomains/base/BaseStreamStanzaDictionary.java
      - copied, changed from r594027, labs/vysper/src/main/java/org/apache/vysper/xmpp/applicationdomains/base/handler/BaseStreamStanzaDictionary.java
    labs/vysper/src/main/java/org/apache/vysper/xmpp/applicationdomains/starttls/
    labs/vysper/src/main/java/org/apache/vysper/xmpp/applicationdomains/starttls/StartTLSStanzaDictionary.java
    labs/vysper/src/main/java/org/apache/vysper/xmpp/applicationdomains/starttls/handler/
    labs/vysper/src/main/java/org/apache/vysper/xmpp/applicationdomains/starttls/handler/StartTLSHandler.java
      - copied, changed from r594027, labs/vysper/src/main/java/org/apache/vysper/xmpp/applicationdomains/base/handler/StartTLSHandler.java
Removed:
    labs/vysper/src/main/java/org/apache/vysper/xmpp/applicationdomains/base/handler/BaseStreamStanzaDictionary.java
Modified:
    labs/vysper/src/main/config/spring-config.xml
    labs/vysper/src/main/java/org/apache/vysper/xmpp/protocol/StanzaHandlerLookup.java
    labs/vysper/src/main/java/org/apache/vysper/xmpp/server/DefaultServerRuntimeContext.java
    labs/vysper/src/test/java/org/apache/vysper/xmpp/protocol/ProtocolStateTestCase.java
    labs/vysper/src/test/java/org/apache/vysper/xmpp/protocol/ProtocolWorkerStateAwarenessTestCase.java
    labs/vysper/src/test/java/org/apache/vysper/xmpp/protocol/StanzaHandlerLookupTestCase.java

Modified: labs/vysper/src/main/config/spring-config.xml
URL: http://svn.apache.org/viewvc/labs/vysper/src/main/config/spring-config.xml?rev=597307&r1=597306&r2=597307&view=diff
==============================================================================
--- labs/vysper/src/main/config/spring-config.xml (original)
+++ labs/vysper/src/main/config/spring-config.xml Wed Nov 21 22:08:38 2007
@@ -39,6 +39,12 @@
         </constructor-arg>
         <constructor-arg ref="stanzaRelay"/>
         <constructor-arg ref="serverFeatures"/>
+        <constructor-arg>
+            <list>
+                <bean class="org.apache.vysper.xmpp.applicationdomains.base.BaseStreamStanzaDictionary"/>
+                <bean class="org.apache.vysper.xmpp.applicationdomains.starttls.StartTLSStanzaDictionary"/>
+            </list>
+        </constructor-arg>
     </bean>
     
     <!--

Copied: labs/vysper/src/main/java/org/apache/vysper/xmpp/applicationdomains/base/BaseStreamStanzaDictionary.java (from r594027, labs/vysper/src/main/java/org/apache/vysper/xmpp/applicationdomains/base/handler/BaseStreamStanzaDictionary.java)
URL: http://svn.apache.org/viewvc/labs/vysper/src/main/java/org/apache/vysper/xmpp/applicationdomains/base/BaseStreamStanzaDictionary.java?p2=labs/vysper/src/main/java/org/apache/vysper/xmpp/applicationdomains/base/BaseStreamStanzaDictionary.java&p1=labs/vysper/src/main/java/org/apache/vysper/xmpp/applicationdomains/base/handler/BaseStreamStanzaDictionary.java&r1=594027&r2=597307&rev=597307&view=diff
==============================================================================
--- labs/vysper/src/main/java/org/apache/vysper/xmpp/applicationdomains/base/handler/BaseStreamStanzaDictionary.java (original)
+++ labs/vysper/src/main/java/org/apache/vysper/xmpp/applicationdomains/base/BaseStreamStanzaDictionary.java Wed Nov 21 22:08:38 2007
@@ -15,10 +15,15 @@
  * permissions and limitations under the License.                      *
  ***********************************************************************/
 
-package org.apache.vysper.xmpp.applicationdomains.base.handler;
+package org.apache.vysper.xmpp.applicationdomains.base;
 
 import org.apache.vysper.xmpp.protocol.NamespaceURIs;
 import org.apache.vysper.xmpp.protocol.NamespaceHandlerDictionary;
+import org.apache.vysper.xmpp.applicationdomains.base.handler.StreamStartHandler;
+import org.apache.vysper.xmpp.applicationdomains.starttls.handler.StartTLSHandler;
+import org.apache.vysper.xmpp.applicationdomains.base.handler.IQHandler;
+import org.apache.vysper.xmpp.applicationdomains.base.handler.MessageHandler;
+import org.apache.vysper.xmpp.applicationdomains.base.handler.PresenceHandler;
 
 /**
  * handler for base stanzas from RFC3920 (xmpp core)<br/>

Added: labs/vysper/src/main/java/org/apache/vysper/xmpp/applicationdomains/starttls/StartTLSStanzaDictionary.java
URL: http://svn.apache.org/viewvc/labs/vysper/src/main/java/org/apache/vysper/xmpp/applicationdomains/starttls/StartTLSStanzaDictionary.java?rev=597307&view=auto
==============================================================================
--- labs/vysper/src/main/java/org/apache/vysper/xmpp/applicationdomains/starttls/StartTLSStanzaDictionary.java (added)
+++ labs/vysper/src/main/java/org/apache/vysper/xmpp/applicationdomains/starttls/StartTLSStanzaDictionary.java Wed Nov 21 22:08:38 2007
@@ -0,0 +1,35 @@
+/***********************************************************************
+ * Copyright (c) 2006-2007 The Apache Software Foundation.             *
+ * All rights reserved.                                                *
+ * ------------------------------------------------------------------- *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you *
+ * may not use this file except in compliance with the License. You    *
+ * may obtain a copy of the License at:                                *
+ *                                                                     *
+ *     http://www.apache.org/licenses/LICENSE-2.0                      *
+ *                                                                     *
+ * Unless required by applicable law or agreed to in writing, software *
+ * distributed under the License is distributed on an "AS IS" BASIS,   *
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or     *
+ * implied.  See the License for the specific language governing       *
+ * permissions and limitations under the License.                      *
+ ***********************************************************************/
+
+package org.apache.vysper.xmpp.applicationdomains.starttls;
+
+import org.apache.vysper.xmpp.applicationdomains.starttls.handler.StartTLSHandler;
+import org.apache.vysper.xmpp.protocol.NamespaceHandlerDictionary;
+import org.apache.vysper.xmpp.protocol.NamespaceURIs;
+
+/**
+ * handler for base stanzas from RFC3920 (xmpp core)<br/>
+ * they are: stream, message, presence, iq
+ */
+public class StartTLSStanzaDictionary extends NamespaceHandlerDictionary {
+
+    public StartTLSStanzaDictionary() {
+        super(NamespaceURIs.URN_IETF_PARAMS_XML_NS_XMPP_TLS);
+        register(new StartTLSHandler());
+        seal();
+    }
+}
\ No newline at end of file

Copied: labs/vysper/src/main/java/org/apache/vysper/xmpp/applicationdomains/starttls/handler/StartTLSHandler.java (from r594027, labs/vysper/src/main/java/org/apache/vysper/xmpp/applicationdomains/base/handler/StartTLSHandler.java)
URL: http://svn.apache.org/viewvc/labs/vysper/src/main/java/org/apache/vysper/xmpp/applicationdomains/starttls/handler/StartTLSHandler.java?p2=labs/vysper/src/main/java/org/apache/vysper/xmpp/applicationdomains/starttls/handler/StartTLSHandler.java&p1=labs/vysper/src/main/java/org/apache/vysper/xmpp/applicationdomains/base/handler/StartTLSHandler.java&r1=594027&r2=597307&rev=597307&view=diff
==============================================================================
--- labs/vysper/src/main/java/org/apache/vysper/xmpp/applicationdomains/base/handler/StartTLSHandler.java (original)
+++ labs/vysper/src/main/java/org/apache/vysper/xmpp/applicationdomains/starttls/handler/StartTLSHandler.java Wed Nov 21 22:08:38 2007
@@ -15,7 +15,7 @@
  * permissions and limitations under the License.                      *
  ***********************************************************************/
 
-package org.apache.vysper.xmpp.applicationdomains.base.handler;
+package org.apache.vysper.xmpp.applicationdomains.starttls.handler;
 
 import org.apache.vysper.xmpp.protocol.NamespaceURIs;
 import org.apache.vysper.xmpp.protocol.ResponseStanzaContainer;

Modified: labs/vysper/src/main/java/org/apache/vysper/xmpp/protocol/StanzaHandlerLookup.java
URL: http://svn.apache.org/viewvc/labs/vysper/src/main/java/org/apache/vysper/xmpp/protocol/StanzaHandlerLookup.java?rev=597307&r1=597306&r2=597307&view=diff
==============================================================================
--- labs/vysper/src/main/java/org/apache/vysper/xmpp/protocol/StanzaHandlerLookup.java (original)
+++ labs/vysper/src/main/java/org/apache/vysper/xmpp/protocol/StanzaHandlerLookup.java Wed Nov 21 22:08:38 2007
@@ -17,19 +17,16 @@
 
 package org.apache.vysper.xmpp.protocol;
 
-import org.apache.vysper.xmpp.stanza.Stanza;
-import org.apache.vysper.xmpp.stanza.IQStanza;
-import org.apache.vysper.xmpp.stanza.MessageStanza;
-import org.apache.vysper.xmpp.stanza.PresenceStanza;
 import org.apache.vysper.xmpp.applicationdomains.base.handler.IQHandler;
 import org.apache.vysper.xmpp.applicationdomains.base.handler.MessageHandler;
 import org.apache.vysper.xmpp.applicationdomains.base.handler.PresenceHandler;
 import org.apache.vysper.xmpp.applicationdomains.base.handler.StreamStartHandler;
+import org.apache.vysper.xmpp.stanza.Stanza;
 import org.apache.vysper.xmpp.xmlfragment.XMLElement;
 
+import java.util.Collection;
 import java.util.LinkedHashMap;
 import java.util.Map;
-import java.util.Collection;
 
 /**
  * for looking up the right handler for the stanza.

Modified: labs/vysper/src/main/java/org/apache/vysper/xmpp/server/DefaultServerRuntimeContext.java
URL: http://svn.apache.org/viewvc/labs/vysper/src/main/java/org/apache/vysper/xmpp/server/DefaultServerRuntimeContext.java?rev=597307&r1=597306&r2=597307&view=diff
==============================================================================
--- labs/vysper/src/main/java/org/apache/vysper/xmpp/server/DefaultServerRuntimeContext.java (original)
+++ labs/vysper/src/main/java/org/apache/vysper/xmpp/server/DefaultServerRuntimeContext.java Wed Nov 21 22:08:38 2007
@@ -18,12 +18,15 @@
 package org.apache.vysper.xmpp.server;
 
 import org.apache.vysper.xmpp.addressing.Entity;
+import org.apache.vysper.xmpp.addressing.EntityImpl;
 import org.apache.vysper.xmpp.delivery.StanzaRelay;
+import org.apache.vysper.xmpp.delivery.RecordingStanzaRelay;
 import org.apache.vysper.xmpp.protocol.NamespaceHandlerDictionary;
 import org.apache.vysper.xmpp.protocol.StanzaHandler;
 import org.apache.vysper.xmpp.protocol.StanzaHandlerLookup;
 import org.apache.vysper.xmpp.stanza.Stanza;
 
+import java.util.List;
 import java.util.UUID;
 
 /**
@@ -40,9 +43,14 @@
         this.stanzaRelay = stanzaRelay;
     }
 
-    public DefaultServerRuntimeContext(Entity serverEntity, StanzaRelay stanzaRelay, ServerFeatures serverFeatures) {
+    public DefaultServerRuntimeContext(Entity serverEntity, 
+                                       StanzaRelay stanzaRelay, 
+                                       ServerFeatures serverFeatures, 
+                                       List<NamespaceHandlerDictionary> dictionaries) {
         this(serverEntity, stanzaRelay);
         this.serverFeatures = serverFeatures;
+
+        addDictionaries(dictionaries);
     }
 
     public StanzaHandler getHandler(Stanza stanza) {
@@ -73,5 +81,11 @@
 
     public void addDictionary(NamespaceHandlerDictionary namespaceHandlerDictionary) {
         stanzaHandlerLookup.addDictionary(namespaceHandlerDictionary);
+    }
+
+    protected void addDictionaries(List<NamespaceHandlerDictionary> dictionaries) {
+        for (NamespaceHandlerDictionary dictionary : dictionaries) {
+            addDictionary(dictionary);
+        }
     }
 }

Modified: labs/vysper/src/test/java/org/apache/vysper/xmpp/protocol/ProtocolStateTestCase.java
URL: http://svn.apache.org/viewvc/labs/vysper/src/test/java/org/apache/vysper/xmpp/protocol/ProtocolStateTestCase.java?rev=597307&r1=597306&r2=597307&view=diff
==============================================================================
--- labs/vysper/src/test/java/org/apache/vysper/xmpp/protocol/ProtocolStateTestCase.java (original)
+++ labs/vysper/src/test/java/org/apache/vysper/xmpp/protocol/ProtocolStateTestCase.java Wed Nov 21 22:08:38 2007
@@ -23,7 +23,7 @@
 import org.apache.vysper.xmpp.server.SessionState;
 import org.apache.vysper.xmpp.server.response.ServerResponses;
 import org.apache.vysper.xmpp.delivery.StanzaReceiverRelay;
-import org.apache.vysper.xmpp.applicationdomains.base.handler.BaseStreamStanzaDictionary;
+import org.apache.vysper.xmpp.applicationdomains.base.BaseStreamStanzaDictionary;
 import org.apache.vysper.xmpp.stanza.Stanza;
 import org.apache.vysper.xmpp.stanza.StanzaBuilder;
 import org.apache.vysper.xmpp.xmlfragment.XMLElementVerifier;

Modified: labs/vysper/src/test/java/org/apache/vysper/xmpp/protocol/ProtocolWorkerStateAwarenessTestCase.java
URL: http://svn.apache.org/viewvc/labs/vysper/src/test/java/org/apache/vysper/xmpp/protocol/ProtocolWorkerStateAwarenessTestCase.java?rev=597307&r1=597306&r2=597307&view=diff
==============================================================================
--- labs/vysper/src/test/java/org/apache/vysper/xmpp/protocol/ProtocolWorkerStateAwarenessTestCase.java (original)
+++ labs/vysper/src/test/java/org/apache/vysper/xmpp/protocol/ProtocolWorkerStateAwarenessTestCase.java Wed Nov 21 22:08:38 2007
@@ -25,7 +25,7 @@
 import org.apache.vysper.xmpp.server.SessionState;
 import org.apache.vysper.xmpp.stanza.Stanza;
 import org.apache.vysper.xmpp.stanza.StanzaBuilder;
-import org.apache.vysper.xmpp.applicationdomains.base.handler.BaseStreamStanzaDictionary;
+import org.apache.vysper.xmpp.applicationdomains.base.BaseStreamStanzaDictionary;
 import org.apache.vysper.xmpp.stanza.StanzaErrorCondition;
 import org.apache.vysper.xmpp.xmlfragment.XMLElementVerifier;
 import junit.framework.TestCase;

Modified: labs/vysper/src/test/java/org/apache/vysper/xmpp/protocol/StanzaHandlerLookupTestCase.java
URL: http://svn.apache.org/viewvc/labs/vysper/src/test/java/org/apache/vysper/xmpp/protocol/StanzaHandlerLookupTestCase.java?rev=597307&r1=597306&r2=597307&view=diff
==============================================================================
--- labs/vysper/src/test/java/org/apache/vysper/xmpp/protocol/StanzaHandlerLookupTestCase.java (original)
+++ labs/vysper/src/test/java/org/apache/vysper/xmpp/protocol/StanzaHandlerLookupTestCase.java Wed Nov 21 22:08:38 2007
@@ -22,7 +22,7 @@
 import org.apache.vysper.xmpp.stanza.StanzaBuilder;
 import org.apache.vysper.xmpp.xmlfragment.Attribute;
 import org.apache.vysper.xmpp.xmlfragment.XMLFragment;
-import org.apache.vysper.xmpp.applicationdomains.base.handler.BaseStreamStanzaDictionary;
+import org.apache.vysper.xmpp.applicationdomains.base.BaseStreamStanzaDictionary;
 import org.apache.vysper.xmpp.applicationdomains.base.handler.IQHandler;
 import org.apache.vysper.xmpp.applicationdomains.base.handler.PresenceHandler;
 import org.apache.vysper.xmpp.applicationdomains.base.handler.MessageHandler;



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@labs.apache.org
For additional commands, e-mail: commits-help@labs.apache.org