Repository: incubator-brooklyn Updated Branches: refs/heads/master 8f384a189 -> 295cf6345
Updates in response to github discussion on HttpTool/HttpToolResponse. Cutting the definitions of brooklyn-core HttpTool/HttpToolResponse as per https://github.com/apache/incubator-brooklyn/pull/1032#issuecomment-157322569 Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/12cb7103 Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/12cb7103 Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/12cb7103 Branch: refs/heads/master Commit: 12cb710323d95646c66e8ab8de922e276cf3be8b Parents: 2b23266 Author: Geoff Macartney <[email protected]> Authored: Fri Nov 13 17:30:44 2015 +0000 Committer: Geoff Macartney <[email protected]> Committed: Wed Nov 18 11:54:33 2015 +0000 ---------------------------------------------------------------------- .../brooklyn/util/core/http/HttpTool.java | 63 +------------------- .../util/core/http/HttpToolResponse.java | 14 ++--- docs/guide/misc/release-notes.md | 51 +++------------- 3 files changed, 16 insertions(+), 112 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/12cb7103/core/src/main/java/org/apache/brooklyn/util/core/http/HttpTool.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/util/core/http/HttpTool.java b/core/src/main/java/org/apache/brooklyn/util/core/http/HttpTool.java index f2ed019..3837d69 100644 --- a/core/src/main/java/org/apache/brooklyn/util/core/http/HttpTool.java +++ b/core/src/main/java/org/apache/brooklyn/util/core/http/HttpTool.java @@ -18,68 +18,11 @@ */ package org.apache.brooklyn.util.core.http; -import static com.google.common.base.Preconditions.checkNotNull; -import static com.google.common.base.Preconditions.checkState; -import java.net.URI; -import java.security.cert.CertificateException; -import java.security.cert.X509Certificate; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Map; -import java.util.Map.Entry; - -import org.apache.brooklyn.util.crypto.SslTrustUtils; -import org.apache.brooklyn.util.exceptions.Exceptions; -import org.apache.brooklyn.util.net.URLParamEncoder; -import org.apache.brooklyn.util.text.Strings; -import org.apache.brooklyn.util.time.Duration; -import org.apache.commons.codec.binary.Base64; -import org.apache.http.ConnectionReuseStrategy; -import org.apache.http.HttpEntity; -import org.apache.http.HttpRequest; -import org.apache.http.HttpResponse; -import org.apache.http.NameValuePair; -import org.apache.http.auth.AuthScope; -import org.apache.http.auth.Credentials; -import org.apache.http.auth.UsernamePasswordCredentials; -import org.apache.http.client.HttpClient; -import org.apache.http.client.entity.UrlEncodedFormEntity; -import org.apache.http.client.methods.HttpDelete; -import org.apache.http.client.methods.HttpEntityEnclosingRequestBase; -import org.apache.http.client.methods.HttpGet; -import org.apache.http.client.methods.HttpHead; -import org.apache.http.client.methods.HttpPost; -import org.apache.http.client.methods.HttpPut; -import org.apache.http.client.methods.HttpUriRequest; -import org.apache.http.conn.ClientConnectionManager; -import org.apache.http.conn.scheme.Scheme; -import org.apache.http.conn.scheme.SchemeSocketFactory; -import org.apache.http.conn.ssl.SSLSocketFactory; -import org.apache.http.conn.ssl.TrustSelfSignedStrategy; -import org.apache.http.conn.ssl.TrustStrategy; -import org.apache.http.conn.ssl.X509HostnameVerifier; -import org.apache.http.entity.ByteArrayEntity; -import org.apache.http.impl.client.DefaultHttpClient; -import org.apache.http.impl.client.LaxRedirectStrategy; -import org.apache.http.message.BasicNameValuePair; -import org.apache.http.params.BasicHttpParams; -import org.apache.http.params.HttpConnectionParams; -import org.apache.http.params.HttpParams; -import org.apache.http.util.EntityUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import com.google.common.base.Function; -import com.google.common.base.Joiner; -import com.google.common.base.Optional; -import com.google.common.collect.Iterables; -import com.google.common.collect.Multimap; /** - * @deprecated since 0.9.0. Prefer org.apache.brooklyn.util.http.HttpTool + * @deprecated since 0.9.0. Prefer {@link org.apache.brooklyn.util.http.HttpTool}. */ @Deprecated -public class HttpTool extends org.apache.brooklyn.util.http.HttpTool { - -} \ No newline at end of file +public class HttpTool { +} http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/12cb7103/core/src/main/java/org/apache/brooklyn/util/core/http/HttpToolResponse.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/util/core/http/HttpToolResponse.java b/core/src/main/java/org/apache/brooklyn/util/core/http/HttpToolResponse.java index 2b3f73f..1343c08 100644 --- a/core/src/main/java/org/apache/brooklyn/util/core/http/HttpToolResponse.java +++ b/core/src/main/java/org/apache/brooklyn/util/core/http/HttpToolResponse.java @@ -19,17 +19,13 @@ package org.apache.brooklyn.util.core.http; -import org.apache.brooklyn.feed.http.HttpPollValue; -import org.apache.http.HttpResponse; - /** - * @deprecated since 0.9.0 Prefer org.apache.brooklyn.util.http.HttpToolResponse + * @deprecated since 0.9.0. Prefer {@link org.apache.brooklyn.util.http.HttpToolResponse}. + * + * @see {@link HttpTool} */ @Deprecated -public class HttpToolResponse extends org.apache.brooklyn.util.http.HttpToolResponse - implements HttpPollValue { +public class HttpToolResponse { + - public HttpToolResponse(HttpResponse response, long startTime) { - super(response, startTime); - } } http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/12cb7103/docs/guide/misc/release-notes.md ---------------------------------------------------------------------- diff --git a/docs/guide/misc/release-notes.md b/docs/guide/misc/release-notes.md index e15421a..e67048e 100644 --- a/docs/guide/misc/release-notes.md +++ b/docs/guide/misc/release-notes.md @@ -16,11 +16,7 @@ title: Release Notes ### Introduction -Version 0.8.0 is a rapid, clean-up and hardening release, as we prepare for graduation. -The biggest change is the package refactoring, discussed in the Backwards Compatibility section. -Other new features include more externalized configuration, -machine management (suspend/resume and windows enhandements), -MySQL cluster, entitlements enhancements, and pluggable blueprint languages. +Version 0.8.0 is [TODO add description] Thanks go to our community for their improvements, feedback and guidance, and to Brooklyn's commercial users for funding much of this development. @@ -28,49 +24,18 @@ to Brooklyn's commercial users for funding much of this development. ### New Features -New features include: - -* All classes are in the `org.apache.brooklyn` namespace - -* Externalized configuration, using `$brooklyn:external` to access data which is - retrieved from a remote store or injected via an extensible mechanism - -* Port mappings supported for BYON locations: fixed-IP machines can now be configured - within subnets - -* The Entitlements API is extended to be more convenient and work better with LDAP - -* The blueprint language is pluggable, so downstream projects can supply their own, - such as TOSCA to complement the default CAMP dialect used by Brooklyn - -* A MySQL master-slave blueprint is added - -* Misc other new sensors and improvements to Redis, Postgres, and general datastore mixins - -* jclouds version bumped to 1.9.1, and misc improvements for several clouds - including Softlayer and GCE +[TODO] ### Backwards Compatibility -Changes since 0.7.0-incubating: - -1. **Major:** Packages have been renamed so that everything is in the `org.apache.brooklyn` - namespace. This decision has not been taken lightly! - - This **[migration guide](migrate-to-0.8.0.html)** will assist converting projects to - the new package structure. - - We recognize that this will be very inconvenient for downstream projects, - and it breaks our policy to deprecate any incompatibility for at least one version, - but it was necessary as part of becoming a top-level Apache project. - Pre-built binaries will not be compatible and must be recompiled against this version. - - We have invested significant effort in ensuring that persisted state will be unaffected. +Changes since 0.8.0-incubating: -1. Some of the code deprecated in 0.7.0 has been deleted. - There are comparatively few newly deprecated items. +1. **Major:** The classes HttpTool and HttpToolResponse in brooklyn-core (package org.apache.brooklyn.util.core.http) +have been moved to brooklyn-utils-common, in package org.apache.brooklyn.util. +Classes such as HttpFeed that previously returned org.apache.brooklyn.util.core.http.HttpToolResponse in some methods now +return org.apache.brooklyn.util.HttpToolResponse. For changes in prior versions, please refer to the release notes for -[0.7.0](/v/0.7.0-incubating/misc/release-notes.html). +[0.8.0](/v/0.8.0-incubating/misc/release-notes.html).
