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/04/15 00:32:16 UTC
svn commit: r1092552 - in /incubator/nuvem/trunk/nuvem-google/src:
main/java/org/apache/nuvem/cloud/xmpp/impl/
test/java/org/apache/nuvem/cloud/xmpp/impl/
Author: johnp
Date: Fri Apr 15 00:32:15 2011
New Revision: 1092552
URL: http://svn.apache.org/viewvc?rev=1092552&view=rev
Log:
Implemented Asynchronous XMPP Reciever for stand-alone XMPP Server and cleaned up some code.
Modified:
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/GoogleXMPPConnector.java
incubator/nuvem/trunk/nuvem-google/src/main/java/org/apache/nuvem/cloud/xmpp/impl/GoogleXMPPEndPoint.java
incubator/nuvem/trunk/nuvem-google/src/test/java/org/apache/nuvem/cloud/xmpp/impl/GoogleXMPPEndPointTestCase.java
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=1092552&r1=1092551&r2=1092552&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 Fri Apr 15 00:32:15 2011
@@ -27,6 +27,8 @@ import javax.servlet.http.HttpServletRes
import org.apache.commons.lang.StringUtils;
import org.apache.nuvem.cloud.xmpp.api.MessageListener;
+import org.apache.nuvem.cloud.xmpp.api.XMPPEndPoint;
+import org.oasisopen.sca.annotation.Reference;
import com.google.appengine.api.xmpp.JID;
import com.google.appengine.api.xmpp.Message;
@@ -50,8 +52,13 @@ public class GoogleRecieverServlet exten
*/
private static final long serialVersionUID = -6839442887435183490L;
+ @Reference
+ private XMPPEndPoint endPoint;
+
/**
- * Adapts the HTTP Post request into a call to the {@link MessageListener#listen(org.apache.nuvem.cloud.xmpp.api.Message)}.
+ * Adapts the HTTP Post request into a call to the
+ * {@link MessageListener#listen(org.apache.nuvem.cloud.xmpp.api.Message)}.
+ *
* @see org.apache.nuvem.cloud.xmpp.api.MessageListener
* @see org.apache.nuvem.cloud.xmpp.api.XMPPEndPoint
*/
@@ -66,7 +73,8 @@ public class GoogleRecieverServlet exten
// for identifying the listeners, we exclude the resource.
String jidExcludingResource = StringUtils.substringBefore(from.getId(),
"/");
- GoogleXMPPEndPoint.getListenerFor(
+
+ endPoint.getListenerFor(
new org.apache.nuvem.cloud.xmpp.api.JID(jidExcludingResource))
.listen(nuvemMessage);
}
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=1092552&r1=1092551&r2=1092552&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 Fri Apr 15 00:32:15 2011
@@ -42,16 +42,16 @@ public class GoogleXMPPConnector impleme
/**
* {@inheritDoc}
*/
- public XMPPService connect() {
+ public XMPPService getConnection() {
return XMPPServiceFactory.getXMPPService();
}
/**
* {@inheritDoc}
*/
- public XMPPService connect(Map<String, String> connectionProperties) {
+ public XMPPService getConnection(Map<String, String> connectionProperties) {
log.warning("Google App engine doesnt support overriding any connection properties, the conneciton properties passed as parameters are ignored!");
- return connect();
+ return getConnection();
}
/**
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=1092552&r1=1092551&r2=1092552&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 Fri Apr 15 00:32:15 2011
@@ -87,7 +87,7 @@ public class GoogleXMPPEndPoint extends
* {@inheritDoc}
*/
public Status sendMessage(org.apache.nuvem.cloud.xmpp.api.Message message) {
- XMPPService xmpp = connector.connect();
+ XMPPService xmpp = connector.getConnection();
if (message == null || message.recipient() == null) {
throw new IllegalArgumentException("invalid input");
}
@@ -121,7 +121,7 @@ public class GoogleXMPPEndPoint extends
if (jid == null)
throw new IllegalArgumentException("jid cannot be null");
- XMPPService xmpp = connector.connect();
+ XMPPService xmpp = connector.getConnection();
Status deliveryStatus = new Status();
JID googleJID = new JID(jid.asString());
try {
@@ -149,7 +149,7 @@ public class GoogleXMPPEndPoint extends
*/
public boolean isPresent(String id) {
Validate.notNull(id);
- XMPPService xmpp = connector.connect();
+ XMPPService xmpp = connector.getConnection();
return xmpp.getPresence(new JID(id)).isAvailable();
}
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=1092552&r1=1092551&r2=1092552&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 Fri Apr 15 00:32:15 2011
@@ -52,7 +52,7 @@ public class GoogleXMPPEndPointTestCase
public void setUp() throws IllegalArgumentException, IllegalAccessException {
mockedConnector = EasyMock.createMock(XMPPConnector.class);
mockXMPPService = EasyMock.createMock(XMPPService.class);
- EasyMock.expect(mockedConnector.connect()).andReturn(mockXMPPService);
+ EasyMock.expect(mockedConnector.getConnection()).andReturn(mockXMPPService);
endPoint = new GoogleXMPPEndPoint(mockedConnector);
}
@@ -157,7 +157,7 @@ public class GoogleXMPPEndPointTestCase
};
endPoint.registerListner(new org.apache.nuvem.cloud.xmpp.api.JID(
"test@domain.com"), listener);
- MessageListener registeredListener = GoogleXMPPEndPoint
+ MessageListener registeredListener = endPoint
.getListenerFor(new org.apache.nuvem.cloud.xmpp.api.JID(
"test@domain.com"));
Assert.assertNotNull(registeredListener);
@@ -175,12 +175,12 @@ public class GoogleXMPPEndPointTestCase
org.apache.nuvem.cloud.xmpp.api.JID jid = new org.apache.nuvem.cloud.xmpp.api.JID(
"test@domain.com");
endPoint.registerListner(jid, listener);
- MessageListener registeredListener = GoogleXMPPEndPoint
+ MessageListener registeredListener = endPoint
.getListenerFor(new org.apache.nuvem.cloud.xmpp.api.JID(
"test@domain.com"));
Assert.assertNotNull(registeredListener);
Assert.assertTrue(endPoint.clearListenersFor(jid));
Assert.assertEquals(MessageListener.LOGGING_LISTENER,
- GoogleXMPPEndPoint.getListenerFor(jid));
+ endPoint.getListenerFor(jid));
}
}