merge awsapi build script changes to master

prachi · prachi · commit 49cdc2317bca · 2012-05-25T14:40:56.000-07:00
diff --git a/build.xml b/build.xml
@@ -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>
diff --git a/build/build-aws-api.properties b/build/build-aws-api.properties
@@ -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
+
diff --git a/build/build-aws-api.xml b/build/build-aws-api.xml
diff --git a/build/build-cloud.xml b/build/build-cloud.xml
@@ -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>
diff --git a/build/build-common.xml b/build/build-common.xml
@@ -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"/>
diff --git a/build/developer.xml b/build/developer.xml
@@ -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" />
diff --git a/build/package.xml b/build/package.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">
diff --git a/build/replace.properties b/build/replace.properties
@@ -7,3 +7,4 @@ AGENTLOGDIR=logs
 AGENTLOG=logs/agent.log
 MSMNTDIR=/mnt
 COMPONENTS-SPEC=components-premium.xml
+AWSAPILOG=awsapi.log
diff --git a/client/tomcatconf/commands.properties.in b/client/tomcatconf/commands.properties.in
@@ -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
diff --git a/client/tomcatconf/db.properties.in b/client/tomcatconf/db.properties.in
@@ -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
diff --git a/client/tomcatconf/log4j-cloud.xml.in b/client/tomcatconf/log4j-cloud.xml.in
@@ -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 -->
    <!-- ======================= -->
diff --git a/client/tomcatconf/server-nonssl.xml b/client/tomcatconf/server-nonssl.xml
@@ -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
diff --git a/client/tomcatconf/server-ssl.xml.in b/client/tomcatconf/server-ssl.xml.in
@@ -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" />
 
diff --git a/client/tomcatconf/server.xml.in b/client/tomcatconf/server.xml.in
@@ -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>
diff --git a/cloud.spec b/cloud.spec
diff --git a/setup/db/create-schema.sql b/setup/db/create-schema.sql
diff --git a/setup/db/db/schema-302to303.sql b/setup/db/db/schema-302to303.sql
diff --git a/wscript_build b/wscript_build
diff --git a/wscript_configure b/wscript_configure
