This commits seems have introduce a bug:
[ERROR] Failed to execute goal
org.apache.maven.plugins:maven-compiler-plugin:2.5.1:compile
(default-compile) on project cloud-engine-storage: Compilation failure
[ERROR]
/root/cloudstack-dev/dist/rpmbuild/BUILD/cloudstack-4.1.0-SNAPSHOT/engine/storage/src/org/apache/cloudstack/storage/to/ImageOnPrimayDataStoreTO.java:[23,7]
class ImageOnPrimaryDataStoreTO is public, should be declared in a file
named ImageOnPrimaryDataStoreTO.java
[ERROR] -> [Help 1]
[ERROR]
[ERROR] To see the full stack trace of the errors, re-run Maven with the
-e switch.
[ERROR] Re-run Maven using the -X switch to enable full debug logging.
[ERROR]
[ERROR] For more information about the errors and possible solutions,
please read the following articles:
[ERROR] [Help 1]
http://cwiki.apache.org/confluence/display/MAVEN/MojoFailureException
[ERROR]
[ERROR] After correcting the problems, you can resume the build with the
command
[ERROR] mvn <goals> -rf :cloud-engine-storage
error: Bad exit status from /var/tmp/rpm-tmp.Wuyn34 (%build)
Le 12/04/2013 13:14, chipchild...@apache.org a ecrit :
Updated Branches:
refs/heads/master 0f8a46c58 -> 4e5a8a0f8
Fixed Primary typo
Conflicts:
client/WEB-INF/classes/resources/messages_de_DE.properties
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/4e5a8a0f
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/4e5a8a0f
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/4e5a8a0f
Branch: refs/heads/master
Commit: 4e5a8a0f8adcc665755229ee3d18f40913d15913
Parents: 0f8a46c
Author: Pascal Borreli<pas...@borreli.com>
Authored: Fri Apr 12 03:53:51 2013 +0000
Committer: Chip Childers<chip.child...@gmail.com>
Committed: Fri Apr 12 14:14:44 2013 +0100
----------------------------------------------------------------------
.../cloudstack/storage/test/DirectAgentTest.java | 4 ++--
.../command/CreateVolumeFromBaseImageCommand.java | 6 +++---
.../storage/to/ImageOnPrimayDataStoreTO.java | 4 ++--
.../xen/resource/XenServerStorageResource.java | 4 ++--
4 files changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4e5a8a0f/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/DirectAgentTest.java
----------------------------------------------------------------------
diff --git
a/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/DirectAgentTest.java
b/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/DirectAgentTest.java
index 2d6b94f..fc4aea8 100644
---
a/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/DirectAgentTest.java
+++
b/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/DirectAgentTest.java
@@ -23,7 +23,7 @@ import java.util.UUID;
import javax.inject.Inject;
import org.apache.cloudstack.storage.to.ImageDataStoreTO;
-import org.apache.cloudstack.storage.to.ImageOnPrimayDataStoreTO;
+import org.apache.cloudstack.storage.to.ImageOnPrimaryDataStoreTO;
import org.apache.cloudstack.storage.to.PrimaryDataStoreTO;
import org.apache.cloudstack.storage.to.TemplateTO;
import org.mockito.Mockito;
@@ -126,7 +126,7 @@ public class DirectAgentTest extends CloudStackTestNGBase {
@Test
public void testDownloadTemplate() {
- ImageOnPrimayDataStoreTO image =
Mockito.mock(ImageOnPrimayDataStoreTO.class);
+ ImageOnPrimaryDataStoreTO image =
Mockito.mock(ImageOnPrimaryDataStoreTO.class);
PrimaryDataStoreTO primaryStore =
Mockito.mock(PrimaryDataStoreTO.class);
Mockito.when(primaryStore.getUuid()).thenReturn(this.getLocalStorageUuid());
Mockito.when(image.getPrimaryDataStore()).thenReturn(primaryStore);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4e5a8a0f/engine/storage/src/org/apache/cloudstack/storage/command/CreateVolumeFromBaseImageCommand.java
----------------------------------------------------------------------
diff --git
a/engine/storage/src/org/apache/cloudstack/storage/command/CreateVolumeFromBaseImageCommand.java
b/engine/storage/src/org/apache/cloudstack/storage/command/CreateVolumeFromBaseImageCommand.java
index f4be067..1734bc4 100644
---
a/engine/storage/src/org/apache/cloudstack/storage/command/CreateVolumeFromBaseImageCommand.java
+++
b/engine/storage/src/org/apache/cloudstack/storage/command/CreateVolumeFromBaseImageCommand.java
@@ -18,14 +18,14 @@
*/
package org.apache.cloudstack.storage.command;
-import org.apache.cloudstack.storage.to.ImageOnPrimayDataStoreTO;
+import org.apache.cloudstack.storage.to.ImageOnPrimaryDataStoreTO;
import org.apache.cloudstack.storage.to.VolumeTO;
import com.cloud.agent.api.Command;
public class CreateVolumeFromBaseImageCommand extends Command implements
StorageSubSystemCommand {
private final VolumeTO volume;
- private final ImageOnPrimayDataStoreTO image;
+ private final ImageOnPrimaryDataStoreTO image;
public CreateVolumeFromBaseImageCommand(VolumeTO volume, String image) {
this.volume = volume;
@@ -36,7 +36,7 @@ public class CreateVolumeFromBaseImageCommand extends Command
implements Storage
return this.volume;
}
- public ImageOnPrimayDataStoreTO getImage() {
+ public ImageOnPrimaryDataStoreTO getImage() {
return this.image;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4e5a8a0f/engine/storage/src/org/apache/cloudstack/storage/to/ImageOnPrimayDataStoreTO.java
----------------------------------------------------------------------
diff --git
a/engine/storage/src/org/apache/cloudstack/storage/to/ImageOnPrimayDataStoreTO.java
b/engine/storage/src/org/apache/cloudstack/storage/to/ImageOnPrimayDataStoreTO.java
index 18743d7..a9a3cc4 100644
---
a/engine/storage/src/org/apache/cloudstack/storage/to/ImageOnPrimayDataStoreTO.java
+++
b/engine/storage/src/org/apache/cloudstack/storage/to/ImageOnPrimayDataStoreTO.java
@@ -20,11 +20,11 @@ package org.apache.cloudstack.storage.to;
import org.apache.cloudstack.storage.volume.TemplateOnPrimaryDataStoreInfo;
-public class ImageOnPrimayDataStoreTO {
+public class ImageOnPrimaryDataStoreTO {
private final String pathOnPrimaryDataStore;
private PrimaryDataStoreTO dataStore;
private final TemplateTO template;
- public ImageOnPrimayDataStoreTO(TemplateOnPrimaryDataStoreInfo template) {
+ public ImageOnPrimaryDataStoreTO(TemplateOnPrimaryDataStoreInfo template) {
this.pathOnPrimaryDataStore = template.getPath();
//this.dataStore = template.getPrimaryDataStore().getDataStoreTO();
this.template = new TemplateTO(template.getTemplate());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4e5a8a0f/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServerStorageResource.java
----------------------------------------------------------------------
diff --git
a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServerStorageResource.java
b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServerStorageResource.java
index 9c29149..7e0ccbe 100644
---
a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServerStorageResource.java
+++
b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServerStorageResource.java
@@ -39,7 +39,7 @@ import
org.apache.cloudstack.storage.command.CreatePrimaryDataStoreCmd;
import org.apache.cloudstack.storage.command.CreateVolumeFromBaseImageCommand;
import org.apache.cloudstack.storage.command.StorageSubSystemCommand;
import org.apache.cloudstack.storage.datastore.protocol.DataStoreProtocol;
-import org.apache.cloudstack.storage.to.ImageOnPrimayDataStoreTO;
+import org.apache.cloudstack.storage.to.ImageOnPrimaryDataStoreTO;
import org.apache.cloudstack.storage.to.VolumeTO;
import org.apache.http.HttpEntity;
import org.apache.http.HttpResponse;
@@ -207,7 +207,7 @@ public class XenServerStorageResource {
protected Answer execute(CreateVolumeFromBaseImageCommand cmd) {
VolumeTO volume = cmd.getVolume();
- ImageOnPrimayDataStoreTO baseImage = cmd.getImage();
+ ImageOnPrimaryDataStoreTO baseImage = cmd.getImage();
Connection conn = hypervisorResource.getConnection();
try {
