You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ki...@apache.org on 2012/09/27 14:23:46 UTC
[20/60] [abbrv] git commit: move to devcloud
move to devcloud
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/1f8e9943
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/1f8e9943
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/1f8e9943
Branch: refs/heads/regions
Commit: 1f8e99439c933cf5559f97a7d0b0058b4ef71901
Parents: 023c2e4
Author: Edison Su <su...@gmail.com>
Authored: Tue Jul 3 19:49:40 2012 -0700
Committer: Edison Su <su...@gmail.com>
Committed: Tue Jul 3 23:38:39 2012 -0700
----------------------------------------------------------------------
build.xml | 2 +-
build/build-clouddev.xml | 96 -----------------------------------------
build/build-devcloud.xml | 96 +++++++++++++++++++++++++++++++++++++++++
3 files changed, 97 insertions(+), 97 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/1f8e9943/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 9e217ff..4b103b2 100755
--- a/build.xml
+++ b/build.xml
@@ -27,7 +27,7 @@
<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-clouddev.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/1f8e9943/build/build-clouddev.xml
----------------------------------------------------------------------
diff --git a/build/build-clouddev.xml b/build/build-clouddev.xml
deleted file mode 100644
index 20de53d..0000000
--- a/build/build-clouddev.xml
+++ /dev/null
@@ -1,96 +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/apache-tomcat-6.0.32;killall java;cd /opt/incubator-cloudstack;ant deploycddb"/>
- </target>
-
- <target name="rdeploydb">
- <echo message="ant rdeploydb"/>
- <sshexec host="${host}" port="${port}" username="root" password="password" command="echo $CATALINA_HOME; export CATALINA_HOME=/opt/apache-tomcat-6.0.32;killall java;cd /opt/incubator-cloudstack;ant deploycddb"/>
- </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" />
- </exec>
- </target>
-
- <target name="rdebug-suspend" >
- <echo message="ant debug-suspend"/>
- <sshexec host="${host}" port="${port}" username="root" password="password" command="killall java;sleep 1;echo $CATALINA_HOME; export CATALINA_HOME=/opt/apache-tomcat-6.0.32;cd /opt/incubator-cloudstack;ant deploy-server;ant debug-suspend"/>
- </target>
-
- <target name="rdebug">
- <echo message="ant debug"/>
- <sshexec host="${host}" port="${port}" username="root" password="password" command="killall java;sleep 1;echo $CATALINA_HOME; export CATALINA_HOME=/opt/apache-tomcat-6.0.32;cd /opt/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/incubator-cloudstack/build">
- <fileset dir="build">
- </fileset>
- </scp>
-
- <scp trust="yes" port="${port}" file="build.xml" todir="root:password@${host}:/opt/incubator-cloudstack/">
- </scp>
-
- <echo message="copying deps folder to remote"/>
- <scp trust="yes" port="${port}" todir="root:password@${host}:/opt/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/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/incubator-cloudstack/dist">
- <fileset dir="dist">
- </fileset>
- </scp>
-
- <sshexec host="${host}" port="${port}" username="root" password="password" command="echo $CATALINA_HOME; export CATALINA_HOME=/opt/apache-tomcat-6.0.32;cd /opt/incubator-cloudstack;ant deploy-server"/>
-
- </target>
-
-</project>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/1f8e9943/build/build-devcloud.xml
----------------------------------------------------------------------
diff --git a/build/build-devcloud.xml b/build/build-devcloud.xml
new file mode 100644
index 0000000..06bdf69
--- /dev/null
+++ b/build/build-devcloud.xml
@@ -0,0 +1,96 @@
+<?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;cd /opt/cloudstack/incubator-cloudstack;ant deploycddb"/>
+ </target>
+
+ <target name="rdeploydb">
+ <echo message="ant rdeploydb"/>
+ <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;cd /opt/cloudstack/incubator-cloudstack;ant deploycddb"/>
+ </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" />
+ </exec>
+ </target>
+
+ <target name="rdebug-suspend" >
+ <echo message="ant debug-suspend"/>
+ <sshexec host="${host}" port="${port}" username="root" password="password" command="killall java;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 host="${host}" port="${port}" username="root" password="password" command="killall java;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"/>
+ </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 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>