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:38 UTC
[3/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/DomainDomainApi.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/DomainDomainApi.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/DomainDomainApi.java
new file mode 100644
index 0000000..591aaeb
--- /dev/null
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/DomainDomainApi.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 Domain features.
+ * <p/>
+ *
+ * Note that this class is transitionary and will fully replace DomainDomainClient 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 DomainDomainApi extends DomainDomainClient {
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/35a44243/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/DomainDomainAsyncApi.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/DomainDomainAsyncApi.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/DomainDomainAsyncApi.java
new file mode 100644
index 0000000..4982b87
--- /dev/null
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/DomainDomainAsyncApi.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 DomainDomainApi
+ * @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 DomainDomainAsyncApi extends DomainDomainAsyncClient {
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/35a44243/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/DomainDomainAsyncClient.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/DomainDomainAsyncClient.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/DomainDomainAsyncClient.java
index fc499a1..56f799c 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/DomainDomainAsyncClient.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/DomainDomainAsyncClient.java
@@ -42,11 +42,13 @@ import com.google.common.util.concurrent.ListenableFuture;
* Provides asynchronous access to CloudStack Domain features available to Domain
* 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_Domain_Admin.html"
* />
*/
+@Deprecated
@RequestFilters(AuthenticationFilter.class)
@QueryParams(keys = "response", values = "json")
public interface DomainDomainAsyncClient {
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/35a44243/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/DomainDomainClient.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/DomainDomainClient.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/DomainDomainClient.java
index bdf2c27..352bb6c 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/DomainDomainClient.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/DomainDomainClient.java
@@ -25,11 +25,13 @@ import org.jclouds.cloudstack.options.ListDomainsOptions;
* Provides synchronous access to CloudStack Domain features available to Domain
* 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_Domain_Admin.html"
* />
*/
+@Deprecated
public interface DomainDomainClient {
/**
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/35a44243/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/DomainLimitApi.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/DomainLimitApi.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/DomainLimitApi.java
new file mode 100644
index 0000000..dfa5cd3
--- /dev/null
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/DomainLimitApi.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 DomainLimitClient 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 DomainLimitApi extends DomainLimitClient, LimitApi {
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/35a44243/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/DomainLimitAsyncApi.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/DomainLimitAsyncApi.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/DomainLimitAsyncApi.java
new file mode 100644
index 0000000..f918e2f
--- /dev/null
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/DomainLimitAsyncApi.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 DomainLimitApi
+ * @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 DomainLimitAsyncApi extends DomainLimitAsyncClient, LimitAsyncApi {
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/35a44243/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/DomainLimitAsyncClient.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/DomainLimitAsyncClient.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/DomainLimitAsyncClient.java
index 881fae7..df7176c 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/DomainLimitAsyncClient.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/DomainLimitAsyncClient.java
@@ -35,11 +35,13 @@ import com.google.common.util.concurrent.ListenableFuture;
* Provides asynchronous access to CloudStack Limit features available to Domain
* Admin users.
*
+ * @deprecated The async interface will be removed in jclouds 1.7.
* @author Adrian Cole
* @see <a href=
* "http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_Domain_Admin.html"
* />
*/
+@Deprecated
@RequestFilters(AuthenticationFilter.class)
@QueryParams(keys = "response", values = "json")
public interface DomainLimitAsyncClient extends LimitAsyncClient {
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/35a44243/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/DomainLimitClient.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/DomainLimitClient.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/DomainLimitClient.java
index d3e8d07..38b1175 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/DomainLimitClient.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/DomainLimitClient.java
@@ -22,11 +22,13 @@ import org.jclouds.cloudstack.domain.ResourceLimit;
* Provides synchronous access to CloudStack Limit features available to Domain
* Admin users.
*
+ * @deprecated The *Client classes will be replaced with the *Api classes in jclouds 1.7.
* @author Adrian Cole
* @see <a href=
* "http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_Domain_Admin.html"
* />
*/
+@Deprecated
public interface DomainLimitClient extends LimitClient {
/**
* Updates resource limits for an account in a domain.
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/35a44243/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/DomainUserApi.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/DomainUserApi.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/DomainUserApi.java
new file mode 100644
index 0000000..4afe07a
--- /dev/null
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/DomainUserApi.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 Userfeatures.
+ * <p/>
+ *
+ * Note that this class is transitionary and will fully replace DomainUserClient 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 DomainUserApi extends DomainUserClient {
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/35a44243/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/DomainUserAsyncApi.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/DomainUserAsyncApi.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/DomainUserAsyncApi.java
new file mode 100644
index 0000000..dc9210d
--- /dev/null
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/DomainUserAsyncApi.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 DomainUserApi
+ * @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 DomainUserAsyncApi extends DomainUserAsyncClient {
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/35a44243/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/DomainUserAsyncClient.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/DomainUserAsyncClient.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/DomainUserAsyncClient.java
index a5d42a5..338b998 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/DomainUserAsyncClient.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/DomainUserAsyncClient.java
@@ -42,11 +42,13 @@ import com.google.common.util.concurrent.ListenableFuture;
* Provides asynchronous access to CloudStack User features available to Domain
* 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_Domain_Admin.html"
* />
*/
+@Deprecated
@RequestFilters(AuthenticationFilter.class)
@QueryParams(keys = "response", values = "json")
public interface DomainUserAsyncClient {
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/35a44243/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/DomainUserClient.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/DomainUserClient.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/DomainUserClient.java
index f1eeed0..0e550b2 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/DomainUserClient.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/DomainUserClient.java
@@ -25,11 +25,13 @@ import org.jclouds.cloudstack.options.ListUsersOptions;
* Provides synchronous access to CloudStack User features available to Domain
* 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_Domain_Admin.html"
* />
*/
+@Deprecated
public interface DomainUserClient {
/**
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/35a44243/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/EventApi.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/EventApi.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/EventApi.java
new file mode 100644
index 0000000..4284b56
--- /dev/null
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/EventApi.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.Event;
+
+/**
+ * Provides synchronous access to CloudStack Account features.
+ * <p/>
+ *
+ * Note that this class is transitionary and will fully replace EventClient 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 EventApi extends EventClient {
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/35a44243/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/EventAsyncApi.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/EventAsyncApi.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/EventAsyncApi.java
new file mode 100644
index 0000000..9af1015
--- /dev/null
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/EventAsyncApi.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.Event;
+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 EventApi
+ * @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 EventAsyncApi extends EventAsyncClient {
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/35a44243/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/EventAsyncClient.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/EventAsyncClient.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/EventAsyncClient.java
index 4911cb4..f9cb6d3 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/EventAsyncClient.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/EventAsyncClient.java
@@ -40,10 +40,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.
* @author Vijay Kiran
* @see org.jclouds.cloudstack.features.AccountClient
* @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", "listAll" }, values = { "json", "true" })
public interface EventAsyncClient {
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/35a44243/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/EventClient.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/EventClient.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/EventClient.java
index dc598c4..d172fd0 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/EventClient.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/EventClient.java
@@ -24,9 +24,11 @@ import org.jclouds.cloudstack.options.ListEventsOptions;
* Provides synchronous access to CloudStack Event features.
* <p/>
*
+ * @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 EventClient {
/**
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/35a44243/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/FirewallApi.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/FirewallApi.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/FirewallApi.java
new file mode 100644
index 0000000..7acbe44
--- /dev/null
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/FirewallApi.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 Firewall features.
+ * <p/>
+ *
+ * Note that this class is transitionary and will fully replace FirewallClient 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 FirewallApi extends FirewallClient {
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/35a44243/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/FirewallAsyncApi.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/FirewallAsyncApi.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/FirewallAsyncApi.java
new file mode 100644
index 0000000..b3a5215
--- /dev/null
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/FirewallAsyncApi.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 FirewallApi
+ * @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 FirewallAsyncApi extends FirewallAsyncClient {
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/35a44243/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/FirewallAsyncClient.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/FirewallAsyncClient.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/FirewallAsyncClient.java
index b4c5ee2..dafcedd 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/FirewallAsyncClient.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/FirewallAsyncClient.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.
* @author Adrian Cole
* @see FirewallClient
* @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 FirewallAsyncClient {
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/35a44243/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/FirewallClient.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/FirewallClient.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/FirewallClient.java
index 99f45af..ef7116c 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/FirewallClient.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/FirewallClient.java
@@ -28,10 +28,12 @@ import org.jclouds.cloudstack.options.ListPortForwardingRulesOptions;
* Provides synchronous access to CloudStack PortForwardingRule features.
* <p/>
*
+ * @deprecated The *Client classes will be replaced with the *Api classes in jclouds 1.7.
* @see PortForwardingRuleAsyncClient
* @see <a href="http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_User.html" />
* @author Adrian Cole
*/
+@Deprecated
public interface FirewallClient {
/**
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/35a44243/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalAccountApi.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalAccountApi.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalAccountApi.java
new file mode 100644
index 0000000..15db032
--- /dev/null
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalAccountApi.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 Account features.
+ * <p/>
+ *
+ * Note that this class is transitionary and will fully replace GlobalAccountClient 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 GlobalAccountApi extends GlobalAccountClient, DomainAccountApi {
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/35a44243/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalAccountAsyncApi.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalAccountAsyncApi.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalAccountAsyncApi.java
new file mode 100644
index 0000000..358270e
--- /dev/null
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalAccountAsyncApi.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 GlobalAccountApi
+ * @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 GlobalAccountAsyncApi extends GlobalAccountAsyncClient, DomainAccountAsyncApi {
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/35a44243/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalAccountAsyncClient.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalAccountAsyncClient.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalAccountAsyncClient.java
index 6da9b95..489c44d 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalAccountAsyncClient.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalAccountAsyncClient.java
@@ -38,11 +38,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 GlobalAccountAsyncClient extends DomainAccountAsyncClient {
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/35a44243/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalAccountClient.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalAccountClient.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalAccountClient.java
index 313a1be..570c6ea 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalAccountClient.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalAccountClient.java
@@ -24,11 +24,13 @@ import org.jclouds.cloudstack.options.UpdateAccountOptions;
* Provides synchronous access to CloudStack Account features available to Global
* Admin users.
*
+ * @deprecated The *Client classes will be replaced with the *Api classes 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
public interface GlobalAccountClient extends DomainAccountClient {
/**
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/35a44243/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalAlertApi.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalAlertApi.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalAlertApi.java
new file mode 100644
index 0000000..0c4f0fc
--- /dev/null
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalAlertApi.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 Alert features.
+ * <p/>
+ *
+ * Note that this class is transitionary and will fully replace GlobalAlertClient 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 GlobalAlertApi extends GlobalAlertClient {
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/35a44243/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalAlertAsyncApi.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalAlertAsyncApi.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalAlertAsyncApi.java
new file mode 100644
index 0000000..3580a9f
--- /dev/null
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalAlertAsyncApi.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 GlobalAlertApi
+ * @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 GlobalAlertAsyncApi extends GlobalAlertAsyncClient {
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/35a44243/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalAlertAsyncClient.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalAlertAsyncClient.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalAlertAsyncClient.java
index 6d85fc2..b3786ee 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalAlertAsyncClient.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalAlertAsyncClient.java
@@ -38,11 +38,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 Richard Downer
* @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 GlobalAlertAsyncClient {
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/35a44243/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalAlertClient.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalAlertClient.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalAlertClient.java
index e019b58..6b21d73 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalAlertClient.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalAlertClient.java
@@ -24,11 +24,13 @@ import org.jclouds.cloudstack.options.ListAlertsOptions;
* Provides synchronous access to CloudStack Alerts features available to Global
* Admin users.
*
+ * @deprecated The *Client classes will be replaced with the *Api classes in jclouds 1.7.
* @author Richard Downer
* @see <a href=
* "http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_Global_Admin.html"
* />
*/
+@Deprecated
public interface GlobalAlertClient {
/**
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/35a44243/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalCapacityApi.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalCapacityApi.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalCapacityApi.java
new file mode 100644
index 0000000..5f1deab
--- /dev/null
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalCapacityApi.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 Capacity features.
+ * <p/>
+ *
+ * Note that this class is transitionary and will fully replace GlobalCapacityClient 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 GlobalCapacityApi extends GlobalCapacityClient {
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/35a44243/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalCapacityAsyncApi.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalCapacityAsyncApi.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalCapacityAsyncApi.java
new file mode 100644
index 0000000..b02bdf3
--- /dev/null
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalCapacityAsyncApi.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 GlobalCapacityApi
+ * @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 GlobalCapacityAsyncApi extends GlobalCapacityAsyncClient {
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/35a44243/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalCapacityAsyncClient.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalCapacityAsyncClient.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalCapacityAsyncClient.java
index 5d0175b..86fbb7f 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalCapacityAsyncClient.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalCapacityAsyncClient.java
@@ -38,11 +38,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 Richard Downer
* @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 GlobalCapacityAsyncClient {
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/35a44243/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalCapacityClient.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalCapacityClient.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalCapacityClient.java
index 17dea20..8dd7240 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalCapacityClient.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalCapacityClient.java
@@ -24,11 +24,13 @@ import org.jclouds.cloudstack.options.ListCapacityOptions;
* Provides synchronous access to CloudStack Capacities features available to Global
* Admin users.
*
+ * @deprecated The *Client classes will be replaced with the *Api classes in jclouds 1.7.
* @author Richard Downer
* @see <a href=
* "http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_Global_Admin.html"
* />
*/
+@Deprecated
public interface GlobalCapacityClient {
/**
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/35a44243/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalConfigurationApi.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalConfigurationApi.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalConfigurationApi.java
new file mode 100644
index 0000000..c1569bc
--- /dev/null
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalConfigurationApi.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 REST features.
+ * <p/>
+ *
+ * Note that this class is transitionary and will fully replace GlobalConfigurationClient 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 GlobalConfigurationApi extends GlobalConfigurationClient, ConfigurationApi {
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/35a44243/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalConfigurationAsyncApi.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalConfigurationAsyncApi.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalConfigurationAsyncApi.java
new file mode 100644
index 0000000..f1e3548
--- /dev/null
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalConfigurationAsyncApi.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 GlobalConfigurationApi
+ * @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 GlobalConfigurationAsyncApi extends GlobalConfigurationAsyncClient, ConfigurationAsyncApi {
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/35a44243/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalConfigurationAsyncClient.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalConfigurationAsyncClient.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalConfigurationAsyncClient.java
index 4ac5470..9785b23 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalConfigurationAsyncClient.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalConfigurationAsyncClient.java
@@ -40,11 +40,13 @@ import com.google.common.util.concurrent.ListenableFuture;
* Provides asynchronous access to CloudStack Configuration 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 GlobalConfigurationAsyncClient extends ConfigurationAsyncClient {
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/35a44243/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalConfigurationClient.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalConfigurationClient.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalConfigurationClient.java
index 110c965..f10e575 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalConfigurationClient.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalConfigurationClient.java
@@ -24,11 +24,13 @@ import org.jclouds.cloudstack.options.ListConfigurationEntriesOptions;
* Provides synchronous access to CloudStack Configuration 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 GlobalConfigurationClient extends ConfigurationClient {
/**
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/35a44243/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalDomainApi.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalDomainApi.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalDomainApi.java
new file mode 100644
index 0000000..268fb3f
--- /dev/null
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalDomainApi.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 Domain features.
+ * <p/>
+ *
+ * Note that this class is transitionary and will fully replace GlobalDomainClient 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 GlobalDomainApi extends GlobalDomainClient, DomainDomainApi {
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/35a44243/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalDomainAsyncApi.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalDomainAsyncApi.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalDomainAsyncApi.java
new file mode 100644
index 0000000..90c1656
--- /dev/null
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalDomainAsyncApi.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 GlobalDomainApi
+ * @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 GlobalDomainAsyncApi extends GlobalDomainAsyncClient, DomainDomainAsyncApi {
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/35a44243/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalDomainAsyncClient.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalDomainAsyncClient.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalDomainAsyncClient.java
index 973b07e..46bb9b5 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalDomainAsyncClient.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalDomainAsyncClient.java
@@ -39,11 +39,13 @@ import com.google.common.util.concurrent.ListenableFuture;
* Provides asynchronous access to CloudStack Domain 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 GlobalDomainAsyncClient extends DomainDomainAsyncClient {
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/35a44243/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalDomainClient.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalDomainClient.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalDomainClient.java
index 463e237..8a5e787 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalDomainClient.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalDomainClient.java
@@ -24,11 +24,13 @@ import org.jclouds.cloudstack.options.UpdateDomainOptions;
* Provides synchronous access to CloudStack Domain 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 GlobalDomainClient extends DomainDomainClient {
/**
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/35a44243/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalHostApi.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalHostApi.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalHostApi.java
new file mode 100644
index 0000000..1141282
--- /dev/null
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalHostApi.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 Host features.
+ * <p/>
+ *
+ * Note that this class is transitionary and will fully replace GlobalHostClient 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 GlobalHostApi extends GlobalHostClient {
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/35a44243/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalHostAsyncApi.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalHostAsyncApi.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalHostAsyncApi.java
new file mode 100644
index 0000000..77938b1
--- /dev/null
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalHostAsyncApi.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 GlobalHostApi
+ * @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 GlobalHostAsyncApi extends GlobalHostAsyncClient {
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/35a44243/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalHostAsyncClient.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalHostAsyncClient.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalHostAsyncClient.java
index 83b9c35..4bc3e82 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalHostAsyncClient.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalHostAsyncClient.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 GlobalHostClient
* @see <a href="http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_Global_Admin.html" />
* @author Andrei Savu
*/
+@Deprecated
@RequestFilters(AuthenticationFilter.class)
@QueryParams(keys = "response", values = "json")
public interface GlobalHostAsyncClient {
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/35a44243/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalHostClient.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalHostClient.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalHostClient.java
index 6c14838..65f08a1 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalHostClient.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalHostClient.java
@@ -32,10 +32,12 @@ import org.jclouds.cloudstack.options.UpdateHostOptions;
* Provides synchronous access to CloudStack host 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 Andrei Savu
*/
+@Deprecated
public interface GlobalHostClient {
/**
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/35a44243/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalOfferingApi.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalOfferingApi.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalOfferingApi.java
new file mode 100644
index 0000000..e6b262e
--- /dev/null
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalOfferingApi.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 GlobalOfferingClient 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 GlobalOfferingApi extends GlobalOfferingClient, OfferingApi {
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/35a44243/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalOfferingAsyncApi.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalOfferingAsyncApi.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalOfferingAsyncApi.java
new file mode 100644
index 0000000..06be614
--- /dev/null
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalOfferingAsyncApi.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 GlobalOfferingApi
+ * @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 GlobalOfferingAsyncApi extends GlobalOfferingAsyncClient, OfferingAsyncApi {
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/35a44243/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalOfferingAsyncClient.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalOfferingAsyncClient.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalOfferingAsyncClient.java
index 46ed732..0d6c138 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalOfferingAsyncClient.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalOfferingAsyncClient.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 GlobalOfferingClient
* @see <a href="http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_Global_Admin.html" />
* @author Andrei Savu
*/
+@Deprecated
@RequestFilters(AuthenticationFilter.class)
@QueryParams(keys = "response", values = "json")
public interface GlobalOfferingAsyncClient extends OfferingAsyncClient {
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/35a44243/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalOfferingClient.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalOfferingClient.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalOfferingClient.java
index 46832af..203705b 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalOfferingClient.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalOfferingClient.java
@@ -29,10 +29,12 @@ import org.jclouds.cloudstack.options.UpdateServiceOfferingOptions;
* Provides synchronous access to CloudStack zone 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 Andrei Savu
*/
+@Deprecated
public interface GlobalOfferingClient extends OfferingClient {
/**
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/35a44243/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalPodApi.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalPodApi.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalPodApi.java
new file mode 100644
index 0000000..e3e8d7d
--- /dev/null
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalPodApi.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 pod features.
+ * <p/>
+ *
+ * Note that this class is transitionary and will fully replace GlobalPodClient 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 GlobalPodApi extends GlobalPodClient {
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/35a44243/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalPodAsyncApi.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalPodAsyncApi.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalPodAsyncApi.java
new file mode 100644
index 0000000..5beedcb
--- /dev/null
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalPodAsyncApi.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 GlobalPodApi
+ * @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 GlobalPodAsyncApi extends GlobalPodAsyncClient {
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/35a44243/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalPodAsyncClient.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalPodAsyncClient.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalPodAsyncClient.java
index 2b89913..c470e9a 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalPodAsyncClient.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalPodAsyncClient.java
@@ -44,11 +44,13 @@ import com.google.common.util.concurrent.ListenableFuture;
* Provides asynchronous access to CloudStack Pod features available to Global
* Admin users.
*
+ * @deprecated The async interface will be removed in jclouds 1.7.
* @author Richard Downer
* @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 GlobalPodAsyncClient {
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/35a44243/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalPodClient.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalPodClient.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalPodClient.java
index 97194dc..2f16251 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalPodClient.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalPodClient.java
@@ -26,11 +26,13 @@ import org.jclouds.cloudstack.options.UpdatePodOptions;
* Provides synchronous access to CloudStack Pod features available to Global
* Admin users.
*
+ * @deprecated The *Client classes will be replaced with the *Api classes in jclouds 1.7.
* @author Richard Downer
* @see <a href=
* "http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_Global_Admin.html"
* />
*/
+@Deprecated
public interface GlobalPodClient {
/**
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/35a44243/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalStoragePoolApi.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalStoragePoolApi.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalStoragePoolApi.java
new file mode 100644
index 0000000..c1c9ece
--- /dev/null
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalStoragePoolApi.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 Storage Pool features.
+ * <p/>
+ *
+ * Note that this class is transitionary and will fully replace GlobalStoragePoolClient 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 GlobalStoragePoolApi extends GlobalStoragePoolClient {
+
+}