Implement filesystem sync in Eclipse Flux

node.server/repository-message-api.js

@@ -235,8 +235,11 @@ MessagesRepository.prototype.resourceCreated = function(data) {
 	var hash = data.hash;
 	var type = data.type;
 
+	var repoProject = this.repository._getProjectStorage(username, projectName);
+	var repoResource = repoProject.resources[resource];
+
 	this.repository.hasResource(username, projectName, resource, function(err, resourceExists) {
-		if (err === null && !resourceExists) {
+		if (err === null && (!resourceExists || repoResource.hash !== hash)) {
 			this.socket.emit('getResourceRequest', {
 				'callback_id' : 0,
 				'username' : username,

org.eclipse.flux.client.java/src/main/java/org/eclipse/flux/client/IMessageHandler.java

@@ -19,6 +19,25 @@
  *
  */
 public interface IMessageHandler {
+    public static final String GET_PROJECT_REQUEST = "getProjectRequest";
+    public static final String GET_PROJECT_RESPONSE = "getProjectResponse";
+    public static final String GET_PROJECTS_REQUEST = "getProjectsRequest";
+    public static final String GET_PROJECTS_RESPONSE = "getProjectsResponse";
+    public static final String GET_LIVE_RESOURCE_REQUEST = "getLiveResourcesRequest";
+    public static final String GET_METADATA_REQUEST = "getMetadataRequest";
+    public static final String GET_METADATA_RESPONSE = "getMetadataResponse";
+    public static final String GET_RESOURCE_REQUEST = "getResourceRequest";
+    public static final String GET_RESOURCE_RESPONSE = "getResourceResponse";
+    public static final String LIVE_RESOURCE_STARTED = "liveResourceStarted";
+    public static final String LIVE_RESOURCE_STARTED_RESPONSE = "liveResourceStartedResponse";
+    public static final String LIVE_RESOURCE_CHANGED = "liveResourceChanged";
+    public static final String METADATA_CHANGED = "metadataChanged";
+    public static final String PROJECT_CONNECTED = "projectConnected";
+    public static final String PROJECT_DISCONNECTED = "projectDisconnected";
+    public static final String RESOURCE_CHANGED = "resourceChanged";
+    public static final String RESOURCE_CREATED = "resourceCreated";
+    public static final String RESOURCE_DELETED = "resourceDeleted";
+    public static final String RESOURCE_STORED = "resourceStored";
 
 	boolean canHandle(String type, JSONObject message);
 

org.eclipse.flux.client.java/src/main/java/org/eclipse/flux/client/MessageConstants.java

@@ -56,5 +56,28 @@ public abstract class MessageConstants {
 	 * Name of the Flux super user.
 	 */
 	public static final String SUPER_USER = "$super$";
-
+
+    public static final String CHANNEL = "channel";
+    public static final String CONNECTED_TO_CHANNEL = "connectedToChannel";
+    public static final String CONTENT = "content";
+    public static final String DELETED = "deleted";
+    public static final String FILES = "files";
+    public static final String HASH = "hash";
+    public static final String INCLUDE_DELETED = "includeDeleted";
+    public static final String PATH = "path";
+    public static final String RESOURCE = "resource";
+    public static final String TIMESTAMP = "timestamp";
+    public static final String TYPE = "type";
+    public static final String SAVE_POINT_HASH = "savePointHash";
+    public static final String SAVE_POINT_TIMESTAMP = "savePointTimestamp";
+    public static final String LIVE_CONTENT = "liveContent";
+    public static final String OFFSET = "offset";
+    public static final String REMOVED_CHAR_COUNT = "removedCharCount";
+    public static final String ADDED_CHARACTERS = "addedCharacters";
+    public static final String PROJECT_REG_EX = "projectRegEx";
+    public static final String RESOURCE_REG_EX = "resourceRegEx";
+    public static final String METADATA = "metadata";
+    public static final String PROJECTS = "projects";
+    public static final String NAME = "name";
+    public static final String MARKER = "marker";
 }

org.eclipse.flux.core/META-INF/MANIFEST.MF

@@ -14,7 +14,9 @@ Require-Bundle: org.eclipse.flux.client.java.osgi,
  org.eclipse.core.runtime,
  org.apache.commons.io,
  org.eclipse.jdt.core,
- org.eclipse.m2e.core;resolution:=optional
+ org.eclipse.m2e.core;resolution:=optional,
+ org.eclipse.flux.watcher;bundle-version="1.0.0",
+ com.google.inject;bundle-version="3.0.0"
 Export-Package: org.eclipse.flux.core,
  org.eclipse.flux.core.util
 Bundle-ActivationPolicy: lazy; exclude:="io.socket, org.java_websocket, org.java_websocket.client, org.java_websocket.drafts, org.java_websocket.exceptions, org.java_websocket.framing, org.java_websocket.handshake, org.java_websocket.server, org.java_websocket.util, org.json"

org.eclipse.flux.core/src/org/eclipse/flux/core/Activator.java

@@ -10,6 +10,7 @@
 *******************************************************************************/
 package org.eclipse.flux.core;
 
+import java.net.URL;
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.concurrent.Executors;
@@ -35,11 +36,15 @@
 import org.eclipse.flux.client.MessageConstants;
 import org.eclipse.flux.client.config.SocketIOFluxConfig;
 import org.eclipse.flux.core.internal.CloudSyncMetadataListener;
-import org.eclipse.flux.core.internal.CloudSyncResourceListener;
 import org.eclipse.flux.core.util.ExceptionUtil;
+import org.eclipse.flux.watcher.core.RepositoryModule;
+import org.eclipse.flux.watcher.fs.JDKProjectModule;
 import org.osgi.framework.BundleContext;
 import org.osgi.service.prefs.BackingStoreException;
 
+import com.google.inject.Guice;
+import com.google.inject.Injector;
+
 /**
  * @author Martin Lippert
  * @author Miles Parker
@@ -57,11 +62,10 @@ public class Activator extends Plugin {
 	private MessageConnector messageConnector;
 	private ChannelSwitcher channelSwitcher;
 
-	private Repository repository;
+	private RepositoryAdapter repository;
 	private LiveEditCoordinator liveEditCoordinator;
 	private boolean lazyStart = false;
 
-	private CloudSyncResourceListener resourceListener;
 	private CloudSyncMetadataListener metadataListener;
 	private IRepositoryListener repositoryListener;
 	private IResourceChangeListener workspaceListener;
@@ -109,6 +113,7 @@ public void start(BundleContext context) throws Exception {
 
 			final String userChannel = lazyStart ? MessageConstants.SUPER_USER : channel;
 
+			Injector injector = Guice.createInjector(new RepositoryModule(), new JDKProjectModule());
 			//Connecting to channel done asynchronously. To avoid blocking plugin state initialization.
 			FluxClient.DEFAULT_INSTANCE.getExecutor().execute(new Runnable() {
 				@Override
@@ -165,14 +170,11 @@ public void stop(BundleContext context) throws Exception {
 	}
 
 	private void initCoreService(String userChannel) throws CoreException {
-		repository = new Repository(messageConnector, userChannel);
+		repository = new RepositoryAdapter(messageConnector, userChannel);
 		liveEditCoordinator = new LiveEditCoordinator(messageConnector);
 
 		IWorkspace workspace = ResourcesPlugin.getWorkspace();
 
-		resourceListener = new CloudSyncResourceListener(repository);
-		workspace.addResourceChangeListener(resourceListener, IResourceChangeEvent.POST_CHANGE);
-
 		metadataListener = new CloudSyncMetadataListener(repository);
 		workspace.addResourceChangeListener(metadataListener, IResourceChangeEvent.POST_BUILD);
 
@@ -225,7 +227,6 @@ private void disposeCoreServices(String userChannel) {
 		if (userChannel.equals(repository.getUsername())) {
 			IWorkspace workspace = ResourcesPlugin.getWorkspace();
 			workspace.removeResourceChangeListener(workspaceListener);
-			workspace.removeResourceChangeListener(resourceListener);
 			workspace.removeResourceChangeListener(metadataListener);
 			repository.removeRepositoryListener(repositoryListener);
 			liveEditCoordinator.dispose();
@@ -242,7 +243,7 @@ private void updateProjectConnections() throws CoreException {
 				if (!project.isOpen()) {
 					project.open(null);
 				}
-				Repository repository = org.eclipse.flux.core.Activator.getDefault()
+				RepositoryAdapter repository = org.eclipse.flux.core.Activator.getDefault()
 						.getRepository();
 				repository.addProject(project);
 			}
@@ -310,7 +311,7 @@ public MessageConnector getMessageConnector() {
 		return messageConnector;
 	}
 
-	public Repository getRepository() {
+	public RepositoryAdapter getRepository() {
 		return repository;
 	}
 

org.eclipse.flux.core/src/org/eclipse/flux/core/ConnectedProject.java

@@ -10,93 +10,78 @@
 *******************************************************************************/
 package org.eclipse.flux.core;
 
-import java.io.IOException;
 import java.io.InputStream;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-
-import org.apache.commons.codec.digest.DigestUtils;
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
 import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceVisitor;
-import org.eclipse.core.runtime.CoreException;
+import org.eclipse.flux.watcher.core.Resource;
+import org.eclipse.flux.watcher.core.spi.Project;
 
 /**
  * @author Martin Lippert
  */
 public class ConnectedProject {
-
-	private IProject project;
-	private Map<String, String> resourceHash;
-	private Map<String, Long> resourceTimestamp;
-
-	public ConnectedProject(IProject project) {
-		this.project = project;
-		this.resourceHash = new ConcurrentHashMap<String, String>();
-		this.resourceTimestamp = new ConcurrentHashMap<String, Long>();
-
-		try {
-			project.refreshLocal(IResource.DEPTH_INFINITE, null);
-			project.accept(new IResourceVisitor() {
-				@Override
-				public boolean visit(IResource resource) throws CoreException {
-					String path = resource.getProjectRelativePath().toString();
-					ConnectedProject.this.setTimestamp(path, resource.getLocalTimeStamp());
-
-					if (resource instanceof IFile) {
-						try {
-							IFile file = (IFile) resource;
-							ConnectedProject.this.setHash(path, DigestUtils.shaHex(file.getContents()));
-						} catch (IOException e) {
-							e.printStackTrace();
-						}
-					}
-					else if (resource instanceof IFolder) {
-						ConnectedProject.this.setHash(path, "0");
-					}
-
-					return true;
-				}
-			}, IResource.DEPTH_INFINITE, IContainer.EXCLUDE_DERIVED);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
 
-	}
-
-	public IProject getProject() {
-		return project;
-	}
-
-	public String getName() {
-		return this.project.getName();
-	}
+    private String name;
+    private Project project;
+
+    public ConnectedProject(Project project) {
+        this.project = project;
+        this.name = project.id();
+    }
+
+    public IProject getProject() {
+        return null;
+    }
+
+    public String getName() {
+        return this.project.id();
+    }
+
+    public static ConnectedProject readFromJSON(InputStream inputStream, IProject project) {
+        return null;
+    }
+
+    public long getTimestamp(String resourcePath) {
+        Resource resource = this.project.getResource(resourcePath);
+        return resource.timestamp();
+    }
+
+    public String getHash(String resourcePath) {
+        Resource resource = this.project.getResource(resourcePath);
+        return resource.hash();
+    }
+
+    public boolean containsResource(String resourcePath) {
+        return this.project.hasResource(resourcePath);
+    }
 
-	public static ConnectedProject readFromJSON(InputStream inputStream, IProject project) {
-		return new ConnectedProject(project);
-	}
-
-	public void setTimestamp(String resourcePath, long newTimestamp) {
-		this.resourceTimestamp.put(resourcePath, newTimestamp);
-	}
-
-	public long getTimestamp(String resourcePath) {
-		return this.resourceTimestamp.get(resourcePath);
-	}
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = 1;
+        result = prime * result + ((name == null) ? 0 : name.hashCode());
+        return result;
+    }
 
-	public void setHash(String resourcePath, String hash) {
-		this.resourceHash.put(resourcePath, hash);
-	}
-
-	public String getHash(String resourcePath) {
-		return this.resourceHash.get(resourcePath);
-	}
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj) {
+            return true;
+        }
+        if (obj == null) {
+            return false;
+        }
+        if (!(obj instanceof ConnectedProject)) {
+            return false;
+        }
+        ConnectedProject other = (ConnectedProject)obj;
+        if (name == null) {
+            if (other.name != null) {
+                return false;
+            }
+        } else if (!name.equals(other.name)) {
+            return false;
+        }
+        return true;
+    }
 
-	public boolean containsResource(String resourcePath) {
-		return this.resourceTimestamp.containsKey(resourcePath);
-	}
-
 }