You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by he...@apache.org on 2017/05/09 13:27:17 UTC
[3/6] brooklyn-client git commit: Merge branch 'master' into
brooklyn-api-convenience-better-error-propagation
Merge branch 'master' into brooklyn-api-convenience-better-error-propagation
imports conflict
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-client/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-client/commit/0260945c
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-client/tree/0260945c
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-client/diff/0260945c
Branch: refs/heads/master
Commit: 0260945ca098cb7efc072579a3f51be19dec4b6f
Parents: 23fdb12 0243386
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Tue May 9 09:10:48 2017 +0100
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Tue May 9 09:10:48 2017 +0100
----------------------------------------------------------------------
cli/README.md | 77 +++++++++----
cli/api/catalog/catalog.go | 112 +++++++++++++++++--
cli/app/app.go | 2 +-
cli/commands/catalog-add.go | 5 +-
cli/commands/reset-catalog.go | 33 ------
cli/error_handler/error.go | 3 +-
cli/net/net.go | 8 +-
cli/pom.xml | 2 +-
cli/release/build.sh | 11 +-
java/pom.xml | 2 +-
.../brooklyn/rest/client/BrooklynApi.java | 5 -
.../ApplicationResourceIntegrationTest.java | 19 ----
.../rest/client/BrooklynApiRestClientTest.java | 2 +-
java/src/test/webapp/WEB-INF/web.xml | 1 -
pom.xml | 2 +-
15 files changed, 177 insertions(+), 107 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-client/blob/0260945c/java/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-client/blob/0260945c/java/src/main/java/org/apache/brooklyn/rest/client/BrooklynApi.java
----------------------------------------------------------------------
diff --cc java/src/main/java/org/apache/brooklyn/rest/client/BrooklynApi.java
index 466827c,0aa857c..90a5332
--- a/java/src/main/java/org/apache/brooklyn/rest/client/BrooklynApi.java
+++ b/java/src/main/java/org/apache/brooklyn/rest/client/BrooklynApi.java
@@@ -31,27 -30,8 +31,26 @@@ import java.util.Map
import javax.annotation.Nullable;
import javax.ws.rs.core.Response;
-import com.google.common.base.Supplier;
-import com.google.common.base.Suppliers;
+import org.apache.brooklyn.rest.api.AccessApi;
+import org.apache.brooklyn.rest.api.ActivityApi;
+import org.apache.brooklyn.rest.api.ApplicationApi;
+import org.apache.brooklyn.rest.api.CatalogApi;
+import org.apache.brooklyn.rest.api.EffectorApi;
+import org.apache.brooklyn.rest.api.EntityApi;
+import org.apache.brooklyn.rest.api.EntityConfigApi;
+import org.apache.brooklyn.rest.api.LocationApi;
+import org.apache.brooklyn.rest.api.PolicyApi;
+import org.apache.brooklyn.rest.api.PolicyConfigApi;
+import org.apache.brooklyn.rest.api.ScriptApi;
+import org.apache.brooklyn.rest.api.SensorApi;
+import org.apache.brooklyn.rest.api.ServerApi;
+import org.apache.brooklyn.rest.api.UsageApi;
- import org.apache.brooklyn.rest.api.VersionApi;
+import org.apache.brooklyn.rest.client.util.http.BuiltResponsePreservingError;
+import org.apache.brooklyn.rest.domain.ApiError;
+import org.apache.brooklyn.util.collections.MutableMap;
+import org.apache.brooklyn.util.exceptions.Exceptions;
+import org.apache.brooklyn.util.javalang.AggregateClassLoader;
+import org.apache.brooklyn.util.net.Urls;
import org.apache.http.auth.AuthScope;
import org.apache.http.auth.Credentials;
import org.apache.http.auth.UsernamePasswordCredentials;