diff --git a/com.ibm.streamsx.inet/.classpath b/com.ibm.streamsx.inet/.classpath index 9271f16..a24f577 100644 --- a/com.ibm.streamsx.inet/.classpath +++ b/com.ibm.streamsx.inet/.classpath @@ -20,5 +20,10 @@ + + + + + + - diff --git a/com.ibm.streamsx.inet/build.xml b/com.ibm.streamsx.inet/build.xml index 110b7a0..06afca8 100644 --- a/com.ibm.streamsx.inet/build.xml +++ b/com.ibm.streamsx.inet/build.xml @@ -65,6 +65,11 @@ artifacts were left around and caused issues with the ant build. + + + + + @@ -73,6 +78,7 @@ artifacts were left around and caused issues with the ant build. + diff --git a/com.ibm.streamsx.inet/impl/java/src/com/ibm/streamsx/inet/http/HTTPGetXMLContent.java b/com.ibm.streamsx.inet/impl/java/src/com/ibm/streamsx/inet/http/HTTPGetXMLContent.java index c423557..2335492 100644 --- a/com.ibm.streamsx.inet/impl/java/src/com/ibm/streamsx/inet/http/HTTPGetXMLContent.java +++ b/com.ibm.streamsx.inet/impl/java/src/com/ibm/streamsx/inet/http/HTTPGetXMLContent.java @@ -10,6 +10,12 @@ import java.util.zip.Inflater; import java.util.zip.InflaterInputStream; +import org.apache.http.HttpEntity; +import org.apache.http.HttpResponse; +import org.apache.http.client.HttpClient; +import org.apache.http.client.methods.HttpGet; +import org.apache.http.impl.client.DefaultHttpClient; + import com.ibm.streams.operator.OperatorContext; import com.ibm.streams.operator.OutputTuple; import com.ibm.streams.operator.model.OutputPortSet; @@ -38,6 +44,9 @@ public class HTTPGetXMLContent extends PollingSingleTupleProducer { private URL urlForXML; // Currently hard-coded to zero. private final int contentIndex = 0; + + private HttpClient client; + private HttpGet get; public synchronized String getUrl() { return url; @@ -53,6 +62,10 @@ public synchronized void initialize(OperatorContext context) throws Exception { super.initialize(context); createUrl(); + client = new DefaultHttpClient(); + get = new HttpGet(getUrl()); + get.addHeader("Accept", "application/xml, text/xml"); + get.addHeader("Accept-Encoding", "gzip, deflate"); } private synchronized void createUrl() throws MalformedURLException { @@ -62,15 +75,14 @@ private synchronized void createUrl() throws MalformedURLException { @Override protected boolean fetchSingleTuple(OutputTuple tuple) throws Exception { - final HttpURLConnection conn = (HttpURLConnection) urlForXML.openConnection(); - conn.addRequestProperty("Accept", "application/xml, text/xml"); - conn.addRequestProperty("Accept-Encoding", "gzip, deflate"); + HttpResponse response = client.execute(get); try { - final int responseCode = conn.getResponseCode(); + final int responseCode = response.getStatusLine().getStatusCode(); if (responseCode != HttpURLConnection.HTTP_OK) return false; - final InputStream content = getInputStream(conn); + final HttpEntity entity = response.getEntity(); + final InputStream content = getInputStream(entity); try { XML xml = ValueFactory.newXML(content); tuple.setXML(contentIndex, xml); @@ -78,23 +90,23 @@ protected boolean fetchSingleTuple(OutputTuple tuple) throws Exception { content.close(); } } finally { - conn.disconnect(); + get.reset(); } return true; } //for handling compressions - static InputStream getInputStream(URLConnection conn) throws IOException { + static InputStream getInputStream(HttpEntity entity) throws IOException { - final InputStream content = conn.getInputStream(); - final String encoding = conn.getContentEncoding(); + final InputStream content = entity.getContent(); + final String encoding = entity.getContentEncoding().getValue(); if (encoding == null) return content; if ("gzip".equalsIgnoreCase(encoding)) - return new GZIPInputStream(conn.getInputStream()); + return new GZIPInputStream(content); if ("deflate".equalsIgnoreCase(encoding)) - return new InflaterInputStream(conn.getInputStream(), new Inflater(true)); + return new InflaterInputStream(content, new Inflater(true)); throw new IOException("Unknown encoding: " + encoding); } diff --git a/com.ibm.streamsx.inet/info.xml b/com.ibm.streamsx.inet/info.xml index a563e8b..8b2c919 100644 --- a/com.ibm.streamsx.inet/info.xml +++ b/com.ibm.streamsx.inet/info.xml @@ -19,6 +19,7 @@ This toolkit separates its functionality into a number of namespaces: **Third-party Libraries** This toolkit embeds a number of third-party libraries under `opt`: * Apache Commons Codec 1.4 +* Apache HTTP Client 4.2.3 * OAuth Signpost 1.2 [http://code.google.com/p/oauth-signpost/] * Jetty 8.1.3 from Eclipse 4.2.2 * Java-websocket 1.3.0 [http://java-websocket.org] diff --git a/com.ibm.streamsx.inet/opt/HTTPClient4.2.3/LICENSE.txt b/com.ibm.streamsx.inet/opt/HTTPClient4.2.3/LICENSE.txt new file mode 100755 index 0000000..7cd40e5 --- /dev/null +++ b/com.ibm.streamsx.inet/opt/HTTPClient4.2.3/LICENSE.txt @@ -0,0 +1,176 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS diff --git a/com.ibm.streamsx.inet/opt/HTTPClient4.2.3/NOTICE.txt b/com.ibm.streamsx.inet/opt/HTTPClient4.2.3/NOTICE.txt new file mode 100755 index 0000000..46861a1 --- /dev/null +++ b/com.ibm.streamsx.inet/opt/HTTPClient4.2.3/NOTICE.txt @@ -0,0 +1,6 @@ +Apache HttpComponents Client +Copyright 1999-2012 The Apache Software Foundation + +This product includes software developed by +The Apache Software Foundation (http://www.apache.org/). + diff --git a/com.ibm.streamsx.inet/opt/HTTPClient4.2.3/lib/commons-codec-1.6.jar b/com.ibm.streamsx.inet/opt/HTTPClient4.2.3/lib/commons-codec-1.6.jar new file mode 100755 index 0000000..ee1bc49 Binary files /dev/null and b/com.ibm.streamsx.inet/opt/HTTPClient4.2.3/lib/commons-codec-1.6.jar differ diff --git a/com.ibm.streamsx.inet/opt/HTTPClient4.2.3/lib/commons-logging-1.1.1.jar b/com.ibm.streamsx.inet/opt/HTTPClient4.2.3/lib/commons-logging-1.1.1.jar new file mode 100755 index 0000000..1deef14 Binary files /dev/null and b/com.ibm.streamsx.inet/opt/HTTPClient4.2.3/lib/commons-logging-1.1.1.jar differ diff --git a/com.ibm.streamsx.inet/opt/HTTPClient4.2.3/lib/fluent-hc-4.2.3.jar b/com.ibm.streamsx.inet/opt/HTTPClient4.2.3/lib/fluent-hc-4.2.3.jar new file mode 100755 index 0000000..7403d27 Binary files /dev/null and b/com.ibm.streamsx.inet/opt/HTTPClient4.2.3/lib/fluent-hc-4.2.3.jar differ diff --git a/com.ibm.streamsx.inet/opt/HTTPClient4.2.3/lib/httpclient-4.2.3.jar b/com.ibm.streamsx.inet/opt/HTTPClient4.2.3/lib/httpclient-4.2.3.jar new file mode 100755 index 0000000..e379af3 Binary files /dev/null and b/com.ibm.streamsx.inet/opt/HTTPClient4.2.3/lib/httpclient-4.2.3.jar differ diff --git a/com.ibm.streamsx.inet/opt/HTTPClient4.2.3/lib/httpclient-cache-4.2.3.jar b/com.ibm.streamsx.inet/opt/HTTPClient4.2.3/lib/httpclient-cache-4.2.3.jar new file mode 100755 index 0000000..c417a8f Binary files /dev/null and b/com.ibm.streamsx.inet/opt/HTTPClient4.2.3/lib/httpclient-cache-4.2.3.jar differ diff --git a/com.ibm.streamsx.inet/opt/HTTPClient4.2.3/lib/httpcore-4.2.2.jar b/com.ibm.streamsx.inet/opt/HTTPClient4.2.3/lib/httpcore-4.2.2.jar new file mode 100755 index 0000000..a64cd2f Binary files /dev/null and b/com.ibm.streamsx.inet/opt/HTTPClient4.2.3/lib/httpcore-4.2.2.jar differ diff --git a/com.ibm.streamsx.inet/opt/HTTPClient4.2.3/lib/httpmime-4.2.3.jar b/com.ibm.streamsx.inet/opt/HTTPClient4.2.3/lib/httpmime-4.2.3.jar new file mode 100755 index 0000000..c91c219 Binary files /dev/null and b/com.ibm.streamsx.inet/opt/HTTPClient4.2.3/lib/httpmime-4.2.3.jar differ