From 2ec5bef63f71659d5cfe8e264307660ca16f4d7a Mon Sep 17 00:00:00 2001
From: Alex Huang <alex@cloud.com>
Date: Thu, 20 Jan 2011 10:31:18 -0800
Subject: [PATCH] eclipse workspace changes

---
 agent/.classpath                          |  1 +
 api/.classpath                            |  1 +
 api/src/com/cloud/resource/Concierge.java | 10 -----
 client/tomcatconf/components.xml.in       |  3 --
 console-proxy/.classpath                  |  2 +-
 console-viewer/.classpath                 |  2 +-
 core/.classpath                           |  1 +
 deps/.project                             | 28 ++++++++-----
 server/.classpath                         | 51 ++++++++++++-----------
 utils/.classpath                          | 33 ++++++++-------
 10 files changed, 65 insertions(+), 67 deletions(-)
 delete mode 100644 api/src/com/cloud/resource/Concierge.java

diff --git a/agent/.classpath b/agent/.classpath
index f36c50ee1f6..f2bd7d7bc6e 100644
--- a/agent/.classpath
+++ b/agent/.classpath
@@ -12,5 +12,6 @@
 	<classpathentry kind="lib" path="/thirdparty/xmlrpc-common-3.1.3.jar"/>
 	<classpathentry kind="lib" path="/thirdparty/libvirt-0.4.5.jar"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/api"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/deps"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/api/.classpath b/api/.classpath
index e52580d102b..dc73036afd7 100644
--- a/api/.classpath
+++ b/api/.classpath
@@ -5,5 +5,6 @@
 	<classpathentry combineaccessrules="false" kind="src" path="/utils"/>
 	<classpathentry kind="lib" path="/thirdparty/log4j-1.2.15.jar"/>
 	<classpathentry kind="lib" path="/thirdparty/gson.jar"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/deps"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/api/src/com/cloud/resource/Concierge.java b/api/src/com/cloud/resource/Concierge.java
deleted file mode 100644
index 04b1538ef5b..00000000000
--- a/api/src/com/cloud/resource/Concierge.java
+++ /dev/null
@@ -1,10 +0,0 @@
-/**
- * 
- */
-package com.cloud.resource;
-
-import com.cloud.utils.component.Adapter;
-
-public interface Concierge<T extends Resource> extends Adapter {
-
-}
diff --git a/client/tomcatconf/components.xml.in b/client/tomcatconf/components.xml.in
index 84b56bebca6..f021a7fe50c 100755
--- a/client/tomcatconf/components.xml.in
+++ b/client/tomcatconf/components.xml.in
@@ -61,9 +61,6 @@
             <adapter name="SimpleInvestigator" class="com.cloud.ha.CheckOnAgentInvestigator"/>
             <adapter name="PingInvestigator" class="com.cloud.ha.InvestigatorImpl"/>
         </adapters>
-        <adapters key="com.cloud.ha.FenceBuilder">
-            <adapter name="StorageFenceBuilder" class="com.cloud.ha.StorageFence"/>
-        </adapters>
         <adapters key="com.cloud.hypervisor.HypervisorGuru">
             <adapter name="XenServerGuru" class="com.cloud.hypervisor.XenServerGuru"/>
             <adapter name="KVMGuru" class="com.cloud.hypervisor.KVMGuru"/>
diff --git a/console-proxy/.classpath b/console-proxy/.classpath
index 521b7a55fa9..5a34eae6642 100644
--- a/console-proxy/.classpath
+++ b/console-proxy/.classpath
@@ -4,6 +4,6 @@
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="lib" path="/thirdparty/log4j-1.2.15.jar"/>
 	<classpathentry kind="lib" path="/thirdparty/gson.jar"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/console-common"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/console"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/console-viewer/.classpath b/console-viewer/.classpath
index 170f58a8bbb..e8a8d8c0a84 100644
--- a/console-viewer/.classpath
+++ b/console-viewer/.classpath
@@ -2,6 +2,6 @@
 <classpath>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/console-common"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/console"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/core/.classpath b/core/.classpath
index f1a4de71803..27c5aa6a984 100644
--- a/core/.classpath
+++ b/core/.classpath
@@ -39,5 +39,6 @@
 	<classpathentry kind="lib" path="/thirdparty/vmware-vim25.jar"/>
 	<classpathentry kind="lib" path="/thirdparty/gson.jar"/>
 	<classpathentry kind="lib" path="/thirdparty/xenserver-5.6.100-1.jar"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/deps"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/deps/.project b/deps/.project
index 2d10b0c4b06..901f15e089b 100644
--- a/deps/.project
+++ b/deps/.project
@@ -1,11 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>deps</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-	</buildSpec>
-	<natures>
-	</natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>deps</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/server/.classpath b/server/.classpath
index b18c9660ffe..52b60598f7d 100644
--- a/server/.classpath
+++ b/server/.classpath
@@ -1,25 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="test"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/utils"/>
-	<classpathentry kind="lib" path="/thirdparty/log4j-1.2.15.jar"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/core"/>
-	<classpathentry kind="lib" path="/thirdparty/cglib-nodep-2.2.jar"/>
-	<classpathentry kind="lib" path="/thirdparty/ehcache-1.5.0.jar"/>
-	<classpathentry kind="lib" path="/thirdparty/commons-httpclient-3.1.jar"/>
-	<classpathentry kind="lib" path="/thirdparty/httpcore-4.0.jar"/>
-	<classpathentry kind="lib" path="/thirdparty/email.jar"/>
-	<classpathentry kind="lib" path="/thirdparty/junit-4.8.1.jar"/>
-	<classpathentry kind="lib" path="/thirdparty/commons-codec-1.4.jar"/>
-	<classpathentry kind="lib" path="/thirdparty/xmlrpc-client-3.1.3.jar"/>
-	<classpathentry kind="lib" path="/thirdparty/xmlrpc-common-3.1.3.jar"/>
-	<classpathentry kind="lib" path="/thirdparty/servlet-api.jar"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/api"/>
-	<classpathentry kind="lib" path="/thirdparty/trilead-ssh2-build213.jar"/>
-	<classpathentry kind="lib" path="/thirdparty/xstream-1.3.1.jar"/>
-	<classpathentry kind="lib" path="/thirdparty/gson.jar"/>
-        <classpathentry kind="lib" path="/deps/cloud-xenserver-5.6.100-1.jar" sourcepath="/deps/XenServerJava"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="test"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/utils"/>
+	<classpathentry kind="lib" path="/thirdparty/log4j-1.2.15.jar"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/core"/>
+	<classpathentry kind="lib" path="/thirdparty/cglib-nodep-2.2.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/ehcache-1.5.0.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/commons-httpclient-3.1.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/httpcore-4.0.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/email.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/junit-4.8.1.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/commons-codec-1.4.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/xmlrpc-client-3.1.3.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/xmlrpc-common-3.1.3.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/servlet-api.jar"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/api"/>
+	<classpathentry kind="lib" path="/thirdparty/trilead-ssh2-build213.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/xstream-1.3.1.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/gson.jar"/>
+	<classpathentry kind="lib" path="/deps/cloud-xenserver-5.6.100-1.jar" sourcepath="/deps/XenServerJava"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/deps"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/utils/.classpath b/utils/.classpath
index e1b97740fe8..6248f0c9744 100644
--- a/utils/.classpath
+++ b/utils/.classpath
@@ -1,16 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="test"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="lib" path="/thirdparty/log4j-1.2.15.jar"/>
-	<classpathentry kind="lib" path="/thirdparty/cglib-nodep-2.2.jar"/>
-	<classpathentry kind="lib" path="/thirdparty/ehcache-1.5.0.jar"/>
-	<classpathentry kind="lib" path="/thirdparty/commons-dbcp-1.2.2.jar"/>
-	<classpathentry kind="lib" path="/thirdparty/commons-pool-1.4.jar"/>
-	<classpathentry kind="lib" path="/thirdparty/junit-4.8.1.jar"/>
-	<classpathentry kind="lib" path="/deps/cloud-bcprov-jdk16-1.45.jar"/>
-	<classpathentry kind="lib" path="/deps/cloud-jsch-0.1.42.jar"/>
-	<classpathentry kind="lib" path="/deps/cloud-commons-codec-1.4.jar"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="test"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="lib" path="/thirdparty/log4j-1.2.15.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/cglib-nodep-2.2.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/ehcache-1.5.0.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/commons-dbcp-1.2.2.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/commons-pool-1.4.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/junit-4.8.1.jar"/>
+	<classpathentry kind="lib" path="/deps/cloud-bcprov-jdk16-1.45.jar"/>
+	<classpathentry kind="lib" path="/deps/cloud-jsch-0.1.42.jar"/>
+	<classpathentry kind="lib" path="/deps/cloud-commons-codec-1.4.jar"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/deps"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>