incubator-cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ke4...@apache.org
Subject [1/2] git commit: fixing apidocs build
Date Wed, 12 Sep 2012 22:18:30 GMT
Updated Branches:
  refs/heads/4.0 46a1a710e -> 6ac3cf9c7
  refs/heads/master 4b83c7f37 -> ff58e05c4


fixing apidocs build


Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/ff58e05c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/ff58e05c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/ff58e05c

Branch: refs/heads/master
Commit: ff58e05c40108ac6467787dceaa8cee87c6fbdc6
Parents: 4b83c7f
Author: David Nalley <david@gnsa.us>
Authored: Wed Sep 12 18:18:19 2012 -0400
Committer: David Nalley <david@gnsa.us>
Committed: Wed Sep 12 18:18:41 2012 -0400

----------------------------------------------------------------------
 build/build-aws-api.xml |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/ff58e05c/build/build-aws-api.xml
----------------------------------------------------------------------
diff --git a/build/build-aws-api.xml b/build/build-aws-api.xml
index e1f182b..dc9bb00 100644
--- a/build/build-aws-api.xml
+++ b/build/build-aws-api.xml
@@ -44,7 +44,7 @@
 	<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 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}" />
@@ -58,11 +58,11 @@
 			<include name="*.jar" />
 		</fileset>
 	</path>
-	<path id="rampart.classpath">
+<!--	<path id="rampart.classpath">
 		<fileset dir="${rampart.dir}">
 			<include name="*.jar" />
 		</fileset>
-	</path>
+	</path>  -->
 	<path id="dist.classpath">
 		<fileset dir="${target.dir}">
 			<include name="**/*.jar" />
@@ -114,7 +114,7 @@
 	<path id="awsapi.classpath">
 		<path refid="deps.classpath" />
 		<!-- <path refid="thirdparty.classpath" /> -->
-		<path refid="rampart.classpath" />
+<!--		<path refid="rampart.classpath" /> -->
 		<path refid="dist.classpath" />
 	</path>
 	<target name="compile-awsapi" depends="-init-awsapi" description="Compile Cloud.com Simple
Storage Service">
@@ -252,12 +252,12 @@
 				<include name="web.xml" />
 			</fileset>
 		</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">
 			<fileset dir="${base.dir}/deps/awsapi-lib/rampart-lib">
 				<include name="*.jar" />
 			</fileset>
-		</copy>
+		</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">
@@ -365,9 +365,9 @@
 			</fileset>
 		</copy>
 		<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" />
-			</fileset>
+			</fileset> -->
 			<fileset dir="${jar.dir}">
 				<include name="cloud-awsapi.jar" />
 				<include name="cloud-jasypt-1.8.jar" />


Mime
View raw message