From df82c8abf3b904f7dff899996811eaf8f90eeb3f Mon Sep 17 00:00:00 2001
From: frank <frank.zhang@citrix.com>
Date: Wed, 11 Apr 2012 15:23:34 -0700
Subject: [PATCH] make cloudbridge buildable

---
 build/build-cloud-bridge.xml | 45 ++++++++++++++++++------------------
 wscript                      |  2 +-
 2 files changed, 23 insertions(+), 24 deletions(-)

diff --git a/build/build-cloud-bridge.xml b/build/build-cloud-bridge.xml
index b4e53a07c86..b5ab98fdb1e 100644
--- a/build/build-cloud-bridge.xml
+++ b/build/build-cloud-bridge.xml
@@ -31,7 +31,6 @@
 	<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.install.dir" location="${base.dir}/../../../../../../packages/config/rpm/tmp/BUILD/cloud-bridge-${version}-1" />
 	<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" />
@@ -51,9 +50,8 @@
 			<include name="**/*.jar" />
 		</fileset>
 	</path>
-	<target name="-init">
+	<target name="-init-cloud-bridge">
 		<mkdir dir="${dist.files.dir}" />
-		<mkdir dir="${target.dir}" />
 		<record name="${build.log}" loglevel="verbose" action="start" />
 		<!-- create a UTC build timestamp using ISO 8601 formatting -->
 		<tstamp>
@@ -72,20 +70,23 @@
 				<isset property="update.build.number" />
 			</and>
 		</condition>
+        <replaceregexp file="wscript"
+            match="VERSION = '(.*)'"
+            replace="VERSION = '${impl.version}'"
+            byline="true"
+            />
 		<echo message="Build number is ${impl.version}" />
-		<propertyfile file="${base.dir}/conf/ec2-service.properties">
+        <!--
+        <propertyfile file="${base.dir}/cloudbridge/conf/ec2-service.properties">
 			<entry key="cloudbridgeVersion" value="${impl.version}" />
 		</propertyfile>
-		<replaceregexp file="wscript"
-		               match="VERSION = '(.*)'"
-		               replace="VERSION = '${impl.version}'"
-		               byline="true"
-		/>
+        -->
 		<!-- 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-cloudbridge" description="clean up files generated by the build">
 		<delete file="${build.log}" />
 		<delete dir="${classes.dir}" />
@@ -101,7 +102,7 @@
 		<path refid="rampart.classpath" />
 		<path refid="dist.classpath" />
 	</path>
-	<target name="compile-cloud-bridge" depends="-init" description="Compile Cloud.com Simple Storage Service">
+	<target name="compile-cloud-bridge" depends="-init-cloud-bridge" description="Compile Cloud.com Simple Storage Service">
 		<compile-java jar.name="cloud-bridge.jar" top.dir="${base.dir}/cloudbridge" classpath="cloud-bridge.classpath">
 			<include-files>
 				<fileset dir="${base.dir}/cloudbridge/src">
@@ -110,14 +111,14 @@
 			</include-files>
 		</compile-java>
 	</target>
-	<target name="build-cloud-bridge-jar" depends="-init, compile-cloud-bridge" description="Builds cloud-bridge jar file.">
+	<target name="build-cloud-bridge-jar" depends="-init-cloud-bridge, compile-cloud-bridge" description="Builds cloud-bridge jar file.">
 		<jar jarfile="${dist.files.dir}/cloud-bridge.jar" basedir="${target.dir}/classes/cloud-bridge.jar" excludes="**/client/*">
 			<fileset dir="${base.dir}/cloudbridge/src">
 				<include name="**/*.hbm.xml" />
 			</fileset>
 		</jar>
 	</target>
-	<target name="build-cloud-bridge-s3" depends="-init, compile-cloud-bridge" description="Builds cloud-bridge S3 AAR file.">
+	<target name="build-cloud-bridge-s3" depends="-init-cloud-bridge, compile-cloud-bridge" description="Builds cloud-bridge S3 AAR file.">
 		<jar jarfile="${dist.files.dir}/cloud-s3.aar" basedir="${target.dir}/classes/cloud-bridge.jar" excludes="**/*">
 			<!--                            
                     <metainf dir="${base.dir}/resource/AmazonS3">
@@ -127,7 +128,7 @@
 -->
 		</jar>
 	</target>
-	<target name="build-cloud-auth-s3" depends="-init, compile-cloud-bridge" description="Builds cloud-bridge S3 auth MAR file.">
+	<target name="build-cloud-auth-s3" depends="-init-cloud-bridge, compile-cloud-bridge" description="Builds cloud-bridge S3 auth MAR file.">
 		<jar jarfile="${dist.files.dir}/cloud-auth-s3.mar" basedir="${target.dir}/classes/cloud-bridge.jar" excludes="**/*">
 			<fileset dir="${target.dir}/classes/cloud-bridge.jar">
 				<include name="**/auth/s3/*.class" />
@@ -137,7 +138,7 @@
 			</metainf>
 		</jar>
 	</target>
-	<target name="build-cloud-bridge-ec2" depends="-init, compile-cloud-bridge" description="Builds cloud-bridge EC2 AAR file.">
+	<target name="build-cloud-bridge-ec2" depends="-init-cloud-bridge, compile-cloud-bridge" description="Builds cloud-bridge EC2 AAR file.">
 		<jar jarfile="${dist.files.dir}/cloud-ec2.aar" basedir="${target.dir}/classes/cloud-bridge.jar" excludes="**/*">
 			<metainf dir="${base.dir}/cloudbridge/resource/AmazonEC2">
 				<include name="services.xml" />
@@ -145,7 +146,7 @@
 			</metainf>
 		</jar>
 	</target>
-	<target name="build-cloud-auth-ec2" depends="-init, compile-cloud-bridge" description="Builds cloud-bridge EC2 auth MAR file.">
+	<target name="build-cloud-auth-ec2" depends="-init-cloud-bridge, compile-cloud-bridge" description="Builds cloud-bridge EC2 auth MAR file.">
 		<jar jarfile="${dist.files.dir}/cloud-auth-ec2.mar" basedir="${target.dir}/classes/cloud-bridge.jar" excludes="**/*">
 			<fileset dir="${target.dir}/classes/cloud-bridge.jar">
 				<include name="**/auth/ec2/*.class" />
@@ -155,7 +156,7 @@
 			</metainf>
 		</jar>
 	</target>
-	<target name="deploy-axis" depends="-init">
+	<target name="deploy-axis" depends="-init-cloud-bridge">
 		<unwar overwrite="true" src="${base.dir}/deps/cloudbridge-lib/axis2.war" dest="${server.deploy.to.dir}/webapps/bridge" />
 	</target>
 	<condition property="access_key.private.notpresent">
@@ -341,12 +342,12 @@
 				<include name="cloud-auth-s3.mar" />
 				<include name="cloud-auth-ec2.mar" />
 			</fileset>
-			<fileset dir="${base.dir}/modules">
+            <fileset dir="${base.dir}/cloudbridge/modules">
 				<include name="*.mar" />
 			</fileset>
 		</copy>
 		<copy todir="${rpm.tomcat.dir}/webapps/bridge/WEB-INF/lib">
-			<fileset dir="${base.dir}/rampart-lib">
+            <fileset dir="${base.dir}/deps/cloudbridge-lib/rampart-lib">
 				<include name="*.jar" />
 			</fileset>
 			<fileset dir="${jar.dir}">
@@ -354,12 +355,12 @@
 			</fileset>
 		</copy>
 		<copy todir="${rpm.tomcat.dir}/lib">
-			<fileset dir="${base.dir}/lib">
+            <fileset dir="${base.dir}/deps/cloudbridge-lib/">
 				<include name="*.jar" />
 			</fileset>
 		</copy>
 		<copy todir="${rpm.tomcat.dir}/webapps/bridge/WEB-INF/classes">
-			<fileset dir="${base.dir}/resource/AmazonEC2">
+            <fileset dir="${base.dir}/cloudbridge/resource/AmazonEC2">
 				<include name="crypto.properties" />
 				<include name="xes.keystore" />
 			</fileset>
@@ -368,9 +369,6 @@
 			<fileset dir="${base.dir}/cloudbridge/conf/">
 				<include name="**/*" />
 			</fileset>
-			<fileset dir="${base.dir}/dist/cloudbridge/tomcat">
-				<include name="**/*" />
-			</fileset>
 		</copy>
 		<copy overwrite="true" todir="${rpm.tomcat.dir}/webapps/bridge/WEB-INF/conf">
 			<fileset dir="${base.dir}/cloudbridge/resource/Axis2/">
@@ -399,6 +397,7 @@
 			</fileset>
 		</copy>
 	</target>
+
 	<target name="deploy-cloudbridge-db">
 		<echo message="deploy-cloudbridge-db" />
 		<exec dir="${db.dir}" executable="bash">
diff --git a/wscript b/wscript
index 28e81f0de66..9feacd1857c 100644
--- a/wscript
+++ b/wscript
@@ -3,7 +3,7 @@
 
 # the following two variables are used by the target "waf dist"
 # if you change 'em here, you need to change it also in cloud.spec, add a %changelog entry there, and add an entry in debian/changelog
-VERSION = '2.2.2'
+VERSION = '3.0.1'
 APPNAME = 'cloud'
 
 import shutil,os