Skip to content

Commit 271d232

Browse files
committed
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
1 parent 778a59f commit 271d232

3 files changed

Lines changed: 19 additions & 3 deletions

File tree

client/tomcatconf/applicationContext.xml.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -503,7 +503,7 @@
503503
<property name="name" value="XCP Agent"/>
504504
</bean>
505505

506-
<bean id="SecondaryStorageDiscoverer" class="com.cloud.storage.secondary.SecondaryStorageDiscoverer">
506+
<bean id="SecondaryStorageDiscoverer" class="org.apache.cloudstack.storage.resource.SecondaryStorageDiscoverer">
507507
<property name="name" value="SecondaryStorage"/>
508508
</bean>
509509

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

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,19 @@
1+
// Licensed to the Apache Software Foundation (ASF) under one
2+
// or more contributor license agreements. See the NOTICE file
3+
// distributed with this work for additional information
4+
// regarding copyright ownership. The ASF licenses this file
5+
// to you under the Apache License, Version 2.0 (the
6+
// "License"); you may not use this file except in compliance
7+
// with the License. You may obtain a copy of the License at
8+
//
9+
// http://www.apache.org/licenses/LICENSE-2.0
10+
//
11+
// Unless required by applicable law or agreed to in writing,
12+
// software distributed under the License is distributed on an
13+
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14+
// KIND, either express or implied. See the License for the
15+
// specific language governing permissions and limitations
16+
// under the License.
117
package com.cloud.consoleproxy;
218

319
import com.cloud.info.ConsoleProxyInfo;

tools/devcloud/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@
146146
<id>quickcloud</id>
147147
<activation>
148148
<property>
149-
<name>quickcloud</name>
149+
<name>deployquick</name>
150150
</property>
151151
</activation>
152152
<build>
@@ -157,7 +157,7 @@
157157
<version>1.2.1</version>
158158
<executions>
159159
<execution>
160-
<phase>package</phase>
160+
<phase>integration-test</phase>
161161
<goals>
162162
<goal>exec</goal>
163163
</goals>

0 commit comments

Comments
 (0)