Fixes for compiler warnings

12 files changed, 20 insertions, 42 deletions

diff --git a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/app/Connector.java b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/app/Connector.java
index 81d802f05..8f1cdba68 100644
--- a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/app/Connector.java
+++ b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/app/Connector.java
@@ -17,15 +17,13 @@ public class Connector {
 	public static final String DEFAULT_SERVERNAME = TCPServerSOContainer.DEFAULT_NAME;
 	public static final String DEFAULT_PROTOCOL = TCPServerSOContainer.DEFAULT_PROTOCOL;
 	
-	private final ServerConfigParser parser;
 	int port = DEFAULT_PORT;
 	int timeout = DEFAULT_TIMEOUT;
 	String protocol = DEFAULT_PROTOCOL;
 	String hostname = DEFAULT_HOSTNAME;
 	List groups = new ArrayList();
 	
-	public Connector(ServerConfigParser parser, String protocol, String host, int port, int timeout) {
-		this.parser = parser;
+	public Connector(String protocol, String host, int port, int timeout) {
 		if (protocol != null && !protocol.equals("")) this.protocol = protocol;
 		if (host != null && !host.equals("")) this.hostname = host;
 		else {
diff --git a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/app/NamedGroup.java b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/app/NamedGroup.java
index 84beb1952..34f9ac381 100644
--- a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/app/NamedGroup.java
+++ b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/app/NamedGroup.java
@@ -19,8 +19,8 @@ public class NamedGroup {
 	public String getIDForGroup() {
 		return parent.getID()+getName();
 	}
-	protected String cleanGroupName(String name) {
-		String res = ((name.startsWith("/"))?name:"/"+name);
+	protected String cleanGroupName(String n) {
+		String res = ((n.startsWith("/"))?n:"/"+n);
 		return res;
 	}
 }
\ No newline at end of file
diff --git a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/app/ServerConfigParser.java b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/app/ServerConfigParser.java
index c2aa10939..9a8737d72 100644
--- a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/app/ServerConfigParser.java
+++ b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/app/ServerConfigParser.java
@@ -79,7 +79,7 @@ public class ServerConfigParser {
 			}
 			String prot = getAttributeValue(n,PROTOCOL_ATTR);
 			String host = getAttributeValue(n,HOSTNAME_ATTR);
-			Connector c = new Connector(this, prot,host,port,timeout);
+			Connector c = new Connector(prot,host,port,timeout);
 			processConnector(n,c);
 			res.add(c);
 		}
diff --git a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/comm/tcp/ExObjectInputStream.java b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/comm/tcp/ExObjectInputStream.java
index ea6483d87..f3f58a88a 100644
--- a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/comm/tcp/ExObjectInputStream.java
+++ b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/comm/tcp/ExObjectInputStream.java
@@ -17,7 +17,6 @@ import java.io.ObjectInputStream;
 import org.eclipse.ecf.provider.Trace;
 
 public class ExObjectInputStream extends ObjectInputStream {
-    private boolean replace = false;
     public static final Trace debug = Trace.create("connection");
 
     public ExObjectInputStream(InputStream in) throws IOException,
@@ -31,7 +30,6 @@ public class ExObjectInputStream extends ObjectInputStream {
         if (backwardCompatibility) {
             try {
                 super.enableResolveObject(true);
-                replace = true;
                 debug("resolveObject");
             } catch (Exception e) {
                 throw new IOException(
diff --git a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/comm/tcp/ExObjectOutputStream.java b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/comm/tcp/ExObjectOutputStream.java
index 980499efd..230cc8a02 100644
--- a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/comm/tcp/ExObjectOutputStream.java
+++ b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/comm/tcp/ExObjectOutputStream.java
@@ -17,7 +17,6 @@ import java.io.OutputStream;
 import org.eclipse.ecf.provider.Trace;
 
 public class ExObjectOutputStream extends ObjectOutputStream {
-    private boolean replace = false;
     public static final Trace debug = Trace.create("connection");
 
     public ExObjectOutputStream(OutputStream out) throws IOException {
@@ -30,7 +29,6 @@ public class ExObjectOutputStream extends ObjectOutputStream {
         if (backwardCompatibility) {
             try {
                 super.enableReplaceObject(true);
-                replace = true;
                 debug("replaceObject");
             } catch (Exception e) {
                 throw new IOException(
diff --git a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/ClientSOContainer.java b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/ClientSOContainer.java
index 526259cdd..33ab6b2d8 100644
--- a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/ClientSOContainer.java
+++ b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/ClientSOContainer.java
@@ -231,7 +231,6 @@ public abstract class ClientSOContainer extends SOContainer {
 		if (vc == null)
 			throw new IOException("view change message is null");
 		ID fromID = mess.getFromContainerID();
-		ID toID = mess.getToContainerID();
 		if (fromID == null || !fromID.equals(remoteServerID)) {
 			throw new IOException("view change message from " + fromID
 					+ " is not same as " + remoteServerID);
diff --git a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/SOContainer.java b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/SOContainer.java
index e6d285ead..7c5923d23 100644
--- a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/SOContainer.java
+++ b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/SOContainer.java
@@ -294,7 +294,7 @@ public abstract class SOContainer implements ISharedObjectContainer {
 			throw new SharedObjectAddException(
 					"Object id is null, or instance is null");
 		}
-		ISharedObject so = addSharedObject0(sd, s);
+		addSharedObject0(sd, s);
 		// Wait right here until committed
 		if (t != null)
 			t.waitToCommit();
@@ -636,7 +636,6 @@ public abstract class SOContainer implements ISharedObjectContainer {
 				.getData();
 		ID fromID = mess.getFromContainerID();
 		ID toID = mess.getToContainerID();
-		long seq = mess.getSequence();
 		Object checkCreateResult = null;
 		ID sharedObjectID = desc.getID();
 		// Check to make sure that the remote creation is allowed.
@@ -695,7 +694,6 @@ public abstract class SOContainer implements ISharedObjectContainer {
 		debug("handleCreateResponseMessage:" + mess);
 		ID fromID = mess.getFromContainerID();
 		ID toID = mess.getToContainerID();
-		long seq = mess.getSequence();
 		ContainerMessage.CreateResponseMessage resp = (ContainerMessage.CreateResponseMessage) mess
 				.getData();
 		if (toID != null && toID.equals(getID())) {
@@ -722,7 +720,6 @@ public abstract class SOContainer implements ISharedObjectContainer {
 		debug("handleSharedObjectDisposeMessage:" + mess);
 		ID fromID = mess.getFromContainerID();
 		ID toID = mess.getToContainerID();
-		long seq = mess.getSequence();
 		ContainerMessage.SharedObjectDisposeMessage resp = (ContainerMessage.SharedObjectDisposeMessage) mess
 				.getData();
 		ID sharedObjectID = resp.getSharedObjectID();
@@ -845,16 +842,16 @@ public abstract class SOContainer implements ISharedObjectContainer {
 		return new SOConfig(sd.getID(), homeID, this, sd.getProperties());
 	}
 
-	protected SOContext makeSharedObjectContext(SOConfig config,
+	protected SOContext makeSharedObjectContext(SOConfig soconfig,
 			IQueueEnqueue queue) {
-		return new SOContext(config.getSharedObjectID(), config
-				.getHomeContainerID(), this, config.getProperties(), queue);
+		return new SOContext(soconfig.getSharedObjectID(), soconfig
+				.getHomeContainerID(), this, soconfig.getProperties(), queue);
 	}
 
-	protected SOContext makeRemoteSharedObjectContext(SOConfig config,
+	protected SOContext makeRemoteSharedObjectContext(SOConfig soconfig,
 			IQueueEnqueue queue) {
-		return new SOContext(config.getSharedObjectID(), config
-				.getHomeContainerID(), this, config.getProperties(), queue);
+		return new SOContext(soconfig.getSharedObjectID(), soconfig
+				.getHomeContainerID(), this, soconfig.getProperties(), queue);
 	}
 
 	protected SOWrapper makeSharedObjectWrapper(SharedObjectDescription sd,
diff --git a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/SOManager.java b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/SOManager.java
index c5a8334b7..a56d4dc4f 100644
--- a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/SOManager.java
+++ b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/SOManager.java
@@ -161,7 +161,6 @@ public class SOManager implements ISharedObjectManager {
 		container.fireContainerEvent(new SharedObjectManagerCreateEvent(
 				container.getID(), sd));
 		ISharedObject newObject = null;
-		Throwable t = null;
 		ID result = sharedObjectID;
 		try {
 			newObject = loadSharedObject(sd);
@@ -195,7 +194,6 @@ public class SOManager implements ISharedObjectManager {
 		// notify listeners
 		container.fireContainerEvent(new SharedObjectManagerAddEvent(container
 				.getID(), sharedObjectID, sharedObject, properties));
-		Throwable t = null;
 		ID result = sharedObjectID;
 		try {
 			ISharedObject so = sharedObject;
diff --git a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/SOWrapper.java b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/SOWrapper.java
index cd8f789cc..5d3a7b279 100644
--- a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/SOWrapper.java
+++ b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/SOWrapper.java
@@ -33,7 +33,6 @@ public class SOWrapper {
     protected ISharedObject sharedObject;
     private SOConfig sharedObjectConfig;
     private ID sharedObjectID;
-    private ID sharedObjectHomeID;
     private SOContainer container;
     private ID containerID;
     private Thread thread;
@@ -41,7 +40,6 @@ public class SOWrapper {
 
     protected SOWrapper(SOContainer.LoadingSharedObject obj, SOContainer cont) {
         sharedObjectID = obj.getID();
-        sharedObjectHomeID = obj.getHomeID();
         sharedObject = obj;
         container = cont;
         containerID = cont.getID();
@@ -53,7 +51,6 @@ public class SOWrapper {
     protected SOWrapper(SOConfig aConfig, ISharedObject obj, SOContainer cont) {
         sharedObjectConfig = aConfig;
         sharedObjectID = sharedObjectConfig.getSharedObjectID();
-        sharedObjectHomeID = sharedObjectConfig.getHomeContainerID();
         sharedObject = obj;
         container = cont;
         containerID = cont.getID();
diff --git a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/ServerSOContainer.java b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/ServerSOContainer.java
index a2e0134c1..031329a7a 100644
--- a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/ServerSOContainer.java
+++ b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/ServerSOContainer.java
@@ -34,7 +34,7 @@ import org.eclipse.ecf.provider.generic.gmm.Member;
 
 public class ServerSOContainer extends SOContainer implements ISharedObjectContainerGroupManager {
 	
-	protected IJoinPolicy policy;
+	protected IJoinPolicy joinpolicy;
 	
     public ServerSOContainer(ISharedObjectContainerConfig config) {
         super(config);
@@ -169,15 +169,14 @@ public class ServerSOContainer extends SOContainer implements ISharedObjectConta
     }
     protected Object checkJoin(SocketAddress saddr, ID fromID, String target, Serializable data)
             throws Exception {
-    	if (this.policy != null) {
-    		return this.policy.checkJoin(saddr,fromID,getID(),target,data);
+    	if (this.joinpolicy != null) {
+    		return this.joinpolicy.checkJoin(saddr,fromID,getID(),target,data);
     	}
         return null;
     }
     protected void handleLeaveGroupMessage(ContainerMessage mess) {
         ID fromID = mess.getFromContainerID();
         if (fromID == null) return;
-        ID toID = mess.getToContainerID();
         debug("Member "+fromID+"leaving group");
         synchronized (getGroupMembershipLock()) {
             IAsynchConnection conn = getConnectionForID(fromID);
@@ -273,7 +272,7 @@ public class ServerSOContainer extends SOContainer implements ISharedObjectConta
 
 	public void setJoinPolicy(IJoinPolicy policy) {
 		synchronized (getGroupMembershipLock()) {
-			this.policy = policy;
+			this.joinpolicy = policy;
 		}
 	}
 }
\ No newline at end of file
diff --git a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/TCPServerSOContainer.java b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/TCPServerSOContainer.java
index d2d09012e..b7c0a21ba 100644
--- a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/TCPServerSOContainer.java
+++ b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/TCPServerSOContainer.java
@@ -16,11 +16,10 @@ import java.io.Serializable;
 import java.net.Socket;
 import java.net.URI;
 import java.net.URISyntaxException;
+
 import org.eclipse.ecf.core.ISharedObjectContainerConfig;
 import org.eclipse.ecf.core.comm.ConnectionRequestHandler;
 import org.eclipse.ecf.core.comm.ISynchAsynchConnection;
-import org.eclipse.ecf.core.identity.ID;
-import org.eclipse.ecf.core.identity.IDFactory;
 
 public class TCPServerSOContainer extends ServerSOContainer implements
         ConnectionRequestHandler {
@@ -72,8 +71,8 @@ public class TCPServerSOContainer extends ServerSOContainer implements
     }
 
     protected void initialize(TCPServerSOContainerGroup listener, String path,
-            int keepAlive) {
-        this.keepAlive = keepAlive;
+            int ka) {
+        this.keepAlive = ka;
         this.group = listener;
         this.group.add(path, this);
     }
@@ -111,10 +110,4 @@ public class TCPServerSOContainer extends ServerSOContainer implements
         return input;
     }
 
-    public static void main(String[] args) throws Exception {
-        ID server = IDFactory.makeStringID(getDefaultServerURL());
-        TCPServerSOContainer cont = new TCPServerSOContainer(
-                new SOContainerConfig(server));
-        Thread.sleep(3000000);
-    }
 }
\ No newline at end of file
diff --git a/releng/features/org.eclipse.ecf.core-feature/feature.xml b/releng/features/org.eclipse.ecf.core-feature/feature.xml
index cf35dfc7a..be042e686 100644
--- a/releng/features/org.eclipse.ecf.core-feature/feature.xml
+++ b/releng/features/org.eclipse.ecf.core-feature/feature.xml
@@ -90,7 +90,8 @@ to any source code in the Content.
          id="org.eclipse.ecf.provider"
          download-size="0"
          install-size="0"
-         version="0.0.0"/>
+         version="0.0.0"
+         unpack="false" />
 
    <plugin
          id="org.eclipse.ecf.ui"