From 6dd2318b443e1a952968dc4b257b39227b2a43ea Mon Sep 17 00:00:00 2001 From: Edison Su Date: Mon, 5 Nov 2012 11:19:16 -0800 Subject: [PATCH] fix build --- .../storage/provider/DefaultNfsSecondaryStorageProvider.java | 4 +--- .../storage/provider/DefaultPrimaryStorageProvider.java | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/engine/storage/src/org/apache/cloudstack/storage/provider/DefaultNfsSecondaryStorageProvider.java b/engine/storage/src/org/apache/cloudstack/storage/provider/DefaultNfsSecondaryStorageProvider.java index a871a32850c..19ffae8de3f 100644 --- a/engine/storage/src/org/apache/cloudstack/storage/provider/DefaultNfsSecondaryStorageProvider.java +++ b/engine/storage/src/org/apache/cloudstack/storage/provider/DefaultNfsSecondaryStorageProvider.java @@ -32,8 +32,6 @@ import org.apache.cloudstack.engine.subsystem.api.storage.DataStore; import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreConfigurator; import org.apache.cloudstack.engine.subsystem.api.storage.StorageProvider; import org.apache.cloudstack.engine.subsystem.api.storage.DataStore.StoreType; -import org.apache.cloudstack.storage.datastoreconfigurator.NfsSecondaryStorageConfigurator; -import org.apache.cloudstack.storage.datastoreconfigurator.XenNfsDataStoreConfigurator; import com.cloud.exception.InvalidParameterValueException; import com.cloud.hypervisor.Hypervisor; @@ -45,7 +43,7 @@ public class DefaultNfsSecondaryStorageProvider implements StorageProvider { protected Map> _supportedProtocols; public boolean configure(String name, Map params) throws ConfigurationException { Map dscs = new HashMap(); - DataStoreConfigurator nfsdc = new NfsSecondaryStorageConfigurator(); + DataStoreConfigurator nfsdc = null; dscs.put(nfsdc.getProtocol(), nfsdc); _supportedProtocols.put(HypervisorType.XenServer, dscs); diff --git a/engine/storage/src/org/apache/cloudstack/storage/provider/DefaultPrimaryStorageProvider.java b/engine/storage/src/org/apache/cloudstack/storage/provider/DefaultPrimaryStorageProvider.java index 40a28236e7b..388b70a2bc5 100644 --- a/engine/storage/src/org/apache/cloudstack/storage/provider/DefaultPrimaryStorageProvider.java +++ b/engine/storage/src/org/apache/cloudstack/storage/provider/DefaultPrimaryStorageProvider.java @@ -14,8 +14,6 @@ import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreConfigurator; import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreLifeCycle; import org.apache.cloudstack.engine.subsystem.api.storage.StorageProvider; import org.apache.cloudstack.engine.subsystem.api.storage.DataStore.StoreType; -import org.apache.cloudstack.storage.datastoreconfigurator.NfsDataStoreConfigurator; -import org.apache.cloudstack.storage.datastoreconfigurator.XenNfsDataStoreConfigurator; import com.cloud.dc.ClusterVO; import com.cloud.dc.DataCenterVO; @@ -45,7 +43,7 @@ public class DefaultPrimaryStorageProvider implements StorageProvider { public DefaultPrimaryStorageProvider() { Map dscs = new HashMap(); - DataStoreConfigurator nfsdc = new XenNfsDataStoreConfigurator(); + DataStoreConfigurator nfsdc = null; dscs.put(nfsdc.getProtocol(), nfsdc); _supportedProtocols.put(HypervisorType.XenServer, dscs);