You are viewing a plain text version of this content. The canonical link for it is here.
Posted to nuvem-commits@incubator.apache.org by jo...@apache.org on 2011/05/07 23:04:11 UTC
svn commit: r1100651 - in /incubator/nuvem/trunk/nuvem-google: ./
src/main/java/org/apache/nuvem/cloud/xmpp/impl/
src/test/java/org/apache/nuvem/cloud/xmpp/impl/
Author: johnp
Date: Sat May 7 23:04:10 2011
New Revision: 1100651
URL: http://svn.apache.org/viewvc?rev=1100651&view=rev
Log:
module restructuring + few folder structure changes to keep it consistent with all other modules
Added:
incubator/nuvem/trunk/nuvem-google/src/test/java/org/apache/nuvem/cloud/xmpp/impl/GooglePresenceAdapterTestCase.java
incubator/nuvem/trunk/nuvem-google/src/test/java/org/apache/nuvem/cloud/xmpp/impl/GooglePresenceServletTestCase.java
Modified:
incubator/nuvem/trunk/nuvem-google/pom.xml
incubator/nuvem/trunk/nuvem-google/src/main/java/org/apache/nuvem/cloud/xmpp/impl/GooglePresenceManager.java
incubator/nuvem/trunk/nuvem-google/src/main/java/org/apache/nuvem/cloud/xmpp/impl/GooglePresenceServlet.java
incubator/nuvem/trunk/nuvem-google/src/main/java/org/apache/nuvem/cloud/xmpp/impl/GoogleRecieverServlet.java
incubator/nuvem/trunk/nuvem-google/src/main/java/org/apache/nuvem/cloud/xmpp/impl/GoogleStatusAdapter.java
incubator/nuvem/trunk/nuvem-google/src/main/java/org/apache/nuvem/cloud/xmpp/impl/GoogleXMPPConnector.java
incubator/nuvem/trunk/nuvem-google/src/main/java/org/apache/nuvem/cloud/xmpp/impl/GoogleXMPPEndPoint.java
incubator/nuvem/trunk/nuvem-google/src/main/java/org/apache/nuvem/cloud/xmpp/impl/GoogleXMPPMessageAdapter.java
incubator/nuvem/trunk/nuvem-google/src/main/java/org/apache/nuvem/cloud/xmpp/impl/PresenceAdapter.java
incubator/nuvem/trunk/nuvem-google/src/test/java/org/apache/nuvem/cloud/xmpp/impl/GoogleXMPPEndPointTestCase.java
Modified: incubator/nuvem/trunk/nuvem-google/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nuvem/trunk/nuvem-google/pom.xml?rev=1100651&r1=1100650&r2=1100651&view=diff
==============================================================================
--- incubator/nuvem/trunk/nuvem-google/pom.xml (original)
+++ incubator/nuvem/trunk/nuvem-google/pom.xml Sat May 7 23:04:10 2011
@@ -27,14 +27,14 @@
<version>1.0-incubating-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
- <artifactId>nuvem-cloud-google</artifactId>
+ <artifactId>nuvem-google</artifactId>
<version>1.0-incubating-SNAPSHOT</version>
<name>Apache Nuvem Cloud API Implementation for Google AppEngine</name>
<dependencies>
<dependency>
<groupId>org.apache.nuvem</groupId>
- <artifactId>nuvem-cloud-api</artifactId>
+ <artifactId>nuvem-api</artifactId>
<version>${project.version}</version>
</dependency>
Modified: incubator/nuvem/trunk/nuvem-google/src/main/java/org/apache/nuvem/cloud/xmpp/impl/GooglePresenceManager.java
URL: http://svn.apache.org/viewvc/incubator/nuvem/trunk/nuvem-google/src/main/java/org/apache/nuvem/cloud/xmpp/impl/GooglePresenceManager.java?rev=1100651&r1=1100650&r2=1100651&view=diff
==============================================================================
--- incubator/nuvem/trunk/nuvem-google/src/main/java/org/apache/nuvem/cloud/xmpp/impl/GooglePresenceManager.java (original)
+++ incubator/nuvem/trunk/nuvem-google/src/main/java/org/apache/nuvem/cloud/xmpp/impl/GooglePresenceManager.java Sat May 7 23:04:10 2011
@@ -23,10 +23,10 @@ package org.apache.nuvem.cloud.xmpp.impl
import java.util.logging.Logger;
import org.apache.commons.lang.Validate;
-import org.apache.nuvem.cloud.xmpp.api.XMPPConnector;
-import org.apache.nuvem.cloud.xmpp.api.presence.PresenceListener;
-import org.apache.nuvem.cloud.xmpp.api.presence.PresenceManager;
-import org.apache.nuvem.cloud.xmpp.common.AbstractPresenceManager;
+import org.apache.nuvem.cloud.xmpp.AbstractPresenceManager;
+import org.apache.nuvem.cloud.xmpp.XMPPConnector;
+import org.apache.nuvem.cloud.xmpp.presence.PresenceListener;
+import org.apache.nuvem.cloud.xmpp.presence.PresenceManager;
import org.oasisopen.sca.annotation.Init;
import org.oasisopen.sca.annotation.Reference;
import org.oasisopen.sca.annotation.Service;
Modified: incubator/nuvem/trunk/nuvem-google/src/main/java/org/apache/nuvem/cloud/xmpp/impl/GooglePresenceServlet.java
URL: http://svn.apache.org/viewvc/incubator/nuvem/trunk/nuvem-google/src/main/java/org/apache/nuvem/cloud/xmpp/impl/GooglePresenceServlet.java?rev=1100651&r1=1100650&r2=1100651&view=diff
==============================================================================
--- incubator/nuvem/trunk/nuvem-google/src/main/java/org/apache/nuvem/cloud/xmpp/impl/GooglePresenceServlet.java (original)
+++ incubator/nuvem/trunk/nuvem-google/src/main/java/org/apache/nuvem/cloud/xmpp/impl/GooglePresenceServlet.java Sat May 7 23:04:10 2011
@@ -26,9 +26,9 @@ import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.nuvem.cloud.xmpp.api.XMPPEndPoint;
-import org.apache.nuvem.cloud.xmpp.api.presence.PresenceListener;
-import org.apache.nuvem.cloud.xmpp.api.presence.PresenceManager;
+import org.apache.nuvem.cloud.xmpp.XMPPEndPoint;
+import org.apache.nuvem.cloud.xmpp.presence.PresenceListener;
+import org.apache.nuvem.cloud.xmpp.presence.PresenceManager;
import org.oasisopen.sca.annotation.Reference;
import com.google.appengine.api.xmpp.Presence;
@@ -42,7 +42,7 @@ import com.google.appengine.api.xmpp.XMP
* This servlet will recieve the presence change requests posted in the HTTP
* POST request, parse the message using the APIs provided by GAE convert the
* request into nuvem specific presence object so that the
- * {@link PresenceListener#listen(org.apache.nuvem.cloud.xmpp.api.presence.Presence)}
+ * {@link PresenceListener#listen(org.apache.nuvem.cloud.xmpp.presence.Presence)}
* will for all listeners registered through the
* {@link PresenceManager#registerListener(PresenceListener)} API.
* </p>
@@ -66,10 +66,10 @@ public class GooglePresenceServlet exten
/**
* Adapts the HTTP Post request into a call to the
- * {@link PresenceListener#listen(org.apache.nuvem.cloud.xmpp.api.presence.Presence)}
+ * {@link PresenceListener#listen(org.apache.nuvem.cloud.xmpp.presence.Presence)}
* .
*
- * @see org.apache.nuvem.cloud.xmpp.api.XMPPEndPoint
+ * @see org.apache.nuvem.cloud.xmpp.XMPPEndPoint
*/
public void doPost(HttpServletRequest req, HttpServletResponse res)
throws IOException {
Modified: incubator/nuvem/trunk/nuvem-google/src/main/java/org/apache/nuvem/cloud/xmpp/impl/GoogleRecieverServlet.java
URL: http://svn.apache.org/viewvc/incubator/nuvem/trunk/nuvem-google/src/main/java/org/apache/nuvem/cloud/xmpp/impl/GoogleRecieverServlet.java?rev=1100651&r1=1100650&r2=1100651&view=diff
==============================================================================
--- incubator/nuvem/trunk/nuvem-google/src/main/java/org/apache/nuvem/cloud/xmpp/impl/GoogleRecieverServlet.java (original)
+++ incubator/nuvem/trunk/nuvem-google/src/main/java/org/apache/nuvem/cloud/xmpp/impl/GoogleRecieverServlet.java Sat May 7 23:04:10 2011
@@ -26,8 +26,8 @@ import javax.servlet.http.HttpServletReq
import javax.servlet.http.HttpServletResponse;
import org.apache.commons.lang.StringUtils;
-import org.apache.nuvem.cloud.xmpp.api.XMPPEndPoint;
-import org.apache.nuvem.cloud.xmpp.api.message.MessageListener;
+import org.apache.nuvem.cloud.xmpp.XMPPEndPoint;
+import org.apache.nuvem.cloud.xmpp.message.MessageListener;
import org.oasisopen.sca.annotation.Reference;
import com.google.appengine.api.xmpp.JID;
@@ -41,7 +41,7 @@ import com.google.appengine.api.xmpp.XMP
* This servlet will recieve the messages posted in the HTTP POST request, parse
* the message using the APIs provided by GAE convert the message into nuvem
* specific message so that the
- * {@link MessageListener#listen(org.apache.nuvem.cloud.xmpp.api.message.Message)} will
+ * {@link MessageListener#listen(org.apache.nuvem.cloud.xmpp.message.Message)} will
* be called for the <code>JID</code> the <code>MessageListener</code> is
* registered for.
* </p>
@@ -57,16 +57,16 @@ public class GoogleRecieverServlet exten
/**
* Adapts the HTTP Post request into a call to the
- * {@link MessageListener#listen(org.apache.nuvem.cloud.xmpp.api.message.Message)}.
+ * {@link MessageListener#listen(org.apache.nuvem.cloud.xmpp.message.Message)}.
*
- * @see org.apache.nuvem.cloud.xmpp.api.message.MessageListener
- * @see org.apache.nuvem.cloud.xmpp.api.XMPPEndPoint
+ * @see org.apache.nuvem.cloud.xmpp.message.MessageListener
+ * @see org.apache.nuvem.cloud.xmpp.XMPPEndPoint
*/
public void doPost(HttpServletRequest req, HttpServletResponse res)
throws IOException {
XMPPService xmpp = XMPPServiceFactory.getXMPPService();
Message message = xmpp.parseMessage(req);
- org.apache.nuvem.cloud.xmpp.api.message.Message nuvemMessage = GoogleXMPPMessageAdapter
+ org.apache.nuvem.cloud.xmpp.message.Message nuvemMessage = GoogleXMPPMessageAdapter
.toNuvemMessage(message);
JID from = message.getFromJid();
@@ -75,7 +75,7 @@ public class GoogleRecieverServlet exten
"/");
endPoint.getListenerFor(
- new org.apache.nuvem.cloud.xmpp.api.JID(jidExcludingResource))
+ new org.apache.nuvem.cloud.xmpp.JID(jidExcludingResource))
.listen(nuvemMessage);
}
}
Modified: incubator/nuvem/trunk/nuvem-google/src/main/java/org/apache/nuvem/cloud/xmpp/impl/GoogleStatusAdapter.java
URL: http://svn.apache.org/viewvc/incubator/nuvem/trunk/nuvem-google/src/main/java/org/apache/nuvem/cloud/xmpp/impl/GoogleStatusAdapter.java?rev=1100651&r1=1100650&r2=1100651&view=diff
==============================================================================
--- incubator/nuvem/trunk/nuvem-google/src/main/java/org/apache/nuvem/cloud/xmpp/impl/GoogleStatusAdapter.java (original)
+++ incubator/nuvem/trunk/nuvem-google/src/main/java/org/apache/nuvem/cloud/xmpp/impl/GoogleStatusAdapter.java Sat May 7 23:04:10 2011
@@ -22,9 +22,9 @@ package org.apache.nuvem.cloud.xmpp.impl
import java.util.HashMap;
import java.util.Map;
-import org.apache.nuvem.cloud.xmpp.api.Error;
-import org.apache.nuvem.cloud.xmpp.api.ErrorCode;
-import org.apache.nuvem.cloud.xmpp.api.Status;
+import org.apache.nuvem.cloud.xmpp.Error;
+import org.apache.nuvem.cloud.xmpp.ErrorCode;
+import org.apache.nuvem.cloud.xmpp.Status;
import com.google.appengine.api.xmpp.JID;
import com.google.appengine.api.xmpp.SendResponse;
Modified: incubator/nuvem/trunk/nuvem-google/src/main/java/org/apache/nuvem/cloud/xmpp/impl/GoogleXMPPConnector.java
URL: http://svn.apache.org/viewvc/incubator/nuvem/trunk/nuvem-google/src/main/java/org/apache/nuvem/cloud/xmpp/impl/GoogleXMPPConnector.java?rev=1100651&r1=1100650&r2=1100651&view=diff
==============================================================================
--- incubator/nuvem/trunk/nuvem-google/src/main/java/org/apache/nuvem/cloud/xmpp/impl/GoogleXMPPConnector.java (original)
+++ incubator/nuvem/trunk/nuvem-google/src/main/java/org/apache/nuvem/cloud/xmpp/impl/GoogleXMPPConnector.java Sat May 7 23:04:10 2011
@@ -22,7 +22,7 @@ package org.apache.nuvem.cloud.xmpp.impl
import java.util.Map;
import java.util.logging.Logger;
-import org.apache.nuvem.cloud.xmpp.api.XMPPConnector;
+import org.apache.nuvem.cloud.xmpp.XMPPConnector;
import com.google.appengine.api.xmpp.XMPPService;
import com.google.appengine.api.xmpp.XMPPServiceFactory;
Modified: incubator/nuvem/trunk/nuvem-google/src/main/java/org/apache/nuvem/cloud/xmpp/impl/GoogleXMPPEndPoint.java
URL: http://svn.apache.org/viewvc/incubator/nuvem/trunk/nuvem-google/src/main/java/org/apache/nuvem/cloud/xmpp/impl/GoogleXMPPEndPoint.java?rev=1100651&r1=1100650&r2=1100651&view=diff
==============================================================================
--- incubator/nuvem/trunk/nuvem-google/src/main/java/org/apache/nuvem/cloud/xmpp/impl/GoogleXMPPEndPoint.java (original)
+++ incubator/nuvem/trunk/nuvem-google/src/main/java/org/apache/nuvem/cloud/xmpp/impl/GoogleXMPPEndPoint.java Sat May 7 23:04:10 2011
@@ -23,13 +23,13 @@ package org.apache.nuvem.cloud.xmpp.impl
import java.util.logging.Logger;
import org.apache.commons.lang.Validate;
-import org.apache.nuvem.cloud.xmpp.api.Error;
-import org.apache.nuvem.cloud.xmpp.api.ErrorCode;
-import org.apache.nuvem.cloud.xmpp.api.Status;
-import org.apache.nuvem.cloud.xmpp.api.XMPPConnector;
-import org.apache.nuvem.cloud.xmpp.api.XMPPEndPoint;
-import org.apache.nuvem.cloud.xmpp.api.presence.PresenceManager;
-import org.apache.nuvem.cloud.xmpp.common.AbstractXMPPEndPoint;
+import org.apache.nuvem.cloud.xmpp.Error;
+import org.apache.nuvem.cloud.xmpp.ErrorCode;
+import org.apache.nuvem.cloud.xmpp.Status;
+import org.apache.nuvem.cloud.xmpp.XMPPConnector;
+import org.apache.nuvem.cloud.xmpp.XMPPEndPoint;
+import org.apache.nuvem.cloud.xmpp.presence.PresenceManager;
+import org.apache.nuvem.cloud.xmpp.AbstractXMPPEndPoint;
import org.oasisopen.sca.annotation.Init;
import org.oasisopen.sca.annotation.Reference;
import org.oasisopen.sca.annotation.Scope;
@@ -90,7 +90,7 @@ public class GoogleXMPPEndPoint extends
* {@inheritDoc}
*/
public Status sendMessage(
- org.apache.nuvem.cloud.xmpp.api.message.Message message) {
+ org.apache.nuvem.cloud.xmpp.message.Message message) {
XMPPService xmpp = connector.getConnection();
if (message == null || message.recipient() == null) {
throw new IllegalArgumentException("invalid input");
@@ -114,14 +114,14 @@ public class GoogleXMPPEndPoint extends
log.info(status.toString());
} else {
log.info("user offline...");
- deliveryStatus.addError(new org.apache.nuvem.cloud.xmpp.api.Error(
+ deliveryStatus.addError(new org.apache.nuvem.cloud.xmpp.Error(
ErrorCode.USER_OFFLINE));
return deliveryStatus;
}
return GoogleStatusAdapter.toStatus(status);
}
- private Status invite(org.apache.nuvem.cloud.xmpp.api.JID jid) {
+ private Status invite(org.apache.nuvem.cloud.xmpp.JID jid) {
if (jid == null)
throw new IllegalArgumentException("jid cannot be null");
@@ -141,11 +141,11 @@ public class GoogleXMPPEndPoint extends
/**
* {@inheritDoc} validation of the input will be done within
- * {@link org.apache.nuvem.cloud.xmpp.api.JID}
+ * {@link org.apache.nuvem.cloud.xmpp.JID}
*/
@Override
public Status invite(String jid) {
- return invite(new org.apache.nuvem.cloud.xmpp.api.JID(jid));
+ return invite(new org.apache.nuvem.cloud.xmpp.JID(jid));
}
/**
Modified: incubator/nuvem/trunk/nuvem-google/src/main/java/org/apache/nuvem/cloud/xmpp/impl/GoogleXMPPMessageAdapter.java
URL: http://svn.apache.org/viewvc/incubator/nuvem/trunk/nuvem-google/src/main/java/org/apache/nuvem/cloud/xmpp/impl/GoogleXMPPMessageAdapter.java?rev=1100651&r1=1100650&r2=1100651&view=diff
==============================================================================
--- incubator/nuvem/trunk/nuvem-google/src/main/java/org/apache/nuvem/cloud/xmpp/impl/GoogleXMPPMessageAdapter.java (original)
+++ incubator/nuvem/trunk/nuvem-google/src/main/java/org/apache/nuvem/cloud/xmpp/impl/GoogleXMPPMessageAdapter.java Sat May 7 23:04:10 2011
@@ -28,16 +28,16 @@ import com.google.appengine.api.xmpp.Mes
*/
public class GoogleXMPPMessageAdapter {
- public static Message toGoogleMessage(org.apache.nuvem.cloud.xmpp.api.message.Message nuvemMessage) {
+ public static Message toGoogleMessage(org.apache.nuvem.cloud.xmpp.message.Message nuvemMessage) {
JID jid = new JID(nuvemMessage.recipient().asString());
Message msg = new MessageBuilder().withRecipientJids(jid).withBody(nuvemMessage.payLoad().content()).build();
return msg;
}
- public static org.apache.nuvem.cloud.xmpp.api.message.Message toNuvemMessage(Message googleMessage) {
+ public static org.apache.nuvem.cloud.xmpp.message.Message toNuvemMessage(Message googleMessage) {
String sender = googleMessage.getFromJid().getId();
- org.apache.nuvem.cloud.xmpp.api.message.Message nuvemMessage =
- new org.apache.nuvem.cloud.xmpp.api.message.MessageBuilder().from(sender).containing(googleMessage.getBody())
+ org.apache.nuvem.cloud.xmpp.message.Message nuvemMessage =
+ new org.apache.nuvem.cloud.xmpp.message.MessageBuilder().from(sender).containing(googleMessage.getBody())
.build();
return nuvemMessage;
}
Modified: incubator/nuvem/trunk/nuvem-google/src/main/java/org/apache/nuvem/cloud/xmpp/impl/PresenceAdapter.java
URL: http://svn.apache.org/viewvc/incubator/nuvem/trunk/nuvem-google/src/main/java/org/apache/nuvem/cloud/xmpp/impl/PresenceAdapter.java?rev=1100651&r1=1100650&r2=1100651&view=diff
==============================================================================
--- incubator/nuvem/trunk/nuvem-google/src/main/java/org/apache/nuvem/cloud/xmpp/impl/PresenceAdapter.java (original)
+++ incubator/nuvem/trunk/nuvem-google/src/main/java/org/apache/nuvem/cloud/xmpp/impl/PresenceAdapter.java Sat May 7 23:04:10 2011
@@ -23,11 +23,11 @@ import java.util.HashMap;
import java.util.Map;
import org.apache.commons.lang.StringUtils;
-import org.apache.nuvem.cloud.xmpp.api.JID;
-import org.apache.nuvem.cloud.xmpp.api.presence.Presence;
-import org.apache.nuvem.cloud.xmpp.api.presence.PresenceBuilder;
-import org.apache.nuvem.cloud.xmpp.api.presence.Presence.Show;
-import org.apache.nuvem.cloud.xmpp.api.presence.Presence.Type;
+import org.apache.nuvem.cloud.xmpp.JID;
+import org.apache.nuvem.cloud.xmpp.presence.Presence;
+import org.apache.nuvem.cloud.xmpp.presence.PresenceBuilder;
+import org.apache.nuvem.cloud.xmpp.presence.Presence.Show;
+import org.apache.nuvem.cloud.xmpp.presence.Presence.Type;
import com.google.appengine.api.xmpp.PresenceShow;
import com.google.appengine.api.xmpp.PresenceType;
@@ -55,7 +55,7 @@ public final class PresenceAdapter {
/**
*
Converts the google {@link com.google.appengine.api.xmpp.Presence} into
- * nuvem's {@link org.apache.nuvem.cloud.xmpp.api.presence.Presence} object
+ * nuvem's {@link org.apache.nuvem.cloud.xmpp.presence.Presence} object
*/
public static Presence toNuvemPresence(
com.google.appengine.api.xmpp.Presence presence) {
Added: incubator/nuvem/trunk/nuvem-google/src/test/java/org/apache/nuvem/cloud/xmpp/impl/GooglePresenceAdapterTestCase.java
URL: http://svn.apache.org/viewvc/incubator/nuvem/trunk/nuvem-google/src/test/java/org/apache/nuvem/cloud/xmpp/impl/GooglePresenceAdapterTestCase.java?rev=1100651&view=auto
==============================================================================
--- incubator/nuvem/trunk/nuvem-google/src/test/java/org/apache/nuvem/cloud/xmpp/impl/GooglePresenceAdapterTestCase.java (added)
+++ incubator/nuvem/trunk/nuvem-google/src/test/java/org/apache/nuvem/cloud/xmpp/impl/GooglePresenceAdapterTestCase.java Sat May 7 23:04:10 2011
@@ -0,0 +1,50 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.nuvem.cloud.xmpp.impl;
+
+import junit.framework.Assert;
+
+import org.apache.nuvem.cloud.xmpp.presence.Presence;
+import org.junit.Test;
+
+import com.google.appengine.api.xmpp.JID;
+import com.google.appengine.api.xmpp.PresenceBuilder;
+import com.google.appengine.api.xmpp.PresenceShow;
+import com.google.appengine.api.xmpp.PresenceType;
+
+public class GooglePresenceAdapterTestCase {
+ private static final String STATUS = "sample status";
+ private static final String FROM_JID = "test@test.com";
+
+ @Test
+ public void ShouldBuildAValidNuvemPresence() {
+ com.google.appengine.api.xmpp.Presence googlePresence = new PresenceBuilder()
+ .withFromJid(new JID(FROM_JID)).withPresenceShow(
+ PresenceShow.CHAT).withPresenceType(
+ PresenceType.AVAILABLE).withStatus(STATUS).build();
+
+ Presence nuvemPresence = PresenceAdapter
+ .toNuvemPresence(googlePresence);
+ Assert.assertEquals(STATUS, nuvemPresence.status());
+ Assert.assertEquals(FROM_JID, nuvemPresence.from().asString());
+ Assert.assertEquals(Presence.Show.CHAT, nuvemPresence.show());
+ Assert.assertEquals(Presence.Type.AVAILABLE, nuvemPresence.type());
+ }
+}
Added: incubator/nuvem/trunk/nuvem-google/src/test/java/org/apache/nuvem/cloud/xmpp/impl/GooglePresenceServletTestCase.java
URL: http://svn.apache.org/viewvc/incubator/nuvem/trunk/nuvem-google/src/test/java/org/apache/nuvem/cloud/xmpp/impl/GooglePresenceServletTestCase.java?rev=1100651&view=auto
==============================================================================
--- incubator/nuvem/trunk/nuvem-google/src/test/java/org/apache/nuvem/cloud/xmpp/impl/GooglePresenceServletTestCase.java (added)
+++ incubator/nuvem/trunk/nuvem-google/src/test/java/org/apache/nuvem/cloud/xmpp/impl/GooglePresenceServletTestCase.java Sat May 7 23:04:10 2011
@@ -0,0 +1,26 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.nuvem.cloud.xmpp.impl;
+
+public class GooglePresenceServletTestCase {
+
+
+
+}
Modified: incubator/nuvem/trunk/nuvem-google/src/test/java/org/apache/nuvem/cloud/xmpp/impl/GoogleXMPPEndPointTestCase.java
URL: http://svn.apache.org/viewvc/incubator/nuvem/trunk/nuvem-google/src/test/java/org/apache/nuvem/cloud/xmpp/impl/GoogleXMPPEndPointTestCase.java?rev=1100651&r1=1100650&r2=1100651&view=diff
==============================================================================
--- incubator/nuvem/trunk/nuvem-google/src/test/java/org/apache/nuvem/cloud/xmpp/impl/GoogleXMPPEndPointTestCase.java (original)
+++ incubator/nuvem/trunk/nuvem-google/src/test/java/org/apache/nuvem/cloud/xmpp/impl/GoogleXMPPEndPointTestCase.java Sat May 7 23:04:10 2011
@@ -21,12 +21,12 @@ package org.apache.nuvem.cloud.xmpp.impl
import junit.framework.Assert;
-import org.apache.nuvem.cloud.xmpp.api.ErrorCode;
-import org.apache.nuvem.cloud.xmpp.api.Status;
-import org.apache.nuvem.cloud.xmpp.api.XMPPConnector;
-import org.apache.nuvem.cloud.xmpp.api.message.Message;
-import org.apache.nuvem.cloud.xmpp.api.message.MessageBuilder;
-import org.apache.nuvem.cloud.xmpp.api.message.MessageListener;
+import org.apache.nuvem.cloud.xmpp.ErrorCode;
+import org.apache.nuvem.cloud.xmpp.Status;
+import org.apache.nuvem.cloud.xmpp.XMPPConnector;
+import org.apache.nuvem.cloud.xmpp.message.Message;
+import org.apache.nuvem.cloud.xmpp.message.MessageBuilder;
+import org.apache.nuvem.cloud.xmpp.message.MessageListener;
import org.easymock.EasyMock;
import org.easymock.IArgumentMatcher;
import org.junit.Before;
@@ -160,10 +160,10 @@ public class GoogleXMPPEndPointTestCase
}
};
- endPoint.registerListner(new org.apache.nuvem.cloud.xmpp.api.JID(
+ endPoint.registerListner(new org.apache.nuvem.cloud.xmpp.JID(
"test@domain.com"), listener);
MessageListener registeredListener = endPoint
- .getListenerFor(new org.apache.nuvem.cloud.xmpp.api.JID(
+ .getListenerFor(new org.apache.nuvem.cloud.xmpp.JID(
"test@domain.com"));
Assert.assertNotNull(registeredListener);
}
@@ -177,11 +177,11 @@ public class GoogleXMPPEndPointTestCase
}
};
- org.apache.nuvem.cloud.xmpp.api.JID jid = new org.apache.nuvem.cloud.xmpp.api.JID(
+ org.apache.nuvem.cloud.xmpp.JID jid = new org.apache.nuvem.cloud.xmpp.JID(
"test@domain.com");
endPoint.registerListner(jid, listener);
MessageListener registeredListener = endPoint
- .getListenerFor(new org.apache.nuvem.cloud.xmpp.api.JID(
+ .getListenerFor(new org.apache.nuvem.cloud.xmpp.JID(
"test@domain.com"));
Assert.assertNotNull(registeredListener);
Assert.assertTrue(endPoint.clearListenersFor(jid));