etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixing apidocs build

This commit is contained in:
David Nalley 2012-09-12 18:18:19 -04:00
parent 4b83c7f371
commit ff58e05c40
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
build/build-aws-api.xml
View File

@ -44,7 +44,7 @@
<property name="jar.dir" location="${target.dir}/jar" /> <property name="jar.dir" location="${target.dir}/jar" />
<property name="build.log" location="${target.dir}/ant_verbose.txt" /> <property name="build.log" location="${target.dir}/ant_verbose.txt" />
<property name="thirdparty.dir" location="${base.dir}/deps/awsapi-lib" /> <property name="thirdparty.dir" location="${base.dir}/deps/awsapi-lib" />
<property name="rampart.dir" location="${base.dir}/deps/awsapi-lib/rampart-lib" /> <!-- <property name="rampart.dir" location="${base.dir}/deps/awsapi-lib/rampart-lib" /> -->
<property file="${build.dir}/build-aws-api.properties" /> <property file="${build.dir}/build-aws-api.properties" />
<property name="version" value="${company.major.version}.${company.minor.version}.${company.patch.version}" /> <property name="version" value="${company.major.version}.${company.minor.version}.${company.patch.version}" />
<property name="tomcat.home" location="${catalina.dir}" /> <property name="tomcat.home" location="${catalina.dir}" />
@ -58,11 +58,11 @@
<include name="*.jar" /> <include name="*.jar" />
</fileset> </fileset>
</path> </path>
<path id="rampart.classpath"> <!-- <path id="rampart.classpath">
<fileset dir="${rampart.dir}"> <fileset dir="${rampart.dir}">
<include name="*.jar" /> <include name="*.jar" />
</fileset> </fileset>
</path> </path> -->
<path id="dist.classpath"> <path id="dist.classpath">
<fileset dir="${target.dir}"> <fileset dir="${target.dir}">
<include name="**/*.jar" /> <include name="**/*.jar" />
@ -114,7 +114,7 @@
<path id="awsapi.classpath"> <path id="awsapi.classpath">
<path refid="deps.classpath" /> <path refid="deps.classpath" />
<!-- <path refid="thirdparty.classpath" /> --> <!-- <path refid="thirdparty.classpath" /> -->
<path refid="rampart.classpath" /> <!-- <path refid="rampart.classpath" /> -->
<path refid="dist.classpath" /> <path refid="dist.classpath" />
</path> </path>
<target name="compile-awsapi" depends="-init-awsapi" description="Compile Cloud.com Simple Storage Service"> <target name="compile-awsapi" depends="-init-awsapi" description="Compile Cloud.com Simple Storage Service">
@ -252,12 +252,12 @@
<include name="web.xml" /> <include name="web.xml" />
</fileset> </fileset>
</copy> </copy>
<!-- rampart lib goes where the axis lib files go --> <!-- rampart lib goes where the axis lib files go
<copy todir="${server.deploy.to.dir}/webapps7080/awsapi/WEB-INF/lib"> <copy todir="${server.deploy.to.dir}/webapps7080/awsapi/WEB-INF/lib">
<fileset dir="${base.dir}/deps/awsapi-lib/rampart-lib"> <fileset dir="${base.dir}/deps/awsapi-lib/rampart-lib">
<include name="*.jar" /> <include name="*.jar" />
</fileset> </fileset>
</copy> </copy> -->
<!-- copying over rampart mar files for WS-Security --> <!-- copying over rampart mar files for WS-Security -->
<copy todir="${server.deploy.to.dir}/webapps7080/awsapi/WEB-INF/modules"> <copy todir="${server.deploy.to.dir}/webapps7080/awsapi/WEB-INF/modules">
<fileset dir="${base.dir}/deps/awsapi-lib/modules"> <fileset dir="${base.dir}/deps/awsapi-lib/modules">
@ -365,9 +365,9 @@
</fileset> </fileset>
</copy> </copy>
<copy todir="${rpm.tomcat.dir}/webapps7080/awsapi/WEB-INF/lib"> <copy todir="${rpm.tomcat.dir}/webapps7080/awsapi/WEB-INF/lib">
<fileset dir="${base.dir}/deps/awsapi-lib/rampart-lib"> <!-- <fileset dir="${base.dir}/deps/awsapi-lib/rampart-lib">
<include name="*.jar" /> <include name="*.jar" />
</fileset> </fileset> -->
<fileset dir="${jar.dir}"> <fileset dir="${jar.dir}">
<include name="cloud-awsapi.jar" /> <include name="cloud-awsapi.jar" />
<include name="cloud-jasypt-1.8.jar" /> <include name="cloud-jasypt-1.8.jar" />