You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by ge...@apache.org on 2017/07/28 13:55:39 UTC
[1/3] brooklyn-server git commit: Delete duplicate pom dependency
Repository: brooklyn-server
Updated Branches:
refs/heads/master 0f325f280 -> 840562651
Delete duplicate pom dependency
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/6a27203d
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/6a27203d
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/6a27203d
Branch: refs/heads/master
Commit: 6a27203ddafdec087dab87559035c5cf738886b2
Parents: 0f325f2
Author: Sam Corbett <sa...@cloudsoftcorp.com>
Authored: Fri Jul 28 12:45:18 2017 +0100
Committer: Sam Corbett <sa...@cloudsoftcorp.com>
Committed: Fri Jul 28 12:45:18 2017 +0100
----------------------------------------------------------------------
karaf/itests/pom.xml | 7 -------
1 file changed, 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/6a27203d/karaf/itests/pom.xml
----------------------------------------------------------------------
diff --git a/karaf/itests/pom.xml b/karaf/itests/pom.xml
index 6ce50b1..5136573 100644
--- a/karaf/itests/pom.xml
+++ b/karaf/itests/pom.xml
@@ -73,13 +73,6 @@
</dependency>
<dependency>
<groupId>org.ops4j.pax.exam</groupId>
- <artifactId>pax-exam-container-karaf</artifactId>
- <version>${pax.exam.version}</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.ops4j.pax.exam</groupId>
<artifactId>pax-exam-junit4</artifactId>
<version>${pax.exam.version}</version>
<scope>test</scope>
[2/3] brooklyn-server git commit: Restore HTTP annotations to
deprecated API methods
Posted by ge...@apache.org.
Restore HTTP annotations to deprecated API methods
The missing annotations meant that brooklyn-client was unable to proxy
the affected classes (since Resteasy expects to work with every method).
I think the simplest way to solve this is to expose the deprecated
methods at .../deprecated.
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/635b0c27
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/635b0c27
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/635b0c27
Branch: refs/heads/master
Commit: 635b0c276f137005268dc832c6801bf950a87c21
Parents: 6a27203
Author: Sam Corbett <sa...@cloudsoftcorp.com>
Authored: Fri Jul 28 12:49:00 2017 +0100
Committer: Sam Corbett <sa...@cloudsoftcorp.com>
Committed: Fri Jul 28 12:49:00 2017 +0100
----------------------------------------------------------------------
.../java/org/apache/brooklyn/rest/api/ActivityApi.java | 10 ++++++++--
.../java/org/apache/brooklyn/rest/api/EntityApi.java | 12 +++++++++---
.../java/org/apache/brooklyn/rest/api/LocationApi.java | 2 +-
3 files changed, 18 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/635b0c27/rest/rest-api/src/main/java/org/apache/brooklyn/rest/api/ActivityApi.java
----------------------------------------------------------------------
diff --git a/rest/rest-api/src/main/java/org/apache/brooklyn/rest/api/ActivityApi.java b/rest/rest-api/src/main/java/org/apache/brooklyn/rest/api/ActivityApi.java
index b6431d9..a306ac3 100644
--- a/rest/rest-api/src/main/java/org/apache/brooklyn/rest/api/ActivityApi.java
+++ b/rest/rest-api/src/main/java/org/apache/brooklyn/rest/api/ActivityApi.java
@@ -72,10 +72,16 @@ public interface ActivityApi {
@QueryParam("limit") @DefaultValue("200") int limit,
@ApiParam(value = "Max depth to traverse, or -1 for all (default)", required = false)
@QueryParam("maxDepth") @DefaultValue("-1") int maxDepth);
-
+
/** @deprecated since 0.12.0 use {@link #getAllChildrenAsMap(String, int, int)} with depth -1 */
+ @GET
+ @Path("/{task}/children/recurse/deprecated")
+ @ApiOperation(
+ value = "Fetch all child tasks details as Map<String,TaskSummary> map key == Task ID",
+ response = Map.class)
@Deprecated
- public Map<String,TaskSummary> getAllChildrenAsMap(String taskId);
+ public Map<String,TaskSummary> getAllChildrenAsMap(
+ @ApiParam(value = "Task ID", required = true) @PathParam("task") String taskId);
@GET
@Path("/{task}/stream/{streamId}")
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/635b0c27/rest/rest-api/src/main/java/org/apache/brooklyn/rest/api/EntityApi.java
----------------------------------------------------------------------
diff --git a/rest/rest-api/src/main/java/org/apache/brooklyn/rest/api/EntityApi.java b/rest/rest-api/src/main/java/org/apache/brooklyn/rest/api/EntityApi.java
index d0788fa..d475b52 100644
--- a/rest/rest-api/src/main/java/org/apache/brooklyn/rest/api/EntityApi.java
+++ b/rest/rest-api/src/main/java/org/apache/brooklyn/rest/api/EntityApi.java
@@ -117,11 +117,17 @@ public interface EntityApi {
@ApiParam(value = "Whether to include subtasks recursively across different entities (default false)", required = false)
@QueryParam("recurse") @DefaultValue("false") Boolean recurse);
- /** @deprecated since 0.12.0 use {@link #listTasks(String, String, Integer, Boolean)} */
+ /** @deprecated since 0.12.0 use {@link #listTasks(String, String, int, Boolean)} */
+ @GET
+ @Path("/{entity}/activities/deprecated")
+ @ApiOperation(value = "Fetch list of tasks for this entity")
+ @ApiResponses(value = {
+ @ApiResponse(code = 404, message = "Could not find application or entity")
+ })
@Deprecated
public List<TaskSummary> listTasks(
- String applicationId,
- String entityId);
+ @ApiParam(value = "Application ID or name", required = true) @PathParam("application") String applicationId,
+ @ApiParam(value = "Entity ID or name", required = true) @PathParam("entity") String entityId);
@GET
@Path("/{entity}/activities/{task}")
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/635b0c27/rest/rest-api/src/main/java/org/apache/brooklyn/rest/api/LocationApi.java
----------------------------------------------------------------------
diff --git a/rest/rest-api/src/main/java/org/apache/brooklyn/rest/api/LocationApi.java b/rest/rest-api/src/main/java/org/apache/brooklyn/rest/api/LocationApi.java
index ea632d5..8950a56 100644
--- a/rest/rest-api/src/main/java/org/apache/brooklyn/rest/api/LocationApi.java
+++ b/rest/rest-api/src/main/java/org/apache/brooklyn/rest/api/LocationApi.java
@@ -49,7 +49,7 @@ import io.swagger.annotations.ApiParam;
public interface LocationApi {
/**
- * @deprecated since 0.7.0; use {@link CatalogApi#listLocations(String, String)}
+ * @deprecated since 0.7.0; use {@link CatalogApi#listLocations}
*/
@GET
@ApiOperation(value = "Fetch the list of location definitions",
[3/3] brooklyn-server git commit: Closes #783
Posted by ge...@apache.org.
Closes #783
Restore HTTP annotations to deprecated API methods
The missing annotations mean that brooklyn-client is unable to proxy the affected classes (since Resteasy expects to work with every method), and by extension that every build of the project fails. I think the simplest way to solve this is to expose the deprecated methods at `.../deprecated`.
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/84056265
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/84056265
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/84056265
Branch: refs/heads/master
Commit: 840562651cc7b669d5a65cd78cd8bd5ad293f1b3
Parents: 0f325f2 635b0c2
Author: Geoff Macartney <ge...@cloudsoftcorp.com>
Authored: Fri Jul 28 14:55:26 2017 +0100
Committer: Geoff Macartney <ge...@cloudsoftcorp.com>
Committed: Fri Jul 28 14:55:26 2017 +0100
----------------------------------------------------------------------
karaf/itests/pom.xml | 7 -------
.../java/org/apache/brooklyn/rest/api/ActivityApi.java | 10 ++++++++--
.../java/org/apache/brooklyn/rest/api/EntityApi.java | 12 +++++++++---
.../java/org/apache/brooklyn/rest/api/LocationApi.java | 2 +-
4 files changed, 18 insertions(+), 13 deletions(-)
----------------------------------------------------------------------