Google Git
Sign in
eclipse/emf-store/org.eclipse.emf.emfstore.other/2b67db1263db9c797a5cafa6b91860d49008507e^!/.
commit
2b67db1263db9c797a5cafa6b91860d49008507e
[log]
author
Edgar Mueller <edgar.m.mueller@gmail.com>
Wed Nov 14 17:06:59 2012 +0100
committer
Edgar Mueller <edgar.m.mueller@gmail.com>
Wed Nov 14 17:06:59 2012 +0100
tree
9e0964200b04d73b1624161c4cdd468e52c64f41
parent
aa84810ea1ea3676a7746d45ff1e67b1c0ce993f [diff]
fixed compile errors
diff --git a/org.eclipse.emf.emfstore.client.backchannel.example/src/org/eclipse/emf/emfstore/backchannel/example/client/DemoBackchannelClient.java b/org.eclipse.emf.emfstore.client.backchannel.example/src/org/eclipse/emf/emfstore/backchannel/example/client/DemoBackchannelClient.java
index c0d7f3a..f46b4c5 100644
--- a/org.eclipse.emf.emfstore.client.backchannel.example/src/org/eclipse/emf/emfstore/backchannel/example/client/DemoBackchannelClient.java
+++ b/org.eclipse.emf.emfstore.client.backchannel.example/src/org/eclipse/emf/emfstore/backchannel/example/client/DemoBackchannelClient.java

@@ -16,8 +16,8 @@
 import org.eclipse.emf.emfstore.client.proxy.ProxyClient;
 import org.eclipse.emf.emfstore.common.model.util.ModelUtil;
 import org.eclipse.emf.emfstore.common.model.util.SerializationException;
-import org.eclipse.emf.emfstore.server.eventmanager.EMFStoreEventListener;
 import org.eclipse.emf.emfstore.server.exceptions.EmfStoreException;
+import org.eclipse.emf.emfstore.server.internal.eventmanager.EMFStoreEventListener;
 import org.eclipse.emf.emfstore.server.model.ProjectInfo;
 import org.eclipse.emf.emfstore.server.model.versioning.events.server.ServerEvent;
 

diff --git a/org.eclipse.emf.emfstore.client.backchannel/src/org/eclipse/emf/emfstore/client/backchannel/BackchannelConnectionManager.java b/org.eclipse.emf.emfstore.client.backchannel/src/org/eclipse/emf/emfstore/client/backchannel/BackchannelConnectionManager.java
index d52910b..69e30c0 100644
--- a/org.eclipse.emf.emfstore.client.backchannel/src/org/eclipse/emf/emfstore/client/backchannel/BackchannelConnectionManager.java
+++ b/org.eclipse.emf.emfstore.client.backchannel/src/org/eclipse/emf/emfstore/client/backchannel/BackchannelConnectionManager.java

@@ -16,10 +16,10 @@
 import org.eclipse.emf.emfstore.common.model.util.ModelUtil;
 import org.eclipse.emf.emfstore.server.backchannel.BackchannelInterface;
 import org.eclipse.emf.emfstore.server.backchannel.connection.server.XmlRpcBackchannelConnectionHandler;
-import org.eclipse.emf.emfstore.server.eventmanager.EMFStoreEventListener;
 import org.eclipse.emf.emfstore.server.exceptions.ConnectionException;
 import org.eclipse.emf.emfstore.server.exceptions.EmfStoreException;
 import org.eclipse.emf.emfstore.server.exceptions.UnknownSessionException;
+import org.eclipse.emf.emfstore.server.internal.eventmanager.EMFStoreEventListener;
 import org.eclipse.emf.emfstore.server.model.ProjectId;
 import org.eclipse.emf.emfstore.server.model.SessionId;
 import org.eclipse.emf.emfstore.server.model.versioning.events.server.ServerEvent;

diff --git a/org.eclipse.emf.emfstore.example.helloworld/src/org/eclipse/emf/emfstore/exampleclient/Application.java b/org.eclipse.emf.emfstore.example.helloworld/src/org/eclipse/emf/emfstore/exampleclient/Application.java
index a54c556..e8acd01 100644
--- a/org.eclipse.emf.emfstore.example.helloworld/src/org/eclipse/emf/emfstore/exampleclient/Application.java
+++ b/org.eclipse.emf.emfstore.example.helloworld/src/org/eclipse/emf/emfstore/exampleclient/Application.java

@@ -28,7 +28,6 @@
 import org.eclipse.emf.emfstore.server.model.ProjectInfo;
 import org.eclipse.emf.emfstore.server.model.versioning.LogMessage;
 import org.eclipse.emf.emfstore.server.model.versioning.VersioningFactory;
-import org.eclipse.emf.emfstore.server.startup.ConsoleProgressMonitor;
 import org.eclipse.equinox.app.IApplication;
 import org.eclipse.equinox.app.IApplicationContext;
 

diff --git a/org.eclipse.emf.emfstore.example.merging/src/org/eclipse/emf/emfstore/example/merging/Application.java b/org.eclipse.emf.emfstore.example.merging/src/org/eclipse/emf/emfstore/example/merging/Application.java
index b164d3d..dad6709 100644
--- a/org.eclipse.emf.emfstore.example.merging/src/org/eclipse/emf/emfstore/example/merging/Application.java
+++ b/org.eclipse.emf.emfstore.example.merging/src/org/eclipse/emf/emfstore/example/merging/Application.java

@@ -45,7 +45,6 @@
 import org.eclipse.emf.emfstore.server.model.versioning.VersioningFactory;
 import org.eclipse.emf.emfstore.server.model.versioning.Versions;
 import org.eclipse.emf.emfstore.server.model.versioning.operations.AbstractOperation;
-import org.eclipse.emf.emfstore.server.startup.ConsoleProgressMonitor;
 import org.eclipse.equinox.app.IApplication;
 import org.eclipse.equinox.app.IApplicationContext;
 

diff --git a/org.eclipse.emf.emfstore.server.backchannel/src/org/eclipse/emf/emfstore/server/backchannel/BackchannelImpl.java b/org.eclipse.emf.emfstore.server.backchannel/src/org/eclipse/emf/emfstore/server/backchannel/BackchannelImpl.java
index 5ee5e34..9f1d693 100644
--- a/org.eclipse.emf.emfstore.server.backchannel/src/org/eclipse/emf/emfstore/server/backchannel/BackchannelImpl.java
+++ b/org.eclipse.emf.emfstore.server.backchannel/src/org/eclipse/emf/emfstore/server/backchannel/BackchannelImpl.java

@@ -12,11 +12,11 @@
 
 import org.eclipse.emf.emfstore.server.accesscontrol.AuthorizationControl;
 import org.eclipse.emf.emfstore.server.core.AbstractEmfstoreInterface;
-import org.eclipse.emf.emfstore.server.eventmanager.EMFStoreEventListener;
-import org.eclipse.emf.emfstore.server.eventmanager.EventManager;
-import org.eclipse.emf.emfstore.server.eventmanager.ListenerContainer;
 import org.eclipse.emf.emfstore.server.exceptions.EmfStoreException;
 import org.eclipse.emf.emfstore.server.exceptions.FatalEmfStoreException;
+import org.eclipse.emf.emfstore.server.internal.eventmanager.EMFStoreEventListener;
+import org.eclipse.emf.emfstore.server.internal.eventmanager.EventManager;
+import org.eclipse.emf.emfstore.server.internal.eventmanager.ListenerContainer;
 import org.eclipse.emf.emfstore.server.model.ProjectId;
 import org.eclipse.emf.emfstore.server.model.ServerSpace;
 import org.eclipse.emf.emfstore.server.model.SessionId;

diff --git a/org.eclipse.emf.emfstore.server.backchannel/src/org/eclipse/emf/emfstore/server/backchannel/BackchannelInterface.java b/org.eclipse.emf.emfstore.server.backchannel/src/org/eclipse/emf/emfstore/server/backchannel/BackchannelInterface.java
index 12db973..c332fb9 100644
--- a/org.eclipse.emf.emfstore.server.backchannel/src/org/eclipse/emf/emfstore/server/backchannel/BackchannelInterface.java
+++ b/org.eclipse.emf.emfstore.server.backchannel/src/org/eclipse/emf/emfstore/server/backchannel/BackchannelInterface.java

@@ -11,8 +11,8 @@
 package org.eclipse.emf.emfstore.server.backchannel;
 
 import org.eclipse.emf.emfstore.server.EmfStoreInterface;
-import org.eclipse.emf.emfstore.server.eventmanager.EMFStoreEventListener;
 import org.eclipse.emf.emfstore.server.exceptions.EmfStoreException;
+import org.eclipse.emf.emfstore.server.internal.eventmanager.EMFStoreEventListener;
 import org.eclipse.emf.emfstore.server.model.ProjectId;
 import org.eclipse.emf.emfstore.server.model.SessionId;
 import org.eclipse.emf.emfstore.server.model.versioning.events.server.ServerEvent;

diff --git a/org.eclipse.emf.emfstore.server.backchannel/src/org/eclipse/emf/emfstore/server/backchannel/connection/server/XmlRpcBackchannelConnectionHandler.java b/org.eclipse.emf.emfstore.server.backchannel/src/org/eclipse/emf/emfstore/server/backchannel/connection/server/XmlRpcBackchannelConnectionHandler.java
index 835f8a5..96d40f5 100644
--- a/org.eclipse.emf.emfstore.server.backchannel/src/org/eclipse/emf/emfstore/server/backchannel/connection/server/XmlRpcBackchannelConnectionHandler.java
+++ b/org.eclipse.emf.emfstore.server.backchannel/src/org/eclipse/emf/emfstore/server/backchannel/connection/server/XmlRpcBackchannelConnectionHandler.java

@@ -13,7 +13,7 @@
 import org.eclipse.emf.emfstore.server.accesscontrol.AuthenticationControl;

 import org.eclipse.emf.emfstore.server.backchannel.BackchannelInterface;

 import org.eclipse.emf.emfstore.server.connection.ConnectionHandler;

-import org.eclipse.emf.emfstore.server.connection.xmlrpc.XmlRpcWebserverManager;

+import org.eclipse.emf.emfstore.server.connection.internal.xmlrpc.XmlRpcWebserverManager;

 import org.eclipse.emf.emfstore.server.exceptions.FatalEmfStoreException;

 

 /**


diff --git a/org.eclipse.emf.emfstore.server.backchannel/src/org/eclipse/emf/emfstore/server/backchannel/connection/server/XmlRpcBackchannelImpl.java b/org.eclipse.emf.emfstore.server.backchannel/src/org/eclipse/emf/emfstore/server/backchannel/connection/server/XmlRpcBackchannelImpl.java
index f59d35d..adb5952 100644
--- a/org.eclipse.emf.emfstore.server.backchannel/src/org/eclipse/emf/emfstore/server/backchannel/connection/server/XmlRpcBackchannelImpl.java
+++ b/org.eclipse.emf.emfstore.server.backchannel/src/org/eclipse/emf/emfstore/server/backchannel/connection/server/XmlRpcBackchannelImpl.java

@@ -11,8 +11,8 @@
 package org.eclipse.emf.emfstore.server.backchannel.connection.server;

 

 import org.eclipse.emf.emfstore.server.backchannel.BackchannelInterface;

-import org.eclipse.emf.emfstore.server.eventmanager.EMFStoreEventListener;

 import org.eclipse.emf.emfstore.server.exceptions.EmfStoreException;

+import org.eclipse.emf.emfstore.server.internal.eventmanager.EMFStoreEventListener;

 import org.eclipse.emf.emfstore.server.model.ProjectId;

 import org.eclipse.emf.emfstore.server.model.SessionId;

 import org.eclipse.emf.emfstore.server.model.versioning.events.server.ServerEvent;