Moved agent commands to core and out of api

api/src/com/cloud/storage/StoragePoolDiscoverer.java

@@ -19,8 +19,6 @@ package com.cloud.storage;
 import java.net.URI;
 import java.util.Map;
 
-import org.apache.cloudstack.storage.datastore.db.StoragePoolVO;
-
 import com.cloud.exception.DiscoveryException;
 import com.cloud.utils.component.Adapter;
 
@@ -29,7 +27,7 @@ import com.cloud.utils.component.Adapter;
  */
 public interface StoragePoolDiscoverer extends Adapter {
 
-    Map<StoragePoolVO, Map<String, String>> find(long dcId, Long podId, URI uri, Map<String, String> details) throws DiscoveryException;
-    
-    Map<StoragePoolVO, Map<String, String>> find(long dcId, Long podId, URI uri, Map<String, String> details, String username, String password) throws DiscoveryException;
+    Map<? extends StoragePool, Map<String, String>> find(long dcId, Long podId, URI uri, Map<String, String> details) throws DiscoveryException;
+
+    Map<? extends StoragePool, Map<String, String>> find(long dcId, Long podId, URI uri, Map<String, String> details, String username, String password) throws DiscoveryException;
 }

core/src/com/cloud/agent/RecoveryHandler.java

@@ -1,31 +0,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.
-package com.cloud.agent;
-
-import com.cloud.agent.api.Command;
-
-public interface RecoveryHandler {
-    /**
-     * Perform the necessary recovery because the success of this command
-     * is not known.
-     * 
-     * @param agentId agent the commands were sent to.
-     * @param seq sequence number.
-     * @param cmds commands that failed.
-     */
-    public void handle(long agentId, long seq, Command[] cmds);
-}