Skip to content
This repository was archived by the owner on Jan 15, 2020. It is now read-only.

Commit 074df0b

Browse files
xueyuanxueyuan
committed
Fixed an incorrect unit test for affinity group. Removed some useless pom.xml.
1 parent 572e71e commit 074df0b

12 files changed

Lines changed: 44 additions & 466 deletions

File tree

‎client/tomcatconf/applicationContext.xml.in‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,6 @@
167167
<bean id="accountJoinDaoImpl" class="com.cloud.api.query.dao.AccountJoinDaoImpl" />
168168
<bean id="accountGuestVlanMapDaoImpl" class="com.cloud.network.dao.AccountGuestVlanMapDaoImpl" />
169169
<bean id="accountVlanMapDaoImpl" class="com.cloud.dc.dao.AccountVlanMapDaoImpl" />
170-
<bean id="agentUpgradeDaoImpl" class="com.cloud.maint.dao.AgentUpgradeDaoImpl" />
171170
<bean id="alertDaoImpl" class="com.cloud.alert.dao.AlertDaoImpl" />
172171
<bean id="asyncJobDaoImpl" class="com.cloud.async.dao.AsyncJobDaoImpl" />
173172
<bean id="asyncJobJoinDaoImpl" class="com.cloud.api.query.dao.AsyncJobJoinDaoImpl" />
@@ -303,7 +302,6 @@
303302
<bean id="snapshotDaoImpl" class="com.cloud.storage.dao.SnapshotDaoImpl" />
304303
<bean id="snapshotPolicyDaoImpl" class="com.cloud.storage.dao.SnapshotPolicyDaoImpl" />
305304
<bean id="snapshotScheduleDaoImpl" class="com.cloud.storage.dao.SnapshotScheduleDaoImpl" />
306-
<bean id="stackMaidDaoImpl" class="com.cloud.cluster.dao.StackMaidDaoImpl" />
307305
<bean id="staticRouteDaoImpl" class="com.cloud.network.vpc.dao.StaticRouteDaoImpl" />
308306
<bean id="storageNetworkIpAddressDaoImpl" class="com.cloud.dc.dao.StorageNetworkIpAddressDaoImpl" />
309307
<bean id="storageNetworkIpRangeDaoImpl" class="com.cloud.dc.dao.StorageNetworkIpRangeDaoImpl" />
@@ -705,7 +703,6 @@
705703
<bean id="syncQueueManagerImpl" class="com.cloud.async.SyncQueueManagerImpl" />
706704
<bean id="taggedResourceManagerImpl" class="com.cloud.tags.TaggedResourceManagerImpl" />
707705
<bean id="templateManagerImpl" class="com.cloud.template.TemplateManagerImpl" />
708-
<bean id="upgradeManagerImpl" class="com.cloud.maint.UpgradeManagerImpl" />
709706
<bean id="uploadMonitorImpl" class="com.cloud.storage.upload.UploadMonitorImpl" />
710707
<bean id="usageServiceImpl" class="com.cloud.usage.UsageServiceImpl" />
711708
<bean id="virtualNetworkApplianceManagerImpl" class="com.cloud.network.router.VirtualNetworkApplianceManagerImpl" />

‎framework/events/pom.xml‎

Lines changed: 21 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,14 @@
1-
<!--
2-
Licensed to the Apache Software Foundation (ASF) under one
3-
or more contributor license agreements. See the NOTICE file
4-
distributed with this work for additional information
5-
regarding copyright ownership. The ASF licenses this file
6-
to you under the Apache License, Version 2.0 (the
7-
"License"); you may not use this file except in compliance
8-
with the License. You may obtain a copy of the License at
9-
10-
http://www.apache.org/licenses/LICENSE-2.0
11-
12-
Unless required by applicable law or agreed to in writing,
13-
software distributed under the License is distributed on an
14-
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15-
KIND, either express or implied. See the License for the
16-
specific language governing permissions and limitations
17-
under the License.
18-
-->
1+
<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor
2+
license agreements. See the NOTICE file distributed with this work for additional
3+
information regarding copyright ownership. The ASF licenses this file to you under
4+
the Apache License, Version 2.0 (the "License"); you may not use this file except
5+
in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
6+
Unless required by applicable law or agreed to in writing, software distributed under
7+
the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
8+
OF ANY KIND, either express or implied. See the License for the specific language
9+
governing permissions and limitations under the License. -->
1910
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
20-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
11+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
2112
<modelVersion>4.0.0</modelVersion>
2213
<artifactId>cloud-framework-events</artifactId>
2314
<name>Apache CloudStack Framework - Event Notification</name>
@@ -30,18 +21,18 @@
3021
<dependencies>
3122
<dependency>
3223
<groupId>org.apache.cloudstack</groupId>
33-
<artifactId>cloud-utils</artifactId>
34-
<version>${project.version}</version>
35-
</dependency>
24+
<artifactId>cloud-utils</artifactId>
25+
<version>${project.version}</version>
26+
</dependency>
27+
<dependency>
28+
<groupId>com.google.code.gson</groupId>
29+
<artifactId>gson</artifactId>
30+
<version>${cs.gson.version}</version>
31+
</dependency>
3632
<dependency>
37-
<groupId>com.google.code.gson</groupId>
38-
<artifactId>gson</artifactId>
39-
<version>${cs.gson.version}</version>
33+
<groupId>com.google.guava</groupId>
34+
<artifactId>guava</artifactId>
35+
<version>${cs.guava.version}</version>
4036
</dependency>
4137
</dependencies>
42-
<build>
43-
<defaultGoal>install</defaultGoal>
44-
<sourceDirectory>src</sourceDirectory>
45-
<testSourceDirectory>test</testSourceDirectory>
46-
</build>
4738
</project>

‎pom.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,6 @@
169169
<module>plugins</module>
170170
<module>patches</module>
171171
<module>framework</module>
172-
<module>services</module>
173172
<module>test</module>
174173
<module>client</module>
175174
</modules>

0 commit comments

Comments
 (0)