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
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/c02baa70 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/c02baa70 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/c02baa70 Branch: refs/heads/quickcloud2 Commit: c02baa70b80b79e4ae478c84366155454b565d33 Parents: c615940 Author: Chiradeep Vittal <chirad...@apache.org> Authored: Fri Apr 5 11:52:52 2013 -0700 Committer: Chiradeep Vittal <chirad...@apache.org> Committed: Fri Apr 5 15:12:17 2013 -0700 ---------------------------------------------------------------------- client/tomcatconf/applicationContext.xml.in | 2 +- .../cloud/consoleproxy/ConsoleProxyService.java | 16 +++++++++++++++ tools/devcloud/pom.xml | 4 +- 3 files changed, 19 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c02baa70/client/tomcatconf/applicationContext.xml.in ---------------------------------------------------------------------- diff --git a/client/tomcatconf/applicationContext.xml.in b/client/tomcatconf/applicationContext.xml.in index 0b4ba82..3edb068 100644 --- a/client/tomcatconf/applicationContext.xml.in +++ b/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> http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c02baa70/server/src/com/cloud/consoleproxy/ConsoleProxyService.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/consoleproxy/ConsoleProxyService.java b/server/src/com/cloud/consoleproxy/ConsoleProxyService.java index e43e5c3..fd00f56 100644 --- a/server/src/com/cloud/consoleproxy/ConsoleProxyService.java +++ b/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; http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c02baa70/tools/devcloud/pom.xml ---------------------------------------------------------------------- diff --git a/tools/devcloud/pom.xml b/tools/devcloud/pom.xml index 93029e1..ba4cc46 100644 --- a/tools/devcloud/pom.xml +++ b/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>
