Normalize deprecation messages to make them easier to find
diff --git a/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/MarconiApi.java b/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/MarconiApi.java
index 532e1e2..900709b 100644
--- a/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/MarconiApi.java
+++ b/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/MarconiApi.java
@@ -109,8 +109,7 @@
* persists between restarts of the client so the client should reuse that same Client-ID. All
* message-related operations require the use of Client-ID in the headers to ensure that messages
* are not echoed back to the client that posted them, unless the client explicitly requests this.
- * @deprecated Please use {@link #getQueueApi(String, UUID)} as this method will be removed
- * in jclouds 3.0.
+ * @deprecated Please use {@link #getQueueApi(String, UUID)} instead. To be removed in jclouds 2.0.
*/
@Deprecated
@Delegate
@@ -127,8 +126,7 @@
* message-related operations require the use of Client-ID in the headers to ensure that messages
* are not echoed back to the client that posted them, unless the client explicitly requests this.
* @param name Name of the queue.
- * @deprecated Please use {@link #getMessageApi(String, UUID, String)} as this method will be removed
- * in jclouds 3.0.
+ * @deprecated Please use {@link #getMessageApi(String, UUID, String)} instead. To be removed in jclouds 2.0.
*/
@Deprecated
@Delegate
@@ -146,8 +144,7 @@
* message-related operations require the use of Client-ID in the headers to ensure that messages
* are not echoed back to the client that posted them, unless the client explicitly requests this.
* @param name Name of the queue.
- * @deprecated Please use {@link #getClaimApi(String, UUID, String)} as this method will be removed
- * in jclouds 3.0.
+ * @deprecated Please use {@link #getClaimApi(String, UUID, String)} instead. To be removed in jclouds 2.0.
*/
@Deprecated
@Delegate
diff --git a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/NeutronApi.java b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/NeutronApi.java
index a5ff027..d39bc3c 100644
--- a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/NeutronApi.java
+++ b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/NeutronApi.java
@@ -39,8 +39,7 @@
* Provides access to the OpenStack Networking (Neutron) v2 API.
* <p/>
*
- * @deprecated Please use {@link org.jclouds.openstack.neutron.v2.NeutronApi} as this
- * interface will be removed in jclouds 3.0.
+ * @deprecated Please use {@link org.jclouds.openstack.neutron.v2.NeutronApi} instead. To be removed in jclouds 2.0.
*/
@Deprecated
public interface NeutronApi extends Closeable {
@@ -84,7 +83,7 @@
/**
* @return the Zone codes configured
- * @deprecated Please use {@link #getConfiguredRegions()} as this method will be removed in jclouds 3.0.
+ * @deprecated Please use {@link #getConfiguredRegions()} instead. To be removed in jclouds 2.0.
*/
@Deprecated
@Provides
@@ -93,7 +92,7 @@
/**
* Provides access to Extension features.
- * @deprecated Please use {@link #getExtensionApi(String)} as this method will be removed in jclouds 3.0.
+ * @deprecated Please use {@link #getExtensionApi(String)} instead. To be removed in jclouds 2.0.
*/
@Deprecated
@Delegate
@@ -102,7 +101,7 @@
/**
* Provides access to Network features.
- * @deprecated Please use {@link #getNetworkApi(String)} as this method will be removed in jclouds 3.0.
+ * @deprecated Please use {@link #getNetworkApi(String)} instead. To be removed in jclouds 2.0.
*/
@Deprecated
@Delegate
@@ -110,7 +109,7 @@
/**
* Provides access to Subnet features.
- * @deprecated Please use {@link #getSubnetApi(String)} as this method will be removed in jclouds 3.0.
+ * @deprecated Please use {@link #getSubnetApi(String)} instead. To be removed in jclouds 2.0.
*/
@Deprecated
@Delegate
@@ -118,7 +117,7 @@
/**
* Provides access to Port features.
- * @deprecated Please use {@link #getPortApi(String)} as this method will be removed in jclouds 3.0.
+ * @deprecated Please use {@link #getPortApi(String)} instead. To be removed in jclouds 2.0.
*/
@Deprecated
@Delegate
@@ -126,7 +125,7 @@
/**
* Provides access to Router features.
- * @deprecated Please use {@link #getRouterApi(String)} as this method will be removed in jclouds 3.0.
+ * @deprecated Please use {@link #getRouterApi(String)} instead. To be removed in jclouds 2.0.
*/
@Deprecated
@Delegate
diff --git a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/NeutronApiMetadata.java b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/NeutronApiMetadata.java
index 8d5e51c..f333647 100644
--- a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/NeutronApiMetadata.java
+++ b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/NeutronApiMetadata.java
@@ -38,6 +38,7 @@
/**
* Implementation of {@link org.jclouds.apis.ApiMetadata} for Neutron 2.0 API
+ * @deprecated To be removed in jclouds 2.0.
*/
@Deprecated
@AutoService(ApiMetadata.class)
diff --git a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/extensions/RouterApi.java b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/extensions/RouterApi.java
index dca4427..3da0e34 100644
--- a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/extensions/RouterApi.java
+++ b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/extensions/RouterApi.java
@@ -56,8 +56,8 @@
* A logical entity for forwarding packets across internal subnets and NATting them on external
* networks through an appropriate external gateway.
*
- * @deprecated Please use {@link org.jclouds.openstack.neutron.v2.extensions.RouterApi} as this
- * interface will be removed in jclouds 3.0.
+ * @deprecated Please use {@link org.jclouds.openstack.neutron.v2.extensions.RouterApi} instead.
+ * To be removed in jclouds 2.0.
*/
@Deprecated
@Path("/v2.0/routers")
diff --git a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/features/NetworkApi.java b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/features/NetworkApi.java
index c2b4aa5..dc7b005 100644
--- a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/features/NetworkApi.java
+++ b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/features/NetworkApi.java
@@ -59,7 +59,8 @@
*
* @see <a href=
* "http://docs.openstack.org/api/openstack-network/2.0/content/Networks.html">api doc</a>
- * @deprecated Use v2 instead of v2_0
+ * @deprecated Please use {@link org.jclouds.openstack.neutron.v2.features.NetworkApi} instead.
+ * To be removed in jclouds 2.0.
*/
@Deprecated
@Path("/v2.0/networks")
diff --git a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/features/PortApi.java b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/features/PortApi.java
index 7390131..4aef5cd 100644
--- a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/features/PortApi.java
+++ b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/features/PortApi.java
@@ -62,7 +62,8 @@
* @see <a href=
* "http://docs.openstack.org/api/openstack-network/2.0/content/Ports.html">api doc</a>
- * @deprecated Use v2 instead of v2_0
+ * @deprecated Please use {@link org.jclouds.openstack.neutron.v2.features.PortApi} instead.
+ * To be removed in jclouds 2.0.
*/
@Deprecated
@Path("/v2.0/ports")
diff --git a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/features/SubnetApi.java b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/features/SubnetApi.java
index 5c2acc5..24ce4b3 100644
--- a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/features/SubnetApi.java
+++ b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/features/SubnetApi.java
@@ -58,7 +58,8 @@
* @see <a href=
* "http://docs.openstack.org/api/openstack-network/2.0/content/Subnets.html">api doc</a>
- * @deprecated Use v2 instead of v2_0
+ * @deprecated Please use {@link org.jclouds.openstack.neutron.v2.features.SubnetApi} instead.
+ * To be removed in jclouds 2.0.
*/
@Deprecated
@Path("/v2.0/subnets")
diff --git a/rackspace-autoscale-us/src/main/java/org/jclouds/rackspace/autoscale/us/v1/AutoscaleUSProviderMetadata.java b/rackspace-autoscale-us/src/main/java/org/jclouds/rackspace/autoscale/us/v1/AutoscaleUSProviderMetadata.java
index adc4ee8..1cc53e6 100644
--- a/rackspace-autoscale-us/src/main/java/org/jclouds/rackspace/autoscale/us/v1/AutoscaleUSProviderMetadata.java
+++ b/rackspace-autoscale-us/src/main/java/org/jclouds/rackspace/autoscale/us/v1/AutoscaleUSProviderMetadata.java
@@ -42,8 +42,8 @@
/**
* Implementation of {@link ProviderMetadata} for Rackspace US Auto Scale API.
*
- * @deprecated Please use {@link org.jclouds.rackspace.autoscale.us.AutoscaleUSProviderMetadata} as
- * this method will be removed in jclouds 2.0.
+ * @deprecated Please use {@link org.jclouds.rackspace.autoscale.us.AutoscaleUSProviderMetadata} instead.
+ * To be removed in jclouds 2.0.
*/
@Deprecated
public class AutoscaleUSProviderMetadata extends BaseProviderMetadata {
diff --git a/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/AutoscaleApi.java b/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/AutoscaleApi.java
index 3504c85..aa9830a 100644
--- a/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/AutoscaleApi.java
+++ b/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/AutoscaleApi.java
@@ -80,7 +80,7 @@
/**
* @return the configured zone codes
- * @deprecated Please use {@link #getConfiguredRegions()} as this method will be removed in jclouds 3.0.
+ * @deprecated Please use {@link #getConfiguredRegions()} instead. To be removed in jclouds 2.0.
*/
@Deprecated
@Provides
@@ -89,8 +89,7 @@
/**
* Provides access to all policy features for scaling Groups.
- * @deprecated Please use {@link #getPolicyApi(String, String)} as this method will be removed
- * in jclouds 3.0.
+ * @deprecated Please use {@link #getPolicyApi(String, String)} instead. To be removed in jclouds 2.0.
*/
@Deprecated
@Delegate
@@ -100,8 +99,7 @@
/**
* Provides access to webhook management features.
- * @deprecated Please use {@link #getWebhookApi(String, String, String)} as this method will be removed
- * in jclouds 3.0.
+ * @deprecated Please use {@link #getWebhookApi(String, String, String)} instead. To be removed in jclouds 2.0.
*/
@Deprecated
@Delegate
diff --git a/rackspace-cloudbigdata/src/main/java/org/jclouds/rackspace/cloudbigdata/v1/CloudBigDataApi.java b/rackspace-cloudbigdata/src/main/java/org/jclouds/rackspace/cloudbigdata/v1/CloudBigDataApi.java
index 93e64a1..74b5c83 100644
--- a/rackspace-cloudbigdata/src/main/java/org/jclouds/rackspace/cloudbigdata/v1/CloudBigDataApi.java
+++ b/rackspace-cloudbigdata/src/main/java/org/jclouds/rackspace/cloudbigdata/v1/CloudBigDataApi.java
@@ -62,7 +62,7 @@
/**
* @return the Zone codes configured
- * @deprecated Please use {@link #getConfiguredRegions()} as this method will be removed in jclouds 3.0.
+ * @deprecated Please use {@link #getConfiguredRegions()} instead. To be removed in jclouds 2.0.
*/
@Deprecated
@Provides
@@ -73,7 +73,7 @@
* Provides access to all Profile features.
* @param zone The zone (region) for the profile API.
* @return A profile API context.
- * @deprecated Please use {@link #getProfileApi(String)} as this method will be removed in jclouds 3.0.
+ * @deprecated Please use {@link #getProfileApi(String)} instead. To be removed in jclouds 2.0.
*/
@Deprecated
@Delegate
@@ -83,7 +83,7 @@
* Provides access to all Cluster features.
* @param zone The zone (region) for the profile API.
* @return A cluster API context.
- * @deprecated Please use {@link #getClusterApi(String)} as this method will be removed in jclouds 3.0.
+ * @deprecated Please use {@link #getClusterApi(String)} instead. To be removed in jclouds 2.0.
*/
@Deprecated
@Delegate
