QuickCloud: we moved the SecondaryStorageDiscoverer from the com.cloud package to the org.apache.cloudstack package

QuickCloud: fix license issue
QuickCloud: use a different activation for deploying quickcloud
Otherwise marvin gets invoked during mvn install -Dquickcloud

client/tomcatconf/applicationContext.xml.in

@@ -503,7 +503,7 @@
     <property name="name" value="XCP Agent"/>
   </bean>
 
-  <bean id="SecondaryStorageDiscoverer" class="com.cloud.storage.secondary.SecondaryStorageDiscoverer">
+  <bean id="SecondaryStorageDiscoverer" class="org.apache.cloudstack.storage.resource.SecondaryStorageDiscoverer">
     <property name="name" value="SecondaryStorage"/>
   </bean>
 

server/src/com/cloud/consoleproxy/ConsoleProxyService.java

@@ -1,3 +1,19 @@
+// 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.
 package com.cloud.consoleproxy;
 
 import com.cloud.info.ConsoleProxyInfo;

tools/devcloud/pom.xml

@@ -146,7 +146,7 @@
       <id>quickcloud</id>
       <activation>
         <property>
-          <name>quickcloud</name>
+          <name>deployquick</name>
         </property>
       </activation>
       <build> 
@@ -157,7 +157,7 @@
         <version>1.2.1</version>
         <executions>
           <execution>
-            <phase>package</phase>
+            <phase>integration-test</phase>
             <goals>
               <goal>exec</goal>
             </goals>