Changeset 46805 for Apogee/trunk/sync

Timestamp:

06/28/06 14:24:15 (2 years ago)

Author:

cbosdonnat

Message:

Adapted to Funambol 3.0 beta 4 api

Files:

• Apogee/trunk/sync/org.nuxeo.sync.jcr.client/build/build.xml (modified) (2 diffs)
• Apogee/trunk/sync/org.nuxeo.sync.jcr.client/config/spds/sources/SyncSource.properties (modified) (2 diffs)
• Apogee/trunk/sync/org.nuxeo.sync.jcr.extensions/build/build.xml (modified) (1 diff)
• Apogee/trunk/sync/org.nuxeo.sync.jcr/src/java/org/nuxeo/sync/jcr/source/JCRSyncSource.java (modified) (4 diffs)

Apogee/trunk/sync/org.nuxeo.sync.jcr.client/build/build.xml

@@ -28 +28 @@
-        <mkdir dir="${prj.output}/bin"/>
-        
-        <javac classpathref="client.class.path"
-            srcdir="${prj.src}"
-            destdir="${prj.output}/bin" />
-        
-        <ant dir="../org.nuxeo.sync.jcr.extensions/build/" 
-            target="localhandler.deliver" inheritall="false">
@@ -37 +33 @@
-            <property name="dest" value="../../org.nuxeo.sync.jcr.client/lib"/>
-        </ant>
+        
+        <javac classpathref="client.class.path"
+            srcdir="${prj.src}"
+            destdir="${prj.output}/bin" />
-        
-    </target>

Apogee/trunk/sync/org.nuxeo.sync.jcr.client/config/spds/sources/SyncSource.properties

@@ -1 @@
-#
-#Mon May 29 13:06:04 CEST 2006
-jcrpassword=password
-name=jackrabbit_foo
@@ -8 +6 @@
-type=text/plain
-jcrhandler=org.nuxeo.sync.jcr.extensions.LocalHandler
-last=1148900761212
-jcrusername=username

Apogee/trunk/sync/org.nuxeo.sync.jcr.extensions/build/build.xml

@@ -68 +68 @@
-        
-        <copy todir="${dest}" file="${prj.output}/LocalHandler.jar" />
+        
+        <copy todir="${dest}">
+            <fileset dir="${prj}/lib">
+                <include name="*.jar"/>
+            </fileset>
+        </copy>
-        
-        <!-- Cleans the output -->

Apogee/trunk/sync/org.nuxeo.sync.jcr/src/java/org/nuxeo/sync/jcr/source/JCRSyncSource.java

@@ -358 +358 @@
-                    syncItemKey);
-            
-
+
+
-            syncItem.setContent(JCRHelper.getNodeContent(__session, 
-                    syncItemKey.getKeyAsString()));
@@ -364 +365 @@
-        
-        return syncItem;
-    }
-
-    /*
-     *  (non-Javadoc)
-     * @see com.funambol.framework.engine.source.SyncSource#removeSyncItem(com.funambol.framework.engine.SyncItemKey, java.sql.Timestamp)
-     */
-    public void removeSyncItem(SyncItemKey syncItemKey, Timestamp time)
-            throws SyncSourceException {
-
-        log.info("[JCRSyncSource] removeSyncItem(" +
-                           principal    +
-                           " , "        +
-                           syncItemKey  +
-                           " , "        +
-                           time         +
-                           ")");
-        
-    }
-
@@ -425 +409 @@
-
-        try {
-            
-            ;
-            
-            JCRHelper.addContentAsNode(__session, 
-                    syncItem.getKey().getKeyAsString(), 
@@ -450 +431 @@
-
-        return new SyncItemKey[0];
-    }
-
-    /*
-     *  (non-Javadoc)
-     * @see com.funambol.framework.engine.source.SyncSource#getSyncItemStateFromId(com.funambol.framework.engine.SyncItemKey)
-     */
-    public char getSyncItemStateFromId(SyncItemKey key) throws SyncSourceException {
-        
-        // TODO
-
-        return 'N';
-    }
-
-    /*
-     *  (non-Javadoc)
-     * @see com.funambol.framework.engine.source.SyncSource#mergeSyncItems(com.funambol.framework.engine.SyncItemKey, com.funambol.framework.engine.SyncItem)
-     */
-    public boolean mergeSyncItems(SyncItemKey syncItemKey, SyncItem syncItem)
-            throws SyncSourceException {
-
-        // TODO
-        return false;
-    }
-
-    /*
-     *  (non-Javadoc)
-     * @see com.funambol.framework.engine.source.SyncSource#isSyncItemInFilterClause(com.funambol.framework.engine.SyncItem)
-     */
-    public boolean isSyncItemInFilterClause(SyncItem syncItem)
-            throws SyncSourceException {
-        // All the workspace items are in the clause.
-        return true;
-    }
-
-    /*
-     *  (non-Javadoc)
-     * @see com.funambol.framework.engine.source.SyncSource#isSyncItemInFilterClause(com.funambol.framework.engine.SyncItemKey)
-     */
-    public boolean isSyncItemInFilterClause(SyncItemKey syncItemKey)
-            throws SyncSourceException {
-        
-        // All the workspace items are in the clause.
-        return true;
-    }
-