You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by mc...@apache.org on 2013/02/05 19:06:57 UTC
[14/51] [abbrv] git commit: refs/heads/vim51_win8 - Remove the last
remnants of the old build system
Remove the last remnants of the old build system
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/e138596a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/e138596a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/e138596a
Branch: refs/heads/vim51_win8
Commit: e138596aa72c2ccb577600ac9766520ca721c5e5
Parents: 1d67c80
Author: Hugo Trippaers <ht...@schubergphilis.com>
Authored: Sat Feb 2 13:55:38 2013 +0100
Committer: Hugo Trippaers <ht...@schubergphilis.com>
Committed: Sat Feb 2 13:55:38 2013 +0100
----------------------------------------------------------------------
build.xml | 49 ---
build/.gitignore | 18 -
build/build-aws-api.properties | 28 --
build/build-aws-api.xml | 478 ---------------------
build/build-cloud-plugins.xml | 328 ---------------
build/build-cloud.properties | 26 --
build/build-cloud.xml | 595 --------------------------
build/build-common.xml | 100 -----
build/build-devcloud.xml | 98 -----
build/build-docs.xml | 82 ----
build/build-marvin.xml | 71 ----
build/build-tests.xml | 319 --------------
build/build-usage.xml | 69 ---
build/cloud.properties | 29 --
build/developer.xml | 431 -------------------
build/overview.html | 35 --
build/package.xml | 305 --------------
build/release-notes | 328 ---------------
cloud.spec | 647 -----------------------------
waf | Bin 92487 -> 0 bytes
waf.bat | 44 --
wscript | 782 -----------------------------------
wscript_build | 457 --------------------
wscript_configure | 408 ------------------
24 files changed, 0 insertions(+), 5727 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e138596a/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
deleted file mode 100755
index b013518..0000000
--- a/build.xml
+++ /dev/null
@@ -1,49 +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 Build Dispatch" default="help" basedir=".">
- <description>
- This is the overall dispatch file. It includes other build
- files but doesnot provide targets of its own. Do not modify
- this file. If you need to create your own targets, modify the
- developer.xml.
- </description>
-
- <dirname property="base.dir" file="${ant.file.Cloud Stack Build Dispatch}"/>
-
- <condition property="build-cloud.properties.file" value="${base.dir}/build/override/build-cloud.properties" else="${base.dir}/build/build-cloud.properties">
- <available file="${base.dir}/build/override/build-cloud.properties" />
- </condition>
-
- <property file="${build-cloud.properties.file}"/>
-
- <property name="dist.dir" location="${base.dir}/dist"/>
- <property name="target.dir" location="${base.dir}/target"/>
-
- <import file="${base.dir}/build/build-cloud.xml" optional="false"/>
- <import file="${base.dir}/build/build-cloud-plugins.xml" optional="false"/>
- <import file="${base.dir}/build/build-docs.xml" optional="true"/>
- <import file="${base.dir}/build/build-tests.xml" optional="true"/>
- <import file="${base.dir}/build/build-marvin.xml" optional="true"/>
- <import file="${base.dir}/build/package.xml" optional="true"/>
- <import file="${base.dir}/build/developer.xml" optional="true"/>
- <import file="${base.dir}/build/build-devcloud.xml" optional="true"/>
- <import file="${base.dir}/build/build-usage.xml" optional="false"/>
- <import file="${base.dir}/build/build-aws-api.xml" optional="false"/>
-</project>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e138596a/build/.gitignore
----------------------------------------------------------------------
diff --git a/build/.gitignore b/build/.gitignore
deleted file mode 100644
index d11410d..0000000
--- a/build/.gitignore
+++ /dev/null
@@ -1,18 +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.
-
-/override
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e138596a/build/build-aws-api.properties
----------------------------------------------------------------------
diff --git a/build/build-aws-api.properties b/build/build-aws-api.properties
deleted file mode 100644
index 0a02d1b..0000000
--- a/build/build-aws-api.properties
+++ /dev/null
@@ -1,28 +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.
-
-company.major.version=1
-company.minor.version=0
-company.patch.version=8
-
-target.compat.version=1.6
-source.compat.version=1.6
-
-debug=true
-build.type=developer
-debuglevel=lines,source,vars
-deprecation=off
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e138596a/build/build-aws-api.xml
----------------------------------------------------------------------
diff --git a/build/build-aws-api.xml b/build/build-aws-api.xml
deleted file mode 100644
index 40ad22c..0000000
--- a/build/build-aws-api.xml
+++ /dev/null
@@ -1,478 +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="awsapi" default="help" basedir=".">
- <target name="help">
- <echo level="info" message="Ant Build File for awsapi" />
- <echo level="info" message="Type 'ant -projecthelp' to get a list of targets and their descriptions." />
- </target>
- <target name="usage" depends="help" />
- <dirname property="base.dir" file="${ant.file.awsapi}/.." />
- <property environment="env" />
- <property name="axis2.home" value="${base.dir}" />
- <path id="axis2.classpath">
- <fileset dir="${axis2.home}">
- <include name="deps/*.jar" />
- </fileset>
- </path>
- <taskdef name="wsdl2code" classname="org.apache.axis2.tool.ant.AntCodegenTask" classpathref="axis2.classpath" />
- <!-- directories for build and distribution -->
- <!-- property name="env.CATALINA_HOME" value="${base.dir}/tomcat" / -->
- <property name="catalina.dir" value="${env.CATALINA_HOME}" />
- <property name="build.dir" location="${base.dir}/build" />
- <property name="buildnumber.dir" location="${build.dir}/" />
- <property name="target.dir" location="${base.dir}/target" />
- <property name="classes.dir" location="${target.dir}/classes" />
- <property name="dist.files.dir" location="${target.dir}/dist-files" />
- <property name="db.dir" location="${base.dir}/awsapi-setup/db/mysql" />
- <property name="jar.dir" location="${target.dir}/jar" />
- <property name="build.log" location="${target.dir}/ant_verbose.txt" />
- <property name="thirdparty.dir" location="${base.dir}/deps/awsapi-lib" />
- <!-- <property name="rampart.dir" location="${base.dir}/deps/awsapi-lib/rampart-lib" /> -->
- <property file="${build.dir}/build-aws-api.properties" />
- <property name="version" value="${company.major.version}.${company.minor.version}.${company.patch.version}" />
- <property name="tomcat.home" location="${catalina.dir}" />
- <property name="deploy.dir" location="${tomcat.home}" />
- <property name="rpm.tomcat.dir" location="${rpm.install.dir}/usr/share/cloud/bridge" />
- <property name="debian.install.dir" location="${base.dir}/packages/config/debian/tmp" />
- <property name="debian.tomcat.dir" location="${debian.install.dir}/usr/share/cloud/bridge" />
- <echo level="info" message="deploy home: ${deploy.dir}" />
- <path id="thirdparty.classpath">
- <fileset dir="${thirdparty.dir}">
- <include name="*.jar" />
- </fileset>
- </path>
-<!-- <path id="rampart.classpath">
- <fileset dir="${rampart.dir}">
- <include name="*.jar" />
- </fileset>
- </path> -->
- <path id="dist.classpath">
- <fileset dir="${target.dir}">
- <include name="**/*.jar" />
- </fileset>
- </path>
- <target name="-init-awsapi">
- <mkdir dir="${dist.files.dir}" />
- <record name="${build.log}" loglevel="verbose" action="start" />
- <!-- create a UTC build timestamp using ISO 8601 formatting -->
- <tstamp>
- <format property="utc.build.timestamp" pattern="yyyy-MM-dd'T'HH:mm:ss.SSS'Z'" timezone="GMT" />
- </tstamp>
- <!-- remember who/where did the build -->
- <exec executable="hostname" outputproperty="host.name" />
- <property name="builder.at" value="${user.name} at ${host.name}" />
- <property name="builder.id" value="${builder.at}, on ${utc.build.timestamp}" />
- <property name="built.by" value="${builder.at}, ${utc.build.timestamp}" />
- <echo level="info" message="builder: ${builder.id}" />
- <!-- set build.number property, stored in eponymous file -->
- <buildnumber file="${buildnumber.dir}/build.number" />
- <condition property="impl.version" value="${version}.${build.number}" else="${version}">
- <and>
- <isset property="update.build.number" />
- </and>
- </condition>
- <echo message="Build number is ${impl.version}" />
- <!--
- <propertyfile file="${base.dir}/awsapi/conf/ec2-service.properties">
- <entry key="awsapiVersion" value="${impl.version}" />
- </propertyfile>
- -->
- <!-- Create the build directory structure used by compile -->
- <mkdir dir="${jar.dir}" />
- <mkdir dir="${dep.cache.dir}" />
- <record name="${build.log}" action="stop" />
- </target>
-
- <target name="clean-awsapi" description="clean up files generated by the build">
- <delete file="${build.log}" />
- <delete dir="${classes.dir}" />
- <delete dir="${jar.dir}" />
- <delete dir="${dist.files.dir}" />
- <delete dir="${target.dir}" />
- </target>
- <target name="clean-awsapi-tomcat">
- <delete dir="${tomcat.home}/webapps/awsapi" />
- <delete dir="${tomcat.home}/webapps7080/awsapi" />
- </target>
- <path id="awsapi.classpath">
- <path refid="deps.classpath" />
- <!-- <path refid="thirdparty.classpath" /> -->
-<!-- <path refid="rampart.classpath" /> -->
- <path refid="dist.classpath" />
- </path>
- <target name="compile-awsapi" depends="-init-awsapi" description="Compile Cloud.com Simple Storage Service">
- <compile-java jar.name="cloud-awsapi.jar" top.dir="${base.dir}/awsapi" classpath="awsapi.classpath">
- <include-files>
- <fileset dir="${base.dir}/awsapi/src">
- <include name="**/*.hbm.xml" />
- </fileset>
- </include-files>
- </compile-java>
- </target>
- <target name="build-awsapi-jar" depends="-init-awsapi, compile-awsapi" description="Builds awsapi jar file.">
- <jar jarfile="${dist.files.dir}/cloud-awsapi.jar" basedir="${target.dir}/classes/cloud-awsapi.jar" excludes="**/client/*">
- <fileset dir="${base.dir}/awsapi/src">
- <include name="**/*.hbm.xml" />
- </fileset>
- </jar>
- </target>
- <target name="build-awsapi-s3" depends="-init-awsapi, compile-awsapi" description="Builds awsapi S3 AAR file.">
- <jar jarfile="${dist.files.dir}/cloud-s3.aar" basedir="${target.dir}/classes/cloud-awsapi.jar" excludes="**/*">
- <!--
- <metainf dir="${base.dir}/resource/AmazonS3">
- <include name="services.xml" />
- <include name="AmazonS3.wsdl" />
- </metainf>
--->
- </jar>
- </target>
- <target name="build-cloud-auth-s3" depends="-init-awsapi, compile-awsapi" description="Builds awsapi S3 auth MAR file.">
- <jar jarfile="${dist.files.dir}/cloud-auth-s3.mar" basedir="${target.dir}/classes/cloud-awsapi.jar" excludes="**/*">
- <fileset dir="${target.dir}/classes/cloud-awsapi.jar">
- <include name="**/auth/s3/*.class" />
- </fileset>
- <metainf dir="${base.dir}/awsapi/src/com/cloud/bridge/auth/s3">
- <include name="module.xml" />
- </metainf>
- </jar>
- </target>
- <target name="build-awsapi-ec2" depends="-init-awsapi, compile-awsapi" description="Builds awsapi EC2 AAR file.">
- <jar jarfile="${dist.files.dir}/cloud-ec2.aar" basedir="${target.dir}/classes/cloud-awsapi.jar" excludes="**/*">
- <metainf dir="${base.dir}/awsapi/resource/AmazonEC2">
- <include name="services.xml" />
- </metainf>
- </jar>
- </target>
- <target name="build-cloud-auth-ec2" depends="-init-awsapi, compile-awsapi" description="Builds awsapi EC2 auth MAR file.">
- <jar jarfile="${dist.files.dir}/cloud-auth-ec2.mar" basedir="${target.dir}/classes/cloud-awsapi.jar" excludes="**/*">
- <fileset dir="${target.dir}/classes/cloud-awsapi.jar">
- <include name="**/auth/ec2/*.class" />
- </fileset>
- <metainf dir="${base.dir}/awsapi/src/com/cloud/bridge/auth/ec2">
- <include name="module.xml" />
- </metainf>
- </jar>
- </target>
- <target name="deploy-axis" depends="-init-awsapi">
- <unwar overwrite="true" src="${base.dir}/deps/awsapi-lib/axis2-webapp-1.5.1.war" dest="${server.deploy.to.dir}/webapps7080/awsapi" >
- <patternset>
- <exclude name="WEB-INF/lib/log4j-1.2.15.jar"/>
- </patternset>
- </unwar>
- </target>
- <condition property="access_key.private.notpresent">
- <not>
- <available file="${base.dir}/awsapi/cloud_private_key.pem" type="file" property="access_key.private.notpresent"/>
- </not>
- </condition>
- <!-- Dev Environment ONLY -->
- <target name="generate-cloud-access-keys" if="access_key.private.notpresent">
- <exec executable="openssl" searchpath="true">
- <arg line="req -x509 -nodes -days 365 -newkey rsa:2048 -subj '/C=US/ST=California/L=Cupertino/O=cloud.com/CN=awsapi-test' -keyout ${base.dir}/cloud_private_key.pem -out ${base.dir}/cloud_cert.pem"/>
- </exec>
- </target>
- <!-- Dev Environment ONLY - this assumes EC2_ACCESS_KEY, EC2_SECRET_KEY and EC2_URL have already been defined...-->
- <target name="register-cloud-bridge" description="Register with cloud-bridge (For Dev environments only)" depends="generate-cloud-access-keys">
- <exec executable="${base.dir}/awsapi-setup/setup/cloud-bridge-register">
- <arg value="--apikey=${env.EC2_ACCESS_KEY}" />
- <arg value="--secretkey=${env.EC2_SECRET_KEY}" />
- <arg value="--cert=${base.dir}/cloud_cert.pem" />
- <arg value="--url=${env.EC2_URL}" />
- </exec>
- </target>
- <target name="build-awsapi" depends="build-awsapi-jar,build-awsapi-s3,build-awsapi-ec2,build-cloud-auth-s3,build-cloud-auth-ec2" description="Builds all of awsapi">
- </target>
- <target name="deploy-awsapi" depends="deploy-axis">
- <!--
- <copy todir="${deploy.dir}/webapps7080/awsapi/WEB-INF/services">
- <fileset dir="${dist.files.dir}">
- <include name="cloud-s3.aar"/>
- </fileset>
- </copy>
- -->
- <copy todir="${server.deploy.to.dir}/webapps7080/awsapi/WEB-INF/services">
- <fileset dir="${dist.files.dir}">
- <include name="cloud-ec2.aar" />
- </fileset>
- </copy>
- <copy todir="${server.deploy.to.dir}/webapps7080/awsapi/WEB-INF/modules">
- <fileset dir="${dist.files.dir}">
- <include name="cloud-auth-s3.mar" />
- </fileset>
- </copy>
- <copy todir="${server.deploy.to.dir}/webapps7080/awsapi/WEB-INF/modules">
- <fileset dir="${dist.files.dir}">
- <include name="cloud-auth-ec2.mar" />
- </fileset>
- </copy>
- <copy todir="${server.deploy.to.dir}/webapps7080/awsapi/WEB-INF/lib">
- <fileset dir="${jar.dir}">
- <include name="cloud-awsapi.jar" />
- <include name="jasypt-1.9.0.jar" />
- <include name="cloud-utils.jar" />
- </fileset>
- </copy>
- <copy todir="${server.deploy.to.dir}/webapps7080/awsapi/WEB-INF/lib">
- <fileset dir="${base.dir}/deps/awsapi-lib">
- <include name="*.jar" />
- <exclude name="mysql-connector-java-5.1.7-bin.jar" />
- <exclude name="servlet-api.jar" />
- </fileset>
- </copy>
- <copy todir="${server.deploy.to.dir}/lib">
- <fileset dir="${base.dir}/deps/awsapi-lib">
- <include name="mysql-connector-java-5.1.7-bin.jar" />
- </fileset>
- </copy>
- <copy overwrite="false" todir="${server.deploy.to.dir}/conf">
- <fileset dir="${base.dir}/awsapi/conf/">
- <include name="**/*" />
- </fileset>
- </copy>
- <copy overwrite="true" todir="${server.deploy.to.dir}/webapps7080/awsapi/WEB-INF/conf">
- <fileset dir="${base.dir}/awsapi/resource/Axis2/">
- <include name="axis2.xml" />
- </fileset>
- </copy>
- <copy overwrite="true" todir="${server.deploy.to.dir}/webapps7080/awsapi/WEB-INF">
- <fileset dir="${base.dir}/awsapi/web/">
- <include name="web.xml" />
- </fileset>
- </copy>
- <!-- rampart lib goes where the axis lib files go
- <copy todir="${server.deploy.to.dir}/webapps7080/awsapi/WEB-INF/lib">
- <fileset dir="${base.dir}/deps/awsapi-lib/rampart-lib">
- <include name="*.jar" />
- </fileset>
- </copy> -->
- <!-- copying over rampart mar files for WS-Security -->
- <copy todir="${server.deploy.to.dir}/webapps7080/awsapi/WEB-INF/modules">
- <fileset dir="${base.dir}/deps/awsapi-lib/modules">
- <include name="*.mar" />
- </fileset>
- </copy>
- <!-- WS-Security requires this keystore -->
- <copy todir="${server.deploy.to.dir}/webapps7080/awsapi/WEB-INF/classes">
- <fileset dir="${base.dir}/awsapi/resource/AmazonEC2">
- <include name="crypto.properties" />
- <include name="xes.keystore" />
- </fileset>
- </copy>
- </target>
-<!--
- <target name="deploy-debian-install" depends="build-awsapi-jar, build-awsapi">
- <copy todir="${debian.tomcat.dir}/webapps7080/awsapi/WEB-INF/services">
- <fileset dir="${dist.files.dir}">
- <include name="cloud-s3.aar"/>
- <include name="cloud-ec2.aar" />
- </fileset>
- </copy>
- <copy todir="${debian.tomcat.dir}/webapps7080/awsapi/WEB-INF/modules">
- <fileset dir="${dist.files.dir}">
- <include name="cloud-auth-s3.mar" />
- <include name="cloud-auth-ec2.mar" />
- </fileset>
- <fileset dir="${base.dir}/modules">
- <include name="*.mar" />
- </fileset>
- </copy>
- <copy todir="${debian.tomcat.dir}/webapps7080/awsapi/WEB-INF/lib">
- <fileset dir="${base.dir}/rampart-lib">
- <include name="*.jar" />
- </fileset>
- <fileset dir="${jar.dir}">
- <include name="cloud-awsapi.jar" />
- <include name="jasypt-1.9.0.jar" />
- </fileset>
- </copy>
- <copy todir="${debian.tomcat.dir}/lib">
- <fileset dir="${base.dir}/lib">
- <include name="*.jar" />
- </fileset>
- </copy>
- <copy todir="${debian.tomcat.dir}/webapps7080/awsapi/WEB-INF/classes">
- <fileset dir="${base.dir}/resource/AmazonEC2">
- <include name="crypto.properties" />
- <include name="xes.keystore" />
- </fileset>
- </copy>
- <copy overwrite="true" todir="${debian.tomcat.dir}/conf">
- <fileset dir="${base.dir}/awsapi/conf/">
- <include name="**/*" />
- </fileset>
- <fileset dir="${base.dir}/awsapi-setup/tomcat">
- <include name="**/*" />
- </fileset>
- </copy>
- <copy overwrite="true" todir="${debian.tomcat.dir}/webapps7080/awsapi/WEB-INF/conf">
- <fileset dir="${base.dir}/awsapi/resource/Axis2/">
- <include name="axis2.xml" />
- </fileset>
- </copy>
- <copy overwrite="true" todir="${debian.tomcat.dir}/webapps7080/awsapi/WEB-INF">
- <fileset dir="${base.dir}/awsapi/web/">
- <include name="web.xml" />
- </fileset>
- </copy>
- <copy overwrite="true" todir="${debian.install.dir}/usr/share/cloud/setup/bridge/db">
- <fileset dir="${base.dir}/db/mysql">
- <include name="*.sql" />
- <include name="*.sh" />
- </fileset>
- </copy>
- <copy overwrite="true" todir="${debian.install.dir}/etc/init.d">
- <fileset dir="${base.dir}/awsapi-setup/init/debian/">
- <include name="cloud-bridge" />
- </fileset>
- </copy>
- <copy overwrite="true" todir="${debian.install.dir}/usr/bin">
- <fileset dir="${base.dir}/awsapi-setup/setup">
- <include name="*" />
- </fileset>
- </copy>
- </target>
--->
-
- <target name="deploy-rpm-install" depends="build-awsapi-jar, build-awsapi">
- <copy todir="${rpm.tomcat.dir}/webapps7080/awsapi/WEB-INF/services">
- <fileset dir="${dist.files.dir}">
-<!--
- <include name="cloud-s3.aar"/>
--->
- <include name="cloud-ec2.aar" />
- </fileset>
- </copy>
- <copy todir="${rpm.tomcat.dir}/webapps7080/awsapi/WEB-INF/modules">
- <fileset dir="${dist.files.dir}">
- <include name="cloud-auth-s3.mar" />
- <include name="cloud-auth-ec2.mar" />
- </fileset>
- <fileset dir="${base.dir}/awsapi/modules">
- <include name="*.mar" />
- </fileset>
- </copy>
- <copy todir="${rpm.tomcat.dir}/webapps7080/awsapi/WEB-INF/lib">
- <fileset dir="${base.dir}/deps/awsapi-lib/rampart-lib">
- <include name="*.jar" />
- </fileset>
- <fileset dir="${base.dir}/deps">
- <include name="axiom-*.jar"/>
- <include name="jasypt-1.9.0.jar"/>
- <include name="jasypt-1.9.0.jar"/>
- <include name="axis2-*.jar"/>
- <include name="XmlSchema-*.jar"/>
- <include name="json-simple*.jar"/>
- <include name="neethi*.jar"/>
- <include name="woden-*.jar"/>
- <include name="xercesImpl*.jar"/>
- <include name="xml-apis*.jar"/>
- <include name="antlr*.jar"/>
- <include name="dom4j*.jar"/>
- <include name="javassist*.jar"/>
- </fileset>
- <fileset dir="${jar.dir}">
- <include name="cloud-awsapi.jar" />
- </fileset>
- </copy>
- <copy todir="${rpm.tomcat.dir}/lib">
- <fileset dir="${base.dir}/deps/awsapi-lib/">
- <include name="*.jar" />
- </fileset>
- </copy>
- <copy todir="${rpm.tomcat.dir}/webapps7080/awsapi/WEB-INF/classes">
- <fileset dir="${base.dir}/awsapi/resource/AmazonEC2">
- <include name="crypto.properties" />
- <include name="xes.keystore" />
- </fileset>
- </copy>
- <copy overwrite="false" todir="${rpm.tomcat.dir}/conf">
- <fileset dir="${base.dir}/awsapi/conf/">
- <include name="**/*" />
- </fileset>
- </copy>
- <copy overwrite="true" todir="${rpm.tomcat.dir}/webapps7080/awsapi/WEB-INF/conf">
- <fileset dir="${base.dir}/awsapi/resource/Axis2/">
- <include name="axis2.xml" />
- </fileset>
- </copy>
- <copy overwrite="true" todir="${rpm.tomcat.dir}/webapps7080/awsapi/WEB-INF">
- <fileset dir="${base.dir}/awsapi/web/">
- <include name="web.xml" />
- </fileset>
- </copy>
- <copy overwrite="true" todir="${rpm.install.dir}/usr/share/cloud/setup/bridge/db">
- <fileset dir="${base.dir}/awsapi-setup/db/mysql">
- <include name="*.sql" />
- <include name="*.sh" />
- </fileset>
- </copy>
- <copy overwrite="true" todir="${rpm.install.dir}/etc/init.d">
- <fileset dir="${base.dir}/awsapi-setup/init/rpm/">
- <include name="cloud-bridge" />
- </fileset>
- </copy>
- <copy overwrite="true" todir="${rpm.install.dir}/usr/bin">
- <fileset dir="${base.dir}/awsapi-setup/setup">
- <include name="*" />
- </fileset>
- </copy>
- </target>
-
- <target name="deploy-awsapi-db">
- <echo message="deploy-awsapi-db" />
- <exec dir="${db.dir}" executable="bash">
- <arg value="deploy-db-bridge.sh" />
- <arg value="${DBROOTPW}" />
- </exec>
- </target>
- <target name="download-ELB-wsdl">
- <echo message="downloading ElasticLoadBalancing.wsdl..." />
- <get src="http://elasticloadbalancing.amazonaws.com/doc/2011-04-05/ElasticLoadBalancing.wsdl" dest="wsdl/" verbose="true" usetimestamp="true" overwrite="false"/>
- </target>
- <target name="codegen-server-s3">
- <wsdl2code
- wsdlfilename="${base.dir}/wsdl/cloud-AmazonS3.wsdl"
- serverside="true"
- generateservicexml="true"
- skipbuildxml="true"
- serversideinterface="true"
- namespacetopackages="http://s3.amazonaws.com/doc/2006-03-01/=com.amazon.s3"
- targetsourcefolderlocation="src"
- targetresourcesfolderlocation="resource/AmazonS3"
- overwrite="true"
- />
- </target>
- <target name="codegen-server-ec2">
- <wsdl2code wsdlfilename="${base.dir}/wsdl/AmazonEC2.wsdl" serverside="true" generateservicexml="true" skipbuildxml="true" serversideinterface="true" namespacetopackages="http://ec2.amazonaws.com/doc/2010-11-15/=com.amazon.ec2"
- targetsourcefolderlocation="src" targetresourcesfolderlocation="resource/AmazonEC2" overwrite="true" />
- </target>
- <target name="codegen-server-elb" depends="download-ELB-wsdl">
- <wsdl2code wsdlfilename="${base.dir}/wsdl/ElasticLoadBalancing.wsdl" serverside="true" generateservicexml="true" skipbuildxml="true" serversideinterface="true" namespacetopackages="http://elasticloadbalancing.amazonaws.com/doc/2011-04-05/=com.amazon.elb" targetsourcefolderlocation="src" targetresourcesfolderlocation="resource/AmazonELB" overwrite="true" />
- </target>
- <target name="codegen-client-s3">
- <wsdl2code wsdlfilename="${base.dir}/wsdl/cloud-AmazonS3.wsdl" serverside="false" generateservicexml="false" skipbuildxml="true" serversideinterface="false" namespacetopackages="http://s3.amazonaws.com/doc/2006-03-01/=com.amazon.s3.client" targetsourcefolderlocation="src" targetresourcesfolderlocation="resource/AmazonS3" overwrite="true" />
- </target>
- <target name="codegen-client-ec2">
- <wsdl2code wsdlfilename="${base.dir}/wsdl/AmazonEC2.wsdl" serverside="false" generateservicexml="false" skipbuildxml="true" serversideinterface="false" namespacetopackages="http://ec2.amazonaws.com/doc/2010-11-15/=com.amazon.ec2.clieent" targetsourcefolderlocation="src" targetresourcesfolderlocation="resource/AmazonEC2" overwrite="true" />
- </target>
- <target name="codegen-client-elb" depends="download-ELB-wsdl">
- <wsdl2code wsdlfilename="${base.dir}/wsdl/ElasticLoadBalancing.wsdl" serverside="false" generateservicexml="false" skipbuildxml="true" serversideinterface="false" namespacetopackages="http://elasticloadbalancing.amazonaws.com/doc/2011-04-05/=com.amazon.elb.client" targetsourcefolderlocation="src" targetresourcesfolderlocation="resource/AmazonELB" overwrite="true" />
- </target>
-</project>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e138596a/build/build-cloud-plugins.xml
----------------------------------------------------------------------
diff --git a/build/build-cloud-plugins.xml b/build/build-cloud-plugins.xml
deleted file mode 100755
index 207ef71..0000000
--- a/build/build-cloud-plugins.xml
+++ /dev/null
@@ -1,328 +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 Plugins" default="help" basedir=".">
-
- <target name="help">
- <echo level="info" message="Ant Build File for CloudStack Plugins" />
- <echo level="info" message="Type 'ant -projecthelp' to get a list of targets and their descriptions." />
- </target>
-
- <description>
- Cloud Stack ant build file for building all the plugins
- </description>
-
- <!--
- Test
- Always use this variable to refer to the base directory because this
- variable is changeable
- -->
- <dirname property="base.dir" file="${ant.file.Cloud Stack Plugins}/.." />
- <property name="build.dir" location="${base.dir}/build" />
-
- <!-- Import anything that the user wants to set-->
- <!-- Import properties files and environment variables here -->
-
- <property environment="env" />
-
- <condition property="build-cloud.properties.file" value="${build.dir}/override/build-cloud.properties" else="${build.dir}/build-cloud.properties">
- <available file="${build.dir}/override/build-cloud.properties" />
- </condition>
-
- <condition property="cloud.properties.file" value="${build.dir}/override/cloud.properties" else="${build.dir}/cloud.properties">
- <available file="${build.dir}/override/cloud.properties" />
- </condition>
-
- <condition property="override.file" value="${build.dir}/override/replace.properties" else="${build.dir}/replace.properties">
- <available file="${build.dir}/override/replace.properties" />
- </condition>
-
- <echo message="Using build parameters from ${build-cloud.properties.file}" />
- <property file="${build-cloud.properties.file}" />
-
- <echo message="Using company info from ${cloud.properties.file}" />
- <property file="${cloud.properties.file}" />
-
- <echo message="Using override file from ${override.file}" />
- <property file="${override.file}" />
-
- <property file="${base.dir}/build/build.number" />
-
- <import file="${build.dir}/build-common.xml" />
-
- <!-- In case these didn't get defined in the build-cloud.properties -->
- <property name="branding.name" value="default" />
- <property name="tomcat.home" value="${env.CATALINA_HOME}" />
- <property name="deprecation" value="off" />
- <property name="target.compat.version" value="1.6" />
- <property name="source.compat.version" value="1.6" />
- <property name="debug" value="true" />
- <property name="debuglevel" value="lines,source"/>
-
- <!-- directories for build and distribution -->
- <property name="dist.dir" location="${base.dir}/dist/" />
- <property name="target.dir" location="${base.dir}/target" />
- <property name="classes.dir" location="${target.dir}/classes" />
- <property name="jar.dir" location="${target.dir}/jar" />
- <property name="dep.cache.dir" location="${target.dir}/dep-cache" />
- <property name="build.log" location="${target.dir}/ant_verbose.txt" />
-
- <property name="deps.dir" location="${base.dir}/deps" />
-
- <!-- directories for client compilation-->
- <property name="client.dir" location="${base.dir}/client" />
- <property name="client.test.dir" location="${client.dir}/test" />
- <property name="client.target.dir" location="${target.dir}/ui" />
- <property name="ui.user.dir" location="${base.dir}/ui" />
- <property name="setup.db.dir" location="${base.dir}/setup/db" />
- <property name="setup.apidoc.dir" location="${base.dir}/setup/apidoc" />
-
- <!-- directories for server compilation-->
- <property name="server.dir" location="${base.dir}/server" />
- <property name="server.test.dir" location="${server.dir}/test" />
- <property name="server.dist.dir" location="${dist.dir}/client" />
- <property name="db.scripts.dir" location="${target.dir}/db"/>
- <property name="apidoc.scripts.dir" location="${base.dir}/setup/apidoc/"/>
-
- <!-- directories for core code compilation-->
- <property name="core.dir" location="${base.dir}/core" />
- <property name="core.test.dir" location="${core.dir}/test/" />
-
- <!-- directories for agent code compilation-->
- <property name="agent.dir" location="${base.dir}/agent" />
- <property name="agent.test.dir" location="${utils.dir}/test/" />
- <property name="agent.dist.dir" location="${dist.dir}/agent" />
-
- <property name="scripts.dir" location="${base.dir}/scripts" />
- <property name="scripts.target.dir" location="${target.dir}/scripts"/>
-
- <!-- directories for console proxy compilation-->
- <property name="console-proxy.dir" location="${base.dir}/console-proxy" />
- <property name="console-proxy.dist.dir" location="${dist.dir}/console-proxy" />
-
- <property name="tools.dir" location="${base.dir}/tools" />
- <!-- <property name="antcontrib.dir" location="${tools.dir}/tools/ant/apache-ant-1.8.0/lib" />-->
- <property name="deploy.dir" location="${build.dir}/deploy" />
- <property name="meld.home" location="/usr/local/bin" />
- <property name="assertion" value="-da" />
-
- <!-- directory for vmware-base library -->
- <property name="vmware-base.dir" location="${base.dir}/vmware-base" />
-
- <!-- directories for branding -->
- <property name="branding.dir" location="${build.dir}/deploy/branding/${branding.name}" />
-
- <property name="core.jar" value="cloud-core.jar" />
- <property name="utils.jar" value="cloud-utils.jar" />
- <property name="server.jar" value="cloud-server.jar" />
- <property name="agent.jar" value="cloud-agent.jar" />
- <property name="console-proxy.jar" value="cloud-console-proxy.jar" />
- <property name="api.jar" value="cloud-api.jar"/>
- <property name="vmware-base.jar" value="cloud-vmware-base.jar" />
-
- <!--
- Import information about the build version and company information
- -->
- <property name="version" value="${company.major.version}.${company.minor.version}.${company.patch.version}" />
-
- <!-- Class paths -->
- <path id="prod.src.path">
- <pathelement location="${server.dir}/src" />
- <pathelement location="${utils.dir}/src" />
- <pathelement location="${core.dir}/src" />
- <pathelement location="${agent.dir}/src" />
- </path>
-
- <path id="src.classpath">
- </path>
-
- <path id="compile.deps.classpath">
- </path>
-
- <path id="deps.classpath">
- <!--filelist files="${deps.classpath}" /-->
- <fileset dir="${deps.dir}" erroronmissingdir="false">
- <include name="*.jar" />
- </fileset>
- <path refid="compile.deps.classpath" />
- </path>
-
- <path id="dist.classpath">
- <fileset dir="${target.dir}">
- <include name="**/*.jar" />
- </fileset>
- <fileset dir="${target.dir}/jar">
- <include name="**/*.jar" />
- </fileset>
- </path>
-
- <path id="test.classpath">
- <fileset dir="${dist.dir}">
- <include name="**/*.jar" />
- </fileset>
- </path>
-
-
- <target name="compile-plugins" description="Compile all of the jars corresponding to plugins" depends="compile-utils, compile-api, compile-core, compile-server, compile-hypervisors, compile-deployment-planners, compile-host-allocators, compile-network-elements, compile-user-authenticators, compile-storage-allocators"/>
-
- <target name="build-plugins" depends="build-hypervisors, build-network-elements, build-deployment-planners, build-host-allocators, build-storage-allocators, build-user-authenticators" description="Builds all jar's for the plug-in's"/>
-
- <target name="clean-plugins" description="Clean all of the generated files by the plugins">
- <delete file="${build.log}" />
- <delete dir="${classes.dir}" />
- <delete dir="${jar.dir}" />
- <delete dir="${dist.files.dir}" />
- <delete dir="${target.dir}" />
- </target>
-
- <!-- ===================== Hypervisors ========================= -->
-
- <target name="compile-hypervisors" depends="compile-kvm, compile-ovm, compile-xen" description="Compile all hypervisors"/>
- <target name="build-hypervisors" depends="build-kvm, build-ovm, build-xen " description="Builds all hypervisors"/>
-
- <target name="compile-kvm" depends="-init, compile-core, compile-agent" description="Compile KVM">
- <ant antfile="${base.dir}/plugins/hypervisors/kvm/build.xml" target="build"/>
- </target>
- <target name="build-kvm" depends="compile-kvm" />
-
- <target name="compile-ovm" depends="-init, compile-server" description="Compile OVM">
- <ant antfile="${base.dir}/plugins/hypervisors/ovm/build.xml" target="build"/>
- </target>
- <target name="build-ovm" depends="compile-ovm" />
-
-
- <target name="compile-xen" depends="-init, compile-server, compile-ovs" description="Compiles Xen ">
- <ant antfile="${base.dir}/plugins/hypervisors/xen/build.xml" target="build"/>
- </target>
- <target name="build-xen" depends="compile-xen" />
-
- <target name="compile-vmware" depends="-init, compile-server" description="Compiles Vmware">
- <ant antfile="${base.dir}/plugins/hypervisors/vmware/build.xml" target="build"/>
- </target>
- <target name="build-vmware" depends="compile-vmware" />
-
-
- <!-- ===================== Deployment Planners ================= -->
-
- <target name="compile-deployment-planners" depends="compile-dp-user-dispersing, compile-dp-user-concentrated-pod" description="Compile all dp's"/>
- <target name="build-deployment-planners" depends="build-dp-user-dispersing, build-dp-user-concentrated-pod" description="builds all dp's"/>
-
- <target name="compile-dp-user-dispersing" depends="-init, compile-server" description="Compile dp-user-dispersing">
- <ant antfile="${base.dir}/plugins/deployment-planners/user-dispersing/build.xml" target="build"/>
- </target>
- <target name="build-dp-user-dispersing" depends="compile-dp-user-dispersing" />
-
- <target name="compile-dp-user-concentrated-pod" depends="-init, compile-server" description="Compile ">
- <ant antfile="${base.dir}/plugins/deployment-planners/user-concentrated-pod/build.xml" target="build"/>
- </target>
- <target name="build-dp-user-concentrated-pod" depends="compile-dp-user-concentrated-pod" />
-
-
- <!-- ===================== Host Allocators ===================== -->
-
- <target name="compile-host-allocators" depends="compile-host-allocator-random" description="Compile all host allocators"/>
- <target name="build-host-allocators" depends="build-host-allocator-random" description="builds all host allocators"/>
-
- <target name="compile-host-allocator-random" depends="-init, compile-server" description="Compile ">
- <ant antfile="${base.dir}/plugins/host-allocators/random/build.xml" target="build"/>
- </target>
- <target name="build-host-allocator-random" depends="compile-host-allocator-random" />
-
-
- <!-- ===================== Storage Allocators ===================== -->
-
- <target name="compile-storage-allocators" depends="compile-storage-allocator-random" description="Compile all storage allocators"/>
- <target name="build-storage-allocators" depends="build-storage-allocator-random" description="builds all storage allocators"/>
-
- <target name="compile-storage-allocator-random" depends="-init, compile-server" description="Compile ">
- <ant antfile="${base.dir}/plugins/storage-allocators/random/build.xml" target="build"/>
- </target>
- <target name="build-storage-allocator-random" depends="compile-storage-allocator-random" />
-
-
- <!-- ===================== User Authenticators ================== -->
-
- <target name="compile-user-authenticators" depends="compile-user-authenticator-ldap, compile-user-authenticator-md5, compile-user-authenticator-plaintext" description="Compile all user authenicators"/>
- <target name="build-user-authenticators" depends="build-user-authenticator-ldap, build-user-authenticator-md5, build-user-authenticator-plaintext" description="builds all user authenticators"/>
-
- <target name="compile-user-authenticator-ldap" depends="-init, compile-server" description="Compiles LDAP user authenticator">
- <ant antfile="${base.dir}/plugins/user-authenticators/ldap/build.xml" target="build"/>
- </target>
- <target name="build-user-authenticator-ldap" depends="compile-user-authenticator-ldap" />
-
- <target name="compile-user-authenticator-md5" depends="-init, compile-server" description="Compiles MD5 user authenticator">
- <ant antfile="${base.dir}/plugins/user-authenticators/md5/build.xml" target="build"/>
- </target>
- <target name="build-user-authenticator-md5" depends="compile-user-authenticator-md5" />
-
- <target name="compile-user-authenticator-plaintext" depends="-init, compile-server" description="Compiles plaintext user authenticator">
- <ant antfile="${base.dir}/plugins/user-authenticators/plain-text/build.xml" target="build"/>
- </target>
- <target name="build-user-authenticator-plaintext" depends="compile-user-authenticator-plaintext" />
-
-
- <!-- ===================== Network Elements ===================== -->
-
- <target name="compile-network-elements" depends="compile-ovs, compile-elb, compile-nicira-nvp" description="Compile all network elements"/>
- <target name="build-network-elements" depends="build-ovs, build-elb, build-nicira-nvp" description="build all network elements"/>
-
- <target name="compile-netscaler" depends="-init, compile-server" description="Compile NetScaler plugin">
- <ant antfile="${base.dir}/plugins/network-elements/netscaler/build.xml" target="build"/>
- </target>
- <target name="build-netscaler" depends="compile-netscaler"/>
-
- <target name="compile-f5" depends="-init, compile-server" description="Compile F5 plugin">
- <ant antfile="${base.dir}/plugins/network-elements/f5/build.xml" target="build"/>
- </target>
- <target name="build-f5" depends="compile-f5"/>
-
- <target name="compile-srx" depends="-init, compile-server" description="Compile SRX plugin">
- <ant antfile="${base.dir}/plugins/network-elements/juniper-srx/build.xml" target="build"/>
- </target>
- <target name="build-srx" depends="compile-srx"/>
-
- <target name="compile-ovs" depends="-init, compile-server" description="Compile Ovs plugin">
- <ant antfile="${base.dir}/plugins/network-elements/ovs/build.xml" target="build"/>
- </target>
- <target name="build-ovs" depends="compile-ovs"/>
-
- <target name="compile-nicira-nvp" depends="-init, compile-server" description="Compile Nicira NVP plugin">
- <ant antfile="${base.dir}/plugins/network-elements/nicira-nvp/build.xml" target="build"/>
- </target>
- <target name="build-nicira-nvp" depends="compile-nicira-nvp"/>
-
-
- <target name="compile-elb" depends="-init, compile-server" description="Compile ELB plugin">
- <ant antfile="${base.dir}/plugins/network-elements/elastic-loadbalancer/build.xml" target="build"/>
- </target>
- <target name="build-elb" depends="compile-elb"/>
-
-
- <!-- ===================== File Systems ===================== -->
-
- <target name="compile-file-systems" depends="compile-netapp" description="Compils all supported file systems"/>
- <target name="build-file-systems" depends="build-netapp" description="Builds all supported file systems"/>
-
- <target name="compile-netapp" depends="-init, compile-server" description="Compile NetApp plugin">
- <ant antfile="${base.dir}/plugins/file-systems/netapp/build.xml" target="build"/>
- </target>
- <target name="build-netapp" depends="compile-netapp"/>
-
-
-</project>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e138596a/build/build-cloud.properties
----------------------------------------------------------------------
diff --git a/build/build-cloud.properties b/build/build-cloud.properties
deleted file mode 100755
index be67a36..0000000
--- a/build/build-cloud.properties
+++ /dev/null
@@ -1,26 +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.
-
-debug=true
-debuglevel=lines,source,vars
-debug.jvmarg=-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=n
-deprecation=off
-build.type=developer
-target.compat.version=1.6
-source.compat.version=1.6
-branding.name=default
-ssvm.include.vmware.jar=true
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e138596a/build/build-cloud.xml
----------------------------------------------------------------------
diff --git a/build/build-cloud.xml b/build/build-cloud.xml
deleted file mode 100755
index c31d00d..0000000
--- a/build/build-cloud.xml
+++ /dev/null
@@ -1,595 +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" default="help" basedir=".">
- <description>
- Cloud Stack ant build file
- </description>
-
- <!--
- Test
- Always use this variable to refer to the base directory because this
- variable is changeable
- -->
- <dirname property="base.dir" file="${ant.file.Cloud Stack}/.." />
- <property name="build.dir" location="${base.dir}/build" />
-
- <!-- Import anything that the user wants to set-->
- <!-- Import properties files and environment variables here -->
-
- <property environment="env" />
-
- <condition property="build-cloud.properties.file" value="${build.dir}/override/build-cloud.properties" else="${build.dir}/build-cloud.properties">
- <available file="${build.dir}/override/build-cloud.properties" />
- </condition>
-
- <condition property="cloud.properties.file" value="${build.dir}/override/cloud.properties" else="${build.dir}/cloud.properties">
- <available file="${build.dir}/override/cloud.properties" />
- </condition>
-
- <condition property="override.file" value="${build.dir}/override/replace.properties" else="${build.dir}/replace.properties">
- <available file="${build.dir}/override/replace.properties" />
- </condition>
-
- <echo message="Using build parameters from ${build-cloud.properties.file}" />
- <property file="${build-cloud.properties.file}" />
-
- <echo message="Using company info from ${cloud.properties.file}" />
- <property file="${cloud.properties.file}" />
-
- <echo message="Using override file from ${override.file}" />
- <property file="${override.file}" />
-
- <property file="${base.dir}/build/build.number" />
-
- <import file="${build.dir}/build-common.xml" />
-
- <!-- In case these didn't get defined in the build-cloud.properties -->
- <property name="tomcat.home" value="${env.CATALINA_HOME}" />
- <property name="deprecation" value="off" />
- <property name="target.compat.version" value="1.6" />
- <property name="source.compat.version" value="1.6" />
- <property name="debug" value="true" />
- <property name="debuglevel" value="lines,source"/>
-
- <!-- directories for build and distribution -->
- <property name="dist.dir" location="${base.dir}/dist/" />
- <property name="target.dir" location="${base.dir}/target" />
- <property name="classes.dir" location="${target.dir}/classes" />
- <property name="jar.dir" location="${target.dir}/jar" />
- <property name="dep.cache.dir" location="${target.dir}/dep-cache" />
- <property name="build.log" location="${target.dir}/ant_verbose.txt" />
-
- <property name="deps.dir" location="${base.dir}/deps" />
- <property name="xenapi.dir" location="${deps.dir}/XenServerJava" />
-
- <!-- directories for client compilation-->
- <property name="client.dir" location="${base.dir}/client" />
- <property name="client.test.dir" location="${client.dir}/test" />
- <property name="client.target.dir" location="${target.dir}/ui" />
- <property name="ui.user.dir" location="${base.dir}/ui" />
- <property name="setup.db.dir" location="${base.dir}/setup/db" />
- <property name="setup.apidoc.dir" location="${base.dir}/setup/apidoc" />
-
- <!-- directories for server compilation-->
- <property name="server.dir" location="${base.dir}/server" />
- <property name="server.test.dir" location="${server.dir}/test" />
- <property name="server.dist.dir" location="${dist.dir}/client" />
- <property name="db.scripts.dir" location="${target.dir}/db"/>
- <property name="apidoc.scripts.dir" location="${base.dir}/setup/apidoc/"/>
-
- <!-- directories for core code compilation-->
- <property name="core.dir" location="${base.dir}/core" />
- <property name="core.test.dir" location="${core.dir}/test/" />
-
- <!-- directories for agent code compilation-->
- <property name="agent.dir" location="${base.dir}/agent" />
- <property name="agent.test.dir" location="${utils.dir}/test/" />
- <property name="agent.dist.dir" location="${dist.dir}/agent" />
-
- <property name="scripts.dir" location="${base.dir}/scripts" />
- <property name="scripts.target.dir" location="${target.dir}/scripts"/>
-
- <!-- directories for console proxy compilation-->
- <property name="console-proxy.dir" location="${base.dir}/console-proxy" />
- <property name="console-proxy.dist.dir" location="${dist.dir}/console-proxy" />
-
- <property name="tools.dir" location="${base.dir}/tools" />
- <!-- <property name="antcontrib.dir" location="${tools.dir}/tools/ant/apache-ant-1.8.0/lib" />-->
- <property name="meld.home" location="/usr/local/bin" />
- <property name="assertion" value="-da" />
-
- <!-- directory for vmware-base library -->
- <property name="vmware-base.dir" location="${base.dir}/vmware-base" />
-
- <property name="core.jar" value="cloud-core.jar" />
- <property name="utils.jar" value="cloud-utils.jar" />
- <property name="server.jar" value="cloud-server.jar" />
- <property name="agent.jar" value="cloud-agent.jar" />
- <property name="console-proxy.jar" value="cloud-console-proxy.jar" />
- <property name="api.jar" value="cloud-api.jar"/>
- <property name="xenapi.jar" value="cloud-xenapi.jar" />
- <property name="vmware-base.jar" value="cloud-vmware-base.jar" />
- <property name="vmware.jar" value="cloud-vmware.jar" />
-
- <!--
- Import information about the build version and company information
- -->
- <property name="version" value="${company.major.version}.${company.minor.version}.${company.patch.version}" />
-
- <!-- Class paths -->
- <path id="prod.src.path">
- <pathelement location="${server.dir}/src" />
- <pathelement location="${utils.dir}/src" />
- <pathelement location="${core.dir}/src" />
- <pathelement location="${agent.dir}/src" />
- </path>
-
- <path id="src.classpath">
- </path>
-
- <path id="compile.deps.classpath">
- </path>
-
- <path id="deps.classpath">
- <!--filelist files="${deps.classpath}" /-->
- <fileset dir="${deps.dir}" erroronmissingdir="false">
- <include name="*.jar" />
- </fileset>
- <path refid="compile.deps.classpath" />
- </path>
-
- <path id="dist.classpath">
- <fileset dir="${target.dir}">
- <include name="**/*.jar" />
- </fileset>
- <fileset dir="${target.dir}/jar">
- <include name="**/*.jar" />
- </fileset>
- </path>
-
- <path id="test.classpath">
- <fileset dir="${dist.dir}">
- <include name="**/*.jar" />
- </fileset>
- </path>
-
- <!-- directories for util code compilation-->
- <property name="utils.dir" location="${base.dir}/utils" />
- <property name="utils.test.dir" location="${utils.dir}/test/" />
- <path id="utils.classpath">
- <path refid="deps.classpath" />
- </path>
- <target name="compile-utils" depends="-init" description="Compile the utilities jar that is shared.">
- <compile-java jar.name="${utils.jar}" top.dir="${utils.dir}" classpath="utils.classpath" >
- <include-files>
- <fileset dir="${utils.dir}/certs">
- <include name="*.keystore" />
- </fileset>
- </include-files>
- </compile-java>
- </target>
-
- <property name="api.dir" location="${base.dir}/api" />
- <property name="api.test.dir" location="${api.dir}/test/" />
- <path id="api.classpath">
- <path refid="deps.classpath" />
- <path refid="dist.classpath"/>
- </path>
- <target name="compile-api" depends="-init, compile-utils" description="Compile the utilities jar that is shared.">
- <compile-java jar.name="${api.jar}" top.dir="${api.dir}" classpath="api.classpath" />
- </target>
-
- <path id="core.classpath">
- <path refid="deps.classpath" />
- <path refid="dist.classpath" />
- </path>
- <target name="compile-core" depends="-init, compile-utils, compile-api" description="Compile the core business logic.">
- <compile-java jar.name="${core.jar}" top.dir="${core.dir}" classpath="core.classpath" />
- </target>
-
- <path id="vmware-base.classpath">
- <path refid="deps.classpath" />
- <path refid="dist.classpath" />
- </path>
- <target name="compile-vmware-base" depends="-init, compile-utils" description="Compile the VMware support library">
- <compile-java jar.name="${vmware-base.jar}" top.dir="${vmware-base.dir}" classpath="vmware-base.classpath" />
- </target>
-
- <path id="xenapi.classpath">
- <path refid="deps.classpath" />
- <path refid="dist.classpath" />
- </path>
- <target name="compile-xenapi" depends="-init" description="Compile XenServer java sdk.">
- <compile-java jar.name="${xenapi.jar}" top.dir="${xenapi.dir}" classpath="xenapi.classpath" />
- </target>
-
- <path id="server.classpath">
- <path refid="deps.classpath" />
- <path refid="dist.classpath" />
- </path>
- <target name="compile-server" depends="-init, compile-utils, compile-core, compile-agent" description="Compile the management server.">
- <compile-java jar.name="${server.jar}" top.dir="${server.dir}" classpath="server.classpath" />
- </target>
-
- <path id="client.classpath">
- <path refid="deps.classpath" />
- <path refid="dist.classpath" />
- </path>
-
- <target name="build-scripts" depends="-init">
- <copy todir="${scripts.target.dir}">
- <fileset dir="${scripts.dir}">
- <include name="**/*"/>
- <exclude name="**/fsimage.so"/>
- <exclude name="**/ping.tar.bz2"/>
- <exclude name="**/vhd-util"/>
- <exclude name="**/.*" />
- </fileset>
- <filterset>
- <filter token="VERSION" value="${impl.version}"/>
- </filterset>
- </copy>
- <copy todir="${scripts.target.dir}">
- <fileset dir="${scripts.dir}">
- <include name="**/fsimage.so"/>
- <include name="**/ping.tar.bz2"/>
- <include name="**/vhd-util"/>
- </fileset>
- </copy>
- </target>
-
- <target name="build-ui" depends="-init" description="Builds the UI">
- <mkdir dir="${client.target.dir}" />
- <copy todir="${client.target.dir}">
- <fileset dir="${ui.user.dir}">
- <include name="**/*.html" />
- <include name="**/*.js"/>
- <include name="**/*.jsp"/>
- <exclude name="**/.classpath" />
- <exclude name="**/.project" />
- </fileset>
- <filterset>
- <filter token="VERSION" value="${impl.version}"/>
- </filterset>
- </copy>
- <copy todir="${client.target.dir}">
- <fileset dir="${ui.user.dir}">
- <include name="**/*"/>
- <exclude name="**/*.html" />
- <exclude name="**/*.js"/>
- <exclude name="**/*.jsp"/>
- <exclude name="**/.classpath" />
- <exclude name="**/.project" />
- </fileset>
- </copy>
- <copy todir="${client.target.dir}">
- <fileset dir="${client.dir}/WEB-INF/classes">
- <include name="**/*.properties"/>
- </fileset>
- </copy>
- </target>
-
-
- <target name="build-server" depends="compile-server">
- <mkdir dir="${server.dist.dir}" />
- <mkdir dir="${server.dist.dir}/lib" />
- <mkdir dir="${server.dist.dir}/conf" />
-
- <copy todir="${jar.dir}">
- <fileset dir="${deps.dir}">
- <include name="cloud-*.jar"/>
- </fileset>
- </copy>
-
- <copy overwrite="true" todir="${server.dist.dir}/conf">
- <fileset dir="${base.dir}/client/tomcatconf">
- <include name="*.in" />
- </fileset>
- <globmapper from="*.in" to="*" />
- <filterchain>
- <filterreader classname="org.apache.tools.ant.filters.ReplaceTokens">
- <param type="propertiesfile" value="${override.file}" />
- </filterreader>
- </filterchain>
- </copy>
-
- <copy overwrite="true" todir="${server.dist.dir}/conf">
- <fileset dir="${server.dir}/src/com/cloud/migration">
- <include name="*.xml" />
- </fileset>
- </copy>
-
- <copy overwrite="true" todir="${db.scripts.dir}">
- <fileset dir="${setup.db.dir}">
- <include name="**/*"/>
- </fileset>
- <filterset>
- <filter token="VERSION" value="${impl.version}"/>
- </filterset>
- </copy>
- </target>
-
- <path id="console-proxy.classpath">
- <path refid="deps.classpath" />
- <path refid="dist.classpath" />
- </path>
- <target name="compile-console-proxy" depends="-init" description="Compile the console proxy.">
- <compile-java jar.name="${console-proxy.jar}" top.dir="${console-proxy.dir}" classpath="console-proxy.classpath" >
- <include-files>
- <fileset dir="${console-proxy.dir}/certs">
- <include name="*.keystore" />
- <include name="*.crt" />
- <include name="*.key" />
- </fileset>
- </include-files>
- </compile-java>
- </target>
-
- <target name="copy-console-proxy" depends="-init">
- <property name="copyto.dir" value="${console-proxy.dist.dir}" />
- <mkdir dir="${copyto.dir}" />
- <mkdir dir="${copyto.dir}/conf" />
- <mkdir dir="${copyto.dir}/logs" />
- <mkdir dir="${copyto.dir}/applet" />
- <mkdir dir="${copyto.dir}/images" />
- <mkdir dir="${copyto.dir}/js" />
- <mkdir dir="${copyto.dir}/ui" />
- <mkdir dir="${copyto.dir}/css" />
- <mkdir dir="${copyto.dir}/certs" />
-
- <copy todir="${copyto.dir}">
- <fileset dir="${deps.dir}">
- <include name="log4j-1.2.15.jar" />
- <include name="apache-log4j-extras-1.0.jar" />
- <include name="gson.jar" />
- </fileset>
- </copy>
-
- <copy todir="${copyto.dir}">
- <fileset dir="${jar.dir}">
- <include name="cloud-console-proxy.jar" />
- </fileset>
- </copy>
- <copy todir="${copyto.dir}/conf">
- <fileset dir="${console-proxy.dir}/conf">
- <include name="log4j-cloud.xml" />
- <include name="consoleproxy.properties" />
- </fileset>
- </copy>
- <copy todir="${copyto.dir}/images">
- <fileset dir="${console-proxy.dir}/images">
- <include name="*.jpg" />
- <include name="*.gif" />
- <include name="*.png" />
- <include name="*.cur" />
- </fileset>
- </copy>
- <copy todir="${copyto.dir}/js">
- <fileset dir="${console-proxy.dir}/js">
- <include name="*.js" />
- </fileset>
- </copy>
- <copy todir="${copyto.dir}/ui">
- <fileset dir="${console-proxy.dir}/ui">
- <include name="*.ftl" />
- </fileset>
- </copy>
- <copy todir="${copyto.dir}/css">
- <fileset dir="${console-proxy.dir}/css">
- <include name="*.css" />
- </fileset>
- </copy>
- <copy todir="${copyto.dir}/certs">
- <fileset dir="${console-proxy.dir}/certs">
- <include name="*.keystore" />
- <include name="*.crt" />
- <include name="*.key" />
- </fileset>
- </copy>
- </target>
-
- <target name="build-console-proxy" depends="-init, compile-console-proxy, copy-console-proxy">
- <copy todir="${console-proxy.dist.dir}">
- <fileset dir="${console-proxy.dir}/scripts">
- </fileset>
- </copy>
- <copy todir="${console-proxy.dist.dir}/conf">
- <fileset dir="${console-proxy.dir}/conf">
- </fileset>
- </copy>
- </target>
-
-
- <path id="agent.classpath">
- <path refid="deps.classpath" />
- <fileset dir="${target.dir}">
- <include name="**/${core.jar}" />
- <include name="**/${utils.jar}" />
- <include name="**/${api.jar}"/>
- </fileset>
- </path>
- <target name="compile-agent" depends="-init, compile-utils, compile-core, compile-api" description="Compile the management agent.">
- <compile-java jar.name="${agent.jar}" top.dir="${agent.dir}" classpath="agent.classpath" />
- </target>
-
- <target name="build-agent" depends="-init, compile-agent">
- <mkdir dir="${agent.dist.dir}" />
- <mkdir dir="${agent.dist.dir}/scripts" />
- <mkdir dir="${agent.dist.dir}/conf" />
- <mkdir dir="${agent.dist.dir}/logs" />
- <mkdir dir="${agent.dist.dir}/db" />
- <mkdir dir="${agent.dist.dir}/storagehdpatch" />
-
- <condition property="agent.properties" value="override/agent.properties" else="agent.properties">
- <available file="${agent.dir}/conf/override/agent.properties" />
- </condition>
-
- <condition property="developer.properties" value="override/developer.properties" else="developer.properties">
- <available file="${agent.dir}/conf/override/developer.properties" />
- </condition>
-
- <copy overwrite="true" todir="${agent.dist.dir}/conf" flatten="true">
- <fileset dir="${agent.dir}/conf">
- <include name="${agent.properties}" />
- <include name="${developer.properties}" />
- </fileset>
- <filterchain>
- <filterreader classname="org.apache.tools.ant.filters.ReplaceTokens">
- <param type="propertiesfile" value="${override.file}" />
- </filterreader>
- </filterchain>
- </copy>
-
- <copy overwrite="true" todir="${agent.dist.dir}/conf" flatten="true">
- <fileset dir="${agent.dir}/conf">
- <include name="log4j-cloud.xml.in" />
- </fileset>
- <globmapper from="*.in" to="*" />
- <filterchain>
- <filterreader classname="org.apache.tools.ant.filters.ReplaceTokens">
- <param type="propertiesfile" value="${override.file}" />
- </filterreader>
- </filterchain>
- </copy>
- <delete file="${agent.dist.dir}/conf/log4j-cloud.xml.in"/>
-
- <copy todir="${agent.dist.dir}">
- <fileset dir="${agent.dir}/scripts">
- <include name="agent.sh" />
- <include name="run.sh" />
- </fileset>
- </copy>
- </target>
-
- <target name="build-servers" depends="-init, build-server" />
-
- <target name="build-opensource" depends="-init, build-server, build-agent, build-scripts, build-ui, build-console-proxy, package-oss-systemvm-iso">
- <fileset dir="${base.dir}/client">
- <include name="setup/**/*" />
- </fileset>
-
- <copy overwrite="true" todir="${jar.dir}">
- <fileset dir="${deps.dir}">
- <include name="vmware-*.jar" />
- </fileset>
- </copy>
-
- </target>
-
-
- <target name="build-systemvm-patch" depends="-init">
- <mkdir dir="${dist.dir}" />
- <mkdir dir="${dist.dir}/build-patch" />
- <mkdir dir="${dist.dir}/build-patch/usr/sbin" />
- <copy overwrite="true" todir="${dist.dir}/build-patch">
- <fileset dir="${base.dir}/patches/systemvm/debian/config/" >
- <include name="**/*"/>
- </fileset>
- <fileset dir="${base.dir}/patches/systemvm/debian/vpn/" >
- <include name="**/*"/>
- </fileset>
- <fileset dir="${base.dir}/patches/systemvm/debian/xe/" >
- <include name="**/*"/>
- <exclude name="**/xe-*" />
- <exclude name="**/xen-*" />
- </fileset>
- </copy>
- <copy overwrite="true" todir="${dist.dir}/build-patch/usr/sbin/">
- <fileset dir="${base.dir}/patches/systemvm/debian/xe/" >
- <include name="**/xe-*" />
- <include name="**/xen-*" />
- </fileset>
- </copy>
- <tar destfile="${dist.dir}/patch.tar">
- <tarfileset dir="${dist.dir}/build-patch/" filemode="755">
- <include name="**/*"/>
- <exclude name="**/.classpath" />
- <exclude name="**/.project" />
- <exclude name="**/wscript_build" />
- </tarfileset>
- </tar>
- <copy file="${base.dir}/patches/systemvm/debian/config/root/.ssh/authorized_keys" todir="${dist.dir}/"/>
- <gzip destfile="${dist.dir}/cloud-scripts.tgz" src="${dist.dir}/patch.tar"/>
- </target>
-
- <target name="help">
- <echo level="info" message="Ant Build File for CloudStack" />
- <echo level="info" message="Type 'ant -projecthelp' to get a list of targets and their descriptions." />
- </target>
- <target name="usage" depends="help" />
-
- <target name="-init">
- <mkdir dir="${dist.dir}" />
- <mkdir dir="${target.dir}" />
- <record name="${build.log}" loglevel="verbose" action="start" />
-
- <!-- create a UTC build timestamp using ISO 8601 formatting -->
- <tstamp>
- <format property="utc.build.timestamp" pattern="yyyy-MM-dd'T'HH:mm:ss'Z'" timezone="GMT" />
- </tstamp>
-
- <!-- remember who/where did the build -->
- <exec executable="hostname" outputproperty="host.name" />
- <property name="builder.at" value="${user.name} at ${host.name}" />
- <property name="builder.id" value="${builder.at}, on ${utc.build.timestamp}" />
- <property name="built.by" value="${builder.at}, ${utc.build.timestamp}" />
- <echo level="info" message="builder: ${builder.id}" />
-
- <!-- set build.number property, stored in eponymous file -->
- <buildnumber file="${build.dir}/build.number" />
- <condition property="impl.version" value="${version}.${manual.build.number}" else="${version}.${utc.build.timestamp}">
- <isset property="manual.build.number"/>
- </condition>
-
- <echo message="Build number is ${impl.version}" />
-
- <!-- Create the build directory structure used by compile -->
- <mkdir dir="${jar.dir}" />
- <mkdir dir="${docs.dir}" />
- <mkdir dir="${dep.cache.dir}" />
-
- <condition property="mvn" value="mvn.bat" else="mvn">
- <os family="Windows"/>
- </condition>
- <!-- Download all dependencies using maven -->
- <exec executable="${mvn}" resolveexecutable="true" searchpath="true" failifexecutionfails="false">
- <arg value="-P"/>
- <arg value="deps"/>
- <arg value="-pl"/>
- <arg value="deps"/>
- </exec>
- <record name="${build.log}" action="stop" />
- </target>
-
- <target name="clean" description="clean up files generated by the build">
- <delete file="${build.log}" />
- <delete dir="${classes.dir}" />
- <delete dir="${jar.dir}" />
- <delete dir="${dist.dir}" />
- <delete dir="${unittest.dir}"/>
- </target>
-
- <target name="compile-all" description="Compile all of the jars" depends="compile-utils, compile-api, compile-core, compile-server, compile-plugins"/>
-
- <target name="clean-all" depends="clean, clean-plugins, clean-awsapi" description="Clean all of the generated files, including dependency cache and javadoc">
- <delete dir="${target.dir}" />
- </target>
-
-</project>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e138596a/build/build-common.xml
----------------------------------------------------------------------
diff --git a/build/build-common.xml b/build/build-common.xml
deleted file mode 100755
index 7240f53..0000000
--- a/build/build-common.xml
+++ /dev/null
@@ -1,100 +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="VMOps-Common" default="help" basedir=".">
- <!--
- compile-java requires the following parameters
- - top.dir = the root directory of the source.
- - jar.name = name of the jar file.
- - classpath = classpath to use for this compile
-
-
- The directory structure under the ${top.dir} needs to be.
- - src
-
- The target files are generated to ${classes.dir}/${jar.name}.
- The jar file is generated to ${dist.dir}/${jar.name}.jar.
- -->
- <target name="help">
- <echo message="This file is meant to be imported by other build.xml to provide common
- functionality. Don not edit this file unless you are sure about adding
- common functionality."/>
- </target>
-
- <dirname property="base.dir" file="${ant.file.VMOps-Common}/.."/>
- <property name="build.dir" location="${base.dir}/build"/>
-
- <property name="target.dir" location="${base.dir}/target"/>
- <property name="classes.dir" location="${target.dir}/classes"/>
- <property name="tests.dir" location="${target.dir}/tests"/>
- <property name="jar.dir" location="${target.dir}/jar"/>
- <property name="dep.cache.dir" location="${target.dir}/dep-cache"/>
- <property name="debug" value="true"/>
- <property name="debuglevel" value="lines,source"/>
-
- <macrodef name="compile-java">
- <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="${classes.dir}/@{jar.name}"/>
-
- <depend srcdir="@{top.dir}/src" destdir="${classes.dir}/@{jar.name}" cache="${dep.cache.dir}" />
-
- <echo message="Compiling @{top.dir}/src"/>
- <javac srcdir="@{top.dir}/src" debug="${debug}" debuglevel="${debuglevel}" deprecation="${deprecation}" destdir="${classes.dir}/@{jar.name}" source="${source.compat.version}" target="${target.compat.version}" includeantruntime="false" compiler="javac1.6" memoryinitialsize="512m" memorymaximumsize="1024m" fork="true">
- <!-- compilerarg line="-processor com.cloud.annotation.LocalProcessor -processorpath ${base.dir}/tools/src -Xlint:all"/ -->
- <!-- compilerarg line="-processor com.cloud.utils.LocalProcessor -processorpath ${base.dir}/utils/src -Xlint:all"/ -->
- <compilerarg line="-Xlint:-path"/>
- <classpath refid="@{classpath}" />
- <exclude-files/>
- </javac>
- <jar jarfile="${jar.dir}/@{jar.name}" basedir="${classes.dir}/@{jar.name}" update="true">
- <manifest>
- <attribute name="Class-Path" value="" />
- <attribute name="Built-By" value="${built.by}" />
- <attribute name="Specification-Title" value="Apache Cloud Stack" />
- <attribute name="Specification-Version" value="${impl.version}" />
- <attribute name="Specification-Vendor" value="${company.name}" />
- <attribute name="Implementation-Title" value="@{jar.name}" />
- <attribute name="Implementation-Version" value="${impl.version}" />
- <attribute name="Implementation-Vendor" value="${company.name}" />
- </manifest>
- <include-files/>
- </jar>
- </sequential>
- </macrodef>
-
- <macrodef name="clean-java">
- <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"/>
-
- <sequential>
- <local name="compile.java.bin.dir"/>
- <property name="compile.java.bin.dir" location="${classes.dir}/@{jar.name}" />
- <rmdir dir="${compile.java.bin.dir}"/>
- <rm file="${jar.dir}/@{jar.name}"/>
- </sequential>
- </macrodef>
-
-</project>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e138596a/build/build-devcloud.xml
----------------------------------------------------------------------
diff --git a/build/build-devcloud.xml b/build/build-devcloud.xml
deleted file mode 100644
index a001dc2..0000000
--- a/build/build-devcloud.xml
+++ /dev/null
@@ -1,98 +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="CloudDev Targets" basedir=".">
-
-
- <condition property="port" value="${rport}" else="2222">
- <isset property="rport"/>
- </condition>
-
- <condition property="host" value="${rhost}" else="localhost">
- <isset property="rhost"/>
- </condition>
-
- <target name="deploydbIfSet" if="deploydb.is.set">
- <echo message="ant deploydb"/>
- <sshexec host="${host}" port="${port}" username="root" password="password" command="echo $CATALINA_HOME; export CATALINA_HOME=/opt/cloudstack/apache-tomcat-6.0.32;killall java; service cloud-management stop;cd /opt/cloudstack/incubator-cloudstack;ant deploycddb"/>
- </target>
-
- <target name="rdeploydb">
- <echo message="ant rdeploydb"/>
- <sshexec trust="yes" host="${host}" port="${port}" username="root" password="password" command="echo $CATALINA_HOME; export CATALINA_HOME=/opt/cloudstack/apache-tomcat-6.0.32;killall java;service cloud-management stop;cd /opt/cloudstack/incubator-cloudstack;ant deploycddb -Drhost=${host}"/>
- </target>
-
- <target name="deploycddb" description="deploy specific db configuration for clouddev" depends="deploydb">
- <exec dir="${db.scripts.dir}" executable="bash">
- <arg value="deploy-db-clouddev.sh" />
- <arg value="${host}" />
- <arg value="8443" />
- </exec>
- </target>
-
- <target name="rdebug-suspend" >
- <echo message="ant debug-suspend"/>
- <sshexec host="${host}" port="${port}" username="root" password="password" command="killall java;service cloud-management stop;sleep 1;echo $CATALINA_HOME; export CATALINA_HOME=/opt/cloudstack/apache-tomcat-6.0.32;cd /opt/cloudstack/incubator-cloudstack;ant deploy-server;ant debug-suspend"/>
- </target>
-
- <target name="rdebug">
- <echo message="ant debug"/>
- <sshexec trust="yes" host="${host}" port="${port}" username="root" password="password" command="killall java;service cloud-management stop;sleep 1;export CATALINA_HOME=/opt/cloudstack/apache-tomcat-6.0.32;cd /opt/cloudstack/incubator-cloudstack;ant deploy-server; ant debug "/>
- </target>
-
-
- <target name="rdeploy" description="deploy to remote">
- <condition property="zip.uptodate">
- <available file="${deploy.work.dir}/client.zip" type="file"/>
- </condition>
-
-
-
- <echo message="copying build folder to remote"/>
- <scp trust="yes" port="${port}" todir="root:password@${host}:/opt/cloudstack/incubator-cloudstack/build">
- <fileset dir="build">
- </fileset>
- </scp>
-
- <scp trust="yes" port="${port}" file="build.xml" todir="root:password@${host}:/opt/cloudstack/incubator-cloudstack/">
- </scp>
-
- <echo message="copying deps folder to remote"/>
- <scp trust="yes" port="${port}" todir="root:password@${host}:/opt/cloudstack/incubator-cloudstack/deps">
- <fileset dir="deps">
- </fileset>
- </scp>
-
- <echo message="copying target folder to remote"/>
- <scp trust="yes" port="${port}" todir="root:password@${host}:/opt/cloudstack/incubator-cloudstack/target">
- <fileset dir="target">
- </fileset>
- </scp>
-
- <echo message="copying dist folder to remote"/>
- <scp trust="yes" port="${port}" todir="root:password@${host}:/opt/cloudstack/incubator-cloudstack/dist">
- <fileset dir="dist">
- </fileset>
- </scp>
-
- <sshexec trust="yes" host="${host}" port="${port}" username="root" password="password" command="echo $CATALINA_HOME; export CATALINA_HOME=/opt/cloudstack/apache-tomcat-6.0.32;cd /opt/cloudstack/incubator-cloudstack;ant deploy-server"/>
-
- </target>
-
-</project>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e138596a/build/build-docs.xml
----------------------------------------------------------------------
diff --git a/build/build-docs.xml b/build/build-docs.xml
deleted file mode 100755
index c38b986..0000000
--- a/build/build-docs.xml
+++ /dev/null
@@ -1,82 +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 Document Tasks" 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 Document Tasks}/.." />
-
- <import file="./build-cloud.xml" optional="false"/>
-
- <!-- directories for java doc -->
- <property name="docs.dir" location="${target.dir}/docs" />
- <property name="docs.dist.dir" location="${dist.dir}/docs" />
-
- <target name="doc" depends="-init, javadoc, readme" description="create all javadoc" />
-
- <target name="readme" depends="-init">
- <mkdir dir="${docs.dir}/readme" />
- <copy file="${agent.dir}/scripts/README.txt" todir="${docs.dir}/readme" />
- </target>
-
- <target name="pdf" depends="-init">
- <javadoc doclet="com.tarsec.javadoc.pdfdoclet.PDFDoclet" docletpath="${tools.dir}/pdfdoclet/pdfdoclet-1.0.2-all.jar" overview="${build.dir}/overview.html" additionalparam="-pdf javadoc.pdf -debug" private="no" access="public" classpathref="deps.classpath" linksource="true" sourcepathref="prod.src.path">
- <!--
- <taglet name="net.sourceforge.taglets.Taglets" path="${tools.dir}/taglets/taglets.jar"/>
- <tag name="config" description="Configurable Parameters in components.xml" scope="types"/>
- <tag name="see" />
- <tag name="author" />
- <tag name="since" />
- -->
- <!--<packages>com.cloud.agent</packages-->
- <!--package name="com.cloud.agent"/-->
- <packageset dir="${server.dir}/src" />
- </javadoc>
- </target>
-
- <target name="javadoc" depends="-init, build-all" description="Generate internal javadoc documentation for maintenance">
- <!-- documentation properties -->
- <property name="jdoc.footer" value="Copyright &copy; ${company.copyright.year} ${company.name}" />
-
- <javadoc destdir="${docs.dir}/html/api-internal" author="true" version="true" classpathref="deps.classpath" sourcepathref="prod.src.path" access="protected" linksource="true" windowtitle="${company.name} ${version} Maintenance API Reference" doctitle="${company.name} ${version} Maintenance API Reference" bottom="${jdoc.footer}" overview="${build.dir}/overview.html">
- <excludepackage name="com.xensource.xenapi.*" />
- <taglet name="net.sourceforge.taglets.Taglets" path="${tools.dir}/taglets/taglets.jar" />
- <tag name="config" description="Configurable Parameters in components.xml" scope="types" />
- <tag name="see" />
- <tag name="author" />
- <tag name="since" />
- <packageset dir="${server.dir}/src" />
- </javadoc>
- </target>
-
- <target name="build-docs" depends="javadoc">
- <copy todir="${docs.dist.dir}">
- <fileset dir="${docs.dir}" />
- </copy>
- </target>
-
-</project>
-
-
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e138596a/build/build-marvin.xml
----------------------------------------------------------------------
diff --git a/build/build-marvin.xml b/build/build-marvin.xml
deleted file mode 100644
index 6daac03..0000000
--- a/build/build-marvin.xml
+++ /dev/null
@@ -1,71 +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="Marvin TestClient" default="help" basedir=".">
- <description>
- This build file contains simple targets that
- - build
- - package
- - distribute
- the Marvin test client written in python
- </description>
-
- <dirname property="base.dir" file="${ant.file.Cloud Stack}/.." />
- <property name="build.dir" location="${base.dir}/build" />
-
- <import file="${build.dir}/build-cloud.xml" optional="false" />
- <import file="${build.dir}/developer.xml" optional="false" />
-
- <!-- directories for the test client code compilation-->
- <property name="dist.dir" location="${base.dir}/dist" />
- <property name="marvin.dir" location="${base.dir}/tools/marvin" />
- <property name="marvin.dist.dir" location="${base.dir}/tools/marvin/dist" />
- <property name="marvin.src.dir" location="${base.dir}/tools/marvin/marvin" />
-
- <target name="build-marvin" depends="build-apidocs" description="generates the cloudstackAPIs for marvin">
- <echo message="Generating Marvin API Classes"/>
- <exec dir="${marvin.src.dir}" executable="python" failonerror="true">
- <arg value="codegenerator.py" />
- <arg value="-s" />
- <arg value="${dist.dir}/commands.xml" />
- </exec>
- <echo message="API classes @ ${marvin.src.dir}/cloudstackAPI"/>
- </target>
-
- <target name="package-marvin" depends="build-marvin" description="create a distributable tarball of Marvin">
- <echo message="Packaging Marvin"/>
- <exec dir="${marvin.dir}" executable="python" failonerror="true">
- <arg value="setup.py" />
- <arg value="sdist" />
- </exec>
- <echo message="distributable tarball at: ${marvin.dist.dir}/Marvin-*.tar.gz"/>
- </target>
-
- <target name="install-marvin" depends="package-marvin" description="installs marvin on the local machine">
- <echo message="Uninstalling Marvin" />
- <exec dir="${marvin.dist.dir}" executable="pip">
- <arg line="uninstall -y marvin"/>
- </exec>
- <echo message="Installing Marvin" />
- <exec dir="${marvin.dist.dir}" executable="pip">
- <arg value="install" />
- <arg value="Marvin-0.1.0.tar.gz" />
- </exec>
- </target>
-</project>