mirror of
https://github.com/apache/cloudstack.git
synced 2025-10-26 08:42:29 +01:00
merge awsapi build script changes to master
This commit is contained in:
prachi
parent
3fd17ae029
commit
49cdc2317b
@ -27,4 +27,5 @@
|
||||
<import file="${base.dir}/build/package.xml" optional="true"/>
|
||||
<import file="${base.dir}/build/developer.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>
|
||||
|
||||
12
build/build-aws-api.properties
Normal file
12
build/build-aws-api.properties
Normal file
@ -0,0 +1,12 @@
|
||||
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
|
||||
|
||||
440
build/build-aws-api.xml
Normal file
440
build/build-aws-api.xml
Normal file
@ -0,0 +1,440 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<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.class.path">
|
||||
<fileset dir="${axis2.home}">
|
||||
<include name="deps/awsapi-lib/*.jar" />
|
||||
</fileset>
|
||||
</path>
|
||||
<taskdef name="wsdl2code" classname="org.apache.axis2.tool.ant.AntCodegenTask" classpathref="axis2.class.path" />
|
||||
<!-- 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" />
|
||||
</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" />
|
||||
<include name="AmazonEC2.wsdl" />
|
||||
</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.war" dest="${server.deploy.to.dir}/webapps/awsapi" />
|
||||
</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}/webapps/awsapi/WEB-INF/services">
|
||||
<fileset dir="${dist.files.dir}">
|
||||
<include name="cloud-s3.aar"/>
|
||||
</fileset>
|
||||
</copy>
|
||||
-->
|
||||
<copy todir="${server.deploy.to.dir}/webapps/awsapi/WEB-INF/services">
|
||||
<fileset dir="${dist.files.dir}">
|
||||
<include name="cloud-ec2.aar" />
|
||||
</fileset>
|
||||
</copy>
|
||||
<copy todir="${server.deploy.to.dir}/webapps/awsapi/WEB-INF/modules">
|
||||
<fileset dir="${dist.files.dir}">
|
||||
<include name="cloud-auth-s3.mar" />
|
||||
</fileset>
|
||||
</copy>
|
||||
<copy todir="${server.deploy.to.dir}/webapps/awsapi/WEB-INF/modules">
|
||||
<fileset dir="${dist.files.dir}">
|
||||
<include name="cloud-auth-ec2.mar" />
|
||||
</fileset>
|
||||
</copy>
|
||||
<copy todir="${server.deploy.to.dir}/webapps/awsapi/WEB-INF/lib">
|
||||
<fileset dir="${jar.dir}">
|
||||
<include name="cloud-awsapi.jar" />
|
||||
<include name="cloud-jasypt-1.8.jar" />
|
||||
</fileset>
|
||||
</copy>
|
||||
<copy todir="${server.deploy.to.dir}/webapps/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}/webapps/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}/webapps/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}/webapps/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}/webapps/awsapi/WEB-INF/modules">
|
||||
<fileset dir="${base.dir}/awsapi/modules">
|
||||
<include name="*.mar" />
|
||||
</fileset>
|
||||
</copy>
|
||||
<!-- WS-Security requires this keystore -->
|
||||
<copy todir="${server.deploy.to.dir}/webapps/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}/webapps/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}/webapps/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}/webapps/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="cloud-jasypt-1.8.jar" />
|
||||
</fileset>
|
||||
</copy>
|
||||
<copy todir="${debian.tomcat.dir}/lib">
|
||||
<fileset dir="${base.dir}/lib">
|
||||
<include name="*.jar" />
|
||||
</fileset>
|
||||
</copy>
|
||||
<copy todir="${debian.tomcat.dir}/webapps/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}/webapps/awsapi/WEB-INF/conf">
|
||||
<fileset dir="${base.dir}/awsapi/resource/Axis2/">
|
||||
<include name="axis2.xml" />
|
||||
</fileset>
|
||||
</copy>
|
||||
<copy overwrite="true" todir="${debian.tomcat.dir}/webapps/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}/webapps/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}/webapps/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}/webapps/awsapi/WEB-INF/lib">
|
||||
<fileset dir="${base.dir}/deps/awsapi-lib/rampart-lib">
|
||||
<include name="*.jar" />
|
||||
</fileset>
|
||||
<fileset dir="${jar.dir}">
|
||||
<include name="cloud-awsapi.jar" />
|
||||
<include name="cloud-jasypt-1.8.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}/webapps/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}/webapps/awsapi/WEB-INF/conf">
|
||||
<fileset dir="${base.dir}/awsapi/resource/Axis2/">
|
||||
<include name="axis2.xml" />
|
||||
</fileset>
|
||||
</copy>
|
||||
<copy overwrite="true" todir="${rpm.tomcat.dir}/webapps/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>
|
||||
@ -493,7 +493,7 @@
|
||||
|
||||
<target name="compile-all" description="Compile all of the jars" depends="compile-utils, compile-api, compile-core, compile-server, compile-ovm"/>
|
||||
|
||||
<target name="clean-all" depends="clean" description="Clean all of the generated files, including dependency cache and javadoc">
|
||||
<target name="clean-all" depends="clean, clean-awsapi" description="Clean all of the generated files, including dependency cache and javadoc">
|
||||
<delete dir="${target.dir}" />
|
||||
</target>
|
||||
</project>
|
||||
|
||||
@ -46,7 +46,7 @@
|
||||
<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">
|
||||
<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"/>
|
||||
|
||||
@ -125,7 +125,7 @@
|
||||
</java>
|
||||
</target>
|
||||
|
||||
<target name="clean-tomcat" depends="stop-tomcat">
|
||||
<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}/work/Catalina"/>
|
||||
@ -154,7 +154,7 @@
|
||||
</copy>
|
||||
</target>
|
||||
|
||||
<target name="deploy-server" depends="deploy-common, deploy-ovm" >
|
||||
<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>
|
||||
|
||||
@ -216,7 +216,7 @@
|
||||
</copy>
|
||||
</target>
|
||||
|
||||
<target name="deploydb">
|
||||
<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>
|
||||
@ -241,6 +241,9 @@
|
||||
</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" />
|
||||
|
||||
@ -139,7 +139,7 @@
|
||||
</zip>
|
||||
</target>
|
||||
|
||||
<target name="build-all" depends="build-opensource, build-ui, build-war-oss, compile-testclient, compile-usage">
|
||||
<target name="build-all" depends="build-opensource, build-ui, build-war-oss, compile-testclient, compile-usage, build-awsapi">
|
||||
</target>
|
||||
|
||||
<target name="build-all-with-simulator" depends="build-all, compile-agent-simulator">
|
||||
|
||||
@ -7,3 +7,4 @@ AGENTLOGDIR=logs
|
||||
AGENTLOG=logs/agent.log
|
||||
MSMNTDIR=/mnt
|
||||
COMPONENTS-SPEC=components-premium.xml
|
||||
AWSAPILOG=awsapi.log
|
||||
|
||||
@ -9,6 +9,7 @@ disableAccount=com.cloud.api.commands.DisableAccountCmd;7
|
||||
enableAccount=com.cloud.api.commands.EnableAccountCmd;7
|
||||
###lockAccount=com.cloud.api.commands.LockAccountCmd;7
|
||||
listAccounts=com.cloud.api.commands.ListAccountsCmd;15
|
||||
markDefaultZoneForAccount=com.cloud.api.commands.MarkDefaultZoneForAccountCmd;1
|
||||
|
||||
#### User commands
|
||||
createUser=com.cloud.api.commands.CreateUserCmd;3
|
||||
|
||||
@ -49,3 +49,6 @@ db.usage.maxActive=100
|
||||
db.usage.maxIdle=30
|
||||
db.usage.maxWait=10000
|
||||
db.usage.autoReconnect=true
|
||||
|
||||
# awsapi database settings
|
||||
db.awsapi.name=cloudbridge
|
||||
|
||||
@ -33,6 +33,17 @@
|
||||
</layout>
|
||||
</appender>
|
||||
|
||||
<appender name="AWSAPI" class="org.apache.log4j.rolling.RollingFileAppender">
|
||||
<param name="Append" value="true"/>
|
||||
<param name="Threshold" value="DEBUG"/>
|
||||
<rollingPolicy class="org.apache.log4j.rolling.TimeBasedRollingPolicy">
|
||||
<param name="FileNamePattern" value="@AWSAPILOG@.%d{yyyy-MM-dd}.gz"/>
|
||||
<param name="ActiveFileName" value="@AWSAPILOG@"/>
|
||||
</rollingPolicy>
|
||||
<layout class="org.apache.log4j.EnhancedPatternLayout">
|
||||
<param name="ConversionPattern" value="%d{ISO8601} %-5p [%c{3}] (%t:%x) %m%n"/>
|
||||
</layout>
|
||||
</appender>
|
||||
<!-- ============================== -->
|
||||
<!-- Append warnings+ to the syslog if it is listening on UDP port FIXME make sysloghost configurable! -->
|
||||
<!-- ============================== -->
|
||||
@ -92,6 +103,24 @@
|
||||
<appender-ref ref="APISERVER"/>
|
||||
</logger>
|
||||
|
||||
|
||||
<logger name="com.cloud.bridge" additivity="false">
|
||||
<level value="DEBUG"/>
|
||||
<appender-ref ref="AWSAPI"/>
|
||||
</logger>
|
||||
|
||||
<logger name="com.cloud.stack" additivity="false">
|
||||
<level value="DEBUG"/>
|
||||
<appender-ref ref="AWSAPI"/>
|
||||
</logger>
|
||||
|
||||
|
||||
<logger name="org.apache.axis2" additivity="false">
|
||||
<level value="INFO"/>
|
||||
<appender-ref ref="AWSAPI"/>
|
||||
</logger>
|
||||
|
||||
|
||||
<!-- ======================= -->
|
||||
<!-- Setup the Root category -->
|
||||
<!-- ======================= -->
|
||||
|
||||
@ -54,6 +54,8 @@
|
||||
<Executor name="tomcatThreadPool" namePrefix="catalina-exec-"
|
||||
maxThreads="150" minSpareThreads="25"/>
|
||||
|
||||
<Executor name="tomcatThreadPool-internal" namePrefix="catalina-exec-int-"
|
||||
maxThreads="150" minSpareThreads="25"/>
|
||||
|
||||
<!-- A "Connector" represents an endpoint by which requests are received
|
||||
and responses are returned. Documentation at :
|
||||
@ -73,6 +75,13 @@
|
||||
connectionTimeout="20000" disableUploadTimeout="true"
|
||||
acceptCount="150" enableLookups="false" maxThreads="150"
|
||||
maxHttpHeaderSize="8192" redirectPort="8443" />
|
||||
|
||||
<Connector executor="tomcatThreadPool-internal" address="127.0.0.1"
|
||||
port="7080" protocol="org.apache.coyote.http11.Http11NioProtocol"
|
||||
connectionTimeout="20000" disableUploadTimeout="true"
|
||||
acceptCount="150" enableLookups="false" maxThreads="150"
|
||||
maxHttpHeaderSize="8192" redirectPort="8443" />
|
||||
|
||||
<!-- Define a SSL HTTP/1.1 Connector on port 8443
|
||||
This connector uses the JSSE configuration, when using APR, the
|
||||
connector should be using the OpenSSL style configuration
|
||||
|
||||
@ -54,6 +54,8 @@
|
||||
<Executor name="tomcatThreadPool" namePrefix="catalina-exec-"
|
||||
maxThreads="150" minSpareThreads="25"/>
|
||||
|
||||
<Executor name="tomcatThreadPool-internal" namePrefix="catalina-exec-int-"
|
||||
maxThreads="150" minSpareThreads="25"/>
|
||||
|
||||
<!-- A "Connector" represents an endpoint by which requests are received
|
||||
and responses are returned. Documentation at :
|
||||
@ -97,6 +99,13 @@
|
||||
keystoreFile="/etc/cloud/management/cloudmanagementserver.keystore"
|
||||
keystorePass="vmops.com"/>
|
||||
|
||||
<Connector executor="tomcatThreadPool-internal" address="127.0.0.1" port="5443" protocol="org.apache.coyote.http11.Http11NioProtocol" SSLEnabled="true"
|
||||
maxThreads="150" scheme="https" secure="true"
|
||||
clientAuth="false" sslProtocol="TLS"
|
||||
keystoreType="JKS"
|
||||
keystoreFile="/etc/cloud/management/cloudmanagementserver.keystore"
|
||||
keystorePass="vmops.com"/>
|
||||
|
||||
<!-- Define an AJP 1.3 Connector on port 20400 -->
|
||||
<Connector port="20400" protocol="AJP/1.3" redirectPort="6443" />
|
||||
|
||||
|
||||
156
client/tomcatconf/server.xml.in
Normal file
156
client/tomcatconf/server.xml.in
Normal file
@ -0,0 +1,156 @@
|
||||
<?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.
|
||||
-->
|
||||
<!-- Note: A "Server" is not itself a "Container", so you may not
|
||||
define subcomponents such as "Valves" at this level.
|
||||
Documentation at /docs/config/server.html
|
||||
-->
|
||||
<Server port="8005" shutdown="SHUTDOWN">
|
||||
|
||||
<!--APR library loader. Documentation at /docs/apr.html -->
|
||||
<Listener className="org.apache.catalina.core.AprLifecycleListener" SSLEngine="on" />
|
||||
<!--Initialize Jasper prior to webapps are loaded. Documentation at /docs/jasper-howto.html -->
|
||||
<Listener className="org.apache.catalina.core.JasperListener" />
|
||||
<!-- JMX Support for the Tomcat server. Documentation at /docs/non-existent.html -->
|
||||
<Listener className="org.apache.catalina.mbeans.ServerLifecycleListener" />
|
||||
<Listener className="org.apache.catalina.mbeans.GlobalResourcesLifecycleListener" />
|
||||
|
||||
<!-- Global JNDI resources
|
||||
Documentation at /docs/jndi-resources-howto.html
|
||||
-->
|
||||
<GlobalNamingResources>
|
||||
<!-- Editable user database that can also be used by
|
||||
UserDatabaseRealm to authenticate users
|
||||
-->
|
||||
<Resource name="UserDatabase" auth="Container"
|
||||
type="org.apache.catalina.UserDatabase"
|
||||
description="User database that can be updated and saved"
|
||||
factory="org.apache.catalina.users.MemoryUserDatabaseFactory"
|
||||
pathname="conf/tomcat-users.xml" />
|
||||
</GlobalNamingResources>
|
||||
|
||||
<!-- A "Service" is a collection of one or more "Connectors" that share
|
||||
a single "Container" Note: A "Service" is not itself a "Container",
|
||||
so you may not define subcomponents such as "Valves" at this level.
|
||||
Documentation at /docs/config/service.html
|
||||
-->
|
||||
<Service name="Catalina">
|
||||
|
||||
<!--The connectors can use a shared executor, you can define one or more named thread pools-->
|
||||
<Executor name="tomcatThreadPool" namePrefix="catalina-exec-"
|
||||
maxThreads="150" minSpareThreads="25"/>
|
||||
|
||||
<Executor name="tomcatThreadPool-internal" namePrefix="catalina-exec-int-"
|
||||
maxThreads="150" minSpareThreads="25"/>
|
||||
|
||||
<!-- A "Connector" represents an endpoint by which requests are received
|
||||
and responses are returned. Documentation at :
|
||||
Java HTTP Connector: /docs/config/http.html (blocking & non-blocking)
|
||||
Java AJP Connector: /docs/config/ajp.html
|
||||
APR (HTTP/AJP) Connector: /docs/apr.html
|
||||
Define a non-SSL HTTP/1.1 Connector on port 8080
|
||||
-->
|
||||
<!--
|
||||
<Connector port="8080" protocol="HTTP/1.1"
|
||||
connectionTimeout="20000"
|
||||
redirectPort="8443" />
|
||||
-->
|
||||
<!-- A "Connector" using the shared thread pool-->
|
||||
<Connector executor="tomcatThreadPool"
|
||||
port="8080" protocol="org.apache.coyote.http11.Http11NioProtocol"
|
||||
connectionTimeout="20000" disableUploadTimeout="true"
|
||||
acceptCount="150" enableLookups="false" maxThreads="150"
|
||||
maxHttpHeaderSize="8192" redirectPort="8443" />
|
||||
|
||||
<Connector executor="tomcatThreadPool-internal" address="127.0.0.1"
|
||||
port="7080" protocol="org.apache.coyote.http11.Http11NioProtocol"
|
||||
connectionTimeout="20000" disableUploadTimeout="true"
|
||||
acceptCount="150" enableLookups="false" maxThreads="150"
|
||||
maxHttpHeaderSize="8192" redirectPort="8443" />
|
||||
|
||||
<!-- Define a SSL HTTP/1.1 Connector on port 8443
|
||||
This connector uses the JSSE configuration, when using APR, the
|
||||
connector should be using the OpenSSL style configuration
|
||||
described in the APR documentation -->
|
||||
<!--
|
||||
<Connector port="8443" protocol="HTTP/1.1" SSLEnabled="true"
|
||||
maxThreads="150" scheme="https" secure="true"
|
||||
clientAuth="false" sslProtocol="TLS"
|
||||
keystoreType="PKCS12"
|
||||
keystoreFile="conf\cloud-localhost.pk12"
|
||||
keystorePass="password"
|
||||
/>
|
||||
-->
|
||||
|
||||
<!-- Define an AJP 1.3 Connector on port 20400 -->
|
||||
<Connector port="20400" protocol="AJP/1.3" redirectPort="8443" />
|
||||
|
||||
|
||||
<!-- An Engine represents the entry point (within Catalina) that processes
|
||||
every request. The Engine implementation for Tomcat stand alone
|
||||
analyzes the HTTP headers included with the request, and passes them
|
||||
on to the appropriate Host (virtual host).
|
||||
Documentation at /docs/config/engine.html -->
|
||||
|
||||
<!-- You should set jvmRoute to support load-balancing via AJP ie :
|
||||
<Engine name="Catalina" defaultHost="localhost" jvmRoute="jvm1">
|
||||
-->
|
||||
<Engine name="Catalina" defaultHost="localhost">
|
||||
|
||||
<!--For clustering, please take a look at documentation at:
|
||||
/docs/cluster-howto.html (simple how to)
|
||||
/docs/config/cluster.html (reference documentation) -->
|
||||
<!--
|
||||
<Cluster className="org.apache.catalina.ha.tcp.SimpleTcpCluster"/>
|
||||
-->
|
||||
|
||||
<!-- The request dumper valve dumps useful debugging information about
|
||||
the request and response data received and sent by Tomcat.
|
||||
Documentation at: /docs/config/valve.html -->
|
||||
<!--
|
||||
<Valve className="org.apache.catalina.valves.RequestDumperValve"/>
|
||||
-->
|
||||
|
||||
<!-- This Realm uses the UserDatabase configured in the global JNDI
|
||||
resources under the key "UserDatabase". Any edits
|
||||
that are performed against this UserDatabase are immediately
|
||||
available for use by the Realm. -->
|
||||
<Realm className="org.apache.catalina.realm.UserDatabaseRealm"
|
||||
resourceName="UserDatabase"/>
|
||||
|
||||
<!-- Define the default virtual host
|
||||
Note: XML Schema validation will not work with Xerces 2.2.
|
||||
-->
|
||||
<Host name="localhost" appBase="webapps"
|
||||
unpackWARs="true" autoDeploy="true"
|
||||
xmlValidation="false" xmlNamespaceAware="false">
|
||||
|
||||
<!-- SingleSignOn valve, share authentication between web applications
|
||||
Documentation at: /docs/config/valve.html -->
|
||||
<!--
|
||||
<Valve className="org.apache.catalina.authenticator.SingleSignOn" />
|
||||
-->
|
||||
|
||||
<!-- Access log processes all example.
|
||||
Documentation at: /docs/config/valve.html -->
|
||||
<Valve className="org.apache.catalina.valves.FastCommonAccessLogValve" directory="logs"
|
||||
prefix="access_log." suffix=".txt" pattern="common" resolveHosts="false"/>
|
||||
|
||||
</Host>
|
||||
</Engine>
|
||||
</Service>
|
||||
</Server>
|
||||
47
cloud.spec
47
cloud.spec
@ -128,6 +128,7 @@ Requires: %{name}-setup = %{version}
|
||||
# reqs the agent-scripts package because of xenserver within the management server
|
||||
Requires: %{name}-agent-scripts = %{version}
|
||||
Requires: %{name}-python = %{version}
|
||||
Requires: %{name}-aws-api = %{version}
|
||||
# for consoleproxy
|
||||
# Requires: %{name}-agent
|
||||
Requires: tomcat6
|
||||
@ -271,6 +272,14 @@ Group: System Environment/Libraries
|
||||
The CloudStack usage monitor provides usage accounting across the entire cloud for
|
||||
cloud operators to charge based on usage parameters.
|
||||
|
||||
%package aws-api
|
||||
Summary: CloudStack CloudBridge
|
||||
Group: System Environment/Libraries
|
||||
Requires: java >= 1.6.0
|
||||
Requires: tomcat6
|
||||
Obsoletes: cloud-bridge < %{version}-%{release}
|
||||
%description aws-api
|
||||
This is the CloudStack CloudBridge
|
||||
|
||||
%prep
|
||||
|
||||
@ -293,6 +302,7 @@ echo Doing CloudStack build
|
||||
rm $RPM_BUILD_ROOT/etc/rc.d/init.d/cloud-console-proxy
|
||||
rm $RPM_BUILD_ROOT/usr/bin/cloud-setup-console-proxy
|
||||
rm $RPM_BUILD_ROOT/usr/libexec/console-proxy-runner
|
||||
./tools/ant/apache-ant-1.7.1/bin/ant deploy-rpm-install -Drpm.install.dir=$RPM_BUILD_ROOT
|
||||
|
||||
%clean
|
||||
|
||||
@ -373,6 +383,32 @@ else
|
||||
/sbin/service %{name}-agent condrestart >/dev/null 2>&1 || true
|
||||
fi
|
||||
|
||||
%post client
|
||||
if [ "$1" == "1" ] ; then
|
||||
/sbin/chkconfig --add %{name}-management > /dev/null 2>&1 || true
|
||||
/sbin/chkconfig --level 345 %{name}-management on > /dev/null 2>&1 || true
|
||||
fi
|
||||
|
||||
if [ "$1" == "1" ] ; then
|
||||
root=/usr/share/cloud/bridge
|
||||
target=/usr/share/cloud/management/
|
||||
|
||||
if [ ! -e $target/webapps/awsapi ]; then
|
||||
ln -s $root/webapps/awsapi $target/webapps/awsapi
|
||||
fi
|
||||
|
||||
jars=`ls $root/lib`
|
||||
for j in $jars
|
||||
do
|
||||
cp -f $root/lib/$j $root/webapps/awsapi/WEB-INF/lib/
|
||||
done
|
||||
|
||||
confs="cloud-bridge.properties ec2-service.properties hibernate.cfg.xml CloudStack.cfg.xml"
|
||||
for c in $confs
|
||||
do
|
||||
cp -f $root/conf/$c $target/conf
|
||||
done
|
||||
fi
|
||||
|
||||
%files utils
|
||||
%defattr(0644,root,root,0755)
|
||||
@ -432,7 +468,7 @@ fi
|
||||
%{_javadir}/jetty-util-6.1.26.jar
|
||||
%{_javadir}/%{name}-axis.jar
|
||||
%{_javadir}/%{name}-commons-discovery.jar
|
||||
%{_javadir}/%{name}-wsdl4j.jar
|
||||
%{_javadir}/%{name}-wsdl4j-1.6.2.jar
|
||||
%{_javadir}/%{name}-bcprov-jdk16-1.45.jar
|
||||
%{_javadir}/%{name}-jsch-0.1.42.jar
|
||||
%{_javadir}/%{name}-iControl.jar
|
||||
@ -539,6 +575,15 @@ fi
|
||||
%config(noreplace) %{_sysconfdir}/%{name}/usage/log4j-%{name}_usage.xml
|
||||
%config(noreplace) %attr(0640,root,%{name}) %{_sysconfdir}/%{name}/usage/db.properties
|
||||
|
||||
%files aws-api
|
||||
%defattr(0644,cloud,cloud,0755)
|
||||
%{_datadir}/cloud/bridge/conf/*
|
||||
%{_datadir}/cloud/bridge/lib/*
|
||||
%{_datadir}/cloud/bridge/webapps/*
|
||||
%attr(0644,root,root) %{_datadir}/cloud/setup/bridge/db/*
|
||||
%attr(0755,root,root) %{_bindir}/cloudstack-aws-api-register
|
||||
%attr(0755,root,root) %{_bindir}/cloud-setup-bridge
|
||||
|
||||
%changelog
|
||||
* Mon May 3 2010 Manuel Amador (Rudd-O) <manuel@vmops.com> 1.9.12
|
||||
- Bump version for RC4 release
|
||||
|
||||
@ -1233,8 +1233,10 @@ CREATE TABLE `cloud`.`account` (
|
||||
`removed` datetime COMMENT 'date removed',
|
||||
`cleanup_needed` tinyint(1) NOT NULL default '0',
|
||||
`network_domain` varchar(255),
|
||||
`default_zone_id` bigint unsigned,
|
||||
PRIMARY KEY (`id`),
|
||||
INDEX i_account__removed(`removed`),
|
||||
CONSTRAINT `fk_account__default_zone_id` FOREIGN KEY `fk_account__default_zone_id`(`default_zone_id`) REFERENCES `data_center`(`id`) ON DELETE CASCADE,
|
||||
CONSTRAINT `uc_account__uuid` UNIQUE (`uuid`)
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
|
||||
|
||||
|
||||
@ -118,4 +118,9 @@ DELETE FROM `cloud`.`configuration` WHERE name='xen.min.product.version';
|
||||
DELETE FROM `cloud`.`configuration` WHERE name='xen.min.version';
|
||||
DELETE FROM `cloud`.`configuration` WHERE name='xen.min.xapi.version';
|
||||
|
||||
INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Advanced', 'DEFAULT', 'management-server', 'enable.ec2.api', 'false', 'enable EC2 API on CloudStack');
|
||||
INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Advanced', 'DEFAULT', 'management-server', 'enable.s3.api', 'false', 'enable Amazon S3 API on CloudStack');
|
||||
ALTER TABLE `cloud`.`account` ADD COLUMN `default_zone_id` bigint unsigned;
|
||||
ALTER TABLE `cloud`.`account` ADD CONSTRAINT `fk_account__default_zone_id` FOREIGN KEY `fk_account__default_zone_id`(`default_zone_id`) REFERENCES `data_center`(`id`) ON DELETE CASCADE;
|
||||
|
||||
DELETE FROM `cloud`.`storage_pool_host_ref` WHERE pool_id IN (SELECT id FROM storage_pool WHERE removed IS NOT NULL);
|
||||
|
||||
@ -77,7 +77,7 @@ def build_jars ():
|
||||
"cloud-servlet-api.jar", "cloud-commons-logging-1.1.1.jar",
|
||||
"cloud-ws-commons-util-1.0.2.jar",
|
||||
"cloud-commons-collections-3.2.1.jar", "vmware*.jar", "cloud-secstorage-extras.jar",
|
||||
"cloud-agent-simulator.jar"]
|
||||
"cloud-agent-simulator.jar", "cloud-awsapi.jar", "cloud-test.jar", "cloud-wsdl4j.jar"]
|
||||
|
||||
for a in jars_str:
|
||||
if _basename (a).startswith ("cloud-") \
|
||||
@ -112,7 +112,7 @@ def build_thirdparty_dir ():
|
||||
def build_dependences ():
|
||||
excludes = ["cloud-xstream-1.3.1.jar", "cloud-servlet-api.jar", "cloud-commons-logging-1.1.1.jar",
|
||||
"cloud-ws-commons-util-1.0.2.jar",
|
||||
"cloud-commons-collections-3.2.1.jar"]
|
||||
"cloud-commons-collections-3.2.1.jar", "cloud-wsdl4j.jar"]
|
||||
|
||||
start_path = bld.path.find_dir ("deps")
|
||||
bld.install_files('${JAVADIR}',start_path.ant_glob("*.jar", excl = excludes), cwd=start_path)
|
||||
|
||||
@ -231,6 +231,7 @@ conf.env.CPSYSCONFDIR = Utils.subst_vars(_join("${SYSCONFDIR}","${CPPATH}"),conf
|
||||
conf.env.CPLOGDIR = Utils.subst_vars(_join("${LOCALSTATEDIR}","log","${CPPATH}"),conf.env)
|
||||
|
||||
conf.env.MSLOG = _join(conf.env.MSLOGDIR,"management-server.log")
|
||||
conf.env.AWSAPILOG = _join(conf.env.MSLOGDIR,"awsapi.log")
|
||||
conf.env.APISERVERLOG = _join(conf.env.MSLOGDIR,"api-server.log")
|
||||
conf.env.AGENTLOG = _join(conf.env.AGENTLOGDIR,"agent.log")
|
||||
conf.env.USAGELOG = _join(conf.env.USAGELOGDIR,"usage.log")
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user