You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bf...@apache.org on 2013/11/04 23:36:09 UTC
[01/12] git commit: updated refs/heads/ui-restyle to d0e8fa3
Updated Branches:
refs/heads/ui-restyle b7259a48e -> d0e8fa35c
Get rid of some errors and warnings in the plugins user-authenticators ldap sources
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/d17a8f8b
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/d17a8f8b
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/d17a8f8b
Branch: refs/heads/ui-restyle
Commit: d17a8f8b1181fa83fcd232905e623dad8e37cfda
Parents: a3fae88
Author: Hugo Trippaers <ht...@schubergphilis.com>
Authored: Mon Nov 4 17:21:10 2013 +0100
Committer: Hugo Trippaers <ht...@schubergphilis.com>
Committed: Mon Nov 4 20:01:13 2013 +0100
----------------------------------------------------------------------
plugins/user-authenticators/ldap/pom.xml | 37 +++++++++++++++++++++++++--
1 file changed, 35 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d17a8f8b/plugins/user-authenticators/ldap/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/user-authenticators/ldap/pom.xml b/plugins/user-authenticators/ldap/pom.xml
index 1f9dea0..34121e4 100644
--- a/plugins/user-authenticators/ldap/pom.xml
+++ b/plugins/user-authenticators/ldap/pom.xml
@@ -90,6 +90,40 @@
</plugin>
</plugins>
+ <pluginManagement>
+ <plugins>
+ <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
+ <plugin>
+ <groupId>org.eclipse.m2e</groupId>
+ <artifactId>lifecycle-mapping</artifactId>
+ <version>1.0.0</version>
+ <configuration>
+ <lifecycleMappingMetadata>
+ <pluginExecutions>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>
+ org.codehaus.gmaven
+ </groupId>
+ <artifactId>
+ gmaven-plugin
+ </artifactId>
+ <versionRange>[1.3,)</versionRange>
+ <goals>
+ <goal>compile</goal>
+ <goal>testCompile</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <ignore></ignore>
+ </action>
+ </pluginExecution>
+ </pluginExecutions>
+ </lifecycleMappingMetadata>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
</build>
<dependencies>
@@ -104,7 +138,6 @@
<dependency> <!-- enables mocking of classes (in addition to interfaces) -->
<groupId>cglib</groupId>
<artifactId>cglib-nodep</artifactId>
- <version>2.2</version>
- </dependency>
+ </dependency>
</dependencies>
</project>
[07/12] git commit: updated refs/heads/ui-restyle to d0e8fa3
Posted by bf...@apache.org.
Fix several rat issues introduced by recent commits
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/479f404a
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/479f404a
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/479f404a
Branch: refs/heads/ui-restyle
Commit: 479f404aeafb4874cd660f113c0281e10db02114
Parents: 9e5e9fd
Author: Hugo Trippaers <ht...@schubergphilis.com>
Authored: Mon Nov 4 20:14:46 2013 +0100
Committer: Hugo Trippaers <ht...@schubergphilis.com>
Committed: Mon Nov 4 20:14:46 2013 +0100
----------------------------------------------------------------------
parents/checkstyle/pom.xml | 10 ++++++++
.../src/main/resources/tooling/checkstyle.xml | 18 +++++++++++++
.../debian/config/etc/logrotate.d/cloud | 11 --------
.../management/ProviderTestConfiguration.java | 26 ++++++++++++++++---
.../PublicNetworkTestConfiguration.java | 26 ++++++++++++++++---
.../test/resources/providerContext.xml | 18 +++++++++++++
.../test/resources/publicNetworkContext.xml | 10 ++++++++
pom.xml | 1 +
.../patches/debian/config/etc/logrotate.d/cloud | 27 ++++++++++++++++++++
9 files changed, 128 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/479f404a/parents/checkstyle/pom.xml
----------------------------------------------------------------------
diff --git a/parents/checkstyle/pom.xml b/parents/checkstyle/pom.xml
index de60100..b1b7b21 100644
--- a/parents/checkstyle/pom.xml
+++ b/parents/checkstyle/pom.xml
@@ -1,3 +1,13 @@
+<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor
+ license agreements. See the NOTICE file distributed with this work for additional
+ information regarding copyright ownership. The ASF licenses this file to
+ you under the Apache License, Version 2.0 (the "License"); you may not use
+ this file except in compliance with the License. You may obtain a copy of
+ the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required
+ by applicable law or agreed to in writing, software distributed under the
+ License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
+ OF ANY KIND, either express or implied. See the License for the specific
+ language governing permissions and limitations under the License. -->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<name>Apache CloudStack Checkstyle Configuration</name>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/479f404a/parents/checkstyle/src/main/resources/tooling/checkstyle.xml
----------------------------------------------------------------------
diff --git a/parents/checkstyle/src/main/resources/tooling/checkstyle.xml b/parents/checkstyle/src/main/resources/tooling/checkstyle.xml
index 8465383..83493d6 100644
--- a/parents/checkstyle/src/main/resources/tooling/checkstyle.xml
+++ b/parents/checkstyle/src/main/resources/tooling/checkstyle.xml
@@ -1,4 +1,22 @@
<?xml version="1.0"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
<!DOCTYPE module PUBLIC
"-//Puppy Crawl//DTD Check Configuration 1.2//EN"
"http://www.puppycrawl.com/dtds/configuration_1_2.dtd">
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/479f404a/patches/systemvm/debian/config/etc/logrotate.d/cloud
----------------------------------------------------------------------
diff --git a/patches/systemvm/debian/config/etc/logrotate.d/cloud b/patches/systemvm/debian/config/etc/logrotate.d/cloud
deleted file mode 100644
index 40c4203..0000000
--- a/patches/systemvm/debian/config/etc/logrotate.d/cloud
+++ /dev/null
@@ -1,11 +0,0 @@
-/var/log/cloud.log {
- rotate 4
- daily
- missingok
- notifempty
- compress
- delaycompress
- postrotate
- pkill socat > /dev/null
- endscript
-}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/479f404a/plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/ProviderTestConfiguration.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/ProviderTestConfiguration.java b/plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/ProviderTestConfiguration.java
index 818d6a0..3c21590 100644
--- a/plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/ProviderTestConfiguration.java
+++ b/plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/ProviderTestConfiguration.java
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
package org.apache.cloudstack.network.contrail.management;
import org.springframework.context.annotation.Bean;
@@ -5,8 +23,8 @@ import org.springframework.context.annotation.Configuration;
@Configuration
public class ProviderTestConfiguration {
- @Bean
- ServerDBSync getServerDBSync() {
- return new ServerDBSyncImpl();
- }
+ @Bean
+ ServerDBSync getServerDBSync() {
+ return new ServerDBSyncImpl();
+ }
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/479f404a/plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/PublicNetworkTestConfiguration.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/PublicNetworkTestConfiguration.java b/plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/PublicNetworkTestConfiguration.java
index a184b14..b41e282 100644
--- a/plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/PublicNetworkTestConfiguration.java
+++ b/plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/PublicNetworkTestConfiguration.java
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
package org.apache.cloudstack.network.contrail.management;
import org.mockito.Mockito;
@@ -6,8 +24,8 @@ import org.springframework.context.annotation.Configuration;
@Configuration
public class PublicNetworkTestConfiguration {
- @Bean
- ServerDBSync getServerDBSync() {
- return Mockito.mock(ServerDBSync.class);
- }
+ @Bean
+ ServerDBSync getServerDBSync() {
+ return Mockito.mock(ServerDBSync.class);
+ }
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/479f404a/plugins/network-elements/juniper-contrail/test/resources/providerContext.xml
----------------------------------------------------------------------
diff --git a/plugins/network-elements/juniper-contrail/test/resources/providerContext.xml b/plugins/network-elements/juniper-contrail/test/resources/providerContext.xml
index f412bc0..62a9f62 100644
--- a/plugins/network-elements/juniper-contrail/test/resources/providerContext.xml
+++ b/plugins/network-elements/juniper-contrail/test/resources/providerContext.xml
@@ -1,4 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context"
xmlns:tx="http://www.springframework.org/schema/tx" xmlns:aop="http://www.springframework.org/schema/aop"
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/479f404a/plugins/network-elements/juniper-contrail/test/resources/publicNetworkContext.xml
----------------------------------------------------------------------
diff --git a/plugins/network-elements/juniper-contrail/test/resources/publicNetworkContext.xml b/plugins/network-elements/juniper-contrail/test/resources/publicNetworkContext.xml
index 3b67b51..db978e7 100644
--- a/plugins/network-elements/juniper-contrail/test/resources/publicNetworkContext.xml
+++ b/plugins/network-elements/juniper-contrail/test/resources/publicNetworkContext.xml
@@ -1,4 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor
+ license agreements. See the NOTICE file distributed with this work for additional
+ information regarding copyright ownership. The ASF licenses this file to
+ you under the Apache License, Version 2.0 (the "License"); you may not use
+ this file except in compliance with the License. You may obtain a copy of
+ the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required
+ by applicable law or agreed to in writing, software distributed under the
+ License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
+ OF ANY KIND, either express or implied. See the License for the specific
+ language governing permissions and limitations under the License. -->
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context"
xmlns:tx="http://www.springframework.org/schema/tx" xmlns:aop="http://www.springframework.org/schema/aop"
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/479f404a/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index b8b2a37..6ea62c2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -651,6 +651,7 @@
<exclude>tools/marvin/marvin/sandbox/advanced/sandbox.cfg</exclude>
<exclude>tools/ngui/static/bootstrap/*</exclude>
<exclude>tools/ngui/static/js/lib/*</exclude>
+ <exclude>**/.checkstyle</exclude>
</excludes>
</configuration>
</plugin>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/479f404a/systemvm/patches/debian/config/etc/logrotate.d/cloud
----------------------------------------------------------------------
diff --git a/systemvm/patches/debian/config/etc/logrotate.d/cloud b/systemvm/patches/debian/config/etc/logrotate.d/cloud
new file mode 100644
index 0000000..37440ac
--- /dev/null
+++ b/systemvm/patches/debian/config/etc/logrotate.d/cloud
@@ -0,0 +1,27 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+/var/log/cloud.log {
+ rotate 4
+ daily
+ missingok
+ notifempty
+ compress
+ delaycompress
+ postrotate
+ pkill socat > /dev/null
+ endscript
+}
[06/12] git commit: updated refs/heads/ui-restyle to d0e8fa3
Posted by bf...@apache.org.
Get rid of some errors and warnings in the server and usage sources
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/29aa4ae8
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/29aa4ae8
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/29aa4ae8
Branch: refs/heads/ui-restyle
Commit: 29aa4ae8da647bcc2558c625d14f6db2dde76a38
Parents: d17a8f8
Author: Hugo Trippaers <ht...@schubergphilis.com>
Authored: Mon Nov 4 17:21:55 2013 +0100
Committer: Hugo Trippaers <ht...@schubergphilis.com>
Committed: Mon Nov 4 20:01:14 2013 +0100
----------------------------------------------------------------------
server/pom.xml | 33 +++++++++++++++++++++++++++++++++
usage/pom.xml | 33 +++++++++++++++++++++++++++++++++
2 files changed, 66 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/29aa4ae8/server/pom.xml
----------------------------------------------------------------------
diff --git a/server/pom.xml b/server/pom.xml
index c7978e2..527bd97 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -228,5 +228,38 @@
</executions>
</plugin>
</plugins>
+ <pluginManagement>
+ <plugins>
+ <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
+ <plugin>
+ <groupId>org.eclipse.m2e</groupId>
+ <artifactId>lifecycle-mapping</artifactId>
+ <version>1.0.0</version>
+ <configuration>
+ <lifecycleMappingMetadata>
+ <pluginExecutions>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>
+ org.apache.maven.plugins
+ </groupId>
+ <artifactId>
+ maven-antrun-plugin
+ </artifactId>
+ <versionRange>[1.7,)</versionRange>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <ignore></ignore>
+ </action>
+ </pluginExecution>
+ </pluginExecutions>
+ </lifecycleMappingMetadata>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
</build>
</project>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/29aa4ae8/usage/pom.xml
----------------------------------------------------------------------
diff --git a/usage/pom.xml b/usage/pom.xml
index 04d1630..e71a1d0 100644
--- a/usage/pom.xml
+++ b/usage/pom.xml
@@ -119,6 +119,39 @@
</executions>
</plugin>
</plugins>
+ <pluginManagement>
+ <plugins>
+ <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
+ <plugin>
+ <groupId>org.eclipse.m2e</groupId>
+ <artifactId>lifecycle-mapping</artifactId>
+ <version>1.0.0</version>
+ <configuration>
+ <lifecycleMappingMetadata>
+ <pluginExecutions>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>
+ org.apache.maven.plugins
+ </groupId>
+ <artifactId>
+ maven-antrun-plugin
+ </artifactId>
+ <versionRange>[1.7,)</versionRange>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <ignore></ignore>
+ </action>
+ </pluginExecution>
+ </pluginExecutions>
+ </lifecycleMappingMetadata>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
</build>
<profiles>
<profile>
[04/12] git commit: updated refs/heads/ui-restyle to d0e8fa3
Posted by bf...@apache.org.
Get rid of a few errors and warnings in the engine storage integration-test sources
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/54a3d804
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/54a3d804
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/54a3d804
Branch: refs/heads/ui-restyle
Commit: 54a3d8048b887796ac470c2a2238f5503ccabb6e
Parents: a5caa10
Author: Hugo Trippaers <ht...@schubergphilis.com>
Authored: Mon Nov 4 17:19:47 2013 +0100
Committer: Hugo Trippaers <ht...@schubergphilis.com>
Committed: Mon Nov 4 20:01:13 2013 +0100
----------------------------------------------------------------------
engine/storage/integration-test/pom.xml | 33 ++++++++++++++++++++
.../test/resources/storageContext.xml | 3 --
2 files changed, 33 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/54a3d804/engine/storage/integration-test/pom.xml
----------------------------------------------------------------------
diff --git a/engine/storage/integration-test/pom.xml b/engine/storage/integration-test/pom.xml
index dc4065e..4e5fdeb 100644
--- a/engine/storage/integration-test/pom.xml
+++ b/engine/storage/integration-test/pom.xml
@@ -185,5 +185,38 @@
</executions>
</plugin>
</plugins>
+ <pluginManagement>
+ <plugins>
+ <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
+ <plugin>
+ <groupId>org.eclipse.m2e</groupId>
+ <artifactId>lifecycle-mapping</artifactId>
+ <version>1.0.0</version>
+ <configuration>
+ <lifecycleMappingMetadata>
+ <pluginExecutions>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>
+ org.apache.maven.plugins
+ </groupId>
+ <artifactId>
+ maven-antrun-plugin
+ </artifactId>
+ <versionRange>[1.7,)</versionRange>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <ignore></ignore>
+ </action>
+ </pluginExecution>
+ </pluginExecutions>
+ </lifecycleMappingMetadata>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
</build>
</project>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/54a3d804/engine/storage/integration-test/test/resources/storageContext.xml
----------------------------------------------------------------------
diff --git a/engine/storage/integration-test/test/resources/storageContext.xml b/engine/storage/integration-test/test/resources/storageContext.xml
index 0dcd6a8..c984515 100644
--- a/engine/storage/integration-test/test/resources/storageContext.xml
+++ b/engine/storage/integration-test/test/resources/storageContext.xml
@@ -85,10 +85,7 @@
<bean id="AccountGuestVlanMapDaoImpl" class="com.cloud.network.dao.AccountGuestVlanMapDaoImpl" />
<bean id="StorageCacheReplacementAlgorithm" class="org.apache.cloudstack.storage.cache.manager.StorageCacheReplacementAlgorithmLRU" />
<bean id="ServiceOfferingDetailsDao" class="com.cloud.service.dao.ServiceOfferingDetailsDaoImpl" />
-<<<<<<< HEAD
<bean id="storageStrategyFactoryImpl" class="org.apache.cloudstack.storage.helper.StorageStrategyFactoryImpl" />
-=======
<bean id="vmsnapshotDetailsDao" class="com.cloud.vm.snapshot.dao.VMSnapshotDetailsDaoImpl" />
<bean id="snapshotManager" class="com.cloud.storage.snapshot.SnapshotManagerImpl" />
->>>>>>> pluggable_vm_snapshot
</beans>
[10/12] git commit: updated refs/heads/ui-restyle to d0e8fa3
Posted by bf...@apache.org.
switch label for VLAN to VLAN/VNI
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/5ccf3a90
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/5ccf3a90
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/5ccf3a90
Branch: refs/heads/ui-restyle
Commit: 5ccf3a90abb79eace839a8e61cf950248aa913c8
Parents: 9a62239
Author: chriscameronv <ch...@contractor.verio.net>
Authored: Wed Oct 30 14:44:56 2013 -0600
Committer: Jessica Wang <je...@apache.org>
Committed: Mon Nov 4 14:25:01 2013 -0800
----------------------------------------------------------------------
.../WEB-INF/classes/resources/messages.properties | 8 +++++---
ui/dictionary.jsp | 2 ++
ui/scripts/network.js | 2 +-
ui/scripts/system.js | 16 ++++++++--------
4 files changed, 16 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5ccf3a90/client/WEB-INF/classes/resources/messages.properties
----------------------------------------------------------------------
diff --git a/client/WEB-INF/classes/resources/messages.properties b/client/WEB-INF/classes/resources/messages.properties
index 12d2a11..d548527 100644
--- a/client/WEB-INF/classes/resources/messages.properties
+++ b/client/WEB-INF/classes/resources/messages.properties
@@ -1176,9 +1176,11 @@ label.virtual.machines=Virtual machines
label.virtual.network=Virtual Network
label.virtual.router=Virtual Router
label.virtual.routers=Virtual Routers
-label.vlan.id=VLAN ID
-label.vlan.range=VLAN Range
-label.vlan=VLAN
+label.vlan.id=VLAN/VNI ID
+label.vlan.range=VLAN/VNI Range
+label.vlan=VLAN/VNI
+label.vnet=VLAN/VNI
+label.vnet.id=VLAN/VNI ID
label.vxlan.id=VXLAN ID
label.vxlan.range=VXLAN Range
label.vxlan=VXLAN
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5ccf3a90/ui/dictionary.jsp
----------------------------------------------------------------------
diff --git a/ui/dictionary.jsp b/ui/dictionary.jsp
index 1bf0eab..ed269c8 100644
--- a/ui/dictionary.jsp
+++ b/ui/dictionary.jsp
@@ -1133,6 +1133,8 @@ dictionary = {
'label.use.vm.ip': '<fmt:message key="label.use.vm.ip" />',
'label.value': '<fmt:message key="label.value" />',
'label.vcdcname': '<fmt:message key="label.vcdcname" />',
+'label.vnet': '<fmt:message key="label.vnet" />',
+'label.vnet.id': '<fmt:message key="label.vnet.id" />',
'label.vcenter.cluster': '<fmt:message key="label.vcenter.cluster" />',
'label.vcenter.datacenter': '<fmt:message key="label.vcenter.datacenter" />',
'label.vcenter.datastore': '<fmt:message key="label.vcenter.datastore" />',
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5ccf3a90/ui/scripts/network.js
----------------------------------------------------------------------
diff --git a/ui/scripts/network.js b/ui/scripts/network.js
index 708b2f1..4196b10 100755
--- a/ui/scripts/network.js
+++ b/ui/scripts/network.js
@@ -1151,7 +1151,7 @@
}
},
vlan: {
- label: 'label.vlan.id'
+ label: 'label.vnet.id'
},
broadcasturi: {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5ccf3a90/ui/scripts/system.js
----------------------------------------------------------------------
diff --git a/ui/scripts/system.js b/ui/scripts/system.js
index c07f5f7..1595948 100644
--- a/ui/scripts/system.js
+++ b/ui/scripts/system.js
@@ -1152,7 +1152,7 @@
label: 'label.state'
},
vlan: {
- label: 'VLAN Range(s)',
+ label: 'VLAN/VNI Range(s)',
isEditable: true
},
tags: {
@@ -1384,7 +1384,7 @@
label: 'label.type'
},
vlan: {
- label: 'label.vlan.id'
+ label: 'label.vnet.id'
},
broadcasturi: {
label: 'broadcast URI'
@@ -1820,13 +1820,13 @@
},
dedicatedGuestVlanRanges: {
- title: 'Dedicated VLAN Ranges',
+ title: 'Dedicated VLAN/VNI Ranges',
listView: {
section: 'dedicatedGuestVlanRanges',
id: 'dedicatedGuestVlanRanges',
fields: {
guestvlanrange: {
- label: 'VLAN Range(s)'
+ label: 'VLAN/VNI Range(s)'
},
domain: {
label: 'label.domain'
@@ -1851,17 +1851,17 @@
},
actions: {
add: {
- label: 'Dedicate VLAN Range',
+ label: 'Dedicate VLAN/VNI Range',
messages: {
notification: function(args) {
- return 'Dedicate VLAN Range';
+ return 'Dedicate VLAN/VNI Range';
}
},
createForm: {
- title: 'Dedicate VLAN Range',
+ title: 'Dedicate VLAN/VNI Range',
fields: {
vlanrange: {
- label: 'VLAN Range',
+ label: 'VLAN/VNI Range',
/* select: function(args) {
var items = [];
if(args.context.physicalNetworks[0].vlan != null && args.context.physicalNetworks[0].vlan.length > 0) {
[11/12] git commit: updated refs/heads/ui-restyle to d0e8fa3
Posted by bf...@apache.org.
Fix NPE due to race condition during system vm launch.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/eb9cfffd
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/eb9cfffd
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/eb9cfffd
Branch: refs/heads/ui-restyle
Commit: eb9cfffd246267bbb5fe4befeb9afeaaf366874a
Parents: 5ccf3a9
Author: Min Chen <mi...@citrix.com>
Authored: Mon Nov 4 14:26:42 2013 -0800
Committer: Min Chen <mi...@citrix.com>
Committed: Mon Nov 4 14:27:04 2013 -0800
----------------------------------------------------------------------
.../src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/eb9cfffd/engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java
----------------------------------------------------------------------
diff --git a/engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java b/engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java
index 86e49f9..5818aa8 100644
--- a/engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java
+++ b/engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java
@@ -453,6 +453,7 @@ public class VolumeServiceImpl implements VolumeService {
} catch (Throwable e) {
s_logger.debug("failed to create template on storage", e);
templateOnPrimaryStoreObj.processEvent(Event.OperationFailed);
+ dataStore.create(template); // make sure that template_spool_ref entry is still present so that the second thread can acquire the lock
VolumeApiResult result = new VolumeApiResult(volume);
result.setResult(e.toString());
future.complete(result);
[02/12] git commit: updated refs/heads/ui-restyle to d0e8fa3
Posted by bf...@apache.org.
Get rid of several warnings and errors in the agent sources
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/a5caa102
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/a5caa102
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/a5caa102
Branch: refs/heads/ui-restyle
Commit: a5caa102a847ef3da8f457b64510ee516a1b831b
Parents: ed6c2d2
Author: Hugo Trippaers <ht...@schubergphilis.com>
Authored: Mon Nov 4 17:19:10 2013 +0100
Committer: Hugo Trippaers <ht...@schubergphilis.com>
Committed: Mon Nov 4 20:01:13 2013 +0100
----------------------------------------------------------------------
agent/pom.xml | 33 ++++++++++++
.../cloud/agent/dao/impl/PropertiesStorage.java | 57 ++++++++++----------
.../com/cloud/agent/dhcp/FakeDhcpSnooper.java | 5 --
agent/src/com/cloud/agent/mockvm/MockVm.java | 7 ---
.../consoleproxy/ConsoleProxyResource.java | 20 ++-----
5 files changed, 66 insertions(+), 56 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a5caa102/agent/pom.xml
----------------------------------------------------------------------
diff --git a/agent/pom.xml b/agent/pom.xml
index 1413322..c3ac308 100644
--- a/agent/pom.xml
+++ b/agent/pom.xml
@@ -115,5 +115,38 @@
</executions>
</plugin>
</plugins>
+ <pluginManagement>
+ <plugins>
+ <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
+ <plugin>
+ <groupId>org.eclipse.m2e</groupId>
+ <artifactId>lifecycle-mapping</artifactId>
+ <version>1.0.0</version>
+ <configuration>
+ <lifecycleMappingMetadata>
+ <pluginExecutions>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>
+ org.apache.maven.plugins
+ </groupId>
+ <artifactId>
+ maven-antrun-plugin
+ </artifactId>
+ <versionRange>[1.7,)</versionRange>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <ignore></ignore>
+ </action>
+ </pluginExecution>
+ </pluginExecutions>
+ </lifecycleMappingMetadata>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
</build>
</project>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a5caa102/agent/src/com/cloud/agent/dao/impl/PropertiesStorage.java
----------------------------------------------------------------------
diff --git a/agent/src/com/cloud/agent/dao/impl/PropertiesStorage.java b/agent/src/com/cloud/agent/dao/impl/PropertiesStorage.java
index 411d946..0c100b3 100755
--- a/agent/src/com/cloud/agent/dao/impl/PropertiesStorage.java
+++ b/agent/src/com/cloud/agent/dao/impl/PropertiesStorage.java
@@ -119,34 +119,33 @@ public class PropertiesStorage implements StorageComponent {
return true;
}
- @Override
- public void setName(String name) {
- // TODO Auto-generated method stub
-
- }
-
- @Override
- public void setConfigParams(Map<String, Object> params) {
- // TODO Auto-generated method stub
-
- }
-
- @Override
- public Map<String, Object> getConfigParams() {
- // TODO Auto-generated method stub
- return null;
- }
-
- @Override
- public int getRunLevel() {
- // TODO Auto-generated method stub
- return 0;
- }
-
- @Override
- public void setRunLevel(int level) {
- // TODO Auto-generated method stub
-
- }
+ @Override
+ public void setName(String name) {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void setConfigParams(Map<String, Object> params) {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public Map<String, Object> getConfigParams() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public int getRunLevel() {
+ // TODO Auto-generated method stub
+ return 0;
+ }
+
+ @Override
+ public void setRunLevel(int level) {
+ // TODO Auto-generated method stub
+ }
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a5caa102/agent/src/com/cloud/agent/dhcp/FakeDhcpSnooper.java
----------------------------------------------------------------------
diff --git a/agent/src/com/cloud/agent/dhcp/FakeDhcpSnooper.java b/agent/src/com/cloud/agent/dhcp/FakeDhcpSnooper.java
index 73a994e..432caa6 100644
--- a/agent/src/com/cloud/agent/dhcp/FakeDhcpSnooper.java
+++ b/agent/src/com/cloud/agent/dhcp/FakeDhcpSnooper.java
@@ -18,9 +18,6 @@ package com.cloud.agent.dhcp;
import java.net.InetAddress;
import java.net.UnknownHostException;
-
-import java.util.HashMap;
-import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Queue;
@@ -32,8 +29,6 @@ import javax.naming.ConfigurationException;
import org.apache.log4j.Logger;
-import com.cloud.agent.api.Answer;
-import com.cloud.agent.api.Command;
import com.cloud.utils.Pair;
import com.cloud.utils.net.NetUtils;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a5caa102/agent/src/com/cloud/agent/mockvm/MockVm.java
----------------------------------------------------------------------
diff --git a/agent/src/com/cloud/agent/mockvm/MockVm.java b/agent/src/com/cloud/agent/mockvm/MockVm.java
index 306a6c4..8a806ee 100644
--- a/agent/src/com/cloud/agent/mockvm/MockVm.java
+++ b/agent/src/com/cloud/agent/mockvm/MockVm.java
@@ -71,11 +71,4 @@ public class MockVm {
return vncPort;
}
- public static void main(String[] args) {
- long i = 10;
- Long l = null;
- if (i == l) {
- System.out.print("fdfd");
- }
- }
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a5caa102/agent/src/com/cloud/agent/resource/consoleproxy/ConsoleProxyResource.java
----------------------------------------------------------------------
diff --git a/agent/src/com/cloud/agent/resource/consoleproxy/ConsoleProxyResource.java b/agent/src/com/cloud/agent/resource/consoleproxy/ConsoleProxyResource.java
index 6f49f47..054acd1 100644
--- a/agent/src/com/cloud/agent/resource/consoleproxy/ConsoleProxyResource.java
+++ b/agent/src/com/cloud/agent/resource/consoleproxy/ConsoleProxyResource.java
@@ -32,9 +32,12 @@ import java.util.Properties;
import javax.naming.ConfigurationException;
-import org.apache.cloudstack.managed.context.ManagedContextRunnable;
import org.apache.log4j.Logger;
+import com.google.gson.Gson;
+
+import org.apache.cloudstack.managed.context.ManagedContextRunnable;
+
import com.cloud.agent.Agent.ExitStatus;
import com.cloud.agent.api.AgentControlAnswer;
import com.cloud.agent.api.Answer;
@@ -61,7 +64,6 @@ import com.cloud.resource.ServerResourceBase;
import com.cloud.utils.NumbersUtil;
import com.cloud.utils.net.NetUtils;
import com.cloud.utils.script.Script;
-import com.google.gson.Gson;
/**
*
@@ -130,19 +132,6 @@ public class ConsoleProxyResource extends ServerResourceBase implements
}
}
- private boolean copyCertToDirectory(String certificate, String filePath)
- throws IOException {
- boolean success;
- // copy cert to the dir
- FileWriter fstream = new FileWriter(filePath);
- BufferedWriter out = new BufferedWriter(fstream);
- out.write(certificate);
- // Close the output stream
- out.close();
- success = true;
- return success;
- }
-
protected Answer execute(final CheckConsoleProxyLoadCommand cmd) {
return executeProxyLoadScan(cmd, cmd.getProxyVmId(),
cmd.getProxyVmName(), cmd.getProxyManagementIp(),
@@ -204,6 +193,7 @@ public class ConsoleProxyResource extends ServerResourceBase implements
return null;
}
+ @Override
public Type getType() {
return Host.Type.ConsoleProxy;
}
[09/12] git commit: updated refs/heads/ui-restyle to d0e8fa3
Posted by bf...@apache.org.
CLOUDSTACK-5017: Throw CloudRuntimeException in case of template/volume
download when ssvm is not ready so that caller can remove some leftover
entries in template_store_ref and volume_store_ref.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/9a62239a
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/9a62239a
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/9a62239a
Branch: refs/heads/ui-restyle
Commit: 9a62239a92c5eafca6fafee1fbccd413bdfb91af
Parents: 84b5bff
Author: Min Chen <mi...@citrix.com>
Authored: Mon Nov 4 12:31:31 2013 -0800
Committer: Min Chen <mi...@citrix.com>
Committed: Mon Nov 4 12:32:05 2013 -0800
----------------------------------------------------------------------
.../storage/image/TemplateServiceImpl.java | 48 +++++++++++++-----
.../storage/volume/VolumeServiceImpl.java | 52 ++++++++++++++------
.../storage/download/DownloadMonitorImpl.java | 6 ++-
3 files changed, 79 insertions(+), 27 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9a62239a/engine/storage/image/src/org/apache/cloudstack/storage/image/TemplateServiceImpl.java
----------------------------------------------------------------------
diff --git a/engine/storage/image/src/org/apache/cloudstack/storage/image/TemplateServiceImpl.java b/engine/storage/image/src/org/apache/cloudstack/storage/image/TemplateServiceImpl.java
index 3e3c6d8..308347d 100644
--- a/engine/storage/image/src/org/apache/cloudstack/storage/image/TemplateServiceImpl.java
+++ b/engine/storage/image/src/org/apache/cloudstack/storage/image/TemplateServiceImpl.java
@@ -172,12 +172,26 @@ public class TemplateServiceImpl implements TemplateService {
return;
}
- TemplateOpContext<TemplateApiResult> context = new TemplateOpContext<TemplateApiResult>(callback,
- templateOnStore, null);
-
- AsyncCallbackDispatcher<TemplateServiceImpl, CreateCmdResult> caller = AsyncCallbackDispatcher.create(this);
- caller.setCallback(caller.getTarget().createTemplateCallback(null, null)).setContext(context);
- store.getDriver().createAsync(store, templateOnStore, caller);
+ try {
+ TemplateOpContext<TemplateApiResult> context = new TemplateOpContext<TemplateApiResult>(callback,
+ templateOnStore, null);
+
+ AsyncCallbackDispatcher<TemplateServiceImpl, CreateCmdResult> caller = AsyncCallbackDispatcher.create(this);
+ caller.setCallback(caller.getTarget().createTemplateCallback(null, null)).setContext(context);
+ store.getDriver().createAsync(store, templateOnStore, caller);
+ } catch (CloudRuntimeException ex) {
+ // clean up already persisted template_store_ref entry in case of createTemplateCallback is never called
+ TemplateDataStoreVO templateStoreVO = _vmTemplateStoreDao.findByStoreTemplate(store.getId(), template.getId());
+ if (templateStoreVO != null) {
+ TemplateInfo tmplObj = _templateFactory.getTemplate(template, store);
+ tmplObj.processEvent(ObjectInDataStoreStateMachine.Event.OperationFailed);
+ }
+ TemplateApiResult result = new TemplateApiResult(template);
+ result.setResult(ex.getMessage());
+ if (callback != null) {
+ callback.complete(result);
+ }
+ }
}
@Override
@@ -732,11 +746,23 @@ public class TemplateServiceImpl implements TemplateService {
if (s_logger.isDebugEnabled()) {
s_logger.debug("Invoke datastore driver createAsync to create template on destination store");
}
- TemplateOpContext<TemplateApiResult> context = new TemplateOpContext<TemplateApiResult>(null,
- (TemplateObject) templateOnStore, future);
- AsyncCallbackDispatcher<TemplateServiceImpl, CreateCmdResult> caller = AsyncCallbackDispatcher.create(this);
- caller.setCallback(caller.getTarget().copyTemplateCrossZoneCallBack(null, null)).setContext(context);
- destStore.getDriver().createAsync(destStore, templateOnStore, caller);
+ try {
+ TemplateOpContext<TemplateApiResult> context = new TemplateOpContext<TemplateApiResult>(null,
+ (TemplateObject)templateOnStore, future);
+ AsyncCallbackDispatcher<TemplateServiceImpl, CreateCmdResult> caller = AsyncCallbackDispatcher.create(this);
+ caller.setCallback(caller.getTarget().copyTemplateCrossZoneCallBack(null, null)).setContext(context);
+ destStore.getDriver().createAsync(destStore, templateOnStore, caller);
+ } catch (CloudRuntimeException ex) {
+ // clean up already persisted template_store_ref entry in case of createTemplateCallback is never called
+ TemplateDataStoreVO templateStoreVO = _vmTemplateStoreDao.findByStoreTemplate(destStore.getId(), srcTemplate.getId());
+ if (templateStoreVO != null) {
+ TemplateInfo tmplObj = _templateFactory.getTemplate(srcTemplate, destStore);
+ tmplObj.processEvent(ObjectInDataStoreStateMachine.Event.OperationFailed);
+ }
+ TemplateApiResult res = new TemplateApiResult((TemplateObject)templateOnStore);
+ res.setResult(ex.getMessage());
+ future.complete(res);
+ }
return future;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9a62239a/engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java
----------------------------------------------------------------------
diff --git a/engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java b/engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java
index 79e8cc8..86e49f9 100644
--- a/engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java
+++ b/engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java
@@ -40,6 +40,7 @@ import org.apache.cloudstack.engine.subsystem.api.storage.EndPoint;
import org.apache.cloudstack.engine.subsystem.api.storage.EndPointSelector;
import org.apache.cloudstack.engine.subsystem.api.storage.ObjectInDataStoreStateMachine;
import org.apache.cloudstack.engine.subsystem.api.storage.ObjectInDataStoreStateMachine.Event;
+import org.apache.cloudstack.engine.subsystem.api.storage.PrimaryDataStore;
import org.apache.cloudstack.engine.subsystem.api.storage.PrimaryDataStoreDriver;
import org.apache.cloudstack.engine.subsystem.api.storage.Scope;
import org.apache.cloudstack.engine.subsystem.api.storage.SnapshotInfo;
@@ -55,7 +56,6 @@ import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
import org.apache.cloudstack.storage.command.CommandResult;
import org.apache.cloudstack.storage.command.CopyCmdAnswer;
import org.apache.cloudstack.storage.command.DeleteCommand;
-import org.apache.cloudstack.engine.subsystem.api.storage.PrimaryDataStore;
import org.apache.cloudstack.storage.datastore.PrimaryDataStoreProviderManager;
import org.apache.cloudstack.storage.datastore.db.VolumeDataStoreDao;
import org.apache.cloudstack.storage.datastore.db.VolumeDataStoreVO;
@@ -165,12 +165,24 @@ public class VolumeServiceImpl implements VolumeService {
DataObject volumeOnStore = dataStore.create(volume);
volumeOnStore.processEvent(Event.CreateOnlyRequested);
- CreateVolumeContext<VolumeApiResult> context = new CreateVolumeContext<VolumeApiResult>(null, volumeOnStore,
- future);
- AsyncCallbackDispatcher<VolumeServiceImpl, CreateCmdResult> caller = AsyncCallbackDispatcher.create(this);
- caller.setCallback(caller.getTarget().createVolumeCallback(null, null)).setContext(context);
-
- dataStore.getDriver().createAsync(dataStore, volumeOnStore, caller);
+ try {
+ CreateVolumeContext<VolumeApiResult> context = new CreateVolumeContext<VolumeApiResult>(null, volumeOnStore,
+ future);
+ AsyncCallbackDispatcher<VolumeServiceImpl, CreateCmdResult> caller = AsyncCallbackDispatcher.create(this);
+ caller.setCallback(caller.getTarget().createVolumeCallback(null, null)).setContext(context);
+
+ dataStore.getDriver().createAsync(dataStore, volumeOnStore, caller);
+ } catch (CloudRuntimeException ex) {
+ // clean up already persisted volume_store_ref entry in case of createVolumeCallback is never called
+ VolumeDataStoreVO volStoreVO = _volumeStoreDao.findByStoreVolume(dataStore.getId(), volume.getId());
+ if (volStoreVO != null) {
+ VolumeInfo volObj = volFactory.getVolume(volume, dataStore);
+ volObj.processEvent(ObjectInDataStoreStateMachine.Event.OperationFailed);
+ }
+ VolumeApiResult volResult = new VolumeApiResult((VolumeObject)volumeOnStore);
+ volResult.setResult(ex.getMessage());
+ future.complete(volResult);
+ }
return future;
}
@@ -1022,13 +1034,25 @@ public class VolumeServiceImpl implements VolumeService {
volumeOnStore.processEvent(Event.CreateOnlyRequested);
- CreateVolumeContext<VolumeApiResult> context = new CreateVolumeContext<VolumeApiResult>(null, volumeOnStore,
- future);
- AsyncCallbackDispatcher<VolumeServiceImpl, CreateCmdResult> caller = AsyncCallbackDispatcher.create(this);
- caller.setCallback(caller.getTarget().registerVolumeCallback(null, null));
- caller.setContext(context);
-
- store.getDriver().createAsync(store, volumeOnStore, caller);
+ try {
+ CreateVolumeContext<VolumeApiResult> context = new CreateVolumeContext<VolumeApiResult>(null, volumeOnStore,
+ future);
+ AsyncCallbackDispatcher<VolumeServiceImpl, CreateCmdResult> caller = AsyncCallbackDispatcher.create(this);
+ caller.setCallback(caller.getTarget().registerVolumeCallback(null, null));
+ caller.setContext(context);
+
+ store.getDriver().createAsync(store, volumeOnStore, caller);
+ } catch (CloudRuntimeException ex) {
+ // clean up already persisted volume_store_ref entry in case of createVolumeCallback is never called
+ VolumeDataStoreVO volStoreVO = _volumeStoreDao.findByStoreVolume(store.getId(), volume.getId());
+ if (volStoreVO != null) {
+ VolumeInfo volObj = volFactory.getVolume(volume, store);
+ volObj.processEvent(ObjectInDataStoreStateMachine.Event.OperationFailed);
+ }
+ VolumeApiResult res = new VolumeApiResult((VolumeObject)volumeOnStore);
+ res.setResult(ex.getMessage());
+ future.complete(res);
+ }
return future;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9a62239a/server/src/com/cloud/storage/download/DownloadMonitorImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/storage/download/DownloadMonitorImpl.java b/server/src/com/cloud/storage/download/DownloadMonitorImpl.java
index d455f1e..89b3407 100755
--- a/server/src/com/cloud/storage/download/DownloadMonitorImpl.java
+++ b/server/src/com/cloud/storage/download/DownloadMonitorImpl.java
@@ -67,6 +67,7 @@ import com.cloud.storage.upload.UploadListener;
import com.cloud.template.VirtualMachineTemplate;
import com.cloud.utils.component.ComponentContext;
import com.cloud.utils.component.ManagerBase;
+import com.cloud.utils.exception.CloudRuntimeException;
@Component
@Local(value = { DownloadMonitor.class })
@@ -169,8 +170,9 @@ public class DownloadMonitorImpl extends ManagerBase implements DownloadMonitor
}
EndPoint ep = _epSelector.select(template);
if (ep == null) {
- s_logger.warn("There is no secondary storage VM for downloading template to image store " + store.getName());
- return;
+ String errMsg = "There is no secondary storage VM for downloading template to image store " + store.getName();
+ s_logger.warn(errMsg);
+ throw new CloudRuntimeException(errMsg);
}
DownloadListener dl = new DownloadListener(ep, store, template, _timer, this, dcmd,
callback);
[12/12] git commit: updated refs/heads/ui-restyle to d0e8fa3
Posted by bf...@apache.org.
Merge branch 'asf-master' into ui-restyle
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/d0e8fa35
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/d0e8fa35
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/d0e8fa35
Branch: refs/heads/ui-restyle
Commit: d0e8fa35c23301ecb91e3f12231eaa14723eb818
Parents: b7259a4 eb9cfff
Author: Brian Federle <br...@citrix.com>
Authored: Mon Nov 4 14:36:01 2013 -0800
Committer: Brian Federle <br...@citrix.com>
Committed: Mon Nov 4 14:36:01 2013 -0800
----------------------------------------------------------------------
agent/pom.xml | 33 ++++++++++++
.../cloud/agent/dao/impl/PropertiesStorage.java | 57 ++++++++++----------
.../com/cloud/agent/dhcp/FakeDhcpSnooper.java | 5 --
agent/src/com/cloud/agent/mockvm/MockVm.java | 7 ---
.../consoleproxy/ConsoleProxyResource.java | 20 ++-----
.../classes/resources/messages.properties | 8 +--
.../storage/image/TemplateServiceImpl.java | 48 +++++++++++++----
engine/storage/integration-test/pom.xml | 33 ++++++++++++
.../test/resources/storageContext.xml | 3 --
.../storage/volume/VolumeServiceImpl.java | 53 +++++++++++++-----
parents/checkstyle/pom.xml | 18 ++++++-
.../src/main/resources/tooling/checkstyle.xml | 18 +++++++
.../debian/config/etc/logrotate.d/cloud | 11 ----
.../management/ProviderTestConfiguration.java | 26 +++++++--
.../PublicNetworkTestConfiguration.java | 26 +++++++--
.../test/resources/providerContext.xml | 18 +++++++
.../test/resources/publicNetworkContext.xml | 10 ++++
plugins/network-elements/nicira-nvp/pom.xml | 2 +-
plugins/user-authenticators/ldap/pom.xml | 37 ++++++++++++-
pom.xml | 1 +
server/pom.xml | 33 ++++++++++++
.../storage/download/DownloadMonitorImpl.java | 6 ++-
.../patches/debian/config/etc/logrotate.d/cloud | 27 ++++++++++
ui/dictionary.jsp | 2 +
ui/scripts/network.js | 2 +-
ui/scripts/system.js | 16 +++---
usage/pom.xml | 33 ++++++++++++
27 files changed, 431 insertions(+), 122 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d0e8fa35/client/WEB-INF/classes/resources/messages.properties
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d0e8fa35/ui/dictionary.jsp
----------------------------------------------------------------------
[03/12] git commit: updated refs/heads/ui-restyle to d0e8fa3
Posted by bf...@apache.org.
Set cloudstack as the parent for our checkstyle config
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/a3fae88c
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/a3fae88c
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/a3fae88c
Branch: refs/heads/ui-restyle
Commit: a3fae88c2725f0d5166af28ff7f4e15a16c2be67
Parents: 54a3d80
Author: Hugo Trippaers <ht...@schubergphilis.com>
Authored: Mon Nov 4 17:20:44 2013 +0100
Committer: Hugo Trippaers <ht...@schubergphilis.com>
Committed: Mon Nov 4 20:01:13 2013 +0100
----------------------------------------------------------------------
parents/checkstyle/pom.xml | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a3fae88c/parents/checkstyle/pom.xml
----------------------------------------------------------------------
diff --git a/parents/checkstyle/pom.xml b/parents/checkstyle/pom.xml
index 245631b..746cb3f 100644
--- a/parents/checkstyle/pom.xml
+++ b/parents/checkstyle/pom.xml
@@ -1,7 +1,11 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<name>Apache CloudStack Checkstyle Configuration</name>
- <groupId>org.apache.cloudstack</groupId>
<artifactId>checkstyle</artifactId>
<version>0.0.1-SNAPSHOT</version>
+ <parent>
+ <groupId>org.apache.cloudstack</groupId>
+ <artifactId>cloudstack</artifactId>
+ <version>4.3.0-SNAPSHOT</version>
+ </parent>
</project>
[05/12] git commit: updated refs/heads/ui-restyle to d0e8fa3
Posted by bf...@apache.org.
Fix version and build paths for the checkstyle code
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/9e5e9fdc
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/9e5e9fdc
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/9e5e9fdc
Branch: refs/heads/ui-restyle
Commit: 9e5e9fdc670f36040ab24d985039a511945d5831
Parents: 29aa4ae
Author: Hugo Trippaers <ht...@schubergphilis.com>
Authored: Mon Nov 4 18:57:03 2013 +0100
Committer: Hugo Trippaers <ht...@schubergphilis.com>
Committed: Mon Nov 4 20:01:14 2013 +0100
----------------------------------------------------------------------
parents/checkstyle/pom.xml | 3 +--
plugins/network-elements/nicira-nvp/pom.xml | 2 +-
2 files changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9e5e9fdc/parents/checkstyle/pom.xml
----------------------------------------------------------------------
diff --git a/parents/checkstyle/pom.xml b/parents/checkstyle/pom.xml
index 746cb3f..de60100 100644
--- a/parents/checkstyle/pom.xml
+++ b/parents/checkstyle/pom.xml
@@ -2,10 +2,9 @@
<modelVersion>4.0.0</modelVersion>
<name>Apache CloudStack Checkstyle Configuration</name>
<artifactId>checkstyle</artifactId>
- <version>0.0.1-SNAPSHOT</version>
<parent>
<groupId>org.apache.cloudstack</groupId>
- <artifactId>cloudstack</artifactId>
+ <artifactId>cloud-maven-standard</artifactId>
<version>4.3.0-SNAPSHOT</version>
</parent>
</project>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9e5e9fdc/plugins/network-elements/nicira-nvp/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/network-elements/nicira-nvp/pom.xml b/plugins/network-elements/nicira-nvp/pom.xml
index 5c65e6a..9341c93 100644
--- a/plugins/network-elements/nicira-nvp/pom.xml
+++ b/plugins/network-elements/nicira-nvp/pom.xml
@@ -37,7 +37,7 @@
<dependency>
<groupId>org.apache.cloudstack</groupId>
<artifactId>checkstyle</artifactId>
- <version>0.0.1-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
</dependencies>
<executions>
[08/12] git commit: updated refs/heads/ui-restyle to d0e8fa3
Posted by bf...@apache.org.
Fix formal pom parsing done by Jenkins
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/84b5bfff
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/84b5bfff
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/84b5bfff
Branch: refs/heads/ui-restyle
Commit: 84b5bfff74440076a2666272fde63b84b61cb0dd
Parents: 479f404
Author: Hugo Trippaers <ht...@schubergphilis.com>
Authored: Mon Nov 4 20:24:26 2013 +0100
Committer: Hugo Trippaers <ht...@schubergphilis.com>
Committed: Mon Nov 4 20:24:26 2013 +0100
----------------------------------------------------------------------
parents/checkstyle/pom.xml | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84b5bfff/parents/checkstyle/pom.xml
----------------------------------------------------------------------
diff --git a/parents/checkstyle/pom.xml b/parents/checkstyle/pom.xml
index b1b7b21..48d58bb 100644
--- a/parents/checkstyle/pom.xml
+++ b/parents/checkstyle/pom.xml
@@ -16,5 +16,6 @@
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloud-maven-standard</artifactId>
<version>4.3.0-SNAPSHOT</version>
+ <relativePath>../../maven-standard/pom.xml</relativePath>
</parent>
</project>