Changeset 1453

Timestamp:

11/07/08 10:01:24 (2 months ago)

Author:

marcelo

Message:

new http protocol

Location:

branches/dev-instedd

Files:

• org.javarosa.demo/src/org/javarosa/demo/shell/JavaRosaDemoShell.java (modified) (2 diffs)
• org.javarosa.mesh4j.sync.extensions/src/org/javarosa/core/services/mesh4j/extensions/SyncEngineService.java (modified) (3 diffs)

branches/dev-instedd/org.javarosa.demo/src/org/javarosa/demo/shell/JavaRosaDemoShell.java

@@ -126 +126 @@
                         
                 } else if (returningActivity instanceof SplashScreenModule) {
-                        
                         LoggedUserIdentityProvider.INSTANCE.setLoggedUser("admin");
                         launchActivity(new FormListActivity(this, "Forms List"), context);
@@ -353 +352 @@
                 initProperty(Mesh4jPropertyRules.SMS_BLOCK_DIFF_SIZE, "100");
                 initProperty(Mesh4jPropertyRules.SMS_MAX_MESSAGE_LENGHT, "140", true);
-                initProperty(Mesh4jPropertyRules.SMS_DEFAULT_TARGET, "+5550001");
+                initProperty(Mesh4jPropertyRules.SMS_DEFAULT_TARGET, "+5550001", true);
                 initProperty(Mesh4jPropertyRules.SMS_PORT, "3333", true);
                 initProperty(Mesh4jPropertyRules.USE_TEMPLATES, Mesh4jPropertyRules.USE_TEMPLATES_NO);
-//              initProperty(Mesh4jPropertyRules.HTTP_SYNC_BASE_URL, "http://vcc-pc:8080/Mesh4j/feeds/", true);
-//              initProperty(Mesh4jPropertyRules.HTTP_DISCOVERY_XFORMS_URL, "http://vcc-pc:8080/Mesh4j/feeds/XForms", true);
-                initProperty(Mesh4jPropertyRules.HTTP_SYNC_BASE_URL, "http://sync.instedd.org/Service.svc/feeds/");
-                initProperty(Mesh4jPropertyRules.HTTP_DISCOVERY_XFORMS_URL, "http://sync.instedd.org/Service.svc/feeds/XForms");
+                initProperty(Mesh4jPropertyRules.HTTP_SYNC_BASE_URL, "http://vcc-pc:8080/mesh4x/feeds/", true);
+                initProperty(Mesh4jPropertyRules.HTTP_DISCOVERY_XFORMS_URL, "http://vcc-pc:8080/mesh4x/feeds/XForms", true);
+//              initProperty(Mesh4jPropertyRules.HTTP_SYNC_BASE_URL, "http://sync.instedd.org/Service.svc/feeds/");
+//              initProperty(Mesh4jPropertyRules.HTTP_DISCOVERY_XFORMS_URL, "http://sync.instedd.org/Service.svc/feeds/XForms");
         }
 

branches/dev-instedd/org.javarosa.mesh4j.sync.extensions/src/org/javarosa/core/services/mesh4j/extensions/SyncEngineService.java

@@ -18 +18 @@
 import org.javarosa.xform.util.XFormUtils;
 import org.mesh4j.sync.SyncEngine;
+import org.mesh4j.sync.adapters.feed.atom.AtomSyndicationFormat;
 import org.mesh4j.sync.adapters.feed.rss.RssSyndicationFormat;
 import org.mesh4j.sync.adapters.http.HttpSyncAdapter;
@@ -103 +104 @@
         // SYnc METHODS
         public static Vector<Item> synchronizeItemsSynchronousHttpMethod(String formName) {
-                String url = getBaseURL()+ formName;
+                String url = getBaseURL()+ formName + "?format=atom10";
                 SplitAdapter splitAdapter = makeXFormSplitAdapter(formName);
-                HttpSyncAdapter httpAdapter = new HttpSyncAdapter(url, RssSyndicationFormat.INSTANCE, LoggedUserIdentityProvider.INSTANCE, IdGenerator.INSTANCE);
+                HttpSyncAdapter httpAdapter = new HttpSyncAdapter(url, AtomSyndicationFormat.INSTANCE, LoggedUserIdentityProvider.INSTANCE, IdGenerator.INSTANCE);
                 SyncEngine syncEngine = new SyncEngine(splitAdapter, httpAdapter);
                 Vector<Item> conflicts = syncEngine.synchronize();
@@ -150 +151 @@
 
         public static void importFormDefFromURL() {
-                String url = JavaRosaServiceProvider.instance().getPropertyManager().getSingularProperty(Mesh4jPropertyRules.HTTP_DISCOVERY_XFORMS_URL);
-                HttpSyncAdapter httpAdapter = new HttpSyncAdapter(url, RssSyndicationFormat.INSTANCE, LoggedUserIdentityProvider.INSTANCE, IdGenerator.INSTANCE);
+                String url = JavaRosaServiceProvider.instance().getPropertyManager().getSingularProperty(Mesh4jPropertyRules.HTTP_DISCOVERY_XFORMS_URL) + "?format=atom10";
+                HttpSyncAdapter httpAdapter = new HttpSyncAdapter(url, AtomSyndicationFormat.INSTANCE, LoggedUserIdentityProvider.INSTANCE, IdGenerator.INSTANCE);
                 Vector<Item> items = httpAdapter.getAll();