diff --git a/build/build-cloud.xml b/build/build-cloud.xml
index fae75e09724..429ba881340 100755
--- a/build/build-cloud.xml
+++ b/build/build-cloud.xml
@@ -178,7 +178,7 @@
     <path refid="thirdparty.classpath" />
     <path refid="dist.classpath" />
   </path>
-  <target name="compile-server" depends="-init, compile-utils, compile-core" description="Compile the management server.">
+  <target name="compile-server" depends="-init, compile-utils, compile-core, compile-agent-simulator" description="Compile the management server.">
     <compile-java jar.name="${server.jar}" top.dir="${server.dir}" classpath="server.classpath" />
   </target>
 
diff --git a/server/.classpath b/server/.classpath
index a5b40092ea7..4238894c88d 100644
--- a/server/.classpath
+++ b/server/.classpath
@@ -1,24 +1,25 @@
-<?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/gson-1.3.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/manageontap.jar"/>
-	<classpathentry kind="lib" path="/thirdparty/email.jar"/>
-	<classpathentry kind="lib" path="/thirdparty/junit-4.8.1.jar"/>
-	<classpathentry kind="lib" path="/thirdparty/xenserver-5.5.0-1.jar"/>
-	<classpathentry kind="lib" path="/thirdparty/ws-commons-util-1.0.2.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/commons-codec-1.4.jar"/>
-	<classpathentry kind="lib" path="/thirdparty/servlet-api.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 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/gson-1.3.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/manageontap.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/email.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/junit-4.8.1.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/xenserver-5.5.0-1.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/ws-commons-util-1.0.2.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/commons-codec-1.4.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/servlet-api.jar"/>
+	<classpathentry kind="src" path="/agent-simulator"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>