fergalmoran/chrometophone
1
0
Fork 0
mirror of https://github.com/fergalmoran/chrometophone.git synced 2025-12-22 09:41:51 +00:00
Code Issues 265 Packages Projects Releases Wiki Activity

Update SDK. Turn on experiment.

Browse Source
This commit is contained in:
burke.davey
2010-10-24 19:26:30 +00:00
parent b99b5d2ca7
commit c65fcced21
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
appengine/.classpath
View File

@@ -3,6 +3,6 @@
<classpathentry kind="src" path="src"/> <classpathentry kind="src" path="src"/>
<classpathentry kind="src" path="c2dm"/> <classpathentry kind="src" path="c2dm"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="com.google.appengine.eclipse.core.GAE_CONTAINER/App Engine"/> <classpathentry kind="con" path="com.google.appengine.eclipse.core.GAE_CONTAINER/App Engine (2)"/>
<classpathentry kind="output" path="war/WEB-INF/classes"/> <classpathentry kind="output" path="war/WEB-INF/classes"/>
</classpath> </classpath>

4
appengine/.settings/com.google.appengine.eclipse.core.prefs
View File

@@ -1,4 +1,4 @@
#Sun Aug 29 18:14:05 BST 2010 #Sun Oct 24 20:19:26 BST 2010
eclipse.preferences.version=1 eclipse.preferences.version=1
filesCopiedToWebInfLib=appengine-api-1.0-sdk-1.3.6.jar|appengine-api-labs-1.3.6.jar|appengine-jsr107cache-1.3.6.jar|jsr107cache-1.1.jar|datanucleus-appengine-1.0.7.final.jar|datanucleus-core-1.1.5.jar|datanucleus-jpa-1.1.5.jar|geronimo-jpa_3.0_spec-1.1.1.jar|geronimo-jta_1.1_spec-1.1.1.jar|jdo2-api-2.3-eb.jar filesCopiedToWebInfLib=appengine-api-1.0-sdk-1.3.8.jar|appengine-api-labs-1.3.8.jar|appengine-jsr107cache-1.3.8.jar|jsr107cache-1.1.jar|datanucleus-appengine-1.0.7.final.jar|datanucleus-core-1.1.5.jar|datanucleus-jpa-1.1.5.jar|geronimo-jpa_3.0_spec-1.1.1.jar|geronimo-jta_1.1_spec-1.1.1.jar|jdo2-api-2.3-eb.jar
ormEnhancementInclusions=src/**|c2dm/** ormEnhancementInclusions=src/**|c2dm/**

4
appengine/src/com/google/android/chrometophone/server/RegisterServlet.java
View File

@@ -17,7 +17,6 @@
package com.google.android.chrometophone.server; package com.google.android.chrometophone.server;
import java.io.IOException; import java.io.IOException;
import java.io.PrintWriter;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import java.util.logging.Level; import java.util.logging.Level;
@@ -168,7 +167,8 @@ public class RegisterServlet extends HttpServlet {
pm.makePersistent(device); pm.makePersistent(device);
if (device.getType().equals(DeviceInfo.TYPE_CHROME)) { if (device.getType().equals(DeviceInfo.TYPE_CHROME)) {
if (device.getPhoneToChromeExperimentEnabled()) { // if (device.getPhoneToChromeExperimentEnabled()) {
if (true) {
String channelId = String channelId =
ChannelServiceFactory.getChannelService().createChannel(deviceRegistrationId); ChannelServiceFactory.getChannelService().createChannel(deviceRegistrationId);
resp.getWriter().println(OK_STATUS + " " + channelId); resp.getWriter().println(OK_STATUS + " " + channelId);