Return-Path: 
 <cloudstack-commits-return-10263-apmail-incubator-cloudstack-commits-archive=incubator.apache.org@incubator.apache.org>
X-Original-To: apmail-incubator-cloudstack-commits-archive@minotaur.apache.org
Delivered-To: apmail-incubator-cloudstack-commits-archive@minotaur.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 38F56E59F
	for <apmail-incubator-cloudstack-commits-archive@minotaur.apache.org>;
 Sat,  2 Feb 2013 13:00:57 +0000 (UTC)
Received: (qmail 52760 invoked by uid 500); 2 Feb 2013 13:00:56 -0000
Delivered-To: apmail-incubator-cloudstack-commits-archive@incubator.apache.org
Received: (qmail 52695 invoked by uid 500); 2 Feb 2013 13:00:56 -0000
Mailing-List: contact cloudstack-commits-help@incubator.apache.org;
 run by ezmlm
Precedence: bulk
List-Help: <mailto:cloudstack-commits-help@incubator.apache.org>
List-Unsubscribe: <mailto:cloudstack-commits-unsubscribe@incubator.apache.org>
List-Post: <mailto:cloudstack-commits@incubator.apache.org>
List-Id: <cloudstack-commits.incubator.apache.org>
Reply-To: cloudstack-dev@incubator.apache.org
Delivered-To: mailing list cloudstack-commits@incubator.apache.org
Received: (qmail 52303 invoked by uid 99); 2 Feb 2013 13:00:55 -0000
Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org)
 (140.211.11.114)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 02 Feb 2013 13:00:55 +0000
Received: by tyr.zones.apache.org (Postfix, from userid 65534)
	id 401928293D4; Sat,  2 Feb 2013 13:00:55 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
From: hugo@apache.org
To: cloudstack-commits@incubator.apache.org
X-Mailer: ASF-Git Admin Mailer
Subject: [3/4] Remove the last remnants of the old build system
Message-Id: <20130202130055.401928293D4@tyr.zones.apache.org>
Date: Sat,  2 Feb 2013 13:00:55 +0000 (UTC)

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e138596a/build/build-tests.xml
----------------------------------------------------------------------
diff --git a/build/build-tests.xml b/build/build-tests.xml
deleted file mode 100755
index 5f41ba2..0000000
--- a/build/build-tests.xml
+++ /dev/null
@@ -1,319 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-
-
-<project name="Cloud Stack Tests" default="help" basedir=".">
-  <description>
-		Cloud Stack ant build file
-    </description>
-
-  <!--
- 	Always use this variable to refer to the base directory because this
-	variable is changeable
-    -->
-  <dirname property="base.dir" file="${ant.file.Cloud Stack Tests}/.." />
-  <property name="build.dir" location="${base.dir}/build" />
-
-  <import file="${build.dir}/build-cloud.xml" optional="false" />
-
-  <property name="server.test.dir" location="${server.dir}/test" />
-  <property name="core.test.dir" location="${core.dir}/test/" />
-  <property name="agent.test.dir" location="${utils.dir}/test/" />
-  <!-- directories for agent simulator code compilation-->
-  <property name="agent-simulator.dir" location="${base.dir}/agent-simulator" />
-  <property name="agent-simulator.dist.dir" location="${dist.dir}/agent-simulator" />
-
-  <!-- directories for the test client code compilation-->
-  <property name="testclient.dir" location="${base.dir}/test" />
-  <property name="testclient.dist.dir" location="${dist.dir}/test" />
-  <property name="tools.dist.dir" location="${dist.dir}/cloudapitools" />
-
-  <property name="test.target.dir" location="${target.dir}/test" />
-  <property name="test.classes.dir" location="${test.target.dir}/classes"/>
-
-  <property name="agent-simulator.jar" value="cloud-agent-simulator.jar" />
-  <property name="testclient.jar" value="cloud-test.jar" />
-
-  <property name="simulator.setup.dir" value="${base.dir}/setup/db/" />
-  <property name="marvin.sandbox.dir" value="${base.dir}/tools/marvin/marvin/sandbox/" />
-  <property name="marvin.config" value="${base.dir}/tools/marvin/marvin/sandbox/demo/simulator/simulator.cfg" />
-  <property name="marvin.config.abspath" location="${marvin.config}" />
-
-  <!-- =================== Agent Simulator ==================== -->
-  <path id="agent-simulator.classpath">
-    <path refid="deps.classpath" />
-    <path refid="dist.classpath" />
-  </path>
-  <target name="compile-agent-simulator" depends="-init, compile-api, compile-utils, compile-core, compile-agent, compile-server" description="Compile the agent simulator.">
-    <compile-java jar.name="${agent-simulator.jar}" top.dir="${agent-simulator.dir}" classpath="agent-simulator.classpath" />
-    <copy overwrite="true" todir="${server.dist.dir}/conf">
-      <fileset dir="${agent-simulator.dir}/tomcatconf">
-        <include name="*.in" />
-      </fileset>
-      <globmapper from="*.in" to="*" />
-    </copy>
-  </target>
-
-  <target name="build-agent-simulator" depends="-init, compile-agent-simulator">
-    <mkdir dir="${agent-simulator.dist.dir}" />
-    <mkdir dir="${agent-simulator.dist.dir}/conf" />
-    <mkdir dir="${agent-simulator.dist.dir}/logs" />
-
-    <copy todir="${agent-simulator.dist.dir}">
-      <fileset dir="${jar.dir}">
-        <include name="${agent-simulator.jar}" />
-        <include name="${agent.jar}" />
-        <include name="${utils.jar}" />
-        <include name="${core.jar}" />
-        <include name="${api.jar}" />
-      </fileset>
-      <fileset dir="${deps.dir}">
-        <include name="log4j-1.2.15.jar" />
-        <include name="gson-1.3.jar" />
-        <include name="commons-logging-1.1.1.jar" />
-        <include name="commons-collections-3.2.1.jar" />
-      </fileset>
-    </copy>
-    <copy overwrite="true" todir="${server.dist.dir}/conf">
-      <fileset dir="${agent-simulator.dir}/tomcatconf">
-        <include name="*.in" />
-      </fileset>
-      <globmapper from="*.in" to="*" />
-    </copy>
-    <copy todir="${agent-simulator.dist.dir}/conf">
-      <fileset dir="${agent.dir}/conf">
-        <include name="log4j-cloud.xml" />
-      </fileset>
-    </copy>
-  </target>
-  <!-- =================== Agent Simulator ==================== -->
-
-  <!-- Run Simulator Tests  -->
-  <target name="setup-simulator"  depends="clean-all">
-      <mkdir dir="${simulator.setup.dir}/override">
-      </mkdir>
-      <copy overwrite="true" file="${simulator.setup.dir}/templates.simulator.sql" tofile="${simulator.setup.dir}/override/templates.sql" />
-
-      <mkdir dir="${build.dir}/override">
-      </mkdir>
-      <copy overwrite="true" file="${build.dir}/replace.properties" tofile="${build.dir}/override/replace.properties" />
-      <!-- Replace the COMPONENT-SPEC for components-simulator.xml -->
-      <copy overwrite="true" file="${build.dir}/simulator.properties" tofile="${build.dir}/override/replace.properties" />
-  </target>
-
-  <target name="run-simulator" depends="setup-simulator, build-all-with-simulator, deploy-server, deploydb-simulator, debug">
-  </target>
-
-  <target name="run-marvin" depends="install-marvin">
-      <exec dir="${marvin.sandbox.dir}/" executable="bash">
-          <arg line="run-marvin.sh -d localhost -m localhost -c ${marvin.config.abspath}" />
-      </exec>
-  </target>
-  <!--   -->
-
-  <!-- =================== QA Testing Client ==================== -->
-  <target name="-init-test" depends="-init">
-    <mkdir dir="${test.target.dir}" />
-    <mkdir dir="${test.classes.dir}" />
-  </target>
-
-  <path id="testclient.classpath">
-    <path refid="deps.classpath" />
-    <path refid="dist.classpath" />
-  </path>
-  <target name="compile-testclient" depends="-init-test, compile-utils" description="Compile the test client.">
-    <echo message="src is ${testclient.dir}"/>
-    <compile-java jar.name="${testclient.jar}" top.dir="${testclient.dir}" classpath="testclient.classpath" />
-  </target>
-
-  <target name="build-testclient" depends="-init-test, compile-testclient">
-    <mkdir dir="${testclient.dist.dir}/src" />
-    <mkdir dir="${testclient.dist.dir}/conf" />
-    <mkdir dir="${testclient.dist.dir}/metadata" />
-    <mkdir dir="${testclient.dist.dir}/usage" />
-
-    <copy todir="${testclient.dist.dir}/src">
-      <fileset dir="${jar.dir}">
-        <include name="${testclient.jar}" />
-        <include name="${utils.jar}" />
-      </fileset>
-      <fileset dir="${deps.dir}">
-        <include name="commons-httpclient-3.1.jar" />
-        <include name="commons-logging-1.1.1.jar" />
-        <include name="commons-codec-1.4.jar" />
-        <include name="log4j.jar" />
-        <include name="log4j-extras.jar" />
-        <include name="trilead-ssh2-build213.jar" />
-        <include name="mysql-connector-java-5.1.7-bin.jar" />
-      </fileset>
-    </copy>
-    <copy overwrite="true" todir="${testclient.dist.dir}/conf">
-      <fileset dir="${testclient.dir}/conf">
-        <include name="log4j.properties" />
-        <include name="templates.sql" />
-        <include name="deploy.xml" />
-        <include name="config.xml" />
-        <include name="tool.properties" />
-      </fileset>
-    </copy>
-
-    <copy overwrite="true" todir="${testclient.dist.dir}/scripts">
-      <fileset dir="${testclient.dir}/scripts" />
-    </copy>
-
-    <copy overwrite="true" todir="${testclient.dist.dir}/metadata">
-      <fileset dir="${testclient.dir}/metadata" />
-    </copy>
-
-    <copy todir="${testclient.dist.dir}/usage" overwrite="true">
-      <fileset dir="${testclient.dir}/scripts/usage" />
-    </copy>
-
-    <copy overwrite="true" todir="${testclient.dist.dir}">
-      <fileset dir="${testclient.dir}/conf/">
-        <include name="deploy.properties" />
-      </fileset>
-    </copy>
-
-    <chmod file="${testclient.dist.dir}/scripts/deploy.sh" perm="uog+xr" />
-    <chmod file="${testclient.dist.dir}/scripts/cleanup.sh" perm="uog+xr" />
-    <chmod file="${testclient.dist.dir}/scripts/cleanparallel.sh" perm="uog+xr" />
-    <chmod file="${testclient.dist.dir}/scripts/deploycluster.sh" perm="uog+xr" />
-    
-  </target>
-
-
-  <target name="build-tools" depends="-init-test, compile-testclient">
-    <mkdir dir="${tools.dist.dir}/src" />
-    <mkdir dir="${tools.dist.dir}/conf" />
-
-
-    <copy todir="${tools.dist.dir}/src">
-      <fileset dir="${jar.dir}">
-        <include name="${testclient.jar}" />
-        <include name="${utils.jar}" />
-      </fileset>
-      <fileset dir="${deps.dir}">
-        <include name="commons-httpclient-3.1.jar" />
-        <include name="commons-logging-1.1.1.jar" />
-        <include name="commons-codec-1.4.jar" />
-        <include name="log4j-1.2.15.jar" />
-        <include name="apache-log4j-extras-1.0.jar" />
-        <include name="trilead-ssh2-build213.jar" />
-        <include name="mysql-connector-java-5.1.7-bin.jar" />
-    </fileset>
-    </copy>
-
-    <copy overwrite="true" todir="${tools.dist.dir}/conf">
-      <fileset dir="${testclient.dir}/conf">
-        <include name="tool.properties" />
-	<include name="log4j.properties" />
-      </fileset>
-    </copy>
-
-    <copy overwrite="true" todir="${tools.dist.dir}">
-      <fileset dir="${testclient.dir}/scripts" >
-	<include name="certSubmitEC2.sh" />
-	<include name="certDeleteEC2.sh" />
-	<include name="sign.sh" />
-      </fileset>
-	<fileset dir="${testclient.dir}/conf">
-        <include name="README" />
-     </fileset>
-    </copy>
-
-    <chmod file="${tools.dist.dir}/certSubmitEC2.sh" perm="a+xr" />
-    <chmod file="${tools.dist.dir}/certDeleteEC2.sh" perm="a+xr" />
-    <chmod file="${tools.dist.dir}/sign.sh" perm="a+xr" />
-  </target>
-
-  <target name="-clean-test">
-    <delete dir="${test.classes.dir}" />
-    <delete dir="${test.target.dir}" />
-  </target>
-  <!-- =================== QA Testing Client ==================== -->
-
-  <!-- ============== Server Testing =============== -->
-  <target name="compile-server-test" depends="-init-test, compile-server" description="Compile all the source code in the server directory">
-    <property name="server.test.target.dir" location="${test.classes.dir}/server" />
-    <property name="jarname" value="server-test.jar" />
-
-    <mkdir dir="${server.test.target.dir}" />
-
-    <depend srcdir="${server.test.dir}" destdir="${server.test.target.dir}" cache="${dep.cache.dir}">
-    </depend>
-    <javac srcdir="${server.test.dir}" debug="${debug}" debuglevel="${debuglevel}" deprecation="${deprecation}" source="1.5" target="1.5" destdir="${server.test.target.dir}" includeantruntime="false">
-      <classpath refid="deps.classpath" />
-      <classpath refid="test.classpath" />
-      <compilerarg value="-Xlint:all" />
-    </javac>
-    <jar jarfile="${test.target.dir}/${jarname}" basedir="${server.test.target.dir}">
-      <metainf dir="${server.dir}/metadata">
-        <include name="**/*.xml" />
-      </metainf>
-      <manifest>
-        <attribute name="Class-Path" value="" />
-        <attribute name="Built-By" value="${built.by}" />
-        <section name="com/cloud/">
-          <attribute name="Specification-Title" value="Cloud Stack" />
-          <attribute name="Specification-Version" value="${version}" />
-          <attribute name="Specification-Vendor" value="${company.name}" />
-          <attribute name="Implementation-Title" value="Server" />
-          <attribute name="Implementation-Version" value="${impl.version}" />
-          <attribute name="Implementation-Vendor" value="${company.name}" />
-        </section>
-      </manifest>
-    </jar>
-  </target>
-	
-	<!-- ====================== XMLTEST Python Based testing ================== -->
-	<target name="xmltest-translate" description="Translate an XML test file into Python">
-		<echo message="Translating: ${xmltest}"/>
-		<exec dir="tools/testClient" executable="python">
-			<arg line="translator.py -i ${xmltest}"/>
-		</exec>
-	</target>
-	
-	<target name="xmltest-execute" description="Specify XML test file with -Dxmltest=filename" depends="xmltest-translate">
-		<echo message="Executing: ${xmltest}.py"/>
-		<exec dir="tools/testClient" executable="python">
-			<arg line="${xmltest}.py"/>
-		</exec>
-	</target>
-	
-	<target name="xmltest-automated" description="Used to run the daily tests using tools/testClient/automated.xml as the source of tests">
-	  <property name="xmltest" value="automated/automated.xml"/>
-	  <echo message="Running daily test run with ${xmltest}.py"/>
-	  <antcall target="xmltest-execute"/>
-	</target>
-
-	<target name="automated-test-run" description="Run the automated tests in tools/testClient/testcases/automated.xml using the debug server">
-	  <antcall target="build-all"/>
-	  <antcall target="deploy-server"/>
-	  <antcall target="deploydb"/>
-	  <antcall target="start-tomcat"/>
-	  <echo message="running tests..."/>
-	  <antcall target="xmltest-automated"/>
-	  <antcall target="stop-tomcat"/>
-	  <antcall target="clean-tomcat"/>
-	</target>
-	<!-- ====================== XMLTEST Python Based testing ================== -->
-		
-</project>
-
-

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e138596a/build/build-usage.xml
----------------------------------------------------------------------
diff --git a/build/build-usage.xml b/build/build-usage.xml
deleted file mode 100644
index 9940f46..0000000
--- a/build/build-usage.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-
-
-<project name="Cloud Stack Usage Server" default="help" basedir=".">
-  <description>
-      Cloud Stack Usage server build
-  </description>
-  <property name="base.dir" location="${ant.file.Cloud Stack Usage Server}/../../.."/>
-  <property name="oss.build.dir" location="${base.dir}/build"/>
-  <property name="usage.jar" value="cloud-usage.jar" />
-  <dirname property="proprietary.dir" file="${ant.file.Cloud Stack Usage Server}/../"/>
-
-  <import file="${oss.build.dir}/build-cloud.xml" optional="false"/>
-  <property name="usage.dir" location="${base.dir}/usage" />
-  <property name="usage.dist.dir" location="${dist.dir}/usage" />
-	<!-- ToDo: get actual PID -->	
-  <property name="pid" value="4567"/>
-	 
-<!-- ===================== Usage.Jar ===================== -->
-  <path id="usage.classpath">
-    <path refid="deps.classpath" /> 
-    <path refid="dist.classpath" /> 
-  </path>
-  <target name="compile-usage" depends="-init, compile-utils, compile-core, compile-server" description="Compile the usage server">
-    <compile-java jar.name="${usage.jar}" top.dir="${usage.dir}" classpath="usage.classpath" />
-  </target>
-
-  <target name="build-usage" depends="compile-usage">
-    <mkdir dir="${usage.dist.dir}/conf" />
-
-    <copy overwrite="true" todir="${usage.dist.dir}/lib">
-      <fileset dir="${jar.dir}">
-        <include name="${usage.jar}" />
-      </fileset>
-    </copy>
-  </target>
-
-  <target name="run-usage" depends="build-usage, deploy-usage">
-    <java classname="com.cloud.usage.UsageServer" fork="true">
-        <classpath refid="usage.classpath"/>
-    	<jvmarg value="-Dpid=${pid}"/>
-    </java>
-  </target>	
-	
-    <target name="debug-usage" depends="build-usage, deploy-usage">
-    	<java classname="com.cloud.usage.UsageServer" fork="true">
-	        <classpath refid="usage.classpath"/>
-	        <jvmarg value="-Dpid=${pid}"/>
-    		<jvmarg value="-Xrunjdwp:transport=dt_socket,address=8788,server=y,suspend=n"/>
-	    </java>
-    </target> 
-	    	
-</project>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e138596a/build/cloud.properties
----------------------------------------------------------------------
diff --git a/build/cloud.properties b/build/cloud.properties
deleted file mode 100755
index e3cddf7..0000000
--- a/build/cloud.properties
+++ /dev/null
@@ -1,29 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-# 
-#   http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-# major.minor.patch versioning scheme for CloudStack
-company.major.version=4
-company.minor.version=0
-company.patch.version=0
-
-svn.revision=2
-
-# copyright year
-company.copyright.year=2012
-company.url=http://cloudstack.org
-company.license.name=Apache License, Version 2.0
-company.name=CloudStack

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e138596a/build/developer.xml
----------------------------------------------------------------------
diff --git a/build/developer.xml b/build/developer.xml
deleted file mode 100755
index fdda171..0000000
--- a/build/developer.xml
+++ /dev/null
@@ -1,431 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-
-
-<project name="CloudStack Developer Targets" basedir=".">
-  <description>
-        This is a developer.xml with tools to start and stop tomcat and 
-        generally developer targets that has nothing to do with compiling.
-    </description>
-
-  <dirname property="base.dir" file="${ant.file.CloudStack Developer Targets}/.."/>
-  <property name="build.dir" location="${base.dir}/build"/>
-  
-  <property name="tomcat.home" location="${env.CATALINA_HOME}"/>
-  <property name="assertion" value="-ea"/>
-
-  <property name="dist.dir" location="${base.dir}/dist"/>
-  <property name="deploy.work.dir" location="${dist.dir}"/>
-  <property name="server.deploy.to.dir" location="${tomcat.home}"/>
-  <property name="unittest.dir" location="${base.dir}/unittest"/>
-  <property name="unittest.target.dir" location="${unittest.dir}/classes"/>
-  <property name="unittest.jar.dir" location="${unittest.dir}/jar"/>
-  <property name="unittest.formatter" value="plain" />
-  <property name="ovm.dir" location="${base.dir}/ovm" />
-  <property name="usage.dir" location="${base.dir}/usage" />	
-  
-  <!-- directories for api doc -->
-  <property name="api.docs.dir" location="${dist.dir}/apidocs" />
-	
-  <condition property="jmxport" value="${jmxport.override}" else="45219">
-    <isset property="jmxport.override" />
-  </condition>
-  
-  <macrodef name="compile-test">
-    <attribute name="top.dir" description="Top Directory of the source.  We will add src to this to get the source code."/>
-    <attribute name="jar.name" description="Name of the jar file"/>
-    <attribute name="classpath" description="class path to use"/>
-    <element name="include-files" optional="true"/>
-    <element name="exclude-files" optional="true"/>
-    
-    <sequential>
-      <mkdir dir="${unittest.target.dir}/@{jar.name}"/>
-        
-      <depend srcdir="@{top.dir}/test" destdir="${unittest.target.dir}/@{jar.name}" cache="${dep.cache.dir}" />
-        
-      <echo message="Compiling @{top.dir}/test"/>
-      <javac srcdir="@{top.dir}/test" debug="${debug}" debuglevel="${debuglevel}" deprecation="${deprecation}" destdir="${unittest.target.dir}/@{jar.name}" source="${source.compat.version}" target="${target.compat.version}" includeantruntime="false" compiler="javac1.6">
-        <compilerarg line="-Xlint:-path"/>
-        <classpath refid="@{classpath}" />
-        <exclude-files/>
-      </javac>
-      <jar jarfile="${unittest.jar.dir}/@{jar.name}" basedir="${unittest.target.dir}/@{jar.name}" update="true"/>
-    </sequential>
-  </macrodef>
-  
-
-  <target name="clean-edits" description="Delete all the editor backup files in the source tree.">
-    <delete>
-      <fileset dir="${base.dir}" includes="**/*~" />
-    </delete>
-  </target>
-
-  <target name="run" depends="start-tomcat"/>
-  <target name="stop" depends="stop-tomcat"/>
-  <target name="debug" depends="debug-tomcat"/>
-
-  <target name="setup">
-	<mkdir dir="${build.dir}/override"/>   
-    <copy todir="${build.dir}/override">
-	  <fileset dir="${build.dir}">
-	    <include name="build-cloud.properties"/>
-	    <include name="replace.properties"/>
-	  </fileset>
-	</copy>  
-    <loadproperties srcfile="${build.dir}/override/replace.properties" resource="propertyresource"/>
-    <!-- propertyfile file="${build.dir}/override/replace.properties"/ -->
-  </target>
-  
-  <target name="debug-suspend">
-    <java jar="${tomcat.home}/bin/bootstrap.jar" fork="true">
-      <jvmarg value="-Dcatalina.home=${tomcat.home}"/>
-      <jvmarg value="-Dcom.sun.management.jmxremote.port=${jmxport}"/>
-      <jvmarg value="-Dcom.sun.management.jmxremote.authenticate=false"/>
-      <jvmarg value="-Dcom.sun.management.jmxremote.ssl=false"/>
-	  <jvmarg value="-Xdebug"/>
-      <jvmarg value="-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y"/>
-      <jvmarg value="-ea"/>
-      <jvmarg value="-Xms256m"/>
-      <jvmarg value="-Xmx384m"/>
-    </java>
-  </target>
-
-  <target name="stop-tomcat">
-    <java dir="${tomcat.home}/bin/" jar="${tomcat.home}/bin/bootstrap.jar" fork="true">
-      <arg value="stop"/>
-    </java>
-  </target>
-
-  <target name="start-tomcat" depends="stop-tomcat">
-    <echo message="Start Tomcat" />
-    <java dir="${tomcat.home}/bin/" jar="${tomcat.home}/bin/bootstrap.jar" fork="true">
-      <jvmarg value="${assertion}"/>
-      <jvmarg value="-Dcom.sun.management.jmxremote.port=${jmxport}"/>
-      <jvmarg value="-Dcom.sun.management.jmxremote.authenticate=false"/>
-      <jvmarg value="-Dcom.sun.management.jmxremote.ssl=false"/>
-      <jvmarg value="-Xms256m"/>
-      <jvmarg value="-Xmx512m"/>
-      <jvmarg value="-XX:MaxPermSize=128m"/>
-      <jvmarg value="-ea"/>
-      <arg value="start"/>
-    </java>
-  </target>
-
-  <target name="debug-tomcat">
-    <java jar="${tomcat.home}/bin/bootstrap.jar" fork="true">
-      <jvmarg value="-Dcatalina.home=${tomcat.home}"/>
-      <jvmarg value="-Dcom.sun.management.jmxremote.port=${jmxport}"/>
-      <jvmarg value="-Dcom.sun.management.jmxremote.authenticate=false"/>
-      <jvmarg value="-Dcom.sun.management.jmxremote.ssl=false"/>
-	  <jvmarg value="-Xdebug"/>
-      <jvmarg value="${debug.jvmarg}"/>
-      <jvmarg value="-ea"/>
-      <jvmarg value="-Xms256m"/>
-      <jvmarg value="-Xmx512m"/>
-      <jvmarg value="-XX:MaxPermSize=128m"/>
-    </java>
-  </target>
-
-  <target name="clean-tomcat" depends="stop-tomcat,clean-awsapi-tomcat">
-    <delete dir="${tomcat.home}/webapps/client"/>
-    <delete dir="${tomcat.home}/webapps/awsapi" />
-	<delete dir="${tomcat.home}/webapps7080/awsapi" />
-    <delete dir="${tomcat.home}/work/Catalina"/>
-    <delete dir="${tomcat.home}/temp" />
-    <delete dir="${tomcat.home}/logs" />
-    <delete quiet="false" >
-      <fileset dir="${tomcat.home}/conf" >
-      	<include name="**/*component*.xml" />
-      </fileset>
-    </delete>
-  </target>
-
-  <target name="unzip" if="zip.uptodate">
-    <unzip src="${deploy.work.dir}/client.zip" dest="${deploy.work.dir}/client"/>
-  </target>
-
-  <target name="unzip-usage" if="usagezip.uptodate">
-    <unzip src="${deploy.work.dir}/usage.zip" dest="${deploy.work.dir}/usage"/>
-  </target>
-    
-  <target name="deploy-ovm" >
-  	<ant antfile="${base.dir}/plugins/hypervisors/ovm/build.xml" target="deploy-ovm"/>
-  </target>
-
-  <target name="deploy-server" depends="deploy-common, deploy-ovm, deploy-awsapi" >
-      <copy todir="${server.deploy.to.dir}/webapps/client/WEB-INF/lib/vms" file="${dist.dir}/systemvm.iso" />
-  </target>
-	
-  <target name="deploy-server-encrypt" depends="deploy-server" >
-  	<move file="${server.deploy.to.dir}/conf/db-enc.properties" tofile="${server.deploy.to.dir}/conf/db.properties" overwrite="true"/>
-  	<echo file="/etc/cloud/management/key" append="false">password</echo>
-  </target>
-	
-  <target name="deploy-common" > 
-    <condition property="zip.uptodate">
-      <available file="${deploy.work.dir}/client.zip" type="file"/>
-    </condition>
-    <antcall target="unzip" inheritAll="true"/>
-    <unwar overwrite="true" src="${deploy.work.dir}/client/client.war" dest="${server.deploy.to.dir}/webapps/client"/>
-    <copy todir="${server.deploy.to.dir}/lib">
-      <fileset dir="${deps.dir}/">
-        <include name="*.jar"/>
-        <exclude name="servlet*.jar"/>
-        <exclude name="axis2*.jar"/>
-        <exclude name="*slf4j*.jar"/>
-      </fileset>
-    </copy>
-    <touch file="${server.deploy.to.dir}/webapps/client/WEB-INF/lib/scripts/vm/hypervisor/xenserver/version"/>
-    <echo file="${server.deploy.to.dir}/webapps/client/WEB-INF/lib/scripts/vm/hypervisor/xenserver/version" append="false" message="${version}.${build.number}"/>
-    <copy overwrite="true" todir="${server.deploy.to.dir}/conf">
-      <fileset dir="${deploy.work.dir}/client/conf/">
-        <include name="**/*"/>
-      </fileset>
-    </copy>
-    <chmod perm="755">
-      <fileset dir="${server.deploy.to.dir}/webapps/client/WEB-INF/lib">
-        <include name="**/*"/>
-      </fileset>
-    </chmod>
-  	
-  	
-<!--    <copy overwrite="true" todir="${server.deploy.to.dir}/lib" file="${server.deploy.to.dir}/webapps/client/WEB-INF/lib/cloud-mysql-connector-java-5.1.7-bin.jar" />
-    <delete file="${server.deploy.to.dir}/webapps/client/WEB-INF/lib/cloud-mysql-connector-java-5.1.7-bin.jar" />
-  -->	
-    <replace file="${server.deploy.to.dir}/conf/catalina.properties" summary="true">
-      <replacetoken><![CDATA[shared.loader=
-]]></replacetoken>
-      <replacevalue><![CDATA[shared.loader=${catalina.home},${catalina.home}/conf
-          ]]></replacevalue>    </replace>
-  </target>
-
-  <target name="deploy-usage">
-    <condition property="usagezip.uptodate">
-      <available file="${deploy.work.dir}/usage.zip" type="file" />
-    </condition>
-    <antcall target="unzip-usage" inheritAll="true" />
-    <copy overwrite="true" todir="${server.deploy.to.dir}/conf">
-      <fileset dir="${usage.dir}/conf/">
-        <include name="*.in" />
-      </fileset>
-      <globmapper from="*.in" to="*" />
-    </copy>  	
-    <copy overwrite="true" todir="${server.deploy.to.dir}/webapps/client/WEB-INF/lib">
-      <fileset dir="${deploy.work.dir}/usage/lib/">
-        <include name="**/*.jar"/>
-      </fileset>
-    </copy>
-  </target>
-  
-  <target name="deploy-cloudstack-db">
-    <condition property="server-setup.file" value="override/server-setup.xml" else="server-setup.xml">
-      <available file="${setup.db.dir}/override/server-setup.xml" />
-    </condition>
-
-    <condition property="templates.file" value="override/templates.sql" else="templates.sql" >
-    	<available file="${setup.db.dir}/override/templates.sql" />
-    </condition>
-  	
-    <echo message="${db.scripts.dir}\\deploy-db-dev.sh ${server-setup.file} ${templates.file} ${DBROOTPW}" />
-    <exec dir="${db.scripts.dir}" executable="bash" failonerror="true">
-      <arg value="deploy-db-dev.sh" />
-      <arg value="${server-setup.file}" />
-      <arg value="${templates.file}" />
-      <arg value="${DBROOTPW}" />
-      <env key="CATALINA_HOME" value="${tomcat.home}"/>
-    </exec>
-    
-    <chmod perm="666">
-      <fileset dir="${db.scripts.dir}">
-        <include name="**/*"/>
-      </fileset>
-    </chmod>
-  </target>
-  
-  <target name="deploydb" depends="deploy-cloudstack-db, deploy-awsapi-db">
-  </target>
-  
-  <target name="deploydb-simulator">
-      <condition property="server-setup.file" value="${setup.db.dir}/override/server-setup.xml" else="server-setup.xml">
-      <available file="${setup.db.dir}/override/server-setup.xml" />
-    </condition>
-
-    <condition property="templates.file" value="${setup.db.dir}/override/templates.sql" else="templates.sql" >
-    	<available file="${setup.db.dir}/override/templates.sql" />
-    </condition>
-  	
-    <echo message="deploydb ${server-setup.file} ${templates.file} ${DBROOTPW}" />
-    <exec dir="${db.scripts.dir}" executable="bash" failonerror="true">
-      <arg value="deploy-db-simulator.sh" />
-      <arg value="${server-setup.file}" />
-      <arg value="${templates.file}" />
-      <arg value="${DBROOTPW}" />
-      <env key="CATALINA_HOME" value="${tomcat.home}"/>
-    </exec>
-    
-    <chmod perm="666">
-      <fileset dir="${db.scripts.dir}">
-        <include name="**/*"/>
-      </fileset>
-    </chmod>
-  </target>
-
-  <path id="test.classpath">
-    <path refid="deps.classpath" />
-    <path refid="dist.classpath"/>
-    <!-- external deps, added for jenkins
-         depends on mysql-connector-java rpm 
-    -->
-    <fileset dir="/usr/share/java/" erroronmissingdir="true">
-      <include name="mysql-connector-java.jar" />
-    </fileset>
-    <fileset dir="${unittest.jar.dir}">
-      <include name="*.jar"/>
-    </fileset>
-    <fileset dir="${deps.dir}">
-      <include name="junit-*.jar"/>
-    </fileset>
-    <dirset dir="${utils.test.dir}/resources"/>
-    <dirset dir="${server.test.dir}/resources"/>
-    <dirset dir="${base.dir}/setup/db"/>
-  </path>
-  
-  <target name="compile-tests" depends="compile-all">
-    <mkdir dir="${unittest.dir}"/>
-    <mkdir dir="${unittest.target.dir}"/>
-    <mkdir dir="${unittest.jar.dir}"/>
-
-    <compile-test jar.name="utils-test.jar" top.dir="${utils.dir}" classpath="test.classpath"/>
-    <compile-test jar.name="server-test.jar" top.dir="${server.dir}" classpath="test.classpath"/>
-  </target>
-  
-  <target name="unittest" description="Execute unit tests" depends="compile-tests">
-    <junit fork="true" printsummary="true" showoutput="true" failureproperty="junit.failure">
-      <!-- N.b. use failureproperty instead of haltonfailure, because if we use
-           the former, we will get no detailed report about the failure.
-           If the test fails, the fail element below will still assure that
-           the Ant run will exit with error status.
-      -->
-      <!--bootclasspath refid="test.classpath"/-->
-      <classpath refid="test.classpath"/>
-      <jvmarg value="${debug.jvmarg}"/>
-      <batchtest todir="${unittest.dir}">
-        <formatter type="${unittest.formatter}"/>
-        <fileset dir="${utils.test.dir}">
-          <include name="**/*Test.java"/>
-        </fileset>
-        <fileset dir="${server.test.dir}">
-          <include name="**/*Test.java"/>
-          <exclude name="**/upgrade/*.java"/>
-        </fileset>
-      </batchtest>
-    </junit>
-    <junitreport todir="${unittest.dir}">
-      <fileset dir="${unittest.dir}"/>
-      <report todir="${unittest.dir}/test-reports"/>
-    </junitreport>
-    <fail if="junit.failure" message="Unit test(s) failed.  See reports!"/>
-  </target>
-    
-  <target name="test" description="Execute one unit test" depends="compile-tests">
-    <junit fork="true" printsummary="true" showoutput="true" failureproperty="junit.failure">
-      <!-- N.b. use failureproperty instead of haltonfailure, because if we use
-           the former, we will get no detailed report about the failure.
-           If the test fails, the fail element below will still assure that
-           the Ant run will exit with error status.
-      -->
-      <classpath refid="test.classpath"/>
-      <jvmarg value="${debug.jvmarg}"/>
-      <jvmarg value="-ea"/>
-      <jvmarg value="-Xms1024m"/>
-      <jvmarg value="-Xmx1024m"/>
-      <batchtest todir="${unittest.dir}">
-        <formatter type="${unittest.formatter}"/>
-        <fileset dir="${utils.test.dir}">
-          <include name="**/${test}.java"/>
-        </fileset>
-        <fileset dir="${server.test.dir}">
-          <include name="**/${test}.java"/>
-          <exclude name="**/upgrade/*.java"/>
-        </fileset>
-      </batchtest>
-    </junit>
-    <junitreport todir="${unittest.dir}">
-      <fileset dir="${unittest.dir}"/>
-      <report todir="${unittest.dir}/test-reports"/>
-    </junitreport>
-    <fail if="junit.failure" message="Unit test(s) failed.  See reports!"/>
-  </target>
-  
-  <target name="test-suspend" description="Execute one unit test" depends="compile-tests">
-    <junit fork="true" printsummary="true" showoutput="true" failureproperty="junit.failure">
-      <!-- N.b. use failureproperty instead of haltonfailure, because if we use
-           the former, we will get no detailed report about the failure.
-           If the test fails, the fail element below will still assure that
-           the Ant run will exit with error status.
-      -->
-      <classpath refid="test.classpath"/>
-      <jvmarg value="-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y"/>
-      <jvmarg value="${assertion}"/>
-      <batchtest todir="${unittest.dir}">
-        <formatter type="${unittest.formatter}"/>
-        <fileset dir="${utils.test.dir}">
-          <include name="**/${test}.java"/>
-        </fileset>
-        <fileset dir="${server.test.dir}">
-          <include name="**/${test}.java"/>
-        </fileset>
-      </batchtest>
-    </junit>
-    <junitreport todir="${unittest.dir}">
-      <fileset dir="${unittest.dir}"/>
-      <report todir="${unittest.dir}/test-reports"/>
-    </junitreport>
-    <fail if="junit.failure" message="Unit test(s) failed.  See reports!"/>
-  </target>
-  
-  
-  <target name="build-apidocs" description="Generate api documentation" depends="build-all">
-    <property name="commands.file" location="${dist.dir}/client/conf/commands.properties" /> 
-    <property name="commands.ext.file" location="${dist.dir}/client/conf/commands-ext.properties" />
-    <property name="commands.vr.file" location="${dist.dir}/client/conf/virtualrouter_commands.properties" />
-    <property name="commands.niciranvp.file" location="${dist.dir}/client/conf/nicira-nvp_commands.properties" />
-  
-  <echo message="build-apidocs" />
-    <exec dir="${apidoc.scripts.dir}" executable="bash" failonerror="true">
-      <arg value="build-apidoc.sh" />
-      <arg value="${target.dir}/jar" />
-      <arg value="${deps.dir}" />
-      <arg value="${dist.dir}" />
-      <arg value="-f ${commands.file},${commands.ext.file},${commands.vr.file},${commands.niciranvp.file}" />
-    </exec>
-    <echo message="Result locates at ${dist.dir}/commands.xml" />
-    
-    <chmod perm="666">
-      <fileset dir="${apidoc.scripts.dir}">
-        <include name="**/*"/>
-      </fileset>
-    </chmod>
-  </target>
-  
-  <target name="build-apidocs-zip" depends="build-apidocs">
-    <delete file="${dist.dir}/apidocs-${version}.zip" />
-    <zip destfile="${dist.dir}/apidocs-${version}.zip" basedir="${dist.dir}/xmldoc/html" />
-  </target>
-
-</project>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e138596a/build/overview.html
----------------------------------------------------------------------
diff --git a/build/overview.html b/build/overview.html
deleted file mode 100755
index 22f349f..0000000
--- a/build/overview.html
+++ /dev/null
@@ -1,35 +0,0 @@
-<html>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-	
-<head><title></title></head>
-<body>
-	
-<p>
-
-VMOps source javadoc.
-		
-<p>
-<a  href="../api-test/index.html" target="_top">Javadoc for JUnit tests</a>
-is also available.
-</p>
-	
-</body>
-</html>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e138596a/build/package.xml
----------------------------------------------------------------------
diff --git a/build/package.xml b/build/package.xml
deleted file mode 100755
index 3efdd7d..0000000
--- a/build/package.xml
+++ /dev/null
@@ -1,305 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-
-
-<project name="Cloud Stack Package" basedir=".">
-  <description>
-        This is a package.xml with tools to package the cloud stack distribution
-    </description>
-
-  <dirname property="base.dir" file="${ant.file.Cloud Stack Package}/.." />
-  <property name="build.dir" location="${base.dir}/build" />
-
-  <import file="${build.dir}/build-cloud.xml" optional="false"/>
-  
-  <property name="target.dir" location="${base.dir}/target"/>
-  <property name="scripts.target.dir" location="${target.dir}/scripts"/>
-  
-  <property name="dist.dir" location="${base.dir}/dist" />
-  <property name="publish.dir" location="${dist.dir}" />
-  <property name="client.dist.dir" location="${dist.dir}/client" />
-  <property name="server.dist.dir" location="${dist.dir}/client" />
-  <property name="agent.dist.dir" location="${dist.dir}/agent" />
-  <property name="docs.dist.dir" location="${dist.dir}/docs" />
-  <property name="db.dist.dir" location="${dist.dir}/db" />
-  <property name="usage.dist.dir" location="${dist.dir}/usage" />
-  
-  <condition property="mkisofs" value="${mkisofs.override}" else="mkisofs">
-    <isset property="mkisofs.override" />
-  </condition>
-  
-  <target name="-init-package">
-    <mkdir dir="${dist.dir}" />
-    <mkdir dir="${publish.dir}" />
-  </target>
-
-  <target name="package-server" depends="-init-package">
-    <delete file="${dist.dir}/client.zip" />
-    <zip destfile="${dist.dir}/client.zip" basedir="${server.dist.dir}" />
-  </target>
-
-  <target name="package-client" depends="-init-package">
-    <zip destfile="${dist.dir}/client.zip" basedir="${client.dist.dir}">
-      <zipfileset dir="${client.dist.dir}">
-        <exclude name="**/*.sh" />
-      </zipfileset>
-      <zipfileset dir="${client.dist.dir}" filemode="555">
-        <include name="**/*.sh" />
-      </zipfileset>
-    </zip>
-  </target>
-
-  <target name="package-usage" depends="-init-package">
-    <zip destfile="${dist.dir}/usage.zip" basedir="${usage.dist.dir}" />
-  </target>
-
-  <target name="package-agent-common" depends="-init-package">
-    <zip destfile="${dist.dir}/agent.zip" duplicate="preserve">
-      <zipfileset dir="${deps.dir}">
-        <include name="cloud-xmlrpc-client-3.1.3.jar" />
-        <include name="cloud-xmlrpc-common-3.1.3.jar" />
-        <include name="cloud-ws-commons-util-1.0.2.jar" />
-        <include name="cloud-log4j.jar" />
-        <include name="cloud-apache-log4j-extras-1.0.jar" />
-        <include name="cloud-gson.jar" />
-        <include name="cloud-commons-httpclient-3.1.jar" />
-        <include name="cloud-commons-logging-1.1.1.jar" />
-        <include name="cloud-commons-collections-3.2.1.jar" />
-        <include name="cloud-commons-codec-1.4.jar" />
-        <include name="cloud-commons-pool-1.4.jar" />
-        <include name="cloud-jna.jar" />
-        <include name="cloud-cglib.jar" />
-        <include name="jetty-6.1.26.jar" />
-        <include name="jetty-util-6.1.26.jar"/>
-      </zipfileset>
-      <zipfileset dir="${jar.dir}">
-        <include name="${agent.jar}" />
-        <include name="${utils.jar}" />
-        <include name="${core.jar}" />
-        <include name="${api.jar}" />
-        <include name="${kvm.jar}" />
-      </zipfileset>
-
-      <zipfileset dir="${agent.dist.dir}" filemode="770">
-        <include name="run.sh" />
-        <include name="agent.sh" />
-      </zipfileset>
-      <zipfileset dir="${agent.dist.dir}">
-        <exclude name="run.sh/" />
-        <exclude name="agent.sh" />
-        <include name="**/*" />
-      </zipfileset>
-      <zipfileset dir="${scripts.dir}" prefix="scripts" filemode="555">
-        <exclude name="**/.project" />
-        <exclude name="**/.classpath" />
-      </zipfileset>
-    </zip>
-  </target>
-
-
-  <target name="package-agent" depends="-init-package, package-oss-systemvm,  build-systemvm-patch, package-agent-common, build-kvm">
-    <zip destfile="${dist.dir}/agent.zip" duplicate="preserve" update="true">
-      <zipfileset dir="${dist.dir}" prefix="vms">
-        <include name="patch.tgz" />
-      </zipfileset>
-      <zipfileset dir="${dist.dir}" prefix="vms" filemode="555">
-        <include name="systemvm.zip" />
-      </zipfileset>
-    </zip>
-  </target>
-
-  <target name="package-oss-systemvm-iso" depends="-init-package, package-oss-systemvm, update-oss-systemvm-with-vmware, build-systemvm-patch">
-    <exec executable="${mkisofs}" dir="${dist.dir}">
-      <arg value="-quiet"/>
-      <arg value="-r"/>
-      <arg value="-o"/>
-      <arg value="systemvm.iso"/>
-      <arg value="systemvm.zip"/>
-      <arg value="cloud-scripts.tgz"/>
-      <arg value="authorized_keys"/>
-    </exec>
-  </target>
-
-
-  <target name="package-agent-simulator" depends="-init-package">
-    <delete file="${dist.dir}/agent-simulator.zip" />
-    <zip destfile="${dist.dir}/agent-simulator.zip" duplicate="preserve">
-      <zipfileset dir="${agent-simulator.dist.dir}">
-        <exclude name="**/*.sh" />
-        <exclude name="**/vnetd" />
-        <exclude name="**/send_arp" />
-        <exclude name="**/vn" />
-        <exclude name="**/*.exp" />
-      </zipfileset>
-      <zipfileset dir="${agent-simulator.dist.dir}" filemode="555">
-        <include name="**/*.sh" />
-        <include name="**/vnetd" />
-        <include name="**/send_arp" />
-        <include name="**/vn" />
-        <include name="**/*.exp" />
-      </zipfileset>
-    </zip>
-  </target>
-
-  <!-- <target name="build-all" depends="build-opensource, build-plugins, build-ui, build-war-oss, compile-testclient, compile-usage, build-awsapi"> -->
-  <target name="build-all" depends="build-opensource, build-plugins, build-ui, build-war-oss, compile-usage, build-awsapi">
-  </target>
-
-  <target name="build-all-with-simulator" depends="build-all, compile-agent-simulator">
-      <war destfile="${client.dist.dir}/client.war" webxml="${client.dir}/WEB-INF/web.xml" update="true">
-      <lib dir="${jar.dir}">
-        <include name="cloud-*.jar" />
-        <include name="vmware-*.jar" />
-        <exclude name="cloud-servlet-api.jar"/>
-      </lib>
-    </war>
-  </target>
-
-  <target name="build-war-oss" depends="-init-package" description="Compile the GWT client UI and builds WAR file.">
-    <mkdir dir="${client.dist.dir}" />
-
-    <war destfile="${client.dist.dir}/client.war" webxml="${client.dir}/WEB-INF/web.xml" update="true">
-      <fileset dir="${client.target.dir}">
-        <include name="**/*" />
-      	<exclude name="**/*.properties" />
-      </fileset>
-      <classes dir="${client.target.dir}">
-    	  <include name="**/resources/*.properties" />
-      </classes>
-      <lib dir="${jar.dir}">
-        <include name="cloud-*.jar" />
-        <include name="vmware-*.jar" />
-        <exclude name="cloud-servlet-api.jar"/>
-      </lib>
-      <zipfileset dir="${scripts.target.dir}" prefix="WEB-INF/lib/scripts" filemode="555">
-        <include name="**/*" />
-      </zipfileset>
-      <zipfileset dir="${db.scripts.dir}" prefix="WEB-INF/lib/db" filemode="555">
-        <include name="**/*"/>
-      </zipfileset>
-    </war>
-  </target>
-
-
-  <target name="package-oss-systemvm" depends="-init-package">
-    <zip destfile="${dist.dir}/systemvm.zip" duplicate="preserve" update="true">
-      <!-- Console proxy now includes an agent shell, therefore we need to package agent related distribution -->
-      <zipfileset dir="${deps.dir}">
-        <include name="xmlrpc-client-3.1.3.jar" />
-        <include name="xmlrpc-common-3.1.3.jar" />
-        <include name="ws-commons-util-1.0.2.jar" />
-        <include name="log4j*.jar" />
-        <include name="asm-3.1.jar" />
-        <include name="apache-log4j-extras-1.1.jar" />
-        <include name="gson-1.7.1.jar" />
-        <include name="commons-httpclient-3.1.jar" />
-        <include name="commons-logging-1.1.1.jar" />
-        <include name="commons-collections-3.1.jar" />
-        <include name="commons-codec-1.6.jar" />
-        <include name="commons-pool-1.6.jar" />
-        <include name="cglib-*.jar" />
-        <include name="axis-*.jar" />
-        <include name="discovery-*.jar" />
-        <include name="wsdl4j-*.jar" />
-        <include name="ejb-api-3.0.jar" />
-        <include name="aws-java-sdk-1.3.21.1.jar" />
-        <include name="httpclient-4.1.jar" />
-        <include name="httpcore-4.1.jar" />
-        <include name="commons-lang-2.1.jar" />
-      </zipfileset>
-      <zipfileset dir="${jar.dir}">
-        <include name="${agent.jar}" />
-        <include name="${utils.jar}" />
-        <include name="${core.jar}" />
-        <include name="${api.jar}" />
-      </zipfileset>
-      <zipfileset dir="${console-proxy.dist.dir}" filemode="555"/>
-      <zipfileset dir="${scripts.dir}/storage/secondary" prefix="scripts/storage/secondary" filemode="555">
-        <exclude name="**/.project" />
-        <exclude name="**/.classpath" />
-      </zipfileset>
-    </zip>
-  </target>
-
-  <target name="update-oss-systemvm-with-vmware" depends="-init-package" if="ssvm.include.vmware.jar">
-    <zip destfile="${dist.dir}/systemvm.zip" duplicate="preserve" update="true">
-      <zipfileset dir="${jar.dir}" >
-        <include name="${vmware.jar}" />
-        <include name="${vmware-base.jar}" />
-      </zipfileset>
-    </zip>
-  </target>	
-
-  <target name="package-docs" depends="-init-package">
-    <delete file="${dist.dir}/docs.zip" />
-    <zip destfile="${dist.dir}/docs.zip" compress="false">
-      <fileset dir="${docs.dist.dir}" />
-    </zip>
-  </target>
-
-  <target name="package-test" depends="-init-package">
-    <delete file="${publish.dir}/test.zip" />
-    <zip destfile="${publish.dir}/test.zip" compress="false">
-      <zipfileset dir="${testclient.dist.dir}" filemode="555" />
-    </zip>
-  </target>
-
-  <target name="package-tools" depends="-init-package">
-    <delete file="${publish.dir}/cloudapitools.zip" />
-    <zip destfile="${publish.dir}/cloudapitools.zip" compress="false">
-      <zipfileset dir="${tools.dist.dir}" filemode="555" />
-    </zip>
-  </target>
-
-  <target name="clean-packages">
-    <delete>
-      <fileset dir="${dist.dir}" includes="*.zip" />
-    </delete>
-  </target>
-
-  <target name="package-all" depends="package-client, package-agent, package-agent-simulator, package-usage, package-docs">
-    <tstamp>
-      <format property="package.date" pattern="yyyy-MM-dd" />
-    </tstamp>
-  </target>
-
-  <target name="package-kvm" depends="package-agent">
-    <zip destfile="${dist.dir}/agent.zip" update="true">
-    	<zipfileset dir="${jar.dir}">
-    	   <include name="cloud-plugin-hypervisor-kvm.jar"/>
-    	</zipfileset>
-    	<zipfileset dir="${deps.dir}">
-    	   <include name="libvirt-0.4.8.jar"/>
-    	</zipfileset>
-    </zip>
-  </target>
-	
-  <target name="clean-zip">
-    <delete dir="${dist.dir}">
-      <include name="*.zip" />
-    </delete>
-  </target>
-
-<!-- The following target is OBSOLETE.  If you need to add a jar file / target, go to the function def runant(target): in wscrpit_build, and list the jar file and the target in the appropriate places -->
-<target name="sendjarfiles" depends="compile-utils, compile-core, compile-server, compile-agent">
-    <copy todir="${waf.artifacts}">
-      <fileset dir="${target.dir}/jar"/>
-    </copy>
-  </target>
-
-</project>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e138596a/build/release-notes
----------------------------------------------------------------------
diff --git a/build/release-notes b/build/release-notes
deleted file mode 100644
index 34b2080..0000000
--- a/build/release-notes
+++ /dev/null
@@ -1,328 +0,0 @@
-********************************************************************************             
-             VMOps Cloud Stack Version 0.4
-                            Release Notes
-********************************************************************************
-
-=================================
-WHAT'S NEW :
-=================================
-
-* NIC bonding support for the Computing, Routing, and Storage nodes to take
-advantage of the multiple NICS installed on the server.
-* Maintenance Mode support for physical servers.  Administrators now have the
-option to enable or disable maintenance mode on any physical servers.  Enabling
-maintenance mode on a Routing or Computing node will result in the seamless live
-migration of guest virtual machines into other physical servers within the same
-zone before making the server available for maintenance.
-* Introduction of a new user web interface for allowing user accounts to manage
-their own virtual machines.  This new interface has a brand new look and feel,
-allows for easier branding and customization, and is easier to incorporate into
-existing web interfaces.
-* Added support for the creation of Reseller Domains.  The Reseller Domain 
-feature allows host providers to create resellers complete with their own
-user base and administrators while using the same global computing resources
-provided by the host provider.
-* Added a new email alerting system that will now inform administrators of
-events such as when physical servers are down or computing resources are 
-passing a pre-configured threshold.
-* Massive improvements to the existing Developer and Integration API.  Error
-codes have now been added and existing API method names and parameters have been
-made more consistent.  A JSON format can also now be optionally
-returned in addition to the existing XML format.  Please read the new API
-Reference documentation for more details on the changes.
-* Billing records have now been changed to Usage records to provide data for
-both billing integration and usage metering.  Price has been completely removed
-from VMOps.  Instead we added ability to set your own display text for both 
-service offering and templates.  You can now use this to set any text for the UI
-to display.
-* New virtual machines deployed will now generate a random password.  A reset
-password is also now available both in the web user interface as well as the 
-API.  We support both Linux and Windows OS based templates.
-* Storage server is now a bare-bone installation and uses the new COMSTAR iSCSI 
-stack for improved performance.  We recognized that while running the storage 
-server as a virtual machine does allows for more hardware support, it severely 
-impacts performance.  The list of compatible hardware can be found in the Open 
-Solaris website.
-* Added clustering support for the VMOps Management Server.  
-* Added the ability to configure an additional storage ip address (separate 
-subnet) for both Routing and Computing servers.  If a server is configured with 
-an additional storage ip, all storage traffic will route through this subnet and
-all network/internet traffic will route through the existing private network.
-* Added concept of a user account.  VMOps supports multiple username for a
-single user account.
-* Created new installers for the VMOps MultiTenant Hypervisor and the VMOps
-Storage.
-
-=================================
-KNOWN ISSUES :
-=================================
-
-* DomR is still counting internal network activities as part of the usage that
-is being returned by the API.
-* The reset password for virtual machine feature does not return an error if it
-fails to successfully reset the password.
-* VMOps installation scripts to not validate bad network configuration values.
-* VNX Proxy Server does not handle rapid refreshes of web console proxy well.
-* VNC Proxy Server at times do not return a thumbnail image.
-* Rebooting a DomR instance will cause network traffic to not be collected.
-* Associating new IP addresses should clean out existing LB or PF rules before
-assigning it to a DomR instance.  
-* The Usage parse engine needs to be split out from the VMOps Management Server
-so that only a single instance of this can be running and does not affect
-normal operations.
-* Templates needs a way of specifying the minimum CPU and Memory requirements.
-* createUser API method currently allows you to assign users to admin accounts.
-* Installations of servers with more than 3 NIC sometimes duplicates the MAC
-address on the ifcfg configuration files.
-* Additional admin only API methods are missing (ie. Domain management, router
-management).
-* Usage parse engine could go OOM in the event it has not been run recently
-and there are a large (2 million+ records).
-* Problem with domU when both e1000 and e1000e used as a NIC drivers for a
-Computing Server.  The installer needs to blacklist one of the drivers.
-* vnet failures and xen crashes currently do not generate an alert to the administrator.
-* The current limit for domU instances created on a Computing Server is 64 and
-the currently limit for domR instances created is 59 on a Routing Server.
-* No current way of allowing different subnets for different pods within the
-same zone.
-* limit the number of usage and event records returned by the API.  A large
-enough of the query could cause the Management Server to go oom.
-
-=================================
-BUG FIXES :
-=================================
-
-* Improved transactions across both database calls and calls across agents.
-* Fixed an issue where duplicate IP or LB rules could be sent to the DomR
-instance during a DomR restart.
-* Removed requirement of the reverse DNS lookup for the Storage Server.
-* Massive improvements to the HA process.
-* Fixed an issue where the it would take too long for the management server
-to detect a TCP disconnect.
-* Fixed an issue where the the agent would *think* it has connected to the 
-management server but in reality, it is just stuck waiting for a response that
-will never come.
-* Generic DB lock wait timeout fixes.
-* Improvements to the general state management of the servers.
-* Fixed issue where where physical servers with the same IP attempts to connect
-to the Management Server.  The second server is now prevented from registering.
-* Fixed an issue where deleting a user from an account would result in all the
-virtual machines to be cleaned up.  This can only happen if the last user for
-an account has been deleted.
-* Fixed an issue where the source NAT ip address of a DomR instance is being
-released back into the public pool even though the DomR instance was not 
-successfully destroyed.
-* Fixed an issue where a guest virtual machine cannot be destroyed while in HA
-state.
-* Removed requirement to specify the storage type when installing a new tempate.
-* Fixed an issue where the console proxy from different zones are all starting
-in the same zone.
-* Fixed an issue where the listing of virtual machines would hang if the console
-proxy is not even started.
-* Massive improvements to our installer scripts.
-* Massive improvements to the general stability of the Cloud Stack.
-* Fixed an issue where the Hypervisor installer is unable to install onto 
-machines with a IPMI card.
-* As usual, there are too many bug fixes to list...
-
-********************************************************************************             
-             VMOps Cloud Stack Version 0.3.xxxx
-                            Release Notes
-********************************************************************************
-
-=================================
-WHAT'S NEW :
-=================================
-
-* Introduction of VMOps Developer API. This allows users of the VMOps Cloud 
-  Stack to manage their virtual machines through a set of REST-like API. 
-* Improved collection of user usage data that can be used for both billing 
-  aggregation and metric collection. 
-* High availability support for user virtual machines. 
-* Support for automatic hypervisor agent software update. 
-* VNC console proxy servers can now run as managed VMOps system VMs. The new 
-  implementation provides features such as on-demand VM startup, standby 
-  capacity pre-allocation and console proxy load monitoring. 
-* Much Improved VMOps Cloud Stack installation process. VMOps Cloud Stack can 
-  now be installed with a minimum of two physical servers.
-* VMOps Cloud Stack installation DVD now comes in two flavors. VMOps Cloud Stack 
-  Management Server Installation DVD and VMOps Cloud Stack Multitenant 
-  Hypervisor Installation DVD.
-
-=================================
-KNOWN ISSUES :
-=================================
-
-* PV drivers for Windows 2003 and Windows 2003 x86_64 (Incomplete Feature)
-* GUI panel for allowing administrators to set various system configurations -
-  i.e. zones, pods, ip addresses (Incomplete Feature)
-* Support for multiple NIC cards on computing, routing, and storage servers 
-  (Disabled Feature)
-* Support for resellers (Incomplete Feature)
-* Allow admins/users to specify the root password for their new instance.  It 
-  cannot default to root/password (Bug 134)
-* Admin/User Dashboard (Bug 154 and 155)
-* Dynamically refresh server and vm instance status in GUI without a manual
-  refresh (Bug 389)
-* Need transaction semantics across DB and agent.  Without this, it is possible
-  to timeout db calls that first lock a record and relies on an agent response
-  before releasing that record. (Bug 408)
-* All Server Roles (Mgmt, Computing, Routing, and Storage) require a functioning
-  eth0 NIC in order to install correctly. (Bug 470)
-* Unable to handle HA when an entire Pod is unreachable (Bug 620)
-* Improved network traffic reporting (Bug 642)
-* Multiple login support a single user account (Bug 589)
-* DomR instances continue to run even though all VMs associated with the DomR
-  are no longer even running. (Bug 617)
-* HA fails when VM and Router for the same user go down at the same time
-  (Bug 603)
-
-=================================
-BUG FIXES :
-=================================
-
-* Improved Billing data generation (Bug 482)
-* Able to create new admins through the admin console UI. (Bug 492)
-* Able to create new Service Offerings through the admin console UI (Bug 500)
-* Significantly improved the imaging speed when installing VMOps Cloud Stack
-  (Bug 476)
-* Harden DomR Template to prevent unauthorized access
-* No longer require eth0 during installation process of the hosts (Bug 490)
-* Fixed issue where having multiple NIC cards caused issues (Bug 489)
-* Installation UI will now allow you to select to the disk for storage
-  (Bug 556)
-* Installation UI will now allow you to select NIC to use as private, public,
-  or simply disabled
-* Mgmt server will now reflect the status of user vms if the storage server that
-  hosts the vm's volumes is no longer accessible. (Bug 521)
-* Routing and Console Proxy VM will now be HA-enabled by default (Bug 614)
-* Console Proxy VM are now automatically managed by the Mgmt Server (Bug 110)
-* Template Management from the console admin UI should be improved
-* Too many to list...
-
-********************************************************************************             
-             VMOps Cloud Stack Version 0.2.6297
-                            Release Notes
-********************************************************************************
-
-=================================
-WHAT'S NEW :
-=================================
-
-* VMOps Server
-  - Introduction of VMOps Integration API.  This API allows service providers
-    to provision users and to retrieve billing info and events.  It is a simple 
-    query language written on top of HTTP that simply returns results in XML 
-    format.  
-  - Improved VMOps Server installation process.
-
-* VMOps Multitenant Hypervisor
-  - Improved VMOps Multitenant Hypervisor installation process.
-
-=================================
-KNOWN ISSUES :
-=================================
-
-* PV drivers for Windows 2003 and Windows 2003 x86_64 (Incomplete Feature) 
-* Developer, Billing, and Provisioning API (Incomplete Feature)
-* Mirroring of disk images on storage servers across pods (Incomplete Feature)
-* HA Enabled VMs (Disabled Feature)
-* Firewall integration API (Incomplete Feature)
-* GUI panel for allowing administrators to set various system configurations -
-  i.e. zones, pods, ip addresses (Incomplete Feature)
-* Support for multiple NIC cards on computing, routing, and storage servers 
-  (Disabled Feature)
-* Ability to deploy agent upgrade on VMOps server and have the upgrade 
-  automatically propagated to storage, routing, and computing servers.
-  (Bug 386)
-* Detailed IO stats for storage servers (Bug 94)
-* Admin/User Dashboard (Bug 154 and 155)
-* OpenSolaris kernel panic (Bug 413)
-* Dynamically refresh server and vm instance status in GUI without a manual
-  refresh (Bug 389)
-* Need transaction semantics across DB and agent.  Without this, it is possible
-  to timeout db calls that first lock a record and relies on an agent response
-  before releasing that record. (Bug 408)
-* All Server Roles (Mgmt, Computing, Routing, and Storage) require a functioning
-  eth0 NIC in order to install correctly. (Bug 470)
-* Admin Console UI Templates Tab needs improvement.  (Bug 469)
-* Unable to create new admins through the admin console UI. (Bug 492)
-* Unable to create new Service Offerings through the admin console UI (Bug 500)
-
-=================================
-BUG FIXES :
-=================================
-
-* Added a new XML (server-setup.xml) to configure initial VMOps Server data.
-  (Bug 430)
-* Made installation of the router template easier (Bug 434)
-* Deleting a user through the admin UI will now show a progress bar (Bug 428)
-* You can no longer any drop down boxes in the search left panel of the console
-  UI (Bug 439)
-* Configured dom0 and domR to no longer do any reverse DNS lookup (Bug 459)
-* Fixed installer to handle multiple NIC (Bug 457)
-* Missing SDL module in all templates (Bug 449)
-
-********************************************************************************             
-             VMOps Cloud Stack Version 0.1.6053
-                            Release Notes
-********************************************************************************
-
-=================================
-WHAT'S NEW :
-=================================
-
-* VMOps Server
-  - Complete web UI for both administrators and users to manage VMOps Cloud
-    Stack.  
-  - Allows administrators to manage the creation of service offerings and set
-    its pricing along with pricing for network bandwidth, additional public
-    ips, and vm templates.
-  - Allows administrators to retrieve billing records and user usages.
-  - VM Sync - coordinates, manages, and maintains the life cycle of VMOps agents 
-    running on attached computing, routing, and storage hosts.
-  - VM Template Management - allows administrators to manage and upload hosted 
-    vm templates into VMOps Cloud Stack.
-
-* VMOps Multitenant Hypervisor
-  - Designed to allow for the complete isolation of CPU, memory, storage, and 
-    network resources for each user.  
-  � Hypervisor Attached Storage (HAS) � The storage solution that is 
-    integrated within the hypervisor and does not rely on centralized SAN or NAS
-    to implement storage virtualization.  It provides a high performance and 
-    ultra-reliable block storage for virtual machine images
-  - Hypervisor Aware Network (HAN) � The network solution for VMOps Cloud Stack 
-    that implements the necessary IP address translation and tunneling for the 
-    guest OS running inside the virtual machine.  It does not rely on VLAN to 
-    implement any network virtualization and isolation.
-
-=================================
-KNOWN ISSUES :
-=================================
-
-* PV drivers for Windows 2003 and Windows 2003 x86_64 (Incomplete Feature) 
-* Developer, Billing, and Provisioning API (Incomplete Feature)
-* Mirroring of disk images on storage servers across pods (Incomplete Feature)
-* HA Enabled VMs (Disabled Feature)
-* Firewall integration API (Incomplete Feature)
-* GUI panel for allowing administrators to set various system configurations -
-  i.e. zones, pods, ip addresses (Incomplete Feature)
-* Support for multiple NIC cards on computing, routing, and storage servers 
-  (Disabled Feature)
-* Ability to deploy agent upgrade on VMOps server and have the upgrade 
-  automatically propagated to storage, routing, and computing servers.
-  (Bug 386)
-* Detailed IO stats for storage servers (Bug 94)
-* Admin/User Dashboard (Bug 154 and 155)
-* OpenSolaris kernel panic (Bug 413)
-* Dynamically refresh server and vm instance status in GUI without a manual
-  refresh (Bug 389)
-* Need transaction semantics across DB and agent.  Without this, it is possible
-  to timeout db calls that first lock a record and relies on an agent response
-  before releasing that record. (Bug 408)
-
-=================================
-BUG FIXES :
-=================================
-
-* N/A
\ No newline at end of file