You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ke...@apache.org on 2013/01/16 23:16:22 UTC
git commit: Disable StorageProvider,
storageType introduced in Javelin new code, temporarily,
to make existing code run
Updated Branches:
refs/heads/javelin 4c1257bf1 -> 727fab71c
Disable StorageProvider, storageType introduced in Javelin new code, temporarily, to make existing code run
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/727fab71
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/727fab71
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/727fab71
Branch: refs/heads/javelin
Commit: 727fab71cb59dab97f386486e3b0dc5596214205
Parents: 4c1257b
Author: Kelven Yang <ke...@gmail.com>
Authored: Wed Jan 16 14:16:01 2013 -0800
Committer: Kelven Yang <ke...@gmail.com>
Committed: Wed Jan 16 14:16:01 2013 -0800
----------------------------------------------------------------------
client/tomcatconf/componentContext.xml.in | 6 ++++++
core/src/com/cloud/storage/StoragePoolVO.java | 13 ++++++++-----
developer/pom.xml | 2 --
.../src/com/cloud/server/ManagementServerImpl.java | 2 +-
.../src/com/cloud/utils/component/AdapterBase.java | 2 +-
5 files changed, 16 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/727fab71/client/tomcatconf/componentContext.xml.in
----------------------------------------------------------------------
diff --git a/client/tomcatconf/componentContext.xml.in b/client/tomcatconf/componentContext.xml.in
index 45068b6..5f2b6d6 100644
--- a/client/tomcatconf/componentContext.xml.in
+++ b/client/tomcatconf/componentContext.xml.in
@@ -67,4 +67,10 @@
-->
<bean id="StaticRoleBasedAPIAccessChecker" class="org.apache.cloudstack.acl.StaticRoleBasedAPIAccessChecker"/>
+
+ <!--
+ Gurus
+ -->
+
+
</beans>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/727fab71/core/src/com/cloud/storage/StoragePoolVO.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/storage/StoragePoolVO.java b/core/src/com/cloud/storage/StoragePoolVO.java
index 188a23e..49abd50 100644
--- a/core/src/com/cloud/storage/StoragePoolVO.java
+++ b/core/src/com/cloud/storage/StoragePoolVO.java
@@ -77,11 +77,14 @@ public class StoragePoolVO implements StoragePool {
@Enumerated(value=EnumType.STRING)
private StoragePoolStatus status;
+ // TODO, disable persisency of storageProvider and storageType, javelin new code not
+ // sync with the schema!
+
// @Column(name="storage_provider", updatable=true, nullable=false)
- private String storageProvider;
+ @Transient private String storageProvider;
- // @Column(name="storage_type", nullable=false)
- private String storageType;
+ // Column(name="storage_type", nullable=false)
+ @Transient private String storageType;
@Override
public long getId() {
@@ -135,7 +138,7 @@ public class StoragePoolVO implements StoragePool {
public long getAvailableBytes() {
return availableBytes;
}
-
+
@Override
public String getStorageProvider() {
return storageProvider;
@@ -153,7 +156,7 @@ public class StoragePoolVO implements StoragePool {
public void setStorageType(String type) {
storageType = type;
}
-
+
@Override
public long getCapacityBytes() {
return capacityBytes;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/727fab71/developer/pom.xml
----------------------------------------------------------------------
diff --git a/developer/pom.xml b/developer/pom.xml
index 236b82f..2cab6a1 100644
--- a/developer/pom.xml
+++ b/developer/pom.xml
@@ -184,7 +184,6 @@
<srcFiles>
<srcFile>${basedir}/target/db/create-schema-view.sql</srcFile>
<srcFile>${basedir}/target/db/templates.sql</srcFile>
- <srcFile>${basedir}/target/db/create-index-fk.sql</srcFile>
<srcFile>${basedir}/target/db/cloudbridge_schema.sql</srcFile>
<srcFile>${basedir}/target/db/cloudbridge_multipart.sql</srcFile>
<srcFile>${basedir}/target/db/cloudbridge_index.sql</srcFile>
@@ -474,7 +473,6 @@
<srcFile>${basedir}/target/db/create-schema-view.sql</srcFile>
<srcFile>${basedir}/target/db/create-schema-premium.sql</srcFile>
<srcFile>${basedir}/target/db/templates.sql</srcFile>
- <srcFile>${basedir}/target/db/create-index-fk.sql</srcFile>
<srcFile>${basedir}/target/db/cloudbridge_schema.sql</srcFile>
<srcFile>${basedir}/target/db/cloudbridge_multipart.sql</srcFile>
<srcFile>${basedir}/target/db/cloudbridge_index.sql</srcFile>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/727fab71/server/src/com/cloud/server/ManagementServerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/server/ManagementServerImpl.java b/server/src/com/cloud/server/ManagementServerImpl.java
index 65501e3..bdc9746 100755
--- a/server/src/com/cloud/server/ManagementServerImpl.java
+++ b/server/src/com/cloud/server/ManagementServerImpl.java
@@ -499,7 +499,7 @@ public class ManagementServerImpl implements ManagementServer {
if(Manager.class.isAssignableFrom(ComponentContext.getTargetClass(adapter)))
continue;
- if(!adapter.configure(adapter.getClass().getSimpleName(), params)) {
+ if(!adapter.configure(adapter.getName(), params)) {
throw new CloudRuntimeException("Failed to start adapter: " + ComponentContext.getTargetClass(adapter).getName());
}
if (!adapter.start()) {
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/727fab71/utils/src/com/cloud/utils/component/AdapterBase.java
----------------------------------------------------------------------
diff --git a/utils/src/com/cloud/utils/component/AdapterBase.java b/utils/src/com/cloud/utils/component/AdapterBase.java
index 8fd374a..a735d85 100644
--- a/utils/src/com/cloud/utils/component/AdapterBase.java
+++ b/utils/src/com/cloud/utils/component/AdapterBase.java
@@ -52,7 +52,7 @@ public class AdapterBase implements Adapter {
public static <T extends Adapter> T getAdapterByName(List<T> adapters, String name) {
for(T adapter : adapters) {
- if(adapter.getName().equals(name))
+ if(adapter.getName().equalsIgnoreCase(name))
return adapter;
}
return null;