apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Disable StorageProvider, storageType introduced in Javelin new code, temporarily, to make existing code run

Browse Source
This commit is contained in:
Kelven Yang 2013-01-16 14:16:01 -08:00
parent 4c1257bf18
commit 727fab71cb
5 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
client/tomcatconf/componentContext.xml.in
View File

@ -67,4 +67,10 @@
--> -->
<bean id="StaticRoleBasedAPIAccessChecker" class="org.apache.cloudstack.acl.StaticRoleBasedAPIAccessChecker"/> <bean id="StaticRoleBasedAPIAccessChecker" class="org.apache.cloudstack.acl.StaticRoleBasedAPIAccessChecker"/>
<!--
Gurus
-->
</beans> </beans>

15
core/src/com/cloud/storage/StoragePoolVO.java
View File

@ -77,11 +77,14 @@ public class StoragePoolVO implements StoragePool {
@Enumerated(value=EnumType.STRING) @Enumerated(value=EnumType.STRING)
private StoragePoolStatus status; private StoragePoolStatus status;
// @Column(name="storage_provider", updatable=true, nullable=false) // TODO, disable persisency of storageProvider and storageType, javelin new code not
private String storageProvider; // sync with the schema!
// @Column(name="storage_type", nullable=false) // @Column(name="storage_provider", updatable=true, nullable=false)
private String storageType; @Transient private String storageProvider;
// Column(name="storage_type", nullable=false)
@Transient private String storageType;
@Override @Override
public long getId() { public long getId() {
@ -135,7 +138,7 @@ public class StoragePoolVO implements StoragePool {
public long getAvailableBytes() { public long getAvailableBytes() {
return availableBytes; return availableBytes;
} }
@Override @Override
public String getStorageProvider() { public String getStorageProvider() {
return storageProvider; return storageProvider;
@ -153,7 +156,7 @@ public class StoragePoolVO implements StoragePool {
public void setStorageType(String type) { public void setStorageType(String type) {
storageType = type; storageType = type;
} }
@Override @Override
public long getCapacityBytes() { public long getCapacityBytes() {
return capacityBytes; return capacityBytes;

2
developer/pom.xml
View File

@ -184,7 +184,6 @@
<srcFiles> <srcFiles>
<srcFile>${basedir}/target/db/create-schema-view.sql</srcFile> <srcFile>${basedir}/target/db/create-schema-view.sql</srcFile>
<srcFile>${basedir}/target/db/templates.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_schema.sql</srcFile>
<srcFile>${basedir}/target/db/cloudbridge_multipart.sql</srcFile> <srcFile>${basedir}/target/db/cloudbridge_multipart.sql</srcFile>
<srcFile>${basedir}/target/db/cloudbridge_index.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-view.sql</srcFile>
<srcFile>${basedir}/target/db/create-schema-premium.sql</srcFile> <srcFile>${basedir}/target/db/create-schema-premium.sql</srcFile>
<srcFile>${basedir}/target/db/templates.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_schema.sql</srcFile>
<srcFile>${basedir}/target/db/cloudbridge_multipart.sql</srcFile> <srcFile>${basedir}/target/db/cloudbridge_multipart.sql</srcFile>
<srcFile>${basedir}/target/db/cloudbridge_index.sql</srcFile> <srcFile>${basedir}/target/db/cloudbridge_index.sql</srcFile>

2
server/src/com/cloud/server/ManagementServerImpl.java
View File

@ -499,7 +499,7 @@ public class ManagementServerImpl implements ManagementServer {
if(Manager.class.isAssignableFrom(ComponentContext.getTargetClass(adapter))) if(Manager.class.isAssignableFrom(ComponentContext.getTargetClass(adapter)))
continue; 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()); throw new CloudRuntimeException("Failed to start adapter: " + ComponentContext.getTargetClass(adapter).getName());
} }
if (!adapter.start()) { if (!adapter.start()) {

2
utils/src/com/cloud/utils/component/AdapterBase.java
View File

@ -52,7 +52,7 @@ public class AdapterBase implements Adapter {
public static <T extends Adapter> T getAdapterByName(List<T> adapters, String name) { public static <T extends Adapter> T getAdapterByName(List<T> adapters, String name) {
for(T adapter : adapters) { for(T adapter : adapters) {
if(adapter.getName().equals(name)) if(adapter.getName().equalsIgnoreCase(name))
return adapter; return adapter;
} }
return null; return null;