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/08/02 02:58:32 UTC
git commit: Deprecating async/client classes for a number of
apis/providers
Updated Branches:
refs/heads/1.6.x 0cbcc7d64 -> 24466fdaa
Deprecating async/client classes for a number of apis/providers
Also added dummy *Api classes for classes that'll be renamed from
*Client->*Api in 1.7.0.
Project: http://git-wip-us.apache.org/repos/asf/incubator-jclouds/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-jclouds/commit/24466fda
Tree: http://git-wip-us.apache.org/repos/asf/incubator-jclouds/tree/24466fda
Diff: http://git-wip-us.apache.org/repos/asf/incubator-jclouds/diff/24466fda
Branch: refs/heads/1.6.x
Commit: 24466fdaabdc0c9d0e9ec335bea3df26e8338da3
Parents: 0cbcc7d
Author: Andrew Bayer <an...@gmail.com>
Authored: Thu Aug 1 14:23:21 2013 -0700
Committer: Andrew Bayer <an...@gmail.com>
Committed: Thu Aug 1 17:58:26 2013 -0700
----------------------------------------------------------------------
.../org/jclouds/cloudsigma/CloudSigmaApi.java | 28 ++++++++++++++++++++
.../jclouds/cloudsigma/CloudSigmaClient.java | 5 +++-
.../jclouds/elasticstack/ElasticStackApi.java | 20 ++++++++++++++
.../elasticstack/ElasticStackClient.java | 3 +++
.../main/java/org/jclouds/gogrid/GoGridApi.java | 20 ++++++++++++++
.../java/org/jclouds/gogrid/GoGridClient.java | 2 ++
.../jclouds/gogrid/features/GridImageApi.java | 22 +++++++++++++++
.../org/jclouds/gogrid/features/GridIpApi.java | 22 +++++++++++++++
.../org/jclouds/gogrid/features/GridJobApi.java | 22 +++++++++++++++
.../gogrid/features/GridLoadBalancerApi.java | 22 +++++++++++++++
.../jclouds/gogrid/features/GridServerApi.java | 22 +++++++++++++++
.../gogrid/services/GridImageAsyncClient.java | 1 +
.../gogrid/services/GridImageClient.java | 1 +
.../gogrid/services/GridIpAsyncClient.java | 2 ++
.../jclouds/gogrid/services/GridIpClient.java | 1 +
.../gogrid/services/GridJobAsyncClient.java | 2 ++
.../jclouds/gogrid/services/GridJobClient.java | 1 +
.../services/GridLoadBalancerAsyncClient.java | 2 ++
.../gogrid/services/GridLoadBalancerClient.java | 1 +
.../gogrid/services/GridServerAsyncClient.java | 2 ++
.../gogrid/services/GridServerClient.java | 1 +
.../org/jclouds/softlayer/SoftLayerApi.java | 20 ++++++++++++++
.../jclouds/softlayer/features/AccountApi.java | 20 ++++++++++++++
.../softlayer/features/AccountAsyncClient.java | 2 ++
.../softlayer/features/AccountClient.java | 1 +
.../softlayer/features/DatacenterApi.java | 20 ++++++++++++++
.../features/DatacenterAsyncClient.java | 2 ++
.../softlayer/features/DatacenterClient.java | 1 +
.../softlayer/features/ProductPackageApi.java | 20 ++++++++++++++
.../features/ProductPackageAsyncClient.java | 2 ++
.../features/ProductPackageClient.java | 1 +
.../softlayer/features/VirtualGuestApi.java | 20 ++++++++++++++
.../features/VirtualGuestAsyncClient.java | 2 ++
.../softlayer/features/VirtualGuestClient.java | 1 +
34 files changed, 313 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/24466fda/apis/cloudsigma/src/main/java/org/jclouds/cloudsigma/CloudSigmaApi.java
----------------------------------------------------------------------
diff --git a/apis/cloudsigma/src/main/java/org/jclouds/cloudsigma/CloudSigmaApi.java b/apis/cloudsigma/src/main/java/org/jclouds/cloudsigma/CloudSigmaApi.java
new file mode 100644
index 0000000..0b03762
--- /dev/null
+++ b/apis/cloudsigma/src/main/java/org/jclouds/cloudsigma/CloudSigmaApi.java
@@ -0,0 +1,28 @@
+/*
+ * 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.cloudsigma;
+
+/**
+ * Provides synchronous access to CloudSigma.
+ * <p/>
+ *
+ * @see <a href="http://cloudsigma.com/en/platform-details/the-api" />
+ * @author Adrian Cole
+ */
+public interface CloudSigmaApi extends CloudSigmaClient {
+}
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/24466fda/apis/cloudsigma/src/main/java/org/jclouds/cloudsigma/CloudSigmaClient.java
----------------------------------------------------------------------
diff --git a/apis/cloudsigma/src/main/java/org/jclouds/cloudsigma/CloudSigmaClient.java b/apis/cloudsigma/src/main/java/org/jclouds/cloudsigma/CloudSigmaClient.java
index b57095f..5983c45 100644
--- a/apis/cloudsigma/src/main/java/org/jclouds/cloudsigma/CloudSigmaClient.java
+++ b/apis/cloudsigma/src/main/java/org/jclouds/cloudsigma/CloudSigmaClient.java
@@ -34,9 +34,12 @@ import org.jclouds.cloudsigma.options.CloneDriveOptions;
* <p/>
*
* @see CloudSigmaAsyncClient
- * @see <a href="TODO: insert URL of cloudsigma documentation" />
+ * @see CloudSigmaApi
+ * @see <a href="https://lvs.cloudsigma.com/docs/" />
* @author Adrian Cole
+ * @deprecated Will be renamed to CloudSigmaApi in 1.7.0.
*/
+@Deprecated
public interface CloudSigmaClient extends Closeable {
/**
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/24466fda/apis/elasticstack/src/main/java/org/jclouds/elasticstack/ElasticStackApi.java
----------------------------------------------------------------------
diff --git a/apis/elasticstack/src/main/java/org/jclouds/elasticstack/ElasticStackApi.java b/apis/elasticstack/src/main/java/org/jclouds/elasticstack/ElasticStackApi.java
new file mode 100644
index 0000000..aecc0d6
--- /dev/null
+++ b/apis/elasticstack/src/main/java/org/jclouds/elasticstack/ElasticStackApi.java
@@ -0,0 +1,20 @@
+/*
+ * 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.elasticstack;
+
+public interface ElasticStackApi extends ElasticStackClient {
+}
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/24466fda/apis/elasticstack/src/main/java/org/jclouds/elasticstack/ElasticStackClient.java
----------------------------------------------------------------------
diff --git a/apis/elasticstack/src/main/java/org/jclouds/elasticstack/ElasticStackClient.java b/apis/elasticstack/src/main/java/org/jclouds/elasticstack/ElasticStackClient.java
index 5f4666d..5b22ab5 100644
--- a/apis/elasticstack/src/main/java/org/jclouds/elasticstack/ElasticStackClient.java
+++ b/apis/elasticstack/src/main/java/org/jclouds/elasticstack/ElasticStackClient.java
@@ -31,9 +31,12 @@ import org.jclouds.io.Payload;
* <p/>
*
* @see ElasticStackAsyncClient
+ * @see ElasticStackApi
* @see <a href="TODO: insert URL of elasticstack documentation" />
* @author Adrian Cole
+ * @deprecated Will be renamed to ElasticStackApi in 1.7.0
*/
+@Deprecated
public interface ElasticStackClient extends Closeable {
/**
* list of server uuids in your account
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/24466fda/providers/gogrid/src/main/java/org/jclouds/gogrid/GoGridApi.java
----------------------------------------------------------------------
diff --git a/providers/gogrid/src/main/java/org/jclouds/gogrid/GoGridApi.java b/providers/gogrid/src/main/java/org/jclouds/gogrid/GoGridApi.java
new file mode 100644
index 0000000..ef8adcd
--- /dev/null
+++ b/providers/gogrid/src/main/java/org/jclouds/gogrid/GoGridApi.java
@@ -0,0 +1,20 @@
+/*
+ * 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.gogrid;
+
+public interface GoGridApi extends GoGridClient {
+}
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/24466fda/providers/gogrid/src/main/java/org/jclouds/gogrid/GoGridClient.java
----------------------------------------------------------------------
diff --git a/providers/gogrid/src/main/java/org/jclouds/gogrid/GoGridClient.java b/providers/gogrid/src/main/java/org/jclouds/gogrid/GoGridClient.java
index fac2205..b33e4e0 100644
--- a/providers/gogrid/src/main/java/org/jclouds/gogrid/GoGridClient.java
+++ b/providers/gogrid/src/main/java/org/jclouds/gogrid/GoGridClient.java
@@ -27,7 +27,9 @@ import org.jclouds.rest.annotations.Delegate;
/**
* @author Oleksiy Yarmula
+ * @deprecated Renamed to GoGridApi in 1.7.0
*/
+@Deprecated
public interface GoGridClient extends Closeable {
/**
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/24466fda/providers/gogrid/src/main/java/org/jclouds/gogrid/features/GridImageApi.java
----------------------------------------------------------------------
diff --git a/providers/gogrid/src/main/java/org/jclouds/gogrid/features/GridImageApi.java b/providers/gogrid/src/main/java/org/jclouds/gogrid/features/GridImageApi.java
new file mode 100644
index 0000000..f91bf75
--- /dev/null
+++ b/providers/gogrid/src/main/java/org/jclouds/gogrid/features/GridImageApi.java
@@ -0,0 +1,22 @@
+/*
+ * 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.gogrid.features;
+
+import org.jclouds.gogrid.services.GridImageClient;
+
+public interface GridImageApi extends GridImageClient {
+}
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/24466fda/providers/gogrid/src/main/java/org/jclouds/gogrid/features/GridIpApi.java
----------------------------------------------------------------------
diff --git a/providers/gogrid/src/main/java/org/jclouds/gogrid/features/GridIpApi.java b/providers/gogrid/src/main/java/org/jclouds/gogrid/features/GridIpApi.java
new file mode 100644
index 0000000..5998bea
--- /dev/null
+++ b/providers/gogrid/src/main/java/org/jclouds/gogrid/features/GridIpApi.java
@@ -0,0 +1,22 @@
+/*
+ * 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.gogrid.features;
+
+import org.jclouds.gogrid.services.GridIpClient;
+
+public interface GridIpApi extends GridIpClient {
+}
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/24466fda/providers/gogrid/src/main/java/org/jclouds/gogrid/features/GridJobApi.java
----------------------------------------------------------------------
diff --git a/providers/gogrid/src/main/java/org/jclouds/gogrid/features/GridJobApi.java b/providers/gogrid/src/main/java/org/jclouds/gogrid/features/GridJobApi.java
new file mode 100644
index 0000000..28486bf
--- /dev/null
+++ b/providers/gogrid/src/main/java/org/jclouds/gogrid/features/GridJobApi.java
@@ -0,0 +1,22 @@
+/*
+ * 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.gogrid.features;
+
+import org.jclouds.gogrid.services.GridJobClient;
+
+public interface GridJobApi extends GridJobClient {
+}
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/24466fda/providers/gogrid/src/main/java/org/jclouds/gogrid/features/GridLoadBalancerApi.java
----------------------------------------------------------------------
diff --git a/providers/gogrid/src/main/java/org/jclouds/gogrid/features/GridLoadBalancerApi.java b/providers/gogrid/src/main/java/org/jclouds/gogrid/features/GridLoadBalancerApi.java
new file mode 100644
index 0000000..62f4a14
--- /dev/null
+++ b/providers/gogrid/src/main/java/org/jclouds/gogrid/features/GridLoadBalancerApi.java
@@ -0,0 +1,22 @@
+/*
+ * 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.gogrid.features;
+
+import org.jclouds.gogrid.services.GridLoadBalancerClient;
+
+public interface GridLoadBalancerApi extends GridLoadBalancerClient {
+}
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/24466fda/providers/gogrid/src/main/java/org/jclouds/gogrid/features/GridServerApi.java
----------------------------------------------------------------------
diff --git a/providers/gogrid/src/main/java/org/jclouds/gogrid/features/GridServerApi.java b/providers/gogrid/src/main/java/org/jclouds/gogrid/features/GridServerApi.java
new file mode 100644
index 0000000..d40afb6
--- /dev/null
+++ b/providers/gogrid/src/main/java/org/jclouds/gogrid/features/GridServerApi.java
@@ -0,0 +1,22 @@
+/*
+ * 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.gogrid.features;
+
+import org.jclouds.gogrid.services.GridServerClient;
+
+public interface GridServerApi extends GridServerClient {
+}
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/24466fda/providers/gogrid/src/main/java/org/jclouds/gogrid/services/GridImageAsyncClient.java
----------------------------------------------------------------------
diff --git a/providers/gogrid/src/main/java/org/jclouds/gogrid/services/GridImageAsyncClient.java b/providers/gogrid/src/main/java/org/jclouds/gogrid/services/GridImageAsyncClient.java
index 779a60d..8f84d19 100644
--- a/providers/gogrid/src/main/java/org/jclouds/gogrid/services/GridImageAsyncClient.java
+++ b/providers/gogrid/src/main/java/org/jclouds/gogrid/services/GridImageAsyncClient.java
@@ -51,6 +51,7 @@ import com.google.common.util.concurrent.ListenableFuture;
/**
* @author Oleksiy Yarmula
+ * @deprecated Async interfaces will be removed in 1.7.0.
*/
@RequestFilters(SharedKeyLiteAuthentication.class)
@QueryParams(keys = VERSION, values = "{jclouds.api-version}")
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/24466fda/providers/gogrid/src/main/java/org/jclouds/gogrid/services/GridImageClient.java
----------------------------------------------------------------------
diff --git a/providers/gogrid/src/main/java/org/jclouds/gogrid/services/GridImageClient.java b/providers/gogrid/src/main/java/org/jclouds/gogrid/services/GridImageClient.java
index ee30738..7556198 100644
--- a/providers/gogrid/src/main/java/org/jclouds/gogrid/services/GridImageClient.java
+++ b/providers/gogrid/src/main/java/org/jclouds/gogrid/services/GridImageClient.java
@@ -28,6 +28,7 @@ import org.jclouds.gogrid.options.SaveImageOptions;
* @see <a
* href="http://wiki.gogrid.com/wiki/index.php/API#Server_Image_Methods"/>
* @author Oleksiy Yarmula
+ * @deprecated This will be renamed to GridImageApi in 1.7.0.
*/
public interface GridImageClient {
/**
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/24466fda/providers/gogrid/src/main/java/org/jclouds/gogrid/services/GridIpAsyncClient.java
----------------------------------------------------------------------
diff --git a/providers/gogrid/src/main/java/org/jclouds/gogrid/services/GridIpAsyncClient.java b/providers/gogrid/src/main/java/org/jclouds/gogrid/services/GridIpAsyncClient.java
index 3cde534..f98fe19 100644
--- a/providers/gogrid/src/main/java/org/jclouds/gogrid/services/GridIpAsyncClient.java
+++ b/providers/gogrid/src/main/java/org/jclouds/gogrid/services/GridIpAsyncClient.java
@@ -42,7 +42,9 @@ import com.google.common.util.concurrent.ListenableFuture;
* @see org.jclouds.gogrid.services.GridImageClient
*
* @author Oleksiy Yarmula
+ * @deprecated Async interfaces will be removed in 1.7.0.
*/
+@Deprecated
@RequestFilters(SharedKeyLiteAuthentication.class)
@QueryParams(keys = VERSION, values = "{jclouds.api-version}")
public interface GridIpAsyncClient {
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/24466fda/providers/gogrid/src/main/java/org/jclouds/gogrid/services/GridIpClient.java
----------------------------------------------------------------------
diff --git a/providers/gogrid/src/main/java/org/jclouds/gogrid/services/GridIpClient.java b/providers/gogrid/src/main/java/org/jclouds/gogrid/services/GridIpClient.java
index 09705a8..abc265c 100644
--- a/providers/gogrid/src/main/java/org/jclouds/gogrid/services/GridIpClient.java
+++ b/providers/gogrid/src/main/java/org/jclouds/gogrid/services/GridIpClient.java
@@ -23,6 +23,7 @@ import org.jclouds.gogrid.options.GetIpListOptions;
/**
* @author Oleksiy Yarmula
+ * @deprecated This will be renamed to GridIpApi in 1.7.0.
*/
public interface GridIpClient {
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/24466fda/providers/gogrid/src/main/java/org/jclouds/gogrid/services/GridJobAsyncClient.java
----------------------------------------------------------------------
diff --git a/providers/gogrid/src/main/java/org/jclouds/gogrid/services/GridJobAsyncClient.java b/providers/gogrid/src/main/java/org/jclouds/gogrid/services/GridJobAsyncClient.java
index 103a15d..fa9cf39 100644
--- a/providers/gogrid/src/main/java/org/jclouds/gogrid/services/GridJobAsyncClient.java
+++ b/providers/gogrid/src/main/java/org/jclouds/gogrid/services/GridJobAsyncClient.java
@@ -38,7 +38,9 @@ import com.google.common.util.concurrent.ListenableFuture;
/**
* @author Oleksiy Yarmula
+ * @deprecated Async interfaces will be removed in 1.7.0.
*/
+@Deprecated
@RequestFilters(SharedKeyLiteAuthentication.class)
@QueryParams(keys = VERSION, values = "{jclouds.api-version}")
public interface GridJobAsyncClient {
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/24466fda/providers/gogrid/src/main/java/org/jclouds/gogrid/services/GridJobClient.java
----------------------------------------------------------------------
diff --git a/providers/gogrid/src/main/java/org/jclouds/gogrid/services/GridJobClient.java b/providers/gogrid/src/main/java/org/jclouds/gogrid/services/GridJobClient.java
index 5e6476b..2a3c89b 100644
--- a/providers/gogrid/src/main/java/org/jclouds/gogrid/services/GridJobClient.java
+++ b/providers/gogrid/src/main/java/org/jclouds/gogrid/services/GridJobClient.java
@@ -26,6 +26,7 @@ import org.jclouds.gogrid.options.GetJobListOptions;
* @see <a href="http://wiki.gogrid.com/wiki/index.php/API#Job_Methods" />
*
* @author Oleksiy Yarmula
+ * @deprecated This will be renamed to GridJobApi in 1.7.0.
*/
public interface GridJobClient {
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/24466fda/providers/gogrid/src/main/java/org/jclouds/gogrid/services/GridLoadBalancerAsyncClient.java
----------------------------------------------------------------------
diff --git a/providers/gogrid/src/main/java/org/jclouds/gogrid/services/GridLoadBalancerAsyncClient.java b/providers/gogrid/src/main/java/org/jclouds/gogrid/services/GridLoadBalancerAsyncClient.java
index c78e5f2..347589f 100644
--- a/providers/gogrid/src/main/java/org/jclouds/gogrid/services/GridLoadBalancerAsyncClient.java
+++ b/providers/gogrid/src/main/java/org/jclouds/gogrid/services/GridLoadBalancerAsyncClient.java
@@ -49,7 +49,9 @@ import com.google.common.util.concurrent.ListenableFuture;
/**
* @author Oleksiy Yarmula
+ * @deprecated Async interfaces will be removed in 1.7.0
*/
+@Deprecated
@RequestFilters(SharedKeyLiteAuthentication.class)
@QueryParams(keys = VERSION, values = "{jclouds.api-version}")
public interface GridLoadBalancerAsyncClient {
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/24466fda/providers/gogrid/src/main/java/org/jclouds/gogrid/services/GridLoadBalancerClient.java
----------------------------------------------------------------------
diff --git a/providers/gogrid/src/main/java/org/jclouds/gogrid/services/GridLoadBalancerClient.java b/providers/gogrid/src/main/java/org/jclouds/gogrid/services/GridLoadBalancerClient.java
index a5abd42..a07241f 100644
--- a/providers/gogrid/src/main/java/org/jclouds/gogrid/services/GridLoadBalancerClient.java
+++ b/providers/gogrid/src/main/java/org/jclouds/gogrid/services/GridLoadBalancerClient.java
@@ -25,6 +25,7 @@ import org.jclouds.gogrid.options.AddLoadBalancerOptions;
/**
* @author Oleksiy Yarmula
+ * @deprecated This will be renamed to GridLoadBalancerApi in 1.7.0.
*/
public interface GridLoadBalancerClient {
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/24466fda/providers/gogrid/src/main/java/org/jclouds/gogrid/services/GridServerAsyncClient.java
----------------------------------------------------------------------
diff --git a/providers/gogrid/src/main/java/org/jclouds/gogrid/services/GridServerAsyncClient.java b/providers/gogrid/src/main/java/org/jclouds/gogrid/services/GridServerAsyncClient.java
index cab4e38..e3b8c1e 100644
--- a/providers/gogrid/src/main/java/org/jclouds/gogrid/services/GridServerAsyncClient.java
+++ b/providers/gogrid/src/main/java/org/jclouds/gogrid/services/GridServerAsyncClient.java
@@ -65,7 +65,9 @@ import com.google.common.util.concurrent.ListenableFuture;
* @see <a href="http://wiki.gogrid.com/wiki/index.php/API" />
* @author Adrian Cole
* @author Oleksiy Yarmula
+ * @deprecated Async interfaces will be removed in 1.7.0.
*/
+@Deprecated
@RequestFilters(SharedKeyLiteAuthentication.class)
@QueryParams(keys = VERSION, values = "1.6")
public interface GridServerAsyncClient {
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/24466fda/providers/gogrid/src/main/java/org/jclouds/gogrid/services/GridServerClient.java
----------------------------------------------------------------------
diff --git a/providers/gogrid/src/main/java/org/jclouds/gogrid/services/GridServerClient.java b/providers/gogrid/src/main/java/org/jclouds/gogrid/services/GridServerClient.java
index 5318e70..6524554 100644
--- a/providers/gogrid/src/main/java/org/jclouds/gogrid/services/GridServerClient.java
+++ b/providers/gogrid/src/main/java/org/jclouds/gogrid/services/GridServerClient.java
@@ -34,6 +34,7 @@ import org.jclouds.gogrid.options.GetServerListOptions;
*
* @author Adrian Cole
* @author Oleksiy Yarmula
+ * @deprecated This will be renamed to GridServerApi in 1.7.0.
*/
public interface GridServerClient {
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/24466fda/providers/softlayer/src/main/java/org/jclouds/softlayer/SoftLayerApi.java
----------------------------------------------------------------------
diff --git a/providers/softlayer/src/main/java/org/jclouds/softlayer/SoftLayerApi.java b/providers/softlayer/src/main/java/org/jclouds/softlayer/SoftLayerApi.java
new file mode 100644
index 0000000..35b047d
--- /dev/null
+++ b/providers/softlayer/src/main/java/org/jclouds/softlayer/SoftLayerApi.java
@@ -0,0 +1,20 @@
+/*
+ * 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.softlayer;
+
+public interface SoftLayerApi extends SoftLayerClient {
+}
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/24466fda/providers/softlayer/src/main/java/org/jclouds/softlayer/features/AccountApi.java
----------------------------------------------------------------------
diff --git a/providers/softlayer/src/main/java/org/jclouds/softlayer/features/AccountApi.java b/providers/softlayer/src/main/java/org/jclouds/softlayer/features/AccountApi.java
new file mode 100644
index 0000000..8dec4cc
--- /dev/null
+++ b/providers/softlayer/src/main/java/org/jclouds/softlayer/features/AccountApi.java
@@ -0,0 +1,20 @@
+/*
+ * 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.softlayer.features;
+
+public interface AccountApi extends AccountClient {
+}
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/24466fda/providers/softlayer/src/main/java/org/jclouds/softlayer/features/AccountAsyncClient.java
----------------------------------------------------------------------
diff --git a/providers/softlayer/src/main/java/org/jclouds/softlayer/features/AccountAsyncClient.java b/providers/softlayer/src/main/java/org/jclouds/softlayer/features/AccountAsyncClient.java
index 2b60572..fcb6b87 100644
--- a/providers/softlayer/src/main/java/org/jclouds/softlayer/features/AccountAsyncClient.java
+++ b/providers/softlayer/src/main/java/org/jclouds/softlayer/features/AccountAsyncClient.java
@@ -38,7 +38,9 @@ import com.google.common.util.concurrent.ListenableFuture;
* @see AccountClient
* @see <a href="http://sldn.softlayer.com/article/REST" />
* @author Jason King
+ * @deprecated Async interfaces will be removed in 1.7.0.
*/
+@Deprecated
@RequestFilters(BasicAuthentication.class)
@Path("/v{jclouds.api-version}")
public interface AccountAsyncClient {
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/24466fda/providers/softlayer/src/main/java/org/jclouds/softlayer/features/AccountClient.java
----------------------------------------------------------------------
diff --git a/providers/softlayer/src/main/java/org/jclouds/softlayer/features/AccountClient.java b/providers/softlayer/src/main/java/org/jclouds/softlayer/features/AccountClient.java
index c6fc31e..9b2f85a 100644
--- a/providers/softlayer/src/main/java/org/jclouds/softlayer/features/AccountClient.java
+++ b/providers/softlayer/src/main/java/org/jclouds/softlayer/features/AccountClient.java
@@ -26,6 +26,7 @@ import org.jclouds.softlayer.domain.ProductPackage;
* @see AccountAsyncClient
* @see <a href="http://sldn.softlayer.com/article/REST" />
* @author Jason King
+ * @deprecated This will be renamed to AccountApi in 1.7.0.
*/
public interface AccountClient {
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/24466fda/providers/softlayer/src/main/java/org/jclouds/softlayer/features/DatacenterApi.java
----------------------------------------------------------------------
diff --git a/providers/softlayer/src/main/java/org/jclouds/softlayer/features/DatacenterApi.java b/providers/softlayer/src/main/java/org/jclouds/softlayer/features/DatacenterApi.java
new file mode 100644
index 0000000..2186fbe
--- /dev/null
+++ b/providers/softlayer/src/main/java/org/jclouds/softlayer/features/DatacenterApi.java
@@ -0,0 +1,20 @@
+/*
+ * 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.softlayer.features;
+
+public interface DatacenterApi extends DatacenterClient {
+}
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/24466fda/providers/softlayer/src/main/java/org/jclouds/softlayer/features/DatacenterAsyncClient.java
----------------------------------------------------------------------
diff --git a/providers/softlayer/src/main/java/org/jclouds/softlayer/features/DatacenterAsyncClient.java b/providers/softlayer/src/main/java/org/jclouds/softlayer/features/DatacenterAsyncClient.java
index e995c56..aac6f9c 100644
--- a/providers/softlayer/src/main/java/org/jclouds/softlayer/features/DatacenterAsyncClient.java
+++ b/providers/softlayer/src/main/java/org/jclouds/softlayer/features/DatacenterAsyncClient.java
@@ -41,7 +41,9 @@ import com.google.common.util.concurrent.ListenableFuture;
* @see DatacenterClient
* @see <a href="http://sldn.softlayer.com/article/REST" />
* @author Adrian Cole
+ * @deprecated Async interfaces will be removed in 1.7.0
*/
+@Deprecated
@RequestFilters(BasicAuthentication.class)
@Path("/v{jclouds.api-version}")
public interface DatacenterAsyncClient {
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/24466fda/providers/softlayer/src/main/java/org/jclouds/softlayer/features/DatacenterClient.java
----------------------------------------------------------------------
diff --git a/providers/softlayer/src/main/java/org/jclouds/softlayer/features/DatacenterClient.java b/providers/softlayer/src/main/java/org/jclouds/softlayer/features/DatacenterClient.java
index 6034dc7..99bb298 100644
--- a/providers/softlayer/src/main/java/org/jclouds/softlayer/features/DatacenterClient.java
+++ b/providers/softlayer/src/main/java/org/jclouds/softlayer/features/DatacenterClient.java
@@ -26,6 +26,7 @@ import org.jclouds.softlayer.domain.Datacenter;
* @see DatacenterAsyncClient
* @see <a href="http://sldn.softlayer.com/article/REST" />
* @author Adrian Cole
+ * @deprecated This will be renamed to DatacenterApi in 1.7.0.
*/
public interface DatacenterClient {
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/24466fda/providers/softlayer/src/main/java/org/jclouds/softlayer/features/ProductPackageApi.java
----------------------------------------------------------------------
diff --git a/providers/softlayer/src/main/java/org/jclouds/softlayer/features/ProductPackageApi.java b/providers/softlayer/src/main/java/org/jclouds/softlayer/features/ProductPackageApi.java
new file mode 100644
index 0000000..1979bff
--- /dev/null
+++ b/providers/softlayer/src/main/java/org/jclouds/softlayer/features/ProductPackageApi.java
@@ -0,0 +1,20 @@
+/*
+ * 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.softlayer.features;
+
+public interface ProductPackageApi extends ProductPackageClient {
+}
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/24466fda/providers/softlayer/src/main/java/org/jclouds/softlayer/features/ProductPackageAsyncClient.java
----------------------------------------------------------------------
diff --git a/providers/softlayer/src/main/java/org/jclouds/softlayer/features/ProductPackageAsyncClient.java b/providers/softlayer/src/main/java/org/jclouds/softlayer/features/ProductPackageAsyncClient.java
index 29bdb7f..4dae2f7 100644
--- a/providers/softlayer/src/main/java/org/jclouds/softlayer/features/ProductPackageAsyncClient.java
+++ b/providers/softlayer/src/main/java/org/jclouds/softlayer/features/ProductPackageAsyncClient.java
@@ -38,7 +38,9 @@ import com.google.common.util.concurrent.ListenableFuture;
* @see ProductPackageClient
* @see <a href="http://sldn.softlayer.com/article/REST" />
* @author Adrian Cole
+ * @deprecated Async interfaces will be removed in 1.7.0
*/
+@Deprecated
@RequestFilters(BasicAuthentication.class)
@Path("/v{jclouds.api-version}")
public interface ProductPackageAsyncClient {
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/24466fda/providers/softlayer/src/main/java/org/jclouds/softlayer/features/ProductPackageClient.java
----------------------------------------------------------------------
diff --git a/providers/softlayer/src/main/java/org/jclouds/softlayer/features/ProductPackageClient.java b/providers/softlayer/src/main/java/org/jclouds/softlayer/features/ProductPackageClient.java
index 76acd3b..c2209a8 100644
--- a/providers/softlayer/src/main/java/org/jclouds/softlayer/features/ProductPackageClient.java
+++ b/providers/softlayer/src/main/java/org/jclouds/softlayer/features/ProductPackageClient.java
@@ -25,6 +25,7 @@ import org.jclouds.softlayer.domain.ProductPackage;
* @see ProductPackageAsyncClient
* @see <a href="http://sldn.softlayer.com/article/REST" />
* @author Adrian Cole
+ * @deprecated This will be renamed to ProductPackageApi in 1.7.0.
*/
public interface ProductPackageClient {
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/24466fda/providers/softlayer/src/main/java/org/jclouds/softlayer/features/VirtualGuestApi.java
----------------------------------------------------------------------
diff --git a/providers/softlayer/src/main/java/org/jclouds/softlayer/features/VirtualGuestApi.java b/providers/softlayer/src/main/java/org/jclouds/softlayer/features/VirtualGuestApi.java
new file mode 100644
index 0000000..31a8fe9
--- /dev/null
+++ b/providers/softlayer/src/main/java/org/jclouds/softlayer/features/VirtualGuestApi.java
@@ -0,0 +1,20 @@
+/*
+ * 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.softlayer.features;
+
+public interface VirtualGuestApi extends VirtualGuestClient {
+}
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/24466fda/providers/softlayer/src/main/java/org/jclouds/softlayer/features/VirtualGuestAsyncClient.java
----------------------------------------------------------------------
diff --git a/providers/softlayer/src/main/java/org/jclouds/softlayer/features/VirtualGuestAsyncClient.java b/providers/softlayer/src/main/java/org/jclouds/softlayer/features/VirtualGuestAsyncClient.java
index 30fddc0..c336d6a 100644
--- a/providers/softlayer/src/main/java/org/jclouds/softlayer/features/VirtualGuestAsyncClient.java
+++ b/providers/softlayer/src/main/java/org/jclouds/softlayer/features/VirtualGuestAsyncClient.java
@@ -48,7 +48,9 @@ import com.google.common.util.concurrent.ListenableFuture;
* @see VirtualGuestClient
* @see <a href="http://sldn.softlayer.com/article/REST" />
* @author Adrian Cole
+ * @deprecated Async interfaces will be removed in 1.7.0
*/
+@Deprecated
@RequestFilters(BasicAuthentication.class)
@Path("/v{jclouds.api-version}")
public interface VirtualGuestAsyncClient {
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/24466fda/providers/softlayer/src/main/java/org/jclouds/softlayer/features/VirtualGuestClient.java
----------------------------------------------------------------------
diff --git a/providers/softlayer/src/main/java/org/jclouds/softlayer/features/VirtualGuestClient.java b/providers/softlayer/src/main/java/org/jclouds/softlayer/features/VirtualGuestClient.java
index 0ebf166..af1ffdd 100644
--- a/providers/softlayer/src/main/java/org/jclouds/softlayer/features/VirtualGuestClient.java
+++ b/providers/softlayer/src/main/java/org/jclouds/softlayer/features/VirtualGuestClient.java
@@ -28,6 +28,7 @@ import org.jclouds.softlayer.domain.VirtualGuest;
* @see VirtualGuestAsyncClient
* @see <a href="http://sldn.softlayer.com/article/REST" />
* @author Adrian Cole
+ * @deprecated This will be renamed to VirtualGuestApi in 1.7.0.
*/
public interface VirtualGuestClient {