Updated Branches: refs/heads/1.6.x f3e43b34f -> 6add9da5a
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/6add9da5/providers/trmk-ecloud/src/main/java/org/jclouds/trmk/ecloud/TerremarkECloudAsyncApi.java ---------------------------------------------------------------------- diff --git a/providers/trmk-ecloud/src/main/java/org/jclouds/trmk/ecloud/TerremarkECloudAsyncApi.java b/providers/trmk-ecloud/src/main/java/org/jclouds/trmk/ecloud/TerremarkECloudAsyncApi.java new file mode 100644 index 0000000..e30e927 --- /dev/null +++ b/providers/trmk-ecloud/src/main/java/org/jclouds/trmk/ecloud/TerremarkECloudAsyncApi.java @@ -0,0 +1,37 @@ +/* + * 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.trmk.ecloud; + +import org.jclouds.rest.annotations.RequestFilters; +import org.jclouds.trmk.vcloud_0_8.filters.SetVCloudTokenCookie; + +/** + * Provides access to eCloud resources via their REST API. + * <p/> + * + * @deprecated The async interface will be removed in jclouds 1.7. + * @see <a href= + * "http://support.theenterprisecloud.com/kb/default.asp?id=645&Lang=1&SID="; + * /> + * @author Adrian Cole + * @deprecated please use {@code org.jclouds.ContextBuilder#buildApi(TerremarkECloudClient.class)} as + * {@link TerremarkECloudAsyncClient} interface will be removed in jclouds 1.7. + */ +@Deprecated +@RequestFilters(SetVCloudTokenCookie.class) +public interface TerremarkECloudAsyncApi extends TerremarkECloudAsyncClient { +} http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/6add9da5/providers/trmk-ecloud/src/main/java/org/jclouds/trmk/ecloud/TerremarkECloudAsyncClient.java ---------------------------------------------------------------------- diff --git a/providers/trmk-ecloud/src/main/java/org/jclouds/trmk/ecloud/TerremarkECloudAsyncClient.java b/providers/trmk-ecloud/src/main/java/org/jclouds/trmk/ecloud/TerremarkECloudAsyncClient.java index 5aec317..218697c 100644 --- a/providers/trmk-ecloud/src/main/java/org/jclouds/trmk/ecloud/TerremarkECloudAsyncClient.java +++ b/providers/trmk-ecloud/src/main/java/org/jclouds/trmk/ecloud/TerremarkECloudAsyncClient.java @@ -84,7 +84,8 @@ import com.google.common.util.concurrent.ListenableFuture; /** * Provides access to eCloud resources via their REST API. * <p/> - * + * + * @deprecated The async interface will be removed in jclouds 1.7. * @see <a href= * "http://support.theenterprisecloud.com/kb/default.asp?id=645&Lang=1&SID="; * /> http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/6add9da5/providers/trmk-ecloud/src/main/java/org/jclouds/trmk/ecloud/TerremarkECloudClient.java ---------------------------------------------------------------------- diff --git a/providers/trmk-ecloud/src/main/java/org/jclouds/trmk/ecloud/TerremarkECloudClient.java b/providers/trmk-ecloud/src/main/java/org/jclouds/trmk/ecloud/TerremarkECloudClient.java index 78cd5f9..0219646 100644 --- a/providers/trmk-ecloud/src/main/java/org/jclouds/trmk/ecloud/TerremarkECloudClient.java +++ b/providers/trmk-ecloud/src/main/java/org/jclouds/trmk/ecloud/TerremarkECloudClient.java @@ -33,12 +33,14 @@ import org.jclouds.trmk.vcloud_0_8.domain.VAppExtendedInfo; /** * Provides access to VCloud resources via their REST API. * <p/> - * + * + * @deprecated *Client classes will be moved to *Api in jclouds 1.7.0. * @see <a href= * "http://support.theenterprisecloud.com/kb/default.asp?id=645&Lang=1&SID="; * /> * @author Adrian Cole */ +@Deprecated public interface TerremarkECloudClient extends TerremarkVCloudClient { /** * Provides synchronous access to Data Center Operations. http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/6add9da5/providers/trmk-ecloud/src/main/java/org/jclouds/trmk/ecloud/config/TerremarkECloudRestClientModule.java ---------------------------------------------------------------------- diff --git a/providers/trmk-ecloud/src/main/java/org/jclouds/trmk/ecloud/config/TerremarkECloudRestClientModule.java b/providers/trmk-ecloud/src/main/java/org/jclouds/trmk/ecloud/config/TerremarkECloudRestClientModule.java index 8355256..e310a80 100644 --- a/providers/trmk-ecloud/src/main/java/org/jclouds/trmk/ecloud/config/TerremarkECloudRestClientModule.java +++ b/providers/trmk-ecloud/src/main/java/org/jclouds/trmk/ecloud/config/TerremarkECloudRestClientModule.java @@ -26,8 +26,12 @@ import javax.inject.Singleton; import org.jclouds.rest.ConfiguresRestClient; import org.jclouds.trmk.ecloud.TerremarkECloudAsyncClient; import org.jclouds.trmk.ecloud.TerremarkECloudClient; +import org.jclouds.trmk.ecloud.features.DataCenterOperationsApi; +import org.jclouds.trmk.ecloud.features.DataCenterOperationsAsyncApi; import org.jclouds.trmk.ecloud.features.DataCenterOperationsAsyncClient; import org.jclouds.trmk.ecloud.features.DataCenterOperationsClient; +import org.jclouds.trmk.ecloud.features.TagOperationsApi; +import org.jclouds.trmk.ecloud.features.TagOperationsAsyncApi; import org.jclouds.trmk.ecloud.features.TagOperationsAsyncClient; import org.jclouds.trmk.ecloud.features.TagOperationsClient; import org.jclouds.trmk.vcloud_0_8.TerremarkVCloudAsyncClient; @@ -54,8 +58,10 @@ public class TerremarkECloudRestClientModule extends TerremarkVCloudRestClientModule<TerremarkECloudClient, TerremarkECloudAsyncClient> { public static final Map<Class<?>, Class<?>> DELEGATE_MAP = ImmutableMap.<Class<?>, Class<?>> builder()// - .put(DataCenterOperationsClient.class, DataCenterOperationsAsyncClient.class)// - .put(TagOperationsClient.class, TagOperationsAsyncClient.class)// + .put(DataCenterOperationsClient.class, DataCenterOperationsAsyncClient.class)// + .put(TagOperationsClient.class, TagOperationsAsyncClient.class)// + .put(DataCenterOperationsApi.class, DataCenterOperationsAsyncApi.class)// + .put(TagOperationsApi.class, TagOperationsAsyncApi.class)// .build(); public TerremarkECloudRestClientModule() { http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/6add9da5/providers/trmk-ecloud/src/main/java/org/jclouds/trmk/ecloud/features/DataCenterOperationsApi.java ---------------------------------------------------------------------- diff --git a/providers/trmk-ecloud/src/main/java/org/jclouds/trmk/ecloud/features/DataCenterOperationsApi.java b/providers/trmk-ecloud/src/main/java/org/jclouds/trmk/ecloud/features/DataCenterOperationsApi.java new file mode 100644 index 0000000..cc0b2b8 --- /dev/null +++ b/providers/trmk-ecloud/src/main/java/org/jclouds/trmk/ecloud/features/DataCenterOperationsApi.java @@ -0,0 +1,31 @@ +/* + * 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.trmk.ecloud.features; + +/** + * Data Center Operations access to DataCenterOperations functionality in vCloud + * <p/> + * There are times where knowing a data center is necessary to complete certain + * operations (i.e. uploading a catalog item). The data centers for an + * organization are those data centers that contain at least one of the + * organization's environments. + * + * @see DataCenterOperationsAsyncClient + * @author Adrian Cole + */ +public interface DataCenterOperationsApi extends DataCenterOperationsClient { +} http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/6add9da5/providers/trmk-ecloud/src/main/java/org/jclouds/trmk/ecloud/features/DataCenterOperationsAsyncApi.java ---------------------------------------------------------------------- diff --git a/providers/trmk-ecloud/src/main/java/org/jclouds/trmk/ecloud/features/DataCenterOperationsAsyncApi.java b/providers/trmk-ecloud/src/main/java/org/jclouds/trmk/ecloud/features/DataCenterOperationsAsyncApi.java new file mode 100644 index 0000000..0a093bd --- /dev/null +++ b/providers/trmk-ecloud/src/main/java/org/jclouds/trmk/ecloud/features/DataCenterOperationsAsyncApi.java @@ -0,0 +1,35 @@ +/* + * 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.trmk.ecloud.features; + +import org.jclouds.rest.annotations.RequestFilters; +import org.jclouds.trmk.vcloud_0_8.filters.SetVCloudTokenCookie; + +/** + * + * @deprecated The async interface will be removed in jclouds 1.7. + * @see <a href= + * "http://support.theenterprisecloud.com/kb/default.asp?id=960&Lang=1&SID="; + * /> + * @see DataCenterOperationsClient + * + * @author Adrian Cole + */ +@Deprecated +@RequestFilters(SetVCloudTokenCookie.class) +public interface DataCenterOperationsAsyncApi extends DataCenterOperationsAsyncClient { +} http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/6add9da5/providers/trmk-ecloud/src/main/java/org/jclouds/trmk/ecloud/features/DataCenterOperationsAsyncClient.java ---------------------------------------------------------------------- diff --git a/providers/trmk-ecloud/src/main/java/org/jclouds/trmk/ecloud/features/DataCenterOperationsAsyncClient.java b/providers/trmk-ecloud/src/main/java/org/jclouds/trmk/ecloud/features/DataCenterOperationsAsyncClient.java index 2271307..f579b72 100644 --- a/providers/trmk-ecloud/src/main/java/org/jclouds/trmk/ecloud/features/DataCenterOperationsAsyncClient.java +++ b/providers/trmk-ecloud/src/main/java/org/jclouds/trmk/ecloud/features/DataCenterOperationsAsyncClient.java @@ -39,7 +39,8 @@ import org.jclouds.trmk.vcloud_0_8.xml.DataCentersHandler; import com.google.common.util.concurrent.ListenableFuture; /** - * + * + * @deprecated The async interface will be removed in jclouds 1.7. * @see <a href= * "http://support.theenterprisecloud.com/kb/default.asp?id=960&Lang=1&SID="; * /> @@ -47,6 +48,7 @@ import com.google.common.util.concurrent.ListenableFuture; * * @author Adrian Cole */ +@Deprecated @RequestFilters(SetVCloudTokenCookie.class) public interface DataCenterOperationsAsyncClient { http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/6add9da5/providers/trmk-ecloud/src/main/java/org/jclouds/trmk/ecloud/features/DataCenterOperationsClient.java ---------------------------------------------------------------------- diff --git a/providers/trmk-ecloud/src/main/java/org/jclouds/trmk/ecloud/features/DataCenterOperationsClient.java b/providers/trmk-ecloud/src/main/java/org/jclouds/trmk/ecloud/features/DataCenterOperationsClient.java index 6728cd3..cc927c9 100644 --- a/providers/trmk-ecloud/src/main/java/org/jclouds/trmk/ecloud/features/DataCenterOperationsClient.java +++ b/providers/trmk-ecloud/src/main/java/org/jclouds/trmk/ecloud/features/DataCenterOperationsClient.java @@ -27,10 +27,12 @@ import org.jclouds.trmk.vcloud_0_8.domain.DataCenter; * operations (i.e. uploading a catalog item). The data centers for an * organization are those data centers that contain at least one of the * organization's environments. - * + * + * @deprecated *Client classes will be moved to *Api in jclouds 1.7.0. * @see DataCenterOperationsAsyncClient * @author Adrian Cole */ +@Deprecated public interface DataCenterOperationsClient { /** http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/6add9da5/providers/trmk-ecloud/src/main/java/org/jclouds/trmk/ecloud/features/TagOperationsApi.java ---------------------------------------------------------------------- diff --git a/providers/trmk-ecloud/src/main/java/org/jclouds/trmk/ecloud/features/TagOperationsApi.java b/providers/trmk-ecloud/src/main/java/org/jclouds/trmk/ecloud/features/TagOperationsApi.java new file mode 100644 index 0000000..3243125 --- /dev/null +++ b/providers/trmk-ecloud/src/main/java/org/jclouds/trmk/ecloud/features/TagOperationsApi.java @@ -0,0 +1,27 @@ +/* + * 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.trmk.ecloud.features; + +/** + * Tag Based Operations + * <p/> + * + * @see TagOperationsAsyncClient + * @author Adrian Cole + */ +public interface TagOperationsApi extends TagOperationsClient { +} http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/6add9da5/providers/trmk-ecloud/src/main/java/org/jclouds/trmk/ecloud/features/TagOperationsAsyncApi.java ---------------------------------------------------------------------- diff --git a/providers/trmk-ecloud/src/main/java/org/jclouds/trmk/ecloud/features/TagOperationsAsyncApi.java b/providers/trmk-ecloud/src/main/java/org/jclouds/trmk/ecloud/features/TagOperationsAsyncApi.java new file mode 100644 index 0000000..18bd90e --- /dev/null +++ b/providers/trmk-ecloud/src/main/java/org/jclouds/trmk/ecloud/features/TagOperationsAsyncApi.java @@ -0,0 +1,35 @@ +/* + * 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.trmk.ecloud.features; + +import org.jclouds.rest.annotations.RequestFilters; +import org.jclouds.trmk.vcloud_0_8.filters.SetVCloudTokenCookie; + +/** + * + * @deprecated The async interface will be removed in jclouds 1.7. + * @see <a href= + * "http://support.theenterprisecloud.com/kb/default.asp?id=954&Lang=1&SID="; + * /> + * @see TagOperationsClient + * + * @author Adrian Cole + */ +@Deprecated +@RequestFilters(SetVCloudTokenCookie.class) +public interface TagOperationsAsyncApi extends TagOperationsAsyncClient { +} http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/6add9da5/providers/trmk-ecloud/src/main/java/org/jclouds/trmk/ecloud/features/TagOperationsAsyncClient.java ---------------------------------------------------------------------- diff --git a/providers/trmk-ecloud/src/main/java/org/jclouds/trmk/ecloud/features/TagOperationsAsyncClient.java b/providers/trmk-ecloud/src/main/java/org/jclouds/trmk/ecloud/features/TagOperationsAsyncClient.java index 875baae..ce9dbc7 100644 --- a/providers/trmk-ecloud/src/main/java/org/jclouds/trmk/ecloud/features/TagOperationsAsyncClient.java +++ b/providers/trmk-ecloud/src/main/java/org/jclouds/trmk/ecloud/features/TagOperationsAsyncClient.java @@ -37,7 +37,8 @@ import org.jclouds.trmk.vcloud_0_8.filters.SetVCloudTokenCookie; import com.google.common.util.concurrent.ListenableFuture; /** - * + * + * @deprecated The async interface will be removed in jclouds 1.7. * @see <a href= * "http://support.theenterprisecloud.com/kb/default.asp?id=954&Lang=1&SID="; * /> @@ -45,6 +46,7 @@ import com.google.common.util.concurrent.ListenableFuture; * * @author Adrian Cole */ +@Deprecated @RequestFilters(SetVCloudTokenCookie.class) public interface TagOperationsAsyncClient { http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/6add9da5/providers/trmk-ecloud/src/main/java/org/jclouds/trmk/ecloud/features/TagOperationsClient.java ---------------------------------------------------------------------- diff --git a/providers/trmk-ecloud/src/main/java/org/jclouds/trmk/ecloud/features/TagOperationsClient.java b/providers/trmk-ecloud/src/main/java/org/jclouds/trmk/ecloud/features/TagOperationsClient.java index 7e1cbad..8a4a208 100644 --- a/providers/trmk-ecloud/src/main/java/org/jclouds/trmk/ecloud/features/TagOperationsClient.java +++ b/providers/trmk-ecloud/src/main/java/org/jclouds/trmk/ecloud/features/TagOperationsClient.java @@ -21,10 +21,12 @@ import java.util.Map; /** * Tag Based Operations * <p/> - * + * + * @deprecated *Client classes will be moved to *Api in jclouds 1.7.0. * @see TagOperationsAsyncClient * @author Adrian Cole */ +@Deprecated public interface TagOperationsClient { /** http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/6add9da5/providers/trmk-vcloudexpress/src/main/java/org/jclouds/trmk/vcloudexpress/TerremarkVCloudExpressApi.java ---------------------------------------------------------------------- diff --git a/providers/trmk-vcloudexpress/src/main/java/org/jclouds/trmk/vcloudexpress/TerremarkVCloudExpressApi.java b/providers/trmk-vcloudexpress/src/main/java/org/jclouds/trmk/vcloudexpress/TerremarkVCloudExpressApi.java new file mode 100644 index 0000000..d81c612 --- /dev/null +++ b/providers/trmk-vcloudexpress/src/main/java/org/jclouds/trmk/vcloudexpress/TerremarkVCloudExpressApi.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.trmk.vcloudexpress; + +/** + * Provides access to VCloud resources via their REST API. + * <p/> + * + * @see <a href="https://community.vcloudexpress.terremark.com/en-us/discussion_forums/f/60.aspx"; + * /> + * @author Adrian Cole + */ +public interface TerremarkVCloudExpressApi extends TerremarkVCloudExpressClient { +} http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/6add9da5/providers/trmk-vcloudexpress/src/main/java/org/jclouds/trmk/vcloudexpress/TerremarkVCloudExpressAsyncApi.java ---------------------------------------------------------------------- diff --git a/providers/trmk-vcloudexpress/src/main/java/org/jclouds/trmk/vcloudexpress/TerremarkVCloudExpressAsyncApi.java b/providers/trmk-vcloudexpress/src/main/java/org/jclouds/trmk/vcloudexpress/TerremarkVCloudExpressAsyncApi.java new file mode 100644 index 0000000..56dd5df --- /dev/null +++ b/providers/trmk-vcloudexpress/src/main/java/org/jclouds/trmk/vcloudexpress/TerremarkVCloudExpressAsyncApi.java @@ -0,0 +1,35 @@ +/* + * 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.trmk.vcloudexpress; + +import org.jclouds.rest.annotations.RequestFilters; +import org.jclouds.trmk.vcloud_0_8.filters.SetVCloudTokenCookie; + +/** + * Provides access to VCloud resources via their REST API. + * <p/> + * + * @deprecated The async interface will be removed in jclouds 1.7. + * @see <a href="https://community.vcloudexpress.terremark.com/en-us/discussion_forums/f/60.aspx"; /> + * @author Adrian Cole + * @deprecated please use {@code org.jclouds.ContextBuilder#buildApi(TerremarkVCloudExpressApi.class)} as + * {@link TerremarkVCloudExpressAsyncClient} interface will be removed in jclouds 1.7. + */ +@Deprecated +@RequestFilters(SetVCloudTokenCookie.class) +public interface TerremarkVCloudExpressAsyncApi extends TerremarkVCloudExpressAsyncClient { +} http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/6add9da5/providers/trmk-vcloudexpress/src/main/java/org/jclouds/trmk/vcloudexpress/TerremarkVCloudExpressAsyncClient.java ---------------------------------------------------------------------- diff --git a/providers/trmk-vcloudexpress/src/main/java/org/jclouds/trmk/vcloudexpress/TerremarkVCloudExpressAsyncClient.java b/providers/trmk-vcloudexpress/src/main/java/org/jclouds/trmk/vcloudexpress/TerremarkVCloudExpressAsyncClient.java index 1e70d22..6453ec2 100644 --- a/providers/trmk-vcloudexpress/src/main/java/org/jclouds/trmk/vcloudexpress/TerremarkVCloudExpressAsyncClient.java +++ b/providers/trmk-vcloudexpress/src/main/java/org/jclouds/trmk/vcloudexpress/TerremarkVCloudExpressAsyncClient.java @@ -58,10 +58,11 @@ import com.google.common.util.concurrent.ListenableFuture; /** * Provides access to VCloud resources via their REST API. * <p/> - * + * + * @deprecated The async interface will be removed in jclouds 1.7. * @see <a href="https://community.vcloudexpress.terremark.com/en-us/discussion_forums/f/60.aspx"; /> * @author Adrian Cole - * @deprecated please use {@code org.jclouds.ContextBuilder#buildApi(TerremarkVCloudExpressClient.class)} as + * @deprecated please use {@code org.jclouds.ContextBuilder#buildApi(TerremarkVCloudExpressApi.class)} as * {@link TerremarkVCloudExpressAsyncClient} interface will be removed in jclouds 1.7. */ @Deprecated http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/6add9da5/providers/trmk-vcloudexpress/src/main/java/org/jclouds/trmk/vcloudexpress/TerremarkVCloudExpressClient.java ---------------------------------------------------------------------- diff --git a/providers/trmk-vcloudexpress/src/main/java/org/jclouds/trmk/vcloudexpress/TerremarkVCloudExpressClient.java b/providers/trmk-vcloudexpress/src/main/java/org/jclouds/trmk/vcloudexpress/TerremarkVCloudExpressClient.java index acb0e47..ae1786a 100644 --- a/providers/trmk-vcloudexpress/src/main/java/org/jclouds/trmk/vcloudexpress/TerremarkVCloudExpressClient.java +++ b/providers/trmk-vcloudexpress/src/main/java/org/jclouds/trmk/vcloudexpress/TerremarkVCloudExpressClient.java @@ -25,11 +25,13 @@ import org.jclouds.trmk.vcloud_0_8.options.AddInternetServiceOptions; /** * Provides access to VCloud resources via their REST API. * <p/> - * + * + * @deprecated *Client classes will be moved to *Api in jclouds 1.7.0. * @see <a href="https://community.vcloudexpress.terremark.com/en-us/discussion_forums/f/60.aspx"; * /> * @author Adrian Cole */ +@Deprecated public interface TerremarkVCloudExpressClient extends TerremarkVCloudClient { InternetService addInternetServiceToVDC(URI vDCId, String serviceName, Protocol protocol, int port,
