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

Commit e0d8f01

Browse files
xueyuanxueyuan
committed
Removed framework-api which is completely useless. Changed framework-ipc to reference gson itself. Move VOs into engine-schema.
1 parent 5e87b0a commit e0d8f01

34 files changed

Lines changed: 86 additions & 223 deletions

core/src/com/cloud/event/UsageEvent.java renamed to api/src/com/cloud/event/UsageEvent.java

File renamed without changes.

core/src/com/cloud/storage/resource/StoragePoolResource.java renamed to api/src/com/cloud/storage/resource/StoragePoolResource.java

File renamed without changes.

‎api/src/com/cloud/storage/snapshot/SnapshotSchedule.java‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@
1616
// under the License.
1717
package com.cloud.storage.snapshot;
1818

19-
import java.util.Date;
19+
import org.apache.cloudstack.api.Identity;
20+
import org.apache.cloudstack.api.InternalIdentity;
2021

21-
public interface SnapshotSchedule {
22-
long getId();
22+
import java.util.Date;
2323

24-
String getUuid();
24+
public interface SnapshotSchedule extends InternalIdentity, Identity {
2525

2626
Long getVolumeId();
2727

@@ -38,10 +38,9 @@ public interface SnapshotSchedule {
3838

3939
Long getAsyncJobId();
4040

41-
void setAsyncJobId(long asyncJobId);
41+
void setAsyncJobId(Long asyncJobId);
4242

4343
Long getSnapshotId();
4444

4545
void setSnapshotId(Long snapshotId);
46-
4746
}

‎core/pom.xml‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,11 @@
3636
<artifactId>cloud-engine-api</artifactId>
3737
<version>${project.version}</version>
3838
</dependency>
39+
<dependency>
40+
<groupId>org.apache.cloudstack</groupId>
41+
<artifactId>cloud-engine-schema</artifactId>
42+
<version>${project.version}</version>
43+
</dependency>
3944
<dependency>
4045
<groupId>commons-httpclient</groupId>
4146
<artifactId>commons-httpclient</artifactId>
@@ -55,7 +60,5 @@
5560
</dependencies>
5661
<build>
5762
<defaultGoal>install</defaultGoal>
58-
<sourceDirectory>src</sourceDirectory>
59-
<testSourceDirectory>test</testSourceDirectory>
6063
</build>
6164
</project>

‎core/src/com/cloud/storage/snapshot/SnapshotSchedule.java‎

Lines changed: 0 additions & 46 deletions
This file was deleted.

‎core/src/com/cloud/vm/VirtualDisk.java‎

Lines changed: 0 additions & 31 deletions
This file was deleted.

‎engine/pom.xml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,6 @@
2929
</parent>
3030
<build>
3131
<defaultGoal>install</defaultGoal>
32-
<sourceDirectory>src</sourceDirectory>
33-
<testSourceDirectory>test</testSourceDirectory>
3432
</build>
3533
<modules>
3634
<module>api</module>

core/src/com/cloud/alert/AlertVO.java renamed to engine/schema/src/com/cloud/alert/AlertVO.java

File renamed without changes.

core/src/com/cloud/configuration/ConfigurationVO.java renamed to engine/schema/src/com/cloud/configuration/ConfigurationVO.java

File renamed without changes.

core/src/com/cloud/configuration/ResourceCountVO.java renamed to engine/schema/src/com/cloud/configuration/ResourceCountVO.java

File renamed without changes.

0 commit comments

Comments
 (0)