You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by ab...@apache.org on 2013/07/03 03:00:37 UTC
[2/4] JCLOUDS-151. Deprecate CloudStack *Client classes,
add dummy *Api classes.
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/35a44243/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalStoragePoolAsyncApi.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalStoragePoolAsyncApi.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalStoragePoolAsyncApi.java
new file mode 100644
index 0000000..35f00ac
--- /dev/null
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalStoragePoolAsyncApi.java
@@ -0,0 +1,52 @@
+/*
+ * 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 org.jclouds.cloudstack.features;
+
+import java.util.Set;
+
+import javax.inject.Named;
+import javax.ws.rs.Consumes;
+import javax.ws.rs.GET;
+import javax.ws.rs.QueryParam;
+import javax.ws.rs.core.MediaType;
+
+import org.jclouds.Fallbacks.EmptySetOnNotFoundOr404;
+import org.jclouds.Fallbacks.NullOnNotFoundOr404;
+import org.jclouds.cloudstack.filters.AuthenticationFilter;
+import org.jclouds.rest.annotations.Fallback;
+import org.jclouds.rest.annotations.OnlyElement;
+import org.jclouds.rest.annotations.QueryParams;
+import org.jclouds.rest.annotations.RequestFilters;
+import org.jclouds.rest.annotations.SelectJson;
+
+import com.google.common.util.concurrent.ListenableFuture;
+
+/**
+ * Provides asynchronous access to cloudstack via their REST API.
+ * <p/>
+ *
+ * @deprecated This class will be removed in 1.7.
+ * @see GlobalStoragePoolApi
+ * @see <a href="http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_User.html" />
+ * @author Adrian Cole
+ */
+@Deprecated
+@RequestFilters(AuthenticationFilter.class)
+@QueryParams(keys = "response", values = "json")
+public interface GlobalStoragePoolAsyncApi extends GlobalStoragePoolAsyncClient {
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/35a44243/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalStoragePoolAsyncClient.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalStoragePoolAsyncClient.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalStoragePoolAsyncClient.java
index 105521e..07b3509 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalStoragePoolAsyncClient.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalStoragePoolAsyncClient.java
@@ -36,10 +36,12 @@ import com.google.common.util.concurrent.ListenableFuture;
* Provides asynchronous access to CloudStack storage pool features.
* <p/>
*
+ * @deprecated The async interface will be removed in jclouds 1.7.
* @see GlobalStoragePoolClient
* @see <a href="http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_Global_Admin.html" />
* @author Richard Downer
*/
+@Deprecated
@RequestFilters(AuthenticationFilter.class)
@QueryParams(keys = "response", values = "json")
public interface GlobalStoragePoolAsyncClient {
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/35a44243/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalStoragePoolClient.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalStoragePoolClient.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalStoragePoolClient.java
index ab5461d..af39588 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalStoragePoolClient.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalStoragePoolClient.java
@@ -24,10 +24,12 @@ import org.jclouds.cloudstack.options.ListStoragePoolsOptions;
* Provides synchronous access to CloudStack storage pool features.
* <p/>
*
+ * @deprecated The *Client classes will be replaced with the *Api classes in jclouds 1.7.
* @see GlobalStoragePoolClient
* @see <a href="http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_Global_Admin.html" />
* @author Richard Downer
*/
+@Deprecated
public interface GlobalStoragePoolClient {
Set<StoragePool> listStoragePools(ListStoragePoolsOptions... options);
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/35a44243/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalUsageApi.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalUsageApi.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalUsageApi.java
new file mode 100644
index 0000000..176ec59
--- /dev/null
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalUsageApi.java
@@ -0,0 +1,32 @@
+/*
+ * 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 org.jclouds.cloudstack.features;
+
+import java.util.Set;
+
+/**
+ * Provides synchronous access to CloudStack Usage features.
+ * <p/>
+ *
+ * Note that this class is transitionary and will fully replace GlobalUsageClient in 1.7.
+ *
+ * @see <a href="http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_User.html" />
+ * @author Adrian Cole
+ */
+public interface GlobalUsageApi extends GlobalUsageClient {
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/35a44243/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalUsageAsyncApi.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalUsageAsyncApi.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalUsageAsyncApi.java
new file mode 100644
index 0000000..d243d7e
--- /dev/null
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalUsageAsyncApi.java
@@ -0,0 +1,52 @@
+/*
+ * 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 org.jclouds.cloudstack.features;
+
+import java.util.Set;
+
+import javax.inject.Named;
+import javax.ws.rs.Consumes;
+import javax.ws.rs.GET;
+import javax.ws.rs.QueryParam;
+import javax.ws.rs.core.MediaType;
+
+import org.jclouds.Fallbacks.EmptySetOnNotFoundOr404;
+import org.jclouds.Fallbacks.NullOnNotFoundOr404;
+import org.jclouds.cloudstack.filters.AuthenticationFilter;
+import org.jclouds.rest.annotations.Fallback;
+import org.jclouds.rest.annotations.OnlyElement;
+import org.jclouds.rest.annotations.QueryParams;
+import org.jclouds.rest.annotations.RequestFilters;
+import org.jclouds.rest.annotations.SelectJson;
+
+import com.google.common.util.concurrent.ListenableFuture;
+
+/**
+ * Provides asynchronous access to cloudstack via their REST API.
+ * <p/>
+ *
+ * @deprecated This class will be removed in 1.7.
+ * @see GlobalUsageApi
+ * @see <a href="http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_User.html" />
+ * @author Adrian Cole
+ */
+@Deprecated
+@RequestFilters(AuthenticationFilter.class)
+@QueryParams(keys = "response", values = "json")
+public interface GlobalUsageAsyncApi extends GlobalUsageAsyncClient {
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/35a44243/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalUsageAsyncClient.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalUsageAsyncClient.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalUsageAsyncClient.java
index 730f6b5..3147828 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalUsageAsyncClient.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalUsageAsyncClient.java
@@ -42,10 +42,12 @@ import com.google.common.util.concurrent.ListenableFuture;
* Provides asynchronous access to CloudStack usage features.
* <p/>
*
+ * @deprecated The async interface will be removed in jclouds 1.7.
* @see GlobalOfferingAsyncClient
* @see <a href="http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_Global_Admin.html" />
* @author Richard Downer
*/
+@Deprecated
@RequestFilters(AuthenticationFilter.class)
@QueryParams(keys = "response", values = "json")
public interface GlobalUsageAsyncClient {
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/35a44243/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalUsageClient.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalUsageClient.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalUsageClient.java
index 4b0af3a..f312438 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalUsageClient.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalUsageClient.java
@@ -27,10 +27,12 @@ import org.jclouds.cloudstack.options.ListUsageRecordsOptions;
* Provides synchronous access to CloudStack usage features.
* <p/>
*
+ * @deprecated The *Client classes will be replaced with the *Api classes in jclouds 1.7.
* @see org.jclouds.cloudstack.features.GlobalOfferingAsyncClient
* @see <a href="http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_Global_Admin.html" />
* @author Richard Downer
*/
+@Deprecated
public interface GlobalUsageClient {
JobResult generateUsageRecords(Date start, Date end, GenerateUsageRecordsOptions... options);
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/35a44243/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalUserApi.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalUserApi.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalUserApi.java
new file mode 100644
index 0000000..a441ed6
--- /dev/null
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalUserApi.java
@@ -0,0 +1,32 @@
+/*
+ * 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 org.jclouds.cloudstack.features;
+
+import java.util.Set;
+
+/**
+ * Provides synchronous access to CloudStack User features.
+ * <p/>
+ *
+ * Note that this class is transitionary and will fully replace GlobalUserClient in 1.7.
+ *
+ * @see <a href="http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_User.html" />
+ * @author Adrian Cole
+ */
+public interface GlobalUserApi extends GlobalUserClient, DomainUserApi {
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/35a44243/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalUserAsyncApi.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalUserAsyncApi.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalUserAsyncApi.java
new file mode 100644
index 0000000..9bede29
--- /dev/null
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalUserAsyncApi.java
@@ -0,0 +1,52 @@
+/*
+ * 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 org.jclouds.cloudstack.features;
+
+import java.util.Set;
+
+import javax.inject.Named;
+import javax.ws.rs.Consumes;
+import javax.ws.rs.GET;
+import javax.ws.rs.QueryParam;
+import javax.ws.rs.core.MediaType;
+
+import org.jclouds.Fallbacks.EmptySetOnNotFoundOr404;
+import org.jclouds.Fallbacks.NullOnNotFoundOr404;
+import org.jclouds.cloudstack.filters.AuthenticationFilter;
+import org.jclouds.rest.annotations.Fallback;
+import org.jclouds.rest.annotations.OnlyElement;
+import org.jclouds.rest.annotations.QueryParams;
+import org.jclouds.rest.annotations.RequestFilters;
+import org.jclouds.rest.annotations.SelectJson;
+
+import com.google.common.util.concurrent.ListenableFuture;
+
+/**
+ * Provides asynchronous access to cloudstack via their REST API.
+ * <p/>
+ *
+ * @deprecated This class will be removed in 1.7.
+ * @see GlobalUserApi
+ * @see <a href="http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_User.html" />
+ * @author Adrian Cole
+ */
+@Deprecated
+@RequestFilters(AuthenticationFilter.class)
+@QueryParams(keys = "response", values = "json")
+public interface GlobalUserAsyncApi extends GlobalUserAsyncClient, DomainUserAsyncApi {
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/35a44243/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalUserAsyncClient.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalUserAsyncClient.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalUserAsyncClient.java
index eedb5f0..1e911e2 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalUserAsyncClient.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalUserAsyncClient.java
@@ -39,11 +39,13 @@ import com.google.common.util.concurrent.ListenableFuture;
* Provides asynchronous access to CloudStack User features available to Global
* Admin users.
*
+ * @deprecated The async interface will be removed in jclouds 1.7.
* @author Andrei Savu
* @see <a href=
* "http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_Global_Admin.html"
* />
*/
+@Deprecated
@RequestFilters(AuthenticationFilter.class)
@QueryParams(keys = "response", values = "json")
public interface GlobalUserAsyncClient extends DomainUserAsyncClient {
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/35a44243/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalUserClient.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalUserClient.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalUserClient.java
index 76df179..f343a21 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalUserClient.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalUserClient.java
@@ -25,11 +25,13 @@ import org.jclouds.cloudstack.options.UpdateUserOptions;
* Provides synchronous access to CloudStack User features available to Global
* Admin users.
*
+ * @deprecated The *Client classes will be replaced with the *Api classes in jclouds 1.7.
* @author Andrei savu
* @see <a href=
* "http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_Global_Admin.html"
* />
*/
+@Deprecated
public interface GlobalUserClient extends DomainUserClient {
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/35a44243/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalVlanApi.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalVlanApi.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalVlanApi.java
new file mode 100644
index 0000000..d8c3ef2
--- /dev/null
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalVlanApi.java
@@ -0,0 +1,32 @@
+/*
+ * 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 org.jclouds.cloudstack.features;
+
+import java.util.Set;
+
+/**
+ * Provides synchronous access to CloudStack Vlan features.
+ * <p/>
+ *
+ * Note that this class is transitionary and will fully replace GlobalVlanClient in 1.7.
+ *
+ * @see <a href="http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_User.html" />
+ * @author Adrian Cole
+ */
+public interface GlobalVlanApi extends GlobalVlanClient {
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/35a44243/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalVlanAsyncApi.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalVlanAsyncApi.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalVlanAsyncApi.java
new file mode 100644
index 0000000..b686757
--- /dev/null
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalVlanAsyncApi.java
@@ -0,0 +1,52 @@
+/*
+ * 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 org.jclouds.cloudstack.features;
+
+import java.util.Set;
+
+import javax.inject.Named;
+import javax.ws.rs.Consumes;
+import javax.ws.rs.GET;
+import javax.ws.rs.QueryParam;
+import javax.ws.rs.core.MediaType;
+
+import org.jclouds.Fallbacks.EmptySetOnNotFoundOr404;
+import org.jclouds.Fallbacks.NullOnNotFoundOr404;
+import org.jclouds.cloudstack.filters.AuthenticationFilter;
+import org.jclouds.rest.annotations.Fallback;
+import org.jclouds.rest.annotations.OnlyElement;
+import org.jclouds.rest.annotations.QueryParams;
+import org.jclouds.rest.annotations.RequestFilters;
+import org.jclouds.rest.annotations.SelectJson;
+
+import com.google.common.util.concurrent.ListenableFuture;
+
+/**
+ * Provides asynchronous access to cloudstack via their REST API.
+ * <p/>
+ *
+ * @deprecated This class will be removed in 1.7.
+ * @see GlobalVlanApi
+ * @see <a href="http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_User.html" />
+ * @author Adrian Cole
+ */
+@Deprecated
+@RequestFilters(AuthenticationFilter.class)
+@QueryParams(keys = "response", values = "json")
+public interface GlobalVlanAsyncApi extends GlobalVlanAsyncClient {
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/35a44243/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalVlanAsyncClient.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalVlanAsyncClient.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalVlanAsyncClient.java
index cc95a31..b9d037b 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalVlanAsyncClient.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalVlanAsyncClient.java
@@ -43,10 +43,12 @@ import com.google.common.util.concurrent.ListenableFuture;
* Provides asynchronous access to cloudstack via their REST API.
* <p/>
*
+ * @deprecated The async interface will be removed in jclouds 1.7.
* @see org.jclouds.cloudstack.features.GlobalVlanClient
* @see <a href="http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_Global_Admin.html" />
* @author Richard Downer
*/
+@Deprecated
@RequestFilters(AuthenticationFilter.class)
@QueryParams(keys = "response", values = "json")
public interface GlobalVlanAsyncClient {
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/35a44243/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalVlanClient.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalVlanClient.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalVlanClient.java
index c52bf8e..c6371e6 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalVlanClient.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalVlanClient.java
@@ -25,10 +25,12 @@ import org.jclouds.cloudstack.options.ListVlanIPRangesOptions;
* Provides synchronous access to CloudStack VLAN features.
* <p/>
*
+ * @deprecated The *Client classes will be replaced with the *Api classes in jclouds 1.7.
* @see GlobalOfferingAsyncClient
* @see <a href="http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_Global_Admin.html" />
* @author Richard Downer
*/
+@Deprecated
public interface GlobalVlanClient {
/**
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/35a44243/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalZoneApi.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalZoneApi.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalZoneApi.java
new file mode 100644
index 0000000..31235d5
--- /dev/null
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalZoneApi.java
@@ -0,0 +1,32 @@
+/*
+ * 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 org.jclouds.cloudstack.features;
+
+import java.util.Set;
+
+/**
+ * Provides synchronous access to CloudStack Zone features.
+ * <p/>
+ *
+ * Note that this class is transitionary and will fully replace GlobalZoneClient in 1.7.
+ *
+ * @see <a href="http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_User.html" />
+ * @author Adrian Cole
+ */
+public interface GlobalZoneApi extends GlobalZoneClient, ZoneApi {
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/35a44243/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalZoneAsyncApi.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalZoneAsyncApi.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalZoneAsyncApi.java
new file mode 100644
index 0000000..6ba9899
--- /dev/null
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalZoneAsyncApi.java
@@ -0,0 +1,52 @@
+/*
+ * 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 org.jclouds.cloudstack.features;
+
+import java.util.Set;
+
+import javax.inject.Named;
+import javax.ws.rs.Consumes;
+import javax.ws.rs.GET;
+import javax.ws.rs.QueryParam;
+import javax.ws.rs.core.MediaType;
+
+import org.jclouds.Fallbacks.EmptySetOnNotFoundOr404;
+import org.jclouds.Fallbacks.NullOnNotFoundOr404;
+import org.jclouds.cloudstack.filters.AuthenticationFilter;
+import org.jclouds.rest.annotations.Fallback;
+import org.jclouds.rest.annotations.OnlyElement;
+import org.jclouds.rest.annotations.QueryParams;
+import org.jclouds.rest.annotations.RequestFilters;
+import org.jclouds.rest.annotations.SelectJson;
+
+import com.google.common.util.concurrent.ListenableFuture;
+
+/**
+ * Provides asynchronous access to cloudstack via their REST API.
+ * <p/>
+ *
+ * @deprecated This class will be removed in 1.7.
+ * @see GlobalZoneApi
+ * @see <a href="http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_User.html" />
+ * @author Adrian Cole
+ */
+@Deprecated
+@RequestFilters(AuthenticationFilter.class)
+@QueryParams(keys = "response", values = "json")
+public interface GlobalZoneAsyncApi extends GlobalZoneAsyncClient, ZoneAsyncApi {
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/35a44243/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalZoneAsyncClient.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalZoneAsyncClient.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalZoneAsyncClient.java
index 0462473..03ef547 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalZoneAsyncClient.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalZoneAsyncClient.java
@@ -40,11 +40,13 @@ import com.google.common.util.concurrent.ListenableFuture;
* Provides asynchronous access to CloudStack Account features available to Global
* Admin users.
*
+ * @deprecated The async interface will be removed in jclouds 1.7.
* @author Adrian Cole, Andrei Savu
* @see <a href=
* "http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_Global_Admin.html"
* />
*/
+@Deprecated
@RequestFilters(AuthenticationFilter.class)
@QueryParams(keys = "response", values = "json")
public interface GlobalZoneAsyncClient extends ZoneAsyncClient {
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/35a44243/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalZoneClient.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalZoneClient.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalZoneClient.java
index 2de68a5..436148d 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalZoneClient.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalZoneClient.java
@@ -25,11 +25,13 @@ import org.jclouds.cloudstack.options.UpdateZoneOptions;
* Provides synchronous access to CloudStack Zone features available to Global
* Admin users.
*
+ * @deprecated The *Client classes will be replaced with the *Api classes in jclouds 1.7.
* @author Andrei Savu
* @see <a href=
* "http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_Global_Admin.html"
* />
*/
+@Deprecated
public interface GlobalZoneClient extends ZoneClient {
/**
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/35a44243/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GuestOSApi.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GuestOSApi.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GuestOSApi.java
new file mode 100644
index 0000000..4e18d26
--- /dev/null
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GuestOSApi.java
@@ -0,0 +1,32 @@
+/*
+ * 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 org.jclouds.cloudstack.features;
+
+import java.util.Set;
+
+/**
+ * Provides synchronous access to CloudStack Guest OS features.
+ * <p/>
+ *
+ * Note that this class is transitionary and will fully replace GuestOSClient in 1.7.
+ *
+ * @see <a href="http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_User.html" />
+ * @author Adrian Cole
+ */
+public interface GuestOSApi extends GuestOSClient {
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/35a44243/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GuestOSAsyncApi.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GuestOSAsyncApi.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GuestOSAsyncApi.java
new file mode 100644
index 0000000..91a1bcd
--- /dev/null
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GuestOSAsyncApi.java
@@ -0,0 +1,52 @@
+/*
+ * 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 org.jclouds.cloudstack.features;
+
+import java.util.Set;
+
+import javax.inject.Named;
+import javax.ws.rs.Consumes;
+import javax.ws.rs.GET;
+import javax.ws.rs.QueryParam;
+import javax.ws.rs.core.MediaType;
+
+import org.jclouds.Fallbacks.EmptySetOnNotFoundOr404;
+import org.jclouds.Fallbacks.NullOnNotFoundOr404;
+import org.jclouds.cloudstack.filters.AuthenticationFilter;
+import org.jclouds.rest.annotations.Fallback;
+import org.jclouds.rest.annotations.OnlyElement;
+import org.jclouds.rest.annotations.QueryParams;
+import org.jclouds.rest.annotations.RequestFilters;
+import org.jclouds.rest.annotations.SelectJson;
+
+import com.google.common.util.concurrent.ListenableFuture;
+
+/**
+ * Provides asynchronous access to cloudstack via their REST API.
+ * <p/>
+ *
+ * @deprecated This class will be removed in 1.7.
+ * @see GuestOSApi
+ * @see <a href="http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_User.html" />
+ * @author Adrian Cole
+ */
+@Deprecated
+@RequestFilters(AuthenticationFilter.class)
+@QueryParams(keys = "response", values = "json")
+public interface GuestOSAsyncApi extends GuestOSAsyncClient {
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/35a44243/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GuestOSAsyncClient.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GuestOSAsyncClient.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GuestOSAsyncClient.java
index 4e3d9c7..e47f7fd 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GuestOSAsyncClient.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GuestOSAsyncClient.java
@@ -45,10 +45,12 @@ import com.google.common.util.concurrent.ListenableFuture;
* Provides asynchronous access to cloudstack via their REST API.
* <p/>
*
+ * @deprecated The async interface will be removed in jclouds 1.7.
* @see AsyncJobClient
* @see <a href="http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_User.html" />
* @author Adrian Cole
*/
+@Deprecated
@RequestFilters(AuthenticationFilter.class)
@QueryParams(keys = "response", values = "json")
public interface GuestOSAsyncClient {
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/35a44243/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GuestOSClient.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GuestOSClient.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GuestOSClient.java
index 8baab8a..ec4ce5c 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GuestOSClient.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GuestOSClient.java
@@ -25,10 +25,12 @@ import org.jclouds.cloudstack.options.ListOSTypesOptions;
* Provides synchronous access to CloudStack Operating System features.
* <p/>
*
+ * @deprecated The *Client classes will be replaced with the *Api classes in jclouds 1.7.
* @see GuestOSAsyncClient
* @see <a href="http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_User.html" />
* @author Adrian Cole
*/
+@Deprecated
public interface GuestOSClient {
/**
* Lists all supported OS types for this cloud.
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/35a44243/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/HypervisorApi.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/HypervisorApi.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/HypervisorApi.java
new file mode 100644
index 0000000..1fea761
--- /dev/null
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/HypervisorApi.java
@@ -0,0 +1,32 @@
+/*
+ * 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 org.jclouds.cloudstack.features;
+
+import java.util.Set;
+
+/**
+ * Provides synchronous access to CloudStack Hypervisor features.
+ * <p/>
+ *
+ * Note that this class is transitionary and will fully replace HypervisorClient in 1.7.
+ *
+ * @see <a href="http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_User.html" />
+ * @author Adrian Cole
+ */
+public interface HypervisorApi extends HypervisorClient {
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/35a44243/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/HypervisorAsyncApi.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/HypervisorAsyncApi.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/HypervisorAsyncApi.java
new file mode 100644
index 0000000..c834ae4
--- /dev/null
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/HypervisorAsyncApi.java
@@ -0,0 +1,52 @@
+/*
+ * 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 org.jclouds.cloudstack.features;
+
+import java.util.Set;
+
+import javax.inject.Named;
+import javax.ws.rs.Consumes;
+import javax.ws.rs.GET;
+import javax.ws.rs.QueryParam;
+import javax.ws.rs.core.MediaType;
+
+import org.jclouds.Fallbacks.EmptySetOnNotFoundOr404;
+import org.jclouds.Fallbacks.NullOnNotFoundOr404;
+import org.jclouds.cloudstack.filters.AuthenticationFilter;
+import org.jclouds.rest.annotations.Fallback;
+import org.jclouds.rest.annotations.OnlyElement;
+import org.jclouds.rest.annotations.QueryParams;
+import org.jclouds.rest.annotations.RequestFilters;
+import org.jclouds.rest.annotations.SelectJson;
+
+import com.google.common.util.concurrent.ListenableFuture;
+
+/**
+ * Provides asynchronous access to cloudstack via their REST API.
+ * <p/>
+ *
+ * @deprecated This class will be removed in 1.7.
+ * @see HypervisorApi
+ * @see <a href="http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_User.html" />
+ * @author Adrian Cole
+ */
+@Deprecated
+@RequestFilters(AuthenticationFilter.class)
+@QueryParams(keys = "response", values = "json")
+public interface HypervisorAsyncApi extends HypervisorAsyncClient {
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/35a44243/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/HypervisorAsyncClient.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/HypervisorAsyncClient.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/HypervisorAsyncClient.java
index 71a2f7f..a2529b7 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/HypervisorAsyncClient.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/HypervisorAsyncClient.java
@@ -36,10 +36,12 @@ import com.google.common.util.concurrent.ListenableFuture;
* Provides asynchronous access to cloudstack via their REST API.
* <p/>
*
+ * @deprecated The async interface will be removed in jclouds 1.7.
* @see AsyncJobClient
* @see <a href="http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_User.html" />
* @author Adrian Cole
*/
+@Deprecated
@RequestFilters(AuthenticationFilter.class)
@QueryParams(keys = "response", values = "json")
public interface HypervisorAsyncClient {
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/35a44243/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/HypervisorClient.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/HypervisorClient.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/HypervisorClient.java
index 3fa89d8..82f2a8b 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/HypervisorClient.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/HypervisorClient.java
@@ -21,10 +21,12 @@ import java.util.Set;
* Provides synchronous access to CloudStack Operating System features.
* <p/>
*
+ * @deprecated The *Client classes will be replaced with the *Api classes in jclouds 1.7.
* @see GuestOSAsyncClient
* @see <a href="http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_User.html" />
* @author Adrian Cole
*/
+@Deprecated
public interface HypervisorClient {
/**
* Lists all supported hypervisors for this cloud.
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/35a44243/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/ISOApi.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/ISOApi.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/ISOApi.java
new file mode 100644
index 0000000..dcd5dd7
--- /dev/null
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/ISOApi.java
@@ -0,0 +1,33 @@
+/*
+ * 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 org.jclouds.cloudstack.features;
+
+import java.util.Set;
+import org.jclouds.cloudstack.domain.ISO;
+
+/**
+ * Provides synchronous access to CloudStack Account features.
+ * <p/>
+ *
+ * Note that this class is transitionary and will fully replace ISOClient in 1.7.
+ *
+ * @see <a href="http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_User.html" />
+ * @author Adrian Cole
+ */
+public interface ISOApi extends ISOClient {
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/35a44243/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/ISOAsyncApi.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/ISOAsyncApi.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/ISOAsyncApi.java
new file mode 100644
index 0000000..39fb619
--- /dev/null
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/ISOAsyncApi.java
@@ -0,0 +1,53 @@
+/*
+ * 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 org.jclouds.cloudstack.features;
+
+import java.util.Set;
+
+import javax.inject.Named;
+import javax.ws.rs.Consumes;
+import javax.ws.rs.GET;
+import javax.ws.rs.QueryParam;
+import javax.ws.rs.core.MediaType;
+
+import org.jclouds.Fallbacks.EmptySetOnNotFoundOr404;
+import org.jclouds.Fallbacks.NullOnNotFoundOr404;
+import org.jclouds.cloudstack.domain.ISO;
+import org.jclouds.cloudstack.filters.AuthenticationFilter;
+import org.jclouds.rest.annotations.Fallback;
+import org.jclouds.rest.annotations.OnlyElement;
+import org.jclouds.rest.annotations.QueryParams;
+import org.jclouds.rest.annotations.RequestFilters;
+import org.jclouds.rest.annotations.SelectJson;
+
+import com.google.common.util.concurrent.ListenableFuture;
+
+/**
+ * Provides asynchronous access to cloudstack via their REST API.
+ * <p/>
+ *
+ * @deprecated This class will be removed in 1.7.
+ * @see ISOApi
+ * @see <a href="http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_User.html" />
+ * @author Adrian Cole
+ */
+@Deprecated
+@RequestFilters(AuthenticationFilter.class)
+@QueryParams(keys = "response", values = "json")
+public interface ISOAsyncApi extends ISOAsyncClient {
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/35a44243/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/ISOAsyncClient.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/ISOAsyncClient.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/ISOAsyncClient.java
index 03bd58b..6f285d2 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/ISOAsyncClient.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/ISOAsyncClient.java
@@ -51,10 +51,12 @@ import com.google.common.util.concurrent.ListenableFuture;
*
* <p/>
*
+ * @deprecated The async interface will be removed in jclouds 1.7.
* @see ISOClient
* @see http://download.cloud.com/releases/2.2.12/api/TOC_User.html
* @author Richard Downer
*/
+@Deprecated
@RequestFilters(AuthenticationFilter.class)
@QueryParams(keys = "response", values = "json")
public interface ISOAsyncClient {
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/35a44243/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/ISOClient.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/ISOClient.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/ISOClient.java
index 660a190..697558d 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/ISOClient.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/ISOClient.java
@@ -33,10 +33,12 @@ import org.jclouds.cloudstack.options.UpdateISOPermissionsOptions;
*
* <p/>
*
+ * @deprecated The *Client classes will be replaced with the *Api classes in jclouds 1.7.
* @see ISOAsyncClient
* @see http://download.cloud.com/releases/2.2.12/api/TOC_User.html
* @author Richard Downer
*/
+@Deprecated
public interface ISOClient {
/**
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/35a44243/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/LimitApi.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/LimitApi.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/LimitApi.java
new file mode 100644
index 0000000..582cc53
--- /dev/null
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/LimitApi.java
@@ -0,0 +1,32 @@
+/*
+ * 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 org.jclouds.cloudstack.features;
+
+import java.util.Set;
+
+/**
+ * Provides synchronous access to CloudStack Limit features.
+ * <p/>
+ *
+ * Note that this class is transitionary and will fully replace LimitClient in 1.7.
+ *
+ * @see <a href="http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_User.html" />
+ * @author Adrian Cole
+ */
+public interface LimitApi extends LimitClient {
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/35a44243/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/LimitAsyncApi.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/LimitAsyncApi.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/LimitAsyncApi.java
new file mode 100644
index 0000000..3a9e427
--- /dev/null
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/LimitAsyncApi.java
@@ -0,0 +1,52 @@
+/*
+ * 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 org.jclouds.cloudstack.features;
+
+import java.util.Set;
+
+import javax.inject.Named;
+import javax.ws.rs.Consumes;
+import javax.ws.rs.GET;
+import javax.ws.rs.QueryParam;
+import javax.ws.rs.core.MediaType;
+
+import org.jclouds.Fallbacks.EmptySetOnNotFoundOr404;
+import org.jclouds.Fallbacks.NullOnNotFoundOr404;
+import org.jclouds.cloudstack.filters.AuthenticationFilter;
+import org.jclouds.rest.annotations.Fallback;
+import org.jclouds.rest.annotations.OnlyElement;
+import org.jclouds.rest.annotations.QueryParams;
+import org.jclouds.rest.annotations.RequestFilters;
+import org.jclouds.rest.annotations.SelectJson;
+
+import com.google.common.util.concurrent.ListenableFuture;
+
+/**
+ * Provides asynchronous access to cloudstack via their REST API.
+ * <p/>
+ *
+ * @deprecated This class will be removed in 1.7.
+ * @see LimitApi
+ * @see <a href="http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_User.html" />
+ * @author Adrian Cole
+ */
+@Deprecated
+@RequestFilters(AuthenticationFilter.class)
+@QueryParams(keys = "response", values = "json")
+public interface LimitAsyncApi extends LimitAsyncClient {
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/35a44243/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/LimitAsyncClient.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/LimitAsyncClient.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/LimitAsyncClient.java
index becd520..d9fdc49 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/LimitAsyncClient.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/LimitAsyncClient.java
@@ -37,11 +37,13 @@ import com.google.common.util.concurrent.ListenableFuture;
/**
* Provides asynchronous access to CloudStack SSHKeyPair features.
*
+ * @deprecated The async interface will be removed in jclouds 1.7.
* @author Vijay Kiran
* @see <a
* href="http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_User.html"
* />
*/
+@Deprecated
@RequestFilters(AuthenticationFilter.class)
@QueryParams(keys = "response", values = "json")
public interface LimitAsyncClient {
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/35a44243/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/LimitClient.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/LimitClient.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/LimitClient.java
index c6b8d90..90f80f4 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/LimitClient.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/LimitClient.java
@@ -23,11 +23,13 @@ import org.jclouds.cloudstack.options.ListResourceLimitsOptions;
/**
* Provides synchronous access to CloudStack resource limit API.
*
+ * @deprecated The *Client classes will be replaced with the *Api classes in jclouds 1.7.
* @author Vijay Kiran
* @see <a
* href="http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_User.html"
* />
*/
+@Deprecated
public interface LimitClient {
/**
* List the resource limits.
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/35a44243/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/LoadBalancerApi.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/LoadBalancerApi.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/LoadBalancerApi.java
new file mode 100644
index 0000000..d977dbe
--- /dev/null
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/LoadBalancerApi.java
@@ -0,0 +1,32 @@
+/*
+ * 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 org.jclouds.cloudstack.features;
+
+import java.util.Set;
+
+/**
+ * Provides synchronous access to CloudStack Load Balancerfeatures.
+ * <p/>
+ *
+ * Note that this class is transitionary and will fully replace LoadBalancerClient in 1.7.
+ *
+ * @see <a href="http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_User.html" />
+ * @author Adrian Cole
+ */
+public interface LoadBalancerApi extends LoadBalancerClient {
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/35a44243/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/LoadBalancerAsyncApi.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/LoadBalancerAsyncApi.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/LoadBalancerAsyncApi.java
new file mode 100644
index 0000000..809f0d2
--- /dev/null
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/LoadBalancerAsyncApi.java
@@ -0,0 +1,52 @@
+/*
+ * 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 org.jclouds.cloudstack.features;
+
+import java.util.Set;
+
+import javax.inject.Named;
+import javax.ws.rs.Consumes;
+import javax.ws.rs.GET;
+import javax.ws.rs.QueryParam;
+import javax.ws.rs.core.MediaType;
+
+import org.jclouds.Fallbacks.EmptySetOnNotFoundOr404;
+import org.jclouds.Fallbacks.NullOnNotFoundOr404;
+import org.jclouds.cloudstack.filters.AuthenticationFilter;
+import org.jclouds.rest.annotations.Fallback;
+import org.jclouds.rest.annotations.OnlyElement;
+import org.jclouds.rest.annotations.QueryParams;
+import org.jclouds.rest.annotations.RequestFilters;
+import org.jclouds.rest.annotations.SelectJson;
+
+import com.google.common.util.concurrent.ListenableFuture;
+
+/**
+ * Provides asynchronous access to cloudstack via their REST API.
+ * <p/>
+ *
+ * @deprecated This class will be removed in 1.7.
+ * @see LoadBalancerApi
+ * @see <a href="http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_User.html" />
+ * @author Adrian Cole
+ */
+@Deprecated
+@RequestFilters(AuthenticationFilter.class)
+@QueryParams(keys = "response", values = "json")
+public interface LoadBalancerAsyncApi extends LoadBalancerAsyncClient {
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/35a44243/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/LoadBalancerAsyncClient.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/LoadBalancerAsyncClient.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/LoadBalancerAsyncClient.java
index 34de82a..c5d694b 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/LoadBalancerAsyncClient.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/LoadBalancerAsyncClient.java
@@ -47,10 +47,12 @@ import com.google.common.util.concurrent.ListenableFuture;
* Provides asynchronous access to cloudstack via their REST API.
* <p/>
*
+ * @deprecated The async interface will be removed in jclouds 1.7.
* @see LoadBalancerClient
* @see <a href="http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_User.html" />
* @author Adrian Cole
*/
+@Deprecated
@RequestFilters(AuthenticationFilter.class)
@QueryParams(keys = "response", values = "json")
public interface LoadBalancerAsyncClient {
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/35a44243/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/LoadBalancerClient.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/LoadBalancerClient.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/LoadBalancerClient.java
index 0552c99..7c25d8a 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/LoadBalancerClient.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/LoadBalancerClient.java
@@ -28,10 +28,12 @@ import org.jclouds.cloudstack.options.UpdateLoadBalancerRuleOptions;
* Provides synchronous access to CloudStack LoadBalancer features.
* <p/>
*
+ * @deprecated The *Client classes will be replaced with the *Api classes in jclouds 1.7.
* @see LoadBalancerAsyncClient
* @see <a href="http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_User.html" />
* @author Adrian Cole
*/
+@Deprecated
public interface LoadBalancerClient {
/**
* List the load balancer rules
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/35a44243/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/NATApi.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/NATApi.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/NATApi.java
new file mode 100644
index 0000000..cbcb8a7
--- /dev/null
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/NATApi.java
@@ -0,0 +1,32 @@
+/*
+ * 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 org.jclouds.cloudstack.features;
+
+import java.util.Set;
+
+/**
+ * Provides synchronous access to CloudStack NAT features.
+ * <p/>
+ *
+ * Note that this class is transitionary and will fully replace NATClient in 1.7.
+ *
+ * @see <a href="http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_User.html" />
+ * @author Adrian Cole
+ */
+public interface NATApi extends NATClient {
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/35a44243/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/NATAsyncApi.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/NATAsyncApi.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/NATAsyncApi.java
new file mode 100644
index 0000000..b6a5bef
--- /dev/null
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/NATAsyncApi.java
@@ -0,0 +1,52 @@
+/*
+ * 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 org.jclouds.cloudstack.features;
+
+import java.util.Set;
+
+import javax.inject.Named;
+import javax.ws.rs.Consumes;
+import javax.ws.rs.GET;
+import javax.ws.rs.QueryParam;
+import javax.ws.rs.core.MediaType;
+
+import org.jclouds.Fallbacks.EmptySetOnNotFoundOr404;
+import org.jclouds.Fallbacks.NullOnNotFoundOr404;
+import org.jclouds.cloudstack.filters.AuthenticationFilter;
+import org.jclouds.rest.annotations.Fallback;
+import org.jclouds.rest.annotations.OnlyElement;
+import org.jclouds.rest.annotations.QueryParams;
+import org.jclouds.rest.annotations.RequestFilters;
+import org.jclouds.rest.annotations.SelectJson;
+
+import com.google.common.util.concurrent.ListenableFuture;
+
+/**
+ * Provides asynchronous access to cloudstack via their REST API.
+ * <p/>
+ *
+ * @deprecated This class will be removed in 1.7.
+ * @see NATApi
+ * @see <a href="http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_User.html" />
+ * @author Adrian Cole
+ */
+@Deprecated
+@RequestFilters(AuthenticationFilter.class)
+@QueryParams(keys = "response", values = "json")
+public interface NATAsyncApi extends NATAsyncClient {
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/35a44243/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/NATAsyncClient.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/NATAsyncClient.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/NATAsyncClient.java
index ed7ff5f..76ba674 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/NATAsyncClient.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/NATAsyncClient.java
@@ -44,12 +44,14 @@ import com.google.common.util.concurrent.ListenableFuture;
* Provides asynchronous access to cloudstack via their REST API.
* <p/>
*
+ * @deprecated The async interface will be removed in jclouds 1.7.
* @see NATClient
* @see <a
* href="http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_User.html"
* />
* @author Adrian Cole
*/
+@Deprecated
@RequestFilters(AuthenticationFilter.class)
@QueryParams(keys = "response", values = "json")
public interface NATAsyncClient {
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/35a44243/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/NATClient.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/NATClient.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/NATClient.java
index ec6a7a2..0373714 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/NATClient.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/NATClient.java
@@ -26,12 +26,14 @@ import org.jclouds.cloudstack.options.ListIPForwardingRulesOptions;
* Provides synchronous access to CloudStack IPForwardingRule features.
* <p/>
*
+ * @deprecated The *Client classes will be replaced with the *Api classes in jclouds 1.7.
* @see NATAsyncClient
* @see <a
* href="http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_User.html"
* />
* @author Adrian Cole
*/
+@Deprecated
public interface NATClient {
/**
* List the ip forwarding rules
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/35a44243/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/NetworkApi.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/NetworkApi.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/NetworkApi.java
new file mode 100644
index 0000000..ce75bb7
--- /dev/null
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/NetworkApi.java
@@ -0,0 +1,33 @@
+/*
+ * 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 org.jclouds.cloudstack.features;
+
+import java.util.Set;
+import org.jclouds.cloudstack.domain.Network;
+
+/**
+ * Provides synchronous access to CloudStack Account features.
+ * <p/>
+ *
+ * Note that this class is transitionary and will fully replace NetworkClient in 1.7.
+ *
+ * @see <a href="http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_User.html" />
+ * @author Adrian Cole
+ */
+public interface NetworkApi extends NetworkClient {
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/35a44243/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/NetworkAsyncApi.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/NetworkAsyncApi.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/NetworkAsyncApi.java
new file mode 100644
index 0000000..4001557
--- /dev/null
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/NetworkAsyncApi.java
@@ -0,0 +1,53 @@
+/*
+ * 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 org.jclouds.cloudstack.features;
+
+import java.util.Set;
+
+import javax.inject.Named;
+import javax.ws.rs.Consumes;
+import javax.ws.rs.GET;
+import javax.ws.rs.QueryParam;
+import javax.ws.rs.core.MediaType;
+
+import org.jclouds.Fallbacks.EmptySetOnNotFoundOr404;
+import org.jclouds.Fallbacks.NullOnNotFoundOr404;
+import org.jclouds.cloudstack.domain.Network;
+import org.jclouds.cloudstack.filters.AuthenticationFilter;
+import org.jclouds.rest.annotations.Fallback;
+import org.jclouds.rest.annotations.OnlyElement;
+import org.jclouds.rest.annotations.QueryParams;
+import org.jclouds.rest.annotations.RequestFilters;
+import org.jclouds.rest.annotations.SelectJson;
+
+import com.google.common.util.concurrent.ListenableFuture;
+
+/**
+ * Provides asynchronous access to cloudstack via their REST API.
+ * <p/>
+ *
+ * @deprecated This class will be removed in 1.7.
+ * @see NetworkApi
+ * @see <a href="http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_User.html" />
+ * @author Adrian Cole
+ */
+@Deprecated
+@RequestFilters(AuthenticationFilter.class)
+@QueryParams(keys = "response", values = "json")
+public interface NetworkAsyncApi extends NetworkAsyncClient {
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/35a44243/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/NetworkAsyncClient.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/NetworkAsyncClient.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/NetworkAsyncClient.java
index 8d40de8..87d4973 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/NetworkAsyncClient.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/NetworkAsyncClient.java
@@ -42,10 +42,12 @@ import com.google.common.util.concurrent.ListenableFuture;
* Provides asynchronous access to cloudstack via their REST API.
* <p/>
*
+ * @deprecated The async interface will be removed in jclouds 1.7.
* @see NetworkClient
* @see <a href="http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_User.html" />
* @author Adrian Cole
*/
+@Deprecated
@RequestFilters(AuthenticationFilter.class)
@QueryParams(keys = "response", values = "json")
public interface NetworkAsyncClient {
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/35a44243/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/NetworkClient.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/NetworkClient.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/NetworkClient.java
index 821a64a..ec949f6 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/NetworkClient.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/NetworkClient.java
@@ -25,10 +25,12 @@ import org.jclouds.cloudstack.options.ListNetworksOptions;
* Provides synchronous access to CloudStack network features.
* <p/>
*
+ * @deprecated The *Client classes will be replaced with the *Api classes in jclouds 1.7.
* @see NetworkAsyncClient
* @see <a href="http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_User.html" />
* @author Adrian Cole
*/
+@Deprecated
public interface NetworkClient {
/**
* Lists networks
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/35a44243/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/OfferingApi.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/OfferingApi.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/OfferingApi.java
new file mode 100644
index 0000000..92f7702
--- /dev/null
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/OfferingApi.java
@@ -0,0 +1,32 @@
+/*
+ * 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 org.jclouds.cloudstack.features;
+
+import java.util.Set;
+
+/**
+ * Provides synchronous access to CloudStack Offering features.
+ * <p/>
+ *
+ * Note that this class is transitionary and will fully replace OfferingClient in 1.7.
+ *
+ * @see <a href="http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_User.html" />
+ * @author Adrian Cole
+ */
+public interface OfferingApi extends OfferingClient {
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/35a44243/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/OfferingAsyncApi.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/OfferingAsyncApi.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/OfferingAsyncApi.java
new file mode 100644
index 0000000..d61006c
--- /dev/null
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/OfferingAsyncApi.java
@@ -0,0 +1,52 @@
+/*
+ * 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 org.jclouds.cloudstack.features;
+
+import java.util.Set;
+
+import javax.inject.Named;
+import javax.ws.rs.Consumes;
+import javax.ws.rs.GET;
+import javax.ws.rs.QueryParam;
+import javax.ws.rs.core.MediaType;
+
+import org.jclouds.Fallbacks.EmptySetOnNotFoundOr404;
+import org.jclouds.Fallbacks.NullOnNotFoundOr404;
+import org.jclouds.cloudstack.filters.AuthenticationFilter;
+import org.jclouds.rest.annotations.Fallback;
+import org.jclouds.rest.annotations.OnlyElement;
+import org.jclouds.rest.annotations.QueryParams;
+import org.jclouds.rest.annotations.RequestFilters;
+import org.jclouds.rest.annotations.SelectJson;
+
+import com.google.common.util.concurrent.ListenableFuture;
+
+/**
+ * Provides asynchronous access to cloudstack via their REST API.
+ * <p/>
+ *
+ * @deprecated This class will be removed in 1.7.
+ * @see OfferingApi
+ * @see <a href="http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_User.html" />
+ * @author Adrian Cole
+ */
+@Deprecated
+@RequestFilters(AuthenticationFilter.class)
+@QueryParams(keys = "response", values = "json")
+public interface OfferingAsyncApi extends OfferingAsyncClient {
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/35a44243/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/OfferingAsyncClient.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/OfferingAsyncClient.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/OfferingAsyncClient.java
index 8c4b4f0..cd8ed2d 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/OfferingAsyncClient.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/OfferingAsyncClient.java
@@ -45,10 +45,12 @@ import com.google.common.util.concurrent.ListenableFuture;
* Provides asynchronous access to cloudstack via their REST API.
* <p/>
*
+ * @deprecated The async interface will be removed in jclouds 1.7.
* @see OfferingClient
* @see <a href="http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_User.html" />
* @author Adrian Cole
*/
+@Deprecated
@RequestFilters(AuthenticationFilter.class)
@QueryParams(keys = "response", values = "json")
public interface OfferingAsyncClient {
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/35a44243/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/OfferingClient.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/OfferingClient.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/OfferingClient.java
index 72ea088..bac5b2f 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/OfferingClient.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/OfferingClient.java
@@ -28,10 +28,12 @@ import org.jclouds.cloudstack.options.ListServiceOfferingsOptions;
* Provides synchronous access to CloudStack zone features.
* <p/>
*
+ * @deprecated The *Client classes will be replaced with the *Api classes in jclouds 1.7.
* @see OfferingAsyncClient
* @see <a href="http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_User.html" />
* @author Adrian Cole
*/
+@Deprecated
public interface OfferingClient {
/**
* Lists service offerings
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/35a44243/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/SSHKeyPairApi.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/SSHKeyPairApi.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/SSHKeyPairApi.java
new file mode 100644
index 0000000..16b50dd
--- /dev/null
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/SSHKeyPairApi.java
@@ -0,0 +1,32 @@
+/*
+ * 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 org.jclouds.cloudstack.features;
+
+import java.util.Set;
+
+/**
+ * Provides synchronous access to CloudStack SSH Keypair features.
+ * <p/>
+ *
+ * Note that this class is transitionary and will fully replace SSHKeyPairClient in 1.7.
+ *
+ * @see <a href="http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_User.html" />
+ * @author Adrian Cole
+ */
+public interface SSHKeyPairApi extends SSHKeyPairClient {
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/35a44243/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/SSHKeyPairAsyncApi.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/SSHKeyPairAsyncApi.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/SSHKeyPairAsyncApi.java
new file mode 100644
index 0000000..9a4f056
--- /dev/null
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/SSHKeyPairAsyncApi.java
@@ -0,0 +1,52 @@
+/*
+ * 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 org.jclouds.cloudstack.features;
+
+import java.util.Set;
+
+import javax.inject.Named;
+import javax.ws.rs.Consumes;
+import javax.ws.rs.GET;
+import javax.ws.rs.QueryParam;
+import javax.ws.rs.core.MediaType;
+
+import org.jclouds.Fallbacks.EmptySetOnNotFoundOr404;
+import org.jclouds.Fallbacks.NullOnNotFoundOr404;
+import org.jclouds.cloudstack.filters.AuthenticationFilter;
+import org.jclouds.rest.annotations.Fallback;
+import org.jclouds.rest.annotations.OnlyElement;
+import org.jclouds.rest.annotations.QueryParams;
+import org.jclouds.rest.annotations.RequestFilters;
+import org.jclouds.rest.annotations.SelectJson;
+
+import com.google.common.util.concurrent.ListenableFuture;
+
+/**
+ * Provides asynchronous access to cloudstack via their REST API.
+ * <p/>
+ *
+ * @deprecated This class will be removed in 1.7.
+ * @see SSHKeyPairApi
+ * @see <a href="http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_User.html" />
+ * @author Adrian Cole
+ */
+@Deprecated
+@RequestFilters(AuthenticationFilter.class)
+@QueryParams(keys = "response", values = "json")
+public interface SSHKeyPairAsyncApi extends SSHKeyPairAsyncClient {
+
+}