fergalmoran/chrometophone
1
0
Fork 0
mirror of https://github.com/fergalmoran/chrometophone.git synced 2026-01-04 16:04:15 +00:00
Code Issues 265 Packages Projects Releases Wiki Activity

Add the XMPP sending to the config, fix build issue.

Browse Source
This commit is contained in:
costin
2011-03-07 22:09:26 +00:00
parent 98a8a55abf
commit 5f34997cab
3 changed files with 29 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
appengine/src/com/google/android/chrometophone/server/XMPPSendServlet.java
View File

@@ -50,6 +50,7 @@ public class XMPPSendServlet extends SendServlet {
Message message = xmpp.parseMessage(req); Message message = xmpp.parseMessage(req);
JID fromJid = message.getFromJid(); JID fromJid = message.getFromJid();
String body = message.getBody(); String body = message.getBody();
String jid = fromJid.getId(); String jid = fromJid.getId();
@@ -59,6 +60,7 @@ public class XMPPSendServlet extends SendServlet {
} }
Map<String, String> params = new HashMap<String, String>(); Map<String, String> params = new HashMap<String, String>();
String[] bodyParts = body.split("&"); String[] bodyParts = body.split("&");
for (String part: bodyParts) { for (String part: bodyParts) {
String[] keyValue = part.split("="); String[] keyValue = part.split("=");
@@ -86,6 +88,7 @@ public class XMPPSendServlet extends SendServlet {
log.info("Sending " + jid); log.info("Sending " + jid);
doSendToDevice(url, title, sel, jid, doSendToDevice(url, title, sel, jid,
deviceName, deviceType, resp); deviceName == null ? null : new String[] {deviceName},
deviceType, resp);
} }
} }

3
appengine/war/WEB-INF/appengine-web.xml
View File

@@ -20,4 +20,7 @@
<system-properties> <system-properties>
<property name="java.util.logging.config.file" value="WEB-INF/logging.properties"/> <property name="java.util.logging.config.file" value="WEB-INF/logging.properties"/>
</system-properties> </system-properties>
<inbound-services>
<service>xmpp_message</service>
</inbound-services>
</appengine-web-app> </appengine-web-app>

33
appengine/war/WEB-INF/web.xml
View File

@@ -30,12 +30,18 @@
</servlet-class> </servlet-class>
</servlet> </servlet>
<servlet> <servlet>
<servlet-name>SendServlet</servlet-name> <servlet-name>SendServlet</servlet-name>
<servlet-class>com.google.android.chrometophone.server.SendServlet <servlet-class>com.google.android.chrometophone.server.SendServlet
</servlet-class> </servlet-class>
</servlet> </servlet>
<servlet>
<servlet-name>XMPPSendServlet</servlet-name>
<servlet-class>com.google.android.chrometophone.server.XMPPSendServlet
</servlet-class>
</servlet>
<servlet> <servlet>
<servlet-name>AuthServlet</servlet-name> <servlet-name>AuthServlet</servlet-name>
<servlet-class>com.google.android.chrometophone.server.AuthServlet <servlet-class>com.google.android.chrometophone.server.AuthServlet
@@ -59,11 +65,16 @@
<url-pattern>/unregister</url-pattern> <url-pattern>/unregister</url-pattern>
</servlet-mapping> </servlet-mapping>
<servlet-mapping> <servlet-mapping>
<servlet-name>SendServlet</servlet-name> <servlet-name>XMPPSendServlet</servlet-name>
<url-pattern>/send</url-pattern> <url-pattern>/_ah/xmpp/message/chat/</url-pattern>
</servlet-mapping> </servlet-mapping>
<servlet-mapping>
<servlet-name>SendServlet</servlet-name>
<url-pattern>/send</url-pattern>
</servlet-mapping>
<servlet-mapping> <servlet-mapping>
<servlet-name>AuthServlet</servlet-name> <servlet-name>AuthServlet</servlet-name>
<url-pattern>/signin</url-pattern> <url-pattern>/signin</url-pattern>