You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by tb...@apache.org on 2017/10/12 11:05:49 UTC
[1/2] brooklyn-server git commit: Update 0.13.0 versions to 1.0.0
Repository: brooklyn-server
Updated Branches:
refs/heads/master fede005e1 -> 4578d47df
Update 0.13.0 versions to 1.0.0
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/e89c5f09
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/e89c5f09
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/e89c5f09
Branch: refs/heads/master
Commit: e89c5f093bcbe86ae58c537977220194719cf334
Parents: 84e9e19
Author: Duncan Godwin <du...@cloudsoftcorp.com>
Authored: Thu Oct 12 10:28:32 2017 +0100
Committer: Duncan Godwin <du...@cloudsoftcorp.com>
Committed: Thu Oct 12 10:28:32 2017 +0100
----------------------------------------------------------------------
.../org/apache/brooklyn/api/entity/Entity.java | 2 +-
.../brooklyn/api/mgmt/ExecutionContext.java | 4 +--
.../brooklyn/api/mgmt/ExecutionManager.java | 4 +--
.../brooklyn/core/entity/AbstractEntity.java | 6 ++--
.../brooklyn/core/entity/EntityInternal.java | 4 +--
.../brooklyn/core/mgmt/BrooklynTaskTags.java | 4 +--
.../mgmt/ha/OsgiBundleInstallationResult.java | 4 +--
.../core/objs/AbstractEntityAdjunct.java | 2 +-
.../apache/brooklyn/core/policy/Policies.java | 4 +--
.../core/typereg/RegisteredTypePredicates.java | 2 +-
.../brooklyn/core/typereg/RegisteredTypes.java | 2 +-
.../util/core/task/BasicExecutionContext.java | 2 +-
.../apache/brooklyn/rest/api/CatalogApi.java | 34 ++++++++++----------
.../org/apache/brooklyn/rest/api/PolicyApi.java | 2 +-
.../brooklyn/rest/api/PolicyConfigApi.java | 2 +-
.../rest/domain/CatalogEnricherSummary.java | 2 +-
.../rest/domain/CatalogEntitySummary.java | 2 +-
.../rest/domain/CatalogItemSummary.java | 2 +-
.../rest/domain/CatalogLocationSummary.java | 2 +-
.../rest/domain/CatalogPolicySummary.java | 2 +-
.../rest/domain/EnricherConfigSummary.java | 2 +-
.../rest/domain/EntityConfigSummary.java | 2 +-
.../rest/domain/LocationConfigSummary.java | 2 +-
.../rest/domain/PolicyConfigSummary.java | 2 +-
.../brooklyn/rest/domain/PolicySummary.java | 2 +-
.../rest/transform/CatalogTransformer.java | 2 +-
.../rest/transform/EntityTransformer.java | 16 ++++-----
.../rest/transform/PolicyTransformer.java | 2 +-
.../brooklyn/util/osgi/VersionedName.java | 2 +-
29 files changed, 60 insertions(+), 60 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e89c5f09/api/src/main/java/org/apache/brooklyn/api/entity/Entity.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/org/apache/brooklyn/api/entity/Entity.java b/api/src/main/java/org/apache/brooklyn/api/entity/Entity.java
index bbee0ad..cafe0ed 100644
--- a/api/src/main/java/org/apache/brooklyn/api/entity/Entity.java
+++ b/api/src/main/java/org/apache/brooklyn/api/entity/Entity.java
@@ -287,7 +287,7 @@ public interface Entity extends BrooklynObject {
/**
* Adds the given feed to this entity. Also calls feed.setEntity if available.
*
- * @deprecated since 0.13.0; see {@link FeedSupport#add(Feed)}
+ * @deprecated since 1.0.0; see {@link FeedSupport#add(Feed)}
*/
@Deprecated
<T extends Feed> T addFeed(T feed);
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e89c5f09/api/src/main/java/org/apache/brooklyn/api/mgmt/ExecutionContext.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/org/apache/brooklyn/api/mgmt/ExecutionContext.java b/api/src/main/java/org/apache/brooklyn/api/mgmt/ExecutionContext.java
index d303ba9..bb95ea9 100644
--- a/api/src/main/java/org/apache/brooklyn/api/mgmt/ExecutionContext.java
+++ b/api/src/main/java/org/apache/brooklyn/api/mgmt/ExecutionContext.java
@@ -53,12 +53,12 @@ public interface ExecutionContext extends Executor {
<T> Task<T> submit(Map<?,?> properties, Callable<T> callable);
/** {@link ExecutionManager#submit(Runnable)
- * @deprecated since 0.13.0 pass a display name or a more detailed map */
+ * @deprecated since 1.0.0 pass a display name or a more detailed map */
@Deprecated
Task<?> submit(Runnable runnable);
/** {@link ExecutionManager#submit(Callable)
- * @deprecated since 0.13.0 pass a display name or a more detailed map */
+ * @deprecated since 1.0.0 pass a display name or a more detailed map */
@Deprecated
<T> Task<T> submit(Callable<T> callable);
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e89c5f09/api/src/main/java/org/apache/brooklyn/api/mgmt/ExecutionManager.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/org/apache/brooklyn/api/mgmt/ExecutionManager.java b/api/src/main/java/org/apache/brooklyn/api/mgmt/ExecutionManager.java
index 347a127..2136db6 100644
--- a/api/src/main/java/org/apache/brooklyn/api/mgmt/ExecutionManager.java
+++ b/api/src/main/java/org/apache/brooklyn/api/mgmt/ExecutionManager.java
@@ -80,12 +80,12 @@ public interface ExecutionManager {
// public Set<Task<?>> getAllTasks();
/** see {@link #submit(Map, TaskAdaptable)}
- * @deprecated since 0.13.0 pass displayName or map */
+ * @deprecated since 1.0.0 pass displayName or map */
@Deprecated
public Task<?> submit(Runnable r);
/** see {@link #submit(Map, TaskAdaptable)}
- * @deprecated since 0.13.0 pass displayName or map */
+ * @deprecated since 1.0.0 pass displayName or map */
@Deprecated
public <T> Task<T> submit(Callable<T> r);
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e89c5f09/core/src/main/java/org/apache/brooklyn/core/entity/AbstractEntity.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/entity/AbstractEntity.java b/core/src/main/java/org/apache/brooklyn/core/entity/AbstractEntity.java
index dfbbc8f..e3430e8 100644
--- a/core/src/main/java/org/apache/brooklyn/core/entity/AbstractEntity.java
+++ b/core/src/main/java/org/apache/brooklyn/core/entity/AbstractEntity.java
@@ -1899,7 +1899,7 @@ public abstract class AbstractEntity extends AbstractBrooklynObject implements E
return addFeed(feed);
}
- /** @deprecated since 0.13.0 use {@link #add(Feed)} */
+ /** @deprecated since 1.0.0 use {@link #add(Feed)} */
@Deprecated
public <T extends Feed> T addFeed(T feed) {
Feed old = findApparentlyEqualAndWarnIfNotSameUniqueTag(feedsInternal, feed);
@@ -1933,7 +1933,7 @@ public abstract class AbstractEntity extends AbstractBrooklynObject implements E
return removeFeed(feed);
}
- /** @deprecated since 0.13.0 use {@link #remove(Feed)} */
+ /** @deprecated since 1.0.0 use {@link #remove(Feed)} */
@Deprecated
public boolean removeFeed(Feed feed) {
feed.stop();
@@ -1965,7 +1965,7 @@ public abstract class AbstractEntity extends AbstractBrooklynObject implements E
return getFeeds().iterator();
}
- // TODO add these back when we implement AdjunctSupport (after 0.13.0)
+ // TODO add these back when we implement AdjunctSupport (after 1.0.0)
// @Override
// public int size() {
// return getFeeds().size();
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e89c5f09/core/src/main/java/org/apache/brooklyn/core/entity/EntityInternal.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/entity/EntityInternal.java b/core/src/main/java/org/apache/brooklyn/core/entity/EntityInternal.java
index 46d10ab..2bcf16f 100644
--- a/core/src/main/java/org/apache/brooklyn/core/entity/EntityInternal.java
+++ b/core/src/main/java/org/apache/brooklyn/core/entity/EntityInternal.java
@@ -189,7 +189,7 @@ public interface EntityInternal extends BrooklynObjectInternal, EntityLocal, Reb
void remove(AttributeSensor<?> attribute);
}
- // TODO extend AdjunctSupport<Feed>, after 0.13.0
+ // TODO extend AdjunctSupport<Feed>, after 1.0.0
public interface FeedSupport extends Iterable<Feed> {
Collection<Feed> getFeeds();
@@ -197,7 +197,7 @@ public interface EntityInternal extends BrooklynObjectInternal, EntityLocal, Reb
/**
* Adds the given feed to this entity. The feed will automatically be re-added on brooklyn restart.
*
- * @deprecated since 0.13.0 will change to return type 'void', for consistency with other {@link AdjunctSupport}
+ * @deprecated since 1.0.0 will change to return type 'void', for consistency with other {@link AdjunctSupport}
*/
@Deprecated
// @Override
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e89c5f09/core/src/main/java/org/apache/brooklyn/core/mgmt/BrooklynTaskTags.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/mgmt/BrooklynTaskTags.java b/core/src/main/java/org/apache/brooklyn/core/mgmt/BrooklynTaskTags.java
index f889b5a..f8a9d0b 100644
--- a/core/src/main/java/org/apache/brooklyn/core/mgmt/BrooklynTaskTags.java
+++ b/core/src/main/java/org/apache/brooklyn/core/mgmt/BrooklynTaskTags.java
@@ -88,7 +88,7 @@ public class BrooklynTaskTags extends TaskTags {
// ------------- entity tags -------------------------
public abstract static class WrappedItem<T> {
- /** @deprecated since 0.13.0 going private; use {@link #getWrappingType()} */
+ /** @deprecated since 1.0.0 going private; use {@link #getWrappingType()} */
@Deprecated
public final String wrappingType;
protected WrappedItem(String wrappingType) {
@@ -117,7 +117,7 @@ public class BrooklynTaskTags extends TaskTags {
}
}
public static class WrappedEntity extends WrappedItem<Entity> {
- /** @deprecated since 0.13.0 going private; use {@link #unwrap()} */
+ /** @deprecated since 1.0.0 going private; use {@link #unwrap()} */
@Deprecated
public final Entity entity;
protected WrappedEntity(String wrappingType, Entity entity) {
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e89c5f09/core/src/main/java/org/apache/brooklyn/core/mgmt/ha/OsgiBundleInstallationResult.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/mgmt/ha/OsgiBundleInstallationResult.java b/core/src/main/java/org/apache/brooklyn/core/mgmt/ha/OsgiBundleInstallationResult.java
index 05221a6..68106d4 100644
--- a/core/src/main/java/org/apache/brooklyn/core/mgmt/ha/OsgiBundleInstallationResult.java
+++ b/core/src/main/java/org/apache/brooklyn/core/mgmt/ha/OsgiBundleInstallationResult.java
@@ -61,7 +61,7 @@ public class OsgiBundleInstallationResult {
public boolean isError() { return isError; }
}
final List<RegisteredType> typesInstalled = MutableList.of();
- /** @deprecated since 0.13.0 use {@link #typesInstalled} */
+ /** @deprecated since 1.0.0 use {@link #typesInstalled} */
@Deprecated
private final List<String> catalogItemsInstalled = MutableList.of();
@@ -80,7 +80,7 @@ public class OsgiBundleInstallationResult {
public List<RegisteredType> getTypesInstalled() {
return typesInstalled;
}
- /** @deprecated since 0.13.0 use {@link #getTypesInstalled()} */
+ /** @deprecated since 1.0.0 use {@link #getTypesInstalled()} */
@Deprecated
public List<String> getCatalogItemsInstalled() {
return ImmutableList.copyOf(catalogItemsInstalled);
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e89c5f09/core/src/main/java/org/apache/brooklyn/core/objs/AbstractEntityAdjunct.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/objs/AbstractEntityAdjunct.java b/core/src/main/java/org/apache/brooklyn/core/objs/AbstractEntityAdjunct.java
index 7b2f6ad..85b1451 100644
--- a/core/src/main/java/org/apache/brooklyn/core/objs/AbstractEntityAdjunct.java
+++ b/core/src/main/java/org/apache/brooklyn/core/objs/AbstractEntityAdjunct.java
@@ -86,7 +86,7 @@ public abstract class AbstractEntityAdjunct extends AbstractBrooklynObject imple
@Deprecated
protected Map<String,Object> leftoverProperties = Maps.newLinkedHashMap();
- /** @deprecated since 0.13.0, going private, use {@link #getExecutionContext()} */
+ /** @deprecated since 1.0.0, going private, use {@link #getExecutionContext()} */
@Deprecated
protected transient ExecutionContext execution;
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e89c5f09/core/src/main/java/org/apache/brooklyn/core/policy/Policies.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/policy/Policies.java b/core/src/main/java/org/apache/brooklyn/core/policy/Policies.java
index 0af5c6a..e77023d 100644
--- a/core/src/main/java/org/apache/brooklyn/core/policy/Policies.java
+++ b/core/src/main/java/org/apache/brooklyn/core/policy/Policies.java
@@ -22,11 +22,11 @@ import org.apache.brooklyn.api.policy.Policy;
import org.apache.brooklyn.core.entity.EntityAdjuncts;
import org.apache.brooklyn.core.entity.lifecycle.Lifecycle;
-/** @deprecated since 0.13.0 use {@link EntityAdjuncts} */
+/** @deprecated since 1.0.0 use {@link EntityAdjuncts} */
@Deprecated
public class Policies {
- /** @deprecated since 0.13.0, use {@link EntityAdjuncts#inferAdjunctStatus(org.apache.brooklyn.api.objs.EntityAdjunct)} */
+ /** @deprecated since 1.0.0, use {@link EntityAdjuncts#inferAdjunctStatus(org.apache.brooklyn.api.objs.EntityAdjunct)} */
@Deprecated
public static Lifecycle getPolicyStatus(Policy p) {
return EntityAdjuncts.inferAdjunctStatus(p);
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e89c5f09/core/src/main/java/org/apache/brooklyn/core/typereg/RegisteredTypePredicates.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/typereg/RegisteredTypePredicates.java b/core/src/main/java/org/apache/brooklyn/core/typereg/RegisteredTypePredicates.java
index e6705ef..30aa214 100644
--- a/core/src/main/java/org/apache/brooklyn/core/typereg/RegisteredTypePredicates.java
+++ b/core/src/main/java/org/apache/brooklyn/core/typereg/RegisteredTypePredicates.java
@@ -267,7 +267,7 @@ public class RegisteredTypePredicates {
}
}
- /** @deprecated since 0.13.0 use {@link AnySuperTypeSatisfies}, kept for persistence compatibility */
+ /** @deprecated since 1.0.0 use {@link AnySuperTypeSatisfies}, kept for persistence compatibility */
@SuppressWarnings("unused")
@Deprecated
private static class AnySuperTypeMatches implements Predicate<RegisteredType> {
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e89c5f09/core/src/main/java/org/apache/brooklyn/core/typereg/RegisteredTypes.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/typereg/RegisteredTypes.java b/core/src/main/java/org/apache/brooklyn/core/typereg/RegisteredTypes.java
index 49ea861..a21ffd3 100644
--- a/core/src/main/java/org/apache/brooklyn/core/typereg/RegisteredTypes.java
+++ b/core/src/main/java/org/apache/brooklyn/core/typereg/RegisteredTypes.java
@@ -446,7 +446,7 @@ public class RegisteredTypes {
/**
* Queries recursively the given types (either {@link Class} or {@link RegisteredType})
* to see whether any java superclasses satisfy the given {@link Predicate} on the {@link Class}
- * @deprecated since 0.13.0 use {@link #isAnyTypeOrSuper(Set, Predicate)} accepting any object in the predicate,
+ * @deprecated since 1.0.0 use {@link #isAnyTypeOrSuper(Set, Predicate)} accepting any object in the predicate,
* typically allowing string equivalence although it is valid to restrict to {@link Class} comparison
* (might be stricter in some OSGi cases) */
@Deprecated
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e89c5f09/core/src/main/java/org/apache/brooklyn/util/core/task/BasicExecutionContext.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/util/core/task/BasicExecutionContext.java b/core/src/main/java/org/apache/brooklyn/util/core/task/BasicExecutionContext.java
index 2c8ddab..f81ad35 100644
--- a/core/src/main/java/org/apache/brooklyn/util/core/task/BasicExecutionContext.java
+++ b/core/src/main/java/org/apache/brooklyn/util/core/task/BasicExecutionContext.java
@@ -84,7 +84,7 @@ public class BasicExecutionContext extends AbstractExecutionContext {
* Supported flags are {@code tag} and {@code tags}
*
* @see ExecutionManager#submit(Map, TaskAdaptable)
- * @deprecated since 0.13.0 use {@link #BasicExecutionContext(ExecutionManager, Iterable)}
+ * @deprecated since 1.0.0 use {@link #BasicExecutionContext(ExecutionManager, Iterable)}
*/
@Deprecated
public BasicExecutionContext(Map<?, ?> flags, ExecutionManager executionManager) {
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e89c5f09/rest/rest-api/src/main/java/org/apache/brooklyn/rest/api/CatalogApi.java
----------------------------------------------------------------------
diff --git a/rest/rest-api/src/main/java/org/apache/brooklyn/rest/api/CatalogApi.java b/rest/rest-api/src/main/java/org/apache/brooklyn/rest/api/CatalogApi.java
index 2c115df..94de80e 100644
--- a/rest/rest-api/src/main/java/org/apache/brooklyn/rest/api/CatalogApi.java
+++ b/rest/rest-api/src/main/java/org/apache/brooklyn/rest/api/CatalogApi.java
@@ -153,7 +153,7 @@ public interface CatalogApi {
@QueryParam("forceUpdate") @DefaultValue("false")
boolean forceUpdate);
- /** @deprecated since 0.13.0 delete the bundle via DELETE /catalog/bundles/xxx */
+ /** @deprecated since 1.0.0 delete the bundle via DELETE /catalog/bundles/xxx */
// but we will probably keep this around for a while as many places use it
@Deprecated
@DELETE
@@ -173,7 +173,7 @@ public interface CatalogApi {
@ApiParam(name = "version", value = "The version identifier of the application or template to delete", required = true)
@PathParam("version") String version) throws Exception;
- /** @deprecated since 0.13.0 delete the bundle via DELETE /catalog/bundles/xxx */
+ /** @deprecated since 1.0.0 delete the bundle via DELETE /catalog/bundles/xxx */
// but we will probably keep this around for a while as many places use it
@Deprecated
@DELETE
@@ -193,7 +193,7 @@ public interface CatalogApi {
@ApiParam(name = "version", value = "The version identifier of the entity or template to delete", required = true)
@PathParam("version") String version) throws Exception;
- /** @deprecated since 0.13.0 delete the bundle via DELETE /catalog/bundles/xxx */
+ /** @deprecated since 1.0.0 delete the bundle via DELETE /catalog/bundles/xxx */
// but we will probably keep this around for a while as many places use it
@Deprecated
@DELETE
@@ -212,7 +212,7 @@ public interface CatalogApi {
@ApiParam(name = "version", value = "The version identifier of the policy to delete", required = true)
@PathParam("version") String version) throws Exception;
- /** @deprecated since 0.13.0 delete the bundle via DELETE /catalog/bundles/xxx */
+ /** @deprecated since 1.0.0 delete the bundle via DELETE /catalog/bundles/xxx */
// but we will probably keep this around for a while as many places use it
@Deprecated
@DELETE
@@ -232,7 +232,7 @@ public interface CatalogApi {
@ApiParam(name = "version", value = "The version identifier of the location to delete", required = true)
@PathParam("version") String version) throws Exception;
- /** @deprecated since 0.13.0 use /catalog/bundles and /catalog/types?supertype=... */
+ /** @deprecated since 1.0.0 use /catalog/bundles and /catalog/types?supertype=... */
// but we will probably keep this around for a while as many places use it
@Deprecated
@GET
@@ -249,7 +249,7 @@ public interface CatalogApi {
@QueryParam("allVersions") @DefaultValue("false") boolean includeAllVersions);
// bad name - it is just templates
- /** @deprecated since 0.13.0 use /catalog/bundles and /catalog/types?supertype=... */
+ /** @deprecated since 1.0.0 use /catalog/bundles and /catalog/types?supertype=... */
// but we will probably keep this around for a while as many places use it
@Deprecated
@GET
@@ -265,7 +265,7 @@ public interface CatalogApi {
@ApiParam(name = "allVersions", value = "Include all versions (defaults false, only returning the best version)")
@QueryParam("allVersions") @DefaultValue("false") boolean includeAllVersions);
- /** @deprecated since 0.13.0 use /catalog/bundles and /catalog/types?supertype=... */
+ /** @deprecated since 1.0.0 use /catalog/bundles and /catalog/types?supertype=... */
// but we will probably keep this around for a while as many places use it
@Deprecated
@GET
@@ -286,7 +286,7 @@ public interface CatalogApi {
@ApiParam(name = "version", value = "The version identifier of the entity or template to retrieve", required = true)
@PathParam("version") String version) throws Exception;
- /** @deprecated since 0.13.0 use /catalog/bundles and /catalog/types?supertype=... */
+ /** @deprecated since 1.0.0 use /catalog/bundles and /catalog/types?supertype=... */
// but we will probably keep this around for a while as many places use it
@Deprecated
@GET
@@ -307,7 +307,7 @@ public interface CatalogApi {
@ApiParam(name = "version", value = "The version identifier of the application to retrieve", required = true)
@PathParam("version") String version) throws Exception;
- /** @deprecated since 0.13.0 use /catalog/bundles and /catalog/types?supertype=... */
+ /** @deprecated since 1.0.0 use /catalog/bundles and /catalog/types?supertype=... */
// but we will probably keep this around for a while as many places use it
@Deprecated
@GET
@@ -323,7 +323,7 @@ public interface CatalogApi {
@ApiParam(name = "allVersions", value = "Include all versions (defaults false, only returning the best version)")
@QueryParam("allVersions") @DefaultValue("false") boolean includeAllVersions);
- /** @deprecated since 0.13.0 use /catalog/bundles and /catalog/types?supertype=... */
+ /** @deprecated since 1.0.0 use /catalog/bundles and /catalog/types?supertype=... */
// but we will probably keep this around for a while as many places use it
@Deprecated
@GET
@@ -343,7 +343,7 @@ public interface CatalogApi {
@ApiParam(name = "version", value = "The version identifier of the application to retrieve", required = true)
@PathParam("version") String version) throws Exception;
- /** @deprecated since 0.13.0 use /catalog/bundles and /catalog/types?supertype=... */
+ /** @deprecated since 1.0.0 use /catalog/bundles and /catalog/types?supertype=... */
// but we will probably keep this around for a while as many places use it
@Deprecated
@GET
@@ -359,7 +359,7 @@ public interface CatalogApi {
@ApiParam(name = "allVersions", value = "Include all versions (defaults false, only returning the best version)")
@QueryParam("allVersions") @DefaultValue("false") boolean includeAllVersions);
- /** @deprecated since 0.13.0 use /catalog/bundles and /catalog/types?supertype=... */
+ /** @deprecated since 1.0.0 use /catalog/bundles and /catalog/types?supertype=... */
// but we will probably keep this around for a while as many places use it
@Deprecated
@GET
@@ -397,7 +397,7 @@ public interface CatalogApi {
@ApiParam(name = "version", value = "version identifier of catalog item (application, entity, policy, location)", required=true)
@PathParam("version") String version);
- /** @deprecated since 0.13.0 use /catalog/bundles and /catalog/types?supertype=...;
+ /** @deprecated since 1.0.0 use /catalog/bundles and /catalog/types?supertype=...;
* deprecation/disabling needs to be done in the bundle, and we might support deprecating/disabling bundles */
// but we will probably keep this around for a while as many places use it
@Deprecated
@@ -414,7 +414,7 @@ public interface CatalogApi {
@ApiParam(name = "deprecated", value = "Whether or not the catalog item is deprecated", required = true)
boolean deprecated);
- /** @deprecated since 0.13.0 use /catalog/bundles and /catalog/types?supertype=...;
+ /** @deprecated since 1.0.0 use /catalog/bundles and /catalog/types?supertype=...;
* deprecation/disabling needs to be done in the bundle, and we might support deprecating/disabling bundles */
// but we will probably keep this around for a while as many places use it
@Deprecated
@@ -431,7 +431,7 @@ public interface CatalogApi {
@ApiParam(name = "disabled", value = "Whether or not the catalog item is disabled", required = true)
boolean disabled);
- /** @deprecated since 0.13.0 use /catalog/bundles and /catalog/types?supertype=... */
+ /** @deprecated since 1.0.0 use /catalog/bundles and /catalog/types?supertype=... */
// but we will probably keep this around for a while as many places use it
@Deprecated
@GET
@@ -447,7 +447,7 @@ public interface CatalogApi {
@ApiParam(name = "allVersions", value = "Include all versions (defaults false, only returning the best version)")
@QueryParam("allVersions") @DefaultValue("false") boolean includeAllVersions);
- /** @deprecated since 0.13.0 use /catalog/bundles and /catalog/types?supertype=... */
+ /** @deprecated since 1.0.0 use /catalog/bundles and /catalog/types?supertype=... */
// but we will probably keep this around for a while as many places use it
@Deprecated
@GET
@@ -464,7 +464,7 @@ public interface CatalogApi {
@ApiParam(name = "version", value = "The version identifier of the enricher to retrieve", required = true)
@PathParam("version") String version) throws Exception;
- /** @deprecated since 0.13.0 delete the bundle via DELETE /catalog/bundles/xxx */
+ /** @deprecated since 1.0.0 delete the bundle via DELETE /catalog/bundles/xxx */
// but we will probably keep this around for a while as many places use it
@Deprecated
@DELETE
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e89c5f09/rest/rest-api/src/main/java/org/apache/brooklyn/rest/api/PolicyApi.java
----------------------------------------------------------------------
diff --git a/rest/rest-api/src/main/java/org/apache/brooklyn/rest/api/PolicyApi.java b/rest/rest-api/src/main/java/org/apache/brooklyn/rest/api/PolicyApi.java
index 1bee2f8..fd79798 100644
--- a/rest/rest-api/src/main/java/org/apache/brooklyn/rest/api/PolicyApi.java
+++ b/rest/rest-api/src/main/java/org/apache/brooklyn/rest/api/PolicyApi.java
@@ -36,7 +36,7 @@ import java.util.Map;
@Api("Entity Policies")
@Produces(MediaType.APPLICATION_JSON)
@Consumes(MediaType.APPLICATION_JSON)
-/** @deprecated since 0.13.0 use AdjunctApi */
+/** @deprecated since 1.0.0 use AdjunctApi */
@Deprecated
public interface PolicyApi {
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e89c5f09/rest/rest-api/src/main/java/org/apache/brooklyn/rest/api/PolicyConfigApi.java
----------------------------------------------------------------------
diff --git a/rest/rest-api/src/main/java/org/apache/brooklyn/rest/api/PolicyConfigApi.java b/rest/rest-api/src/main/java/org/apache/brooklyn/rest/api/PolicyConfigApi.java
index f38d9d4..fafed43 100644
--- a/rest/rest-api/src/main/java/org/apache/brooklyn/rest/api/PolicyConfigApi.java
+++ b/rest/rest-api/src/main/java/org/apache/brooklyn/rest/api/PolicyConfigApi.java
@@ -42,7 +42,7 @@ import io.swagger.annotations.ApiResponses;
@Api("Entity Policy Config")
@Produces(MediaType.APPLICATION_JSON)
@Consumes(MediaType.APPLICATION_JSON)
-/** @deprecated since 0.13.0 use AdjunctApi */
+/** @deprecated since 1.0.0 use AdjunctApi */
@Deprecated
public interface PolicyConfigApi {
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e89c5f09/rest/rest-api/src/main/java/org/apache/brooklyn/rest/domain/CatalogEnricherSummary.java
----------------------------------------------------------------------
diff --git a/rest/rest-api/src/main/java/org/apache/brooklyn/rest/domain/CatalogEnricherSummary.java b/rest/rest-api/src/main/java/org/apache/brooklyn/rest/domain/CatalogEnricherSummary.java
index 56ff0ff..7577320 100644
--- a/rest/rest-api/src/main/java/org/apache/brooklyn/rest/domain/CatalogEnricherSummary.java
+++ b/rest/rest-api/src/main/java/org/apache/brooklyn/rest/domain/CatalogEnricherSummary.java
@@ -29,7 +29,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.google.common.collect.ImmutableSet;
-/** @deprecated since 0.13.0 new {@link TypeApi} returns {@link TypeSummary} */
+/** @deprecated since 1.0.0 new {@link TypeApi} returns {@link TypeSummary} */
@Deprecated
public class CatalogEnricherSummary extends CatalogItemSummary {
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e89c5f09/rest/rest-api/src/main/java/org/apache/brooklyn/rest/domain/CatalogEntitySummary.java
----------------------------------------------------------------------
diff --git a/rest/rest-api/src/main/java/org/apache/brooklyn/rest/domain/CatalogEntitySummary.java b/rest/rest-api/src/main/java/org/apache/brooklyn/rest/domain/CatalogEntitySummary.java
index 6df6b38..6387442 100644
--- a/rest/rest-api/src/main/java/org/apache/brooklyn/rest/domain/CatalogEntitySummary.java
+++ b/rest/rest-api/src/main/java/org/apache/brooklyn/rest/domain/CatalogEntitySummary.java
@@ -29,7 +29,7 @@ import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-/** @deprecated since 0.13.0 new {@link TypeApi} returns {@link TypeSummary} */
+/** @deprecated since 1.0.0 new {@link TypeApi} returns {@link TypeSummary} */
@Deprecated
public class CatalogEntitySummary extends CatalogItemSummary {
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e89c5f09/rest/rest-api/src/main/java/org/apache/brooklyn/rest/domain/CatalogItemSummary.java
----------------------------------------------------------------------
diff --git a/rest/rest-api/src/main/java/org/apache/brooklyn/rest/domain/CatalogItemSummary.java b/rest/rest-api/src/main/java/org/apache/brooklyn/rest/domain/CatalogItemSummary.java
index 19a1749..1809b88 100644
--- a/rest/rest-api/src/main/java/org/apache/brooklyn/rest/domain/CatalogItemSummary.java
+++ b/rest/rest-api/src/main/java/org/apache/brooklyn/rest/domain/CatalogItemSummary.java
@@ -38,7 +38,7 @@ import com.google.common.collect.ImmutableMap;
* see also, subclasses */
@JsonIgnoreProperties(ignoreUnknown = true)
// ignore unknown, ie properties from subclasses (entity)
-/** @deprecated since 0.13.0 new {@link TypeApi} returns {@link TypeSummary} */
+/** @deprecated since 1.0.0 new {@link TypeApi} returns {@link TypeSummary} */
@Deprecated
public class CatalogItemSummary implements HasId, HasName, Serializable {
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e89c5f09/rest/rest-api/src/main/java/org/apache/brooklyn/rest/domain/CatalogLocationSummary.java
----------------------------------------------------------------------
diff --git a/rest/rest-api/src/main/java/org/apache/brooklyn/rest/domain/CatalogLocationSummary.java b/rest/rest-api/src/main/java/org/apache/brooklyn/rest/domain/CatalogLocationSummary.java
index 1b76948..45d18f4 100644
--- a/rest/rest-api/src/main/java/org/apache/brooklyn/rest/domain/CatalogLocationSummary.java
+++ b/rest/rest-api/src/main/java/org/apache/brooklyn/rest/domain/CatalogLocationSummary.java
@@ -28,7 +28,7 @@ import org.apache.brooklyn.rest.api.TypeApi;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.google.common.collect.ImmutableSet;
-/** @deprecated since 0.13.0 new {@link TypeApi} returns {@link TypeSummary} */
+/** @deprecated since 1.0.0 new {@link TypeApi} returns {@link TypeSummary} */
@Deprecated
public class CatalogLocationSummary extends CatalogItemSummary {
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e89c5f09/rest/rest-api/src/main/java/org/apache/brooklyn/rest/domain/CatalogPolicySummary.java
----------------------------------------------------------------------
diff --git a/rest/rest-api/src/main/java/org/apache/brooklyn/rest/domain/CatalogPolicySummary.java b/rest/rest-api/src/main/java/org/apache/brooklyn/rest/domain/CatalogPolicySummary.java
index dafa6bb..8c9ff9d 100644
--- a/rest/rest-api/src/main/java/org/apache/brooklyn/rest/domain/CatalogPolicySummary.java
+++ b/rest/rest-api/src/main/java/org/apache/brooklyn/rest/domain/CatalogPolicySummary.java
@@ -29,7 +29,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.google.common.collect.ImmutableSet;
-/** @deprecated since 0.13.0 new {@link TypeApi} returns {@link TypeSummary} */
+/** @deprecated since 1.0.0 new {@link TypeApi} returns {@link TypeSummary} */
@Deprecated
public class CatalogPolicySummary extends CatalogItemSummary {
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e89c5f09/rest/rest-api/src/main/java/org/apache/brooklyn/rest/domain/EnricherConfigSummary.java
----------------------------------------------------------------------
diff --git a/rest/rest-api/src/main/java/org/apache/brooklyn/rest/domain/EnricherConfigSummary.java b/rest/rest-api/src/main/java/org/apache/brooklyn/rest/domain/EnricherConfigSummary.java
index de8e4d3..1042e21 100644
--- a/rest/rest-api/src/main/java/org/apache/brooklyn/rest/domain/EnricherConfigSummary.java
+++ b/rest/rest-api/src/main/java/org/apache/brooklyn/rest/domain/EnricherConfigSummary.java
@@ -23,7 +23,7 @@ import java.util.Map;
import org.apache.brooklyn.config.ConfigKey;
-/** @deprecated since 0.13.0 no different to ConfigSummary, use that */
+/** @deprecated since 1.0.0 no different to ConfigSummary, use that */
@Deprecated
public class EnricherConfigSummary extends ConfigSummary {
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e89c5f09/rest/rest-api/src/main/java/org/apache/brooklyn/rest/domain/EntityConfigSummary.java
----------------------------------------------------------------------
diff --git a/rest/rest-api/src/main/java/org/apache/brooklyn/rest/domain/EntityConfigSummary.java b/rest/rest-api/src/main/java/org/apache/brooklyn/rest/domain/EntityConfigSummary.java
index 131ae65..a31ac22 100644
--- a/rest/rest-api/src/main/java/org/apache/brooklyn/rest/domain/EntityConfigSummary.java
+++ b/rest/rest-api/src/main/java/org/apache/brooklyn/rest/domain/EntityConfigSummary.java
@@ -26,7 +26,7 @@ import org.apache.brooklyn.config.ConfigKey;
import com.fasterxml.jackson.annotation.JsonProperty;
-/** @deprecated since 0.13.0 no different to {@link ConfigSummary}, use that */
+/** @deprecated since 1.0.0 no different to {@link ConfigSummary}, use that */
@Deprecated
public class EntityConfigSummary extends ConfigSummary {
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e89c5f09/rest/rest-api/src/main/java/org/apache/brooklyn/rest/domain/LocationConfigSummary.java
----------------------------------------------------------------------
diff --git a/rest/rest-api/src/main/java/org/apache/brooklyn/rest/domain/LocationConfigSummary.java b/rest/rest-api/src/main/java/org/apache/brooklyn/rest/domain/LocationConfigSummary.java
index 240921b..3e9de38 100644
--- a/rest/rest-api/src/main/java/org/apache/brooklyn/rest/domain/LocationConfigSummary.java
+++ b/rest/rest-api/src/main/java/org/apache/brooklyn/rest/domain/LocationConfigSummary.java
@@ -24,7 +24,7 @@ import java.util.Map;
import com.fasterxml.jackson.annotation.JsonProperty;
-/** @deprecated since 0.13.0 no different to ConfigSummary, use that */
+/** @deprecated since 1.0.0 no different to ConfigSummary, use that */
@Deprecated
public class LocationConfigSummary extends ConfigSummary {
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e89c5f09/rest/rest-api/src/main/java/org/apache/brooklyn/rest/domain/PolicyConfigSummary.java
----------------------------------------------------------------------
diff --git a/rest/rest-api/src/main/java/org/apache/brooklyn/rest/domain/PolicyConfigSummary.java b/rest/rest-api/src/main/java/org/apache/brooklyn/rest/domain/PolicyConfigSummary.java
index 4098ee1..894cc5b 100644
--- a/rest/rest-api/src/main/java/org/apache/brooklyn/rest/domain/PolicyConfigSummary.java
+++ b/rest/rest-api/src/main/java/org/apache/brooklyn/rest/domain/PolicyConfigSummary.java
@@ -26,7 +26,7 @@ import org.apache.brooklyn.config.ConfigKey;
import com.fasterxml.jackson.annotation.JsonProperty;
-/** @deprecated since 0.13.0 no different to {@link ConfigSummary}, use that */
+/** @deprecated since 1.0.0 no different to {@link ConfigSummary}, use that */
@Deprecated
public class PolicyConfigSummary extends ConfigSummary {
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e89c5f09/rest/rest-api/src/main/java/org/apache/brooklyn/rest/domain/PolicySummary.java
----------------------------------------------------------------------
diff --git a/rest/rest-api/src/main/java/org/apache/brooklyn/rest/domain/PolicySummary.java b/rest/rest-api/src/main/java/org/apache/brooklyn/rest/domain/PolicySummary.java
index 1d0e930..9f2b7c4 100644
--- a/rest/rest-api/src/main/java/org/apache/brooklyn/rest/domain/PolicySummary.java
+++ b/rest/rest-api/src/main/java/org/apache/brooklyn/rest/domain/PolicySummary.java
@@ -26,7 +26,7 @@ import org.apache.brooklyn.api.objs.HighlightTuple;
import com.fasterxml.jackson.annotation.JsonProperty;
-/** @deprecated since 0.13.0 use {@link AdjunctSummary}; this class is identical */
+/** @deprecated since 1.0.0 use {@link AdjunctSummary}; this class is identical */
@Deprecated
public class PolicySummary extends AdjunctSummary {
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e89c5f09/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/transform/CatalogTransformer.java
----------------------------------------------------------------------
diff --git a/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/transform/CatalogTransformer.java b/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/transform/CatalogTransformer.java
index 8bff9f1..3684a3e 100644
--- a/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/transform/CatalogTransformer.java
+++ b/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/transform/CatalogTransformer.java
@@ -71,7 +71,7 @@ import org.slf4j.LoggerFactory;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Sets;
-/** @deprecated since 0.13.0 use {@link RegisteredType} methods in {@link TypeTransformer} */
+/** @deprecated since 1.0.0 use {@link RegisteredType} methods in {@link TypeTransformer} */
@Deprecated
public class CatalogTransformer {
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e89c5f09/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/transform/EntityTransformer.java
----------------------------------------------------------------------
diff --git a/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/transform/EntityTransformer.java b/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/transform/EntityTransformer.java
index 1537f07..6638ccf 100644
--- a/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/transform/EntityTransformer.java
+++ b/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/transform/EntityTransformer.java
@@ -130,31 +130,31 @@ public class EntityTransformer {
return serviceUriBuilder(ub, EntityApi.class, "get").build(entity.getApplicationId(), entity.getId());
}
- /** @deprecated since 0.13.0 use {@link ConfigTransformer} */
+ /** @deprecated since 1.0.0 use {@link ConfigTransformer} */
@Deprecated
public static EntityConfigSummary entityConfigSummary(ConfigKey<?> config, String label, Double priority, Boolean pinned, Map<String, URI> links) {
return new EntityConfigSummary(config, label, priority, pinned, links);
}
- /** @deprecated since 0.13.0 use {@link ConfigTransformer} */
+ /** @deprecated since 1.0.0 use {@link ConfigTransformer} */
@Deprecated
public static PolicyConfigSummary policyConfigSummary(ConfigKey<?> config, String label, Double priority, Map<String, URI> links) {
return new PolicyConfigSummary(config, label, priority, links);
}
- /** @deprecated since 0.13.0 use {@link ConfigTransformer} */
+ /** @deprecated since 1.0.0 use {@link ConfigTransformer} */
@Deprecated
public static EnricherConfigSummary enricherConfigSummary(ConfigKey<?> config, String label, Double priority, Map<String, URI> links) {
return new EnricherConfigSummary(config, label, priority, links);
}
- /** @deprecated since 0.13.0 use {@link ConfigTransformer} */
+ /** @deprecated since 1.0.0 use {@link ConfigTransformer} */
@Deprecated
public static ConfigSummary entityConfigSummary(Entity entity, ConfigKey<?> config, UriBuilder ub) {
return ConfigTransformer.of(config).on(entity).includeLinks(ub, true, true).transform();
}
- /** @deprecated since 0.13.0 use {@link ConfigTransformer} */
+ /** @deprecated since 1.0.0 use {@link ConfigTransformer} */
@Deprecated
public static EntityConfigSummary entityConfigSummary(ConfigKey<?> config, Field configKeyField) {
CatalogConfig catalogConfig = configKeyField!=null ? configKeyField.getAnnotation(CatalogConfig.class) : null;
@@ -164,7 +164,7 @@ public class EntityTransformer {
return entityConfigSummary(config, label, priority, pinned, null);
}
- /** @deprecated since 0.13.0 use {@link ConfigTransformer} */
+ /** @deprecated since 1.0.0 use {@link ConfigTransformer} */
@Deprecated
public static EntityConfigSummary entityConfigSummary(SpecParameter<?> input, AtomicInteger paramPriorityCnt) {
// Increment the priority because the config container is a set. Server-side we are using an ordered set
@@ -174,14 +174,14 @@ public class EntityTransformer {
return entityConfigSummary(input.getConfigKey(), input.getLabel(), priority, input.isPinned(), null);
}
- /** @deprecated since 0.13.0 use {@link ConfigTransformer} */
+ /** @deprecated since 1.0.0 use {@link ConfigTransformer} */
@Deprecated
public static PolicyConfigSummary policyConfigSummary(SpecParameter<?> input) {
Double priority = input.isPinned() ? Double.valueOf(1d) : null;
return policyConfigSummary(input.getConfigKey(), input.getLabel(), priority, null);
}
- /** @deprecated since 0.13.0 use {@link ConfigTransformer} */
+ /** @deprecated since 1.0.0 use {@link ConfigTransformer} */
@Deprecated
public static EnricherConfigSummary enricherConfigSummary(SpecParameter<?> input) {
Double priority = input.isPinned() ? Double.valueOf(1d) : null;
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e89c5f09/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/transform/PolicyTransformer.java
----------------------------------------------------------------------
diff --git a/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/transform/PolicyTransformer.java b/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/transform/PolicyTransformer.java
index 577e4f1..c494efa 100644
--- a/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/transform/PolicyTransformer.java
+++ b/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/transform/PolicyTransformer.java
@@ -43,7 +43,7 @@ import static org.apache.brooklyn.rest.util.WebResourceUtils.serviceUriBuilder;
/**
* Converts from Brooklyn entities to restful API summary objects
- * @deprecated since 0.13.0 use {@link AdjunctTransformer} and {@link AdjunctSummary}
+ * @deprecated since 1.0.0 use {@link AdjunctTransformer} and {@link AdjunctSummary}
*/
@Deprecated
public class PolicyTransformer {
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e89c5f09/utils/common/src/main/java/org/apache/brooklyn/util/osgi/VersionedName.java
----------------------------------------------------------------------
diff --git a/utils/common/src/main/java/org/apache/brooklyn/util/osgi/VersionedName.java b/utils/common/src/main/java/org/apache/brooklyn/util/osgi/VersionedName.java
index 9734153..3b8bb0e 100644
--- a/utils/common/src/main/java/org/apache/brooklyn/util/osgi/VersionedName.java
+++ b/utils/common/src/main/java/org/apache/brooklyn/util/osgi/VersionedName.java
@@ -38,7 +38,7 @@ public class VersionedName implements Comparable<VersionedName> {
private final String name;
private final String v;
- @Deprecated // since 0.12.0 - remove along with version and readResolve in 0.13.0
+ @Deprecated // since 0.12.0 - remove along with version and readResolve in 1.0.0
private final String symbolicName = null;
@Deprecated // since 0.12.0
private final Version version = null;
[2/2] brooklyn-server git commit: This closes #861
Posted by tb...@apache.org.
This closes #861
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/4578d47d
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/4578d47d
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/4578d47d
Branch: refs/heads/master
Commit: 4578d47dfcf17408cb532a99f17cc02f53dc2ada
Parents: fede005 e89c5f0
Author: Thomas Bouron <th...@cloudsoftcorp.com>
Authored: Thu Oct 12 12:05:45 2017 +0100
Committer: Thomas Bouron <th...@cloudsoftcorp.com>
Committed: Thu Oct 12 12:05:45 2017 +0100
----------------------------------------------------------------------
.../org/apache/brooklyn/api/entity/Entity.java | 2 +-
.../brooklyn/api/mgmt/ExecutionContext.java | 4 +--
.../brooklyn/api/mgmt/ExecutionManager.java | 4 +--
.../brooklyn/core/entity/AbstractEntity.java | 6 ++--
.../brooklyn/core/entity/EntityInternal.java | 4 +--
.../brooklyn/core/mgmt/BrooklynTaskTags.java | 4 +--
.../mgmt/ha/OsgiBundleInstallationResult.java | 4 +--
.../core/objs/AbstractEntityAdjunct.java | 2 +-
.../apache/brooklyn/core/policy/Policies.java | 4 +--
.../core/typereg/RegisteredTypePredicates.java | 2 +-
.../brooklyn/core/typereg/RegisteredTypes.java | 2 +-
.../util/core/task/BasicExecutionContext.java | 2 +-
.../apache/brooklyn/rest/api/CatalogApi.java | 34 ++++++++++----------
.../org/apache/brooklyn/rest/api/PolicyApi.java | 2 +-
.../brooklyn/rest/api/PolicyConfigApi.java | 2 +-
.../rest/domain/CatalogEnricherSummary.java | 2 +-
.../rest/domain/CatalogEntitySummary.java | 2 +-
.../rest/domain/CatalogItemSummary.java | 2 +-
.../rest/domain/CatalogLocationSummary.java | 2 +-
.../rest/domain/CatalogPolicySummary.java | 2 +-
.../rest/domain/EnricherConfigSummary.java | 2 +-
.../rest/domain/EntityConfigSummary.java | 2 +-
.../rest/domain/LocationConfigSummary.java | 2 +-
.../rest/domain/PolicyConfigSummary.java | 2 +-
.../brooklyn/rest/domain/PolicySummary.java | 2 +-
.../rest/transform/CatalogTransformer.java | 2 +-
.../rest/transform/EntityTransformer.java | 16 ++++-----
.../rest/transform/PolicyTransformer.java | 2 +-
.../brooklyn/util/osgi/VersionedName.java | 2 +-
29 files changed, 60 insertions(+), 60 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/4578d47d/core/src/main/java/org/apache/brooklyn/core/entity/AbstractEntity.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/4578d47d/core/src/main/java/org/apache/brooklyn/core/entity/EntityInternal.java
----------------------------------------------------------------------