You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by be...@apache.org on 2011/06/28 18:31:11 UTC
svn commit: r1140714 - in /mina/vysper/trunk/server: core/src/main/java/org/apache/vysper/xmpp/server/s2s/XmppEndpointResolver.java extensions/xep0045-muc/pom.xml

Author: berndf
Date: Tue Jun 28 16:31:10 2011
New Revision: 1140714

URL: http://svn.apache.org/viewvc?rev=1140714&view=rev
Log:
remove suspected test code

Modified:
    mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/server/s2s/XmppEndpointResolver.java
    mina/vysper/trunk/server/extensions/xep0045-muc/pom.xml

Modified: mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/server/s2s/XmppEndpointResolver.java
URL: http://svn.apache.org/viewvc/mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/server/s2s/XmppEndpointResolver.java?rev=1140714&r1=1140713&r2=1140714&view=diff
==============================================================================
--- mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/server/s2s/XmppEndpointResolver.java (original)
+++ mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/server/s2s/XmppEndpointResolver.java Tue Jun 28 16:31:10 2011
@@ -75,13 +75,7 @@ public class XmppEndpointResolver {
                     }
                 });
             } else {
-                if(domain.equals("vysper.org")) {
-                    addresses.add(new ResolvedAddress(domain, 5124, 0));
-                } else if(domain.equals("xmpp.protocol7.com")) {
-                    addresses.add(new ResolvedAddress(domain, 5123, 0));
-                } else {              
-                    addresses.add(new ResolvedAddress(domain, SERVER_PORT, 0));
-                }
+                addresses.add(new ResolvedAddress(domain, SERVER_PORT, 0));
             }
         } catch (TextParseException e) {
             // ignore

Modified: mina/vysper/trunk/server/extensions/xep0045-muc/pom.xml
URL: http://svn.apache.org/viewvc/mina/vysper/trunk/server/extensions/xep0045-muc/pom.xml?rev=1140714&r1=1140713&r2=1140714&view=diff
==============================================================================
--- mina/vysper/trunk/server/extensions/xep0045-muc/pom.xml (original)
+++ mina/vysper/trunk/server/extensions/xep0045-muc/pom.xml Tue Jun 28 16:31:10 2011
@@ -41,6 +41,82 @@
       <artifactId>vysper-core</artifactId>
     </dependency>
     
+      <!--<dependency>-->
+        <!--<groupId>commons-codec</groupId>-->
+        <!--<artifactId>commons-codec</artifactId>-->
+      <!--</dependency>-->
+
+      <!--<dependency>-->
+          <!--<groupId>commons-io</groupId>-->
+          <!--<artifactId>commons-io</artifactId>-->
+          <!--<version>1.4</version>-->
+      <!--</dependency>-->
+
+      <!--<dependency>-->
+        <!--<groupId>org.apache.vysper</groupId>-->
+        <!--<artifactId>nbxml</artifactId>-->
+      <!--</dependency>-->
+
+      <!--<dependency>-->
+        <!--<groupId>org.apache.vysper.extensions</groupId>-->
+        <!--<artifactId>xep0045-muc</artifactId>-->
+      <!--</dependency>-->
+
+      <!--<dependency>-->
+        <!--<groupId>org.apache.vysper.extensions</groupId>-->
+        <!--<artifactId>xep0060-pubsub</artifactId>-->
+      <!--</dependency>-->
+
+      <!--<dependency>-->
+        <!--<groupId>org.apache.vysper.extensions</groupId>-->
+        <!--<artifactId>xep0124-xep0206-bosh</artifactId>-->
+      <!--</dependency>-->
+
+      <!--<dependency>-->
+        <!--<groupId>org.springframework</groupId>-->
+        <!--<artifactId>spring</artifactId>-->
+        <!--<optional>true</optional>-->
+      <!--</dependency>-->
+
+      <!--<dependency>-->
+        <!--<groupId>org.apache.mina</groupId>-->
+        <!--<artifactId>mina-core</artifactId>-->
+      <!--</dependency>-->
+
+      <!--<dependency>-->
+        <!--<groupId>org.apache.mina</groupId>-->
+        <!--<artifactId>mina-integration-jmx</artifactId>-->
+        <!--<optional>true</optional>-->
+      <!--</dependency>-->
+
+      <!--<dependency>-->
+        <!--<groupId>javax.jcr</groupId>-->
+        <!--<artifactId>jcr</artifactId>-->
+      <!--</dependency>-->
+
+      <!--<dependency>-->
+        <!--<groupId>org.apache.jackrabbit</groupId>-->
+        <!--<artifactId>jackrabbit-core</artifactId>-->
+      <!--</dependency>-->
+
+      <!--&lt;!&ndash; Logging &ndash;&gt;-->
+      <!--<dependency>-->
+        <!--<groupId>org.slf4j</groupId>-->
+        <!--<artifactId>slf4j-api</artifactId>-->
+      <!--</dependency>-->
+
+      <!--<dependency>-->
+        <!--<groupId>org.slf4j</groupId>-->
+        <!--<artifactId>jcl-over-slf4j</artifactId>-->
+        <!--<optional>true</optional>-->
+      <!--</dependency>-->
+    <!---->
+      <!--<dependency>-->
+        <!--<groupId>net.sf.ehcache</groupId>-->
+        <!--<artifactId>ehcache-core</artifactId>-->
+        <!--<optional>true</optional>-->
+      <!--</dependency>-->
+
     <!-- Runtime dependencies -->
     <dependency>
       <groupId>org.slf4j</groupId>