Skip to content

Commit 225ad3c

Browse files
author
Edison Su
committed
seperate code into different modules: storage, storage/volume, storage/image, storage/snapshot, storage/backup, storage/integration-test
1 parent 487a0ac commit 225ad3c

76 files changed

Lines changed: 414 additions & 140 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎engine/pom.xml‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,14 @@
3737
<module>compute</module>
3838
<module>orchestration</module>
3939
<module>storage</module>
40+
<module>storage/volume</module>
41+
<module>storage/image</module>
42+
<module>storage/backup</module>
43+
<module>storage/snapshot</module>
44+
<module>storage/integration-test</module>
4045
<module>components-api</module>
4146
<module>schema</module>
4247
<module>network</module>
4348
<module>service</module>
4449
</modules>
45-
</project>
50+
</project>

‎engine/storage/backup/pom.xml‎

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
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
4+
you under the Apache License, Version 2.0 (the "License"); you may not use
5+
this file except in compliance with the License. You may obtain a copy of
6+
the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required
7+
by applicable law or agreed to in writing, software distributed under the
8+
License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
9+
OF ANY KIND, either express or implied. See the License for the specific
10+
language governing permissions and limitations under the License. -->
11+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
12+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
13+
<modelVersion>4.0.0</modelVersion>
14+
<artifactId>cloud-engine-storage-backup</artifactId>
15+
<name>Apache CloudStack Engine Storage Backup Component</name>
16+
<parent>
17+
<groupId>org.apache.cloudstack</groupId>
18+
<artifactId>cloud-engine</artifactId>
19+
<version>4.1.0-SNAPSHOT</version>
20+
<relativePath>../../pom.xml</relativePath>
21+
</parent>
22+
<dependencies>
23+
<dependency>
24+
<groupId>org.apache.cloudstack</groupId>
25+
<artifactId>cloud-engine-storage</artifactId>
26+
<version>${project.version}</version>
27+
</dependency>
28+
<dependency>
29+
<groupId>mysql</groupId>
30+
<artifactId>mysql-connector-java</artifactId>
31+
<version>${cs.mysql.version}</version>
32+
<scope>provided</scope>
33+
</dependency>
34+
<dependency>
35+
<groupId>org.mockito</groupId>
36+
<artifactId>mockito-all</artifactId>
37+
<version>1.9.5</version>
38+
</dependency>
39+
<dependency>
40+
<groupId>javax.inject</groupId>
41+
<artifactId>javax.inject</artifactId>
42+
<version>1</version>
43+
</dependency>
44+
</dependencies>
45+
<build>
46+
<defaultGoal>install</defaultGoal>
47+
<sourceDirectory>src</sourceDirectory>
48+
<testSourceDirectory>test</testSourceDirectory>
49+
</build>
50+
</project>

engine/storage/src/org/apache/cloudstack/storage/backup/BackupMotionService.java renamed to engine/storage/backup/src/org/apache/cloudstack/storage/backup/BackupMotionService.java

File renamed without changes.

engine/storage/src/org/apache/cloudstack/storage/backup/BackupService.java renamed to engine/storage/backup/src/org/apache/cloudstack/storage/backup/BackupService.java

File renamed without changes.

‎engine/storage/image/pom.xml‎

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
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
4+
you under the Apache License, Version 2.0 (the "License"); you may not use
5+
this file except in compliance with the License. You may obtain a copy of
6+
the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required
7+
by applicable law or agreed to in writing, software distributed under the
8+
License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
9+
OF ANY KIND, either express or implied. See the License for the specific
10+
language governing permissions and limitations under the License. -->
11+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
12+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
13+
<modelVersion>4.0.0</modelVersion>
14+
<artifactId>cloud-engine-storage-image</artifactId>
15+
<name>Apache CloudStack Engine Storage Image Component</name>
16+
<parent>
17+
<groupId>org.apache.cloudstack</groupId>
18+
<artifactId>cloud-engine</artifactId>
19+
<version>4.1.0-SNAPSHOT</version>
20+
<relativePath>../../pom.xml</relativePath>
21+
</parent>
22+
<dependencies>
23+
<dependency>
24+
<groupId>org.apache.cloudstack</groupId>
25+
<artifactId>cloud-engine-storage</artifactId>
26+
<version>${project.version}</version>
27+
</dependency>
28+
<dependency>
29+
<groupId>mysql</groupId>
30+
<artifactId>mysql-connector-java</artifactId>
31+
<version>${cs.mysql.version}</version>
32+
<scope>provided</scope>
33+
</dependency>
34+
<dependency>
35+
<groupId>org.mockito</groupId>
36+
<artifactId>mockito-all</artifactId>
37+
<version>1.9.5</version>
38+
</dependency>
39+
<dependency>
40+
<groupId>javax.inject</groupId>
41+
<artifactId>javax.inject</artifactId>
42+
<version>1</version>
43+
</dependency>
44+
</dependencies>
45+
<build>
46+
<defaultGoal>install</defaultGoal>
47+
<sourceDirectory>src</sourceDirectory>
48+
<testSourceDirectory>test</testSourceDirectory>
49+
</build>
50+
</project>

engine/storage/src/org/apache/cloudstack/storage/image/ImageOrchestrator.java renamed to engine/storage/image/src/org/apache/cloudstack/storage/image/ImageOrchestrator.java

File renamed without changes.

engine/storage/src/org/apache/cloudstack/storage/image/ImageService.java renamed to engine/storage/image/src/org/apache/cloudstack/storage/image/ImageService.java

File renamed without changes.

engine/storage/src/org/apache/cloudstack/storage/image/ImageServiceImpl.java renamed to engine/storage/image/src/org/apache/cloudstack/storage/image/ImageServiceImpl.java

File renamed without changes.

engine/storage/src/org/apache/cloudstack/storage/image/TemplateObject.java renamed to engine/storage/image/src/org/apache/cloudstack/storage/image/TemplateObject.java

File renamed without changes.

engine/storage/src/org/apache/cloudstack/storage/image/downloader/ImageDownloader.java renamed to engine/storage/image/src/org/apache/cloudstack/storage/image/downloader/ImageDownloader.java

File renamed without changes.

0 commit comments

Comments
 (0)