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 2011/03/16 12:55:30 UTC
svn commit: r1082133 - in /mina/vysper/trunk: ./ demo/pubsub/client/
examples/ examples/embedded-war/ examples/pubsub-client/
server/core/src/main/java/org/apache/vysper/xmpp/server/
server/extensions/xep0060-pubsub/src/test/java/org/apache/vysper/xmpp...
Author: ngn
Date: Wed Mar 16 11:55:30 2011
New Revision: 1082133
URL: http://svn.apache.org/viewvc?rev=1082133&view=rev
Log:
Moving pubsub demo into examples module
Added:
mina/vysper/trunk/examples/pubsub-client/
- copied from r1068181, mina/vysper/trunk/demo/pubsub/client/
Removed:
mina/vysper/trunk/demo/pubsub/client/
Modified:
mina/vysper/trunk/examples/embedded-war/pom.xml
mina/vysper/trunk/examples/pom.xml
mina/vysper/trunk/examples/pubsub-client/pom.xml
mina/vysper/trunk/pom.xml
mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/server/XMPPServer.java
mina/vysper/trunk/server/extensions/xep0060-pubsub/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/TestSessionContext.java
Modified: mina/vysper/trunk/examples/embedded-war/pom.xml
URL: http://svn.apache.org/viewvc/mina/vysper/trunk/examples/embedded-war/pom.xml?rev=1082133&r1=1082132&r2=1082133&view=diff
==============================================================================
--- mina/vysper/trunk/examples/embedded-war/pom.xml (original)
+++ mina/vysper/trunk/examples/embedded-war/pom.xml Wed Mar 16 11:55:30 2011
@@ -25,7 +25,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.vysper.examples</groupId>
<artifactId>vysper-embedded-war</artifactId>
- <name>Example of Apache Vysper embedded in a WAR</name>
+ <name>Apache Vysper Embedded in a WAR demo</name>
<version>0.7-SNAPSHOT</version>
<packaging>war</packaging>
Modified: mina/vysper/trunk/examples/pom.xml
URL: http://svn.apache.org/viewvc/mina/vysper/trunk/examples/pom.xml?rev=1082133&r1=1082132&r2=1082133&view=diff
==============================================================================
--- mina/vysper/trunk/examples/pom.xml (original)
+++ mina/vysper/trunk/examples/pom.xml Wed Mar 16 11:55:30 2011
@@ -32,5 +32,6 @@
<modules>
<module>embedded-war</module>
+ <module>pubsub-client</module>
</modules>
</project>
Modified: mina/vysper/trunk/examples/pubsub-client/pom.xml
URL: http://svn.apache.org/viewvc/mina/vysper/trunk/examples/pubsub-client/pom.xml?rev=1082133&r1=1068181&r2=1082133&view=diff
==============================================================================
--- mina/vysper/trunk/examples/pubsub-client/pom.xml (original)
+++ mina/vysper/trunk/examples/pubsub-client/pom.xml Wed Mar 16 11:55:30 2011
@@ -19,16 +19,14 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>vysper-parent</artifactId>
- <groupId>org.apache.vysper</groupId>
+ <artifactId>vysper-examples</artifactId>
+ <groupId>org.apache.vysper.examples</groupId>
<version>0.7-SNAPSHOT</version>
- <relativePath>../../../pom.xml</relativePath>
</parent>
-
- <groupId>org.apache.vysper</groupId>
- <artifactId>demo-pubsub-client</artifactId>
- <name>Apache Vysper XEP-0060 Publish-Subscribe Demo Application</name>
+ <groupId>org.apache.vysper.examples</groupId>
+ <artifactId>vysper-pubsub-demo</artifactId>
+ <name>Apache Vysper Publish-Subscribe demo</name>
<version>0.7-SNAPSHOT</version>
<repositories>
Modified: mina/vysper/trunk/pom.xml
URL: http://svn.apache.org/viewvc/mina/vysper/trunk/pom.xml?rev=1082133&r1=1082132&r2=1082133&view=diff
==============================================================================
--- mina/vysper/trunk/pom.xml (original)
+++ mina/vysper/trunk/pom.xml Wed Mar 16 11:55:30 2011
@@ -430,7 +430,6 @@
<module>server</module>
<module>dist</module>
<module>examples</module>
- <module>demo/pubsub/client</module>
</modules>
<properties>
Modified: mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/server/XMPPServer.java
URL: http://svn.apache.org/viewvc/mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/server/XMPPServer.java?rev=1082133&r1=1082132&r2=1082133&view=diff
==============================================================================
--- mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/server/XMPPServer.java (original)
+++ mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/server/XMPPServer.java Wed Mar 16 11:55:30 2011
@@ -34,7 +34,6 @@ import org.apache.vysper.xmpp.authorizat
import org.apache.vysper.xmpp.cryptography.BogusTrustManagerFactory;
import org.apache.vysper.xmpp.cryptography.InputStreamBasedTLSContextFactory;
import org.apache.vysper.xmpp.delivery.OfflineStanzaReceiver;
-import org.apache.vysper.xmpp.delivery.RecordingStanzaRelay;
import org.apache.vysper.xmpp.delivery.StanzaRelayBroker;
import org.apache.vysper.xmpp.delivery.inbound.DeliveringInternalInboundStanzaRelay;
import org.apache.vysper.xmpp.delivery.inbound.DeliveringExternalInboundStanzaRelay;
Modified: mina/vysper/trunk/server/extensions/xep0060-pubsub/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/TestSessionContext.java
URL: http://svn.apache.org/viewvc/mina/vysper/trunk/server/extensions/xep0060-pubsub/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/TestSessionContext.java?rev=1082133&r1=1082132&r2=1082133&view=diff
==============================================================================
--- mina/vysper/trunk/server/extensions/xep0060-pubsub/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/TestSessionContext.java (original)
+++ mina/vysper/trunk/server/extensions/xep0060-pubsub/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/TestSessionContext.java Wed Mar 16 11:55:30 2011
@@ -82,7 +82,7 @@ public class TestSessionContext extends
* @return
*/
public static TestSessionContext createWithStanzaReceiverRelay(SessionStateHolder sessionStateHolder) {
- StanzaReceiverRelay relay = new org.apache.vysper.xmpp.delivery.StanzaReceiverRelay();
+ StanzaReceiverRelay relay = new StanzaReceiverRelay();
DefaultServerRuntimeContext serverContext = new DefaultServerRuntimeContext(new EntityImpl(null, "test", null),
relay);
relay.setServerRuntimeContext(serverContext);