gitqueue
diff --git a/‎client/tomcatconf/componentContext.xml.in‎
Lines changed: 6 additions & 0 deletions b/‎client/tomcatconf/componentContext.xml.in‎
Lines changed: 6 additions & 0 deletions
diff --git a/‎core/src/com/cloud/storage/StoragePoolVO.java‎
Lines changed: 8 additions & 5 deletions b/‎core/src/com/cloud/storage/StoragePoolVO.java‎
Lines changed: 8 additions & 5 deletions
diff --git a/‎developer/pom.xml‎
Lines changed: 0 additions & 2 deletions b/‎developer/pom.xml‎
Lines changed: 0 additions & 2 deletions
diff --git a/‎server/src/com/cloud/server/ManagementServerImpl.java‎
Lines changed: 1 addition & 1 deletion b/‎server/src/com/cloud/server/ManagementServerImpl.java‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎utils/src/com/cloud/utils/component/AdapterBase.java‎
Lines changed: 1 addition & 1 deletion b/‎utils/src/com/cloud/utils/component/AdapterBase.java‎
Lines changed: 1 addition & 1 deletion
@@ -67,4 +67,10 @@
   -->
   <bean id="StaticRoleBasedAPIAccessChecker" class="org.apache.cloudstack.acl.StaticRoleBasedAPIAccessChecker"/>
 
+  
+  <!--
+    Gurus
+  -->
+  
+  
 </beans>
@@ -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 long getDataCenterId() {
     public long getAvailableBytes() {
 		return availableBytes;
 	}
-	
+
 	@Override
 	public String getStorageProvider() {
 		return storageProvider;
@@ -153,7 +156,7 @@ public String getStorageType() {
 	public void setStorageType(String type) {
 		storageType = type;
 	}
-
+	
 	@Override
     public long getCapacityBytes() {
 		return capacityBytes;
 
@@ -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>
 
@@ -499,7 +499,7 @@ private void startAdapters() {
 				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()) {
 
@@ -52,7 +52,7 @@ public boolean stop() {
 
     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;
Original file line number	Diff line number	Diff line change
`@@ -499,7 +499,7 @@ private void startAdapters() {`
`499`	`499`	`if(Manager.class.isAssignableFrom(ComponentContext.getTargetClass(adapter)))`
`500`	`500`	`continue;`
`501`	`501`
`502`		`- if(!adapter.configure(adapter.getClass().getSimpleName(), params)) {`
	`502`	`+ if(!adapter.configure(adapter.getName(), params)) {`
`503`	`503`	`throw new CloudRuntimeException("Failed to start adapter: " + ComponentContext.getTargetClass(adapter).getName());`
`504`	`504`	`}`
`505`	`505`	`if (!adapter.start()) {`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ public boolean stop() {`
`52`	`52`
`53`	`53`	`public static <T extends Adapter> T getAdapterByName(List<T> adapters, String name) {`
`54`	`54`	`for(T adapter : adapters) {`
`55`		`- if(adapter.getName().equals(name))`
	`55`	`+ if(adapter.getName().equalsIgnoreCase(name))`
`56`	`56`	`return adapter;`
`57`	`57`	`}`
`58`	`58`	`return null;`