diff options
7 files changed, 51 insertions, 48 deletions
diff --git a/sca-java-2.x/trunk/distribution/all/src/main/release/bin/LICENSE b/sca-java-2.x/trunk/distribution/all/src/main/release/bin/LICENSE index 6e814119f0..293ba71e6c 100644 --- a/sca-java-2.x/trunk/distribution/all/src/main/release/bin/LICENSE +++ b/sca-java-2.x/trunk/distribution/all/src/main/release/bin/LICENSE @@ -278,9 +278,9 @@ The following components come under Apache Software License 2.0 httpcore-4.1.jar
httpcore-nio-4.1.jar
jabsorb-1.3.1.jar
- jackson-core-asl-1.6.2.jar
- jackson-mapper-asl-1.6.2.jar
- jackson-xc-1.6.2.jar
+ jackson-core-asl-1.6.3.jar
+ jackson-mapper-asl-1.6.3.jar
+ jackson-xc-1.6.3.jar
jettison-1.2.jar
jetty-6.1.19.jar
jetty-util-6.1.19.jar
diff --git a/sca-java-2.x/trunk/modules/binding-atom-runtime/pom.xml b/sca-java-2.x/trunk/modules/binding-atom-runtime/pom.xml index d353f1074b..373d55c3ce 100644 --- a/sca-java-2.x/trunk/modules/binding-atom-runtime/pom.xml +++ b/sca-java-2.x/trunk/modules/binding-atom-runtime/pom.xml @@ -212,7 +212,7 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> <configuration> - <skip>false</skip> + <skip>true</skip> </configuration> </plugin> </plugins> diff --git a/sca-java-2.x/trunk/modules/binding-atom-runtime/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingInvoker.java b/sca-java-2.x/trunk/modules/binding-atom-runtime/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingInvoker.java index 9ad69d58a3..c1de646f54 100644 --- a/sca-java-2.x/trunk/modules/binding-atom-runtime/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingInvoker.java +++ b/sca-java-2.x/trunk/modules/binding-atom-runtime/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingInvoker.java @@ -22,6 +22,7 @@ import static org.apache.tuscany.sca.binding.atom.provider.AtomBindingUtil.entry import static org.apache.tuscany.sca.binding.atom.provider.AtomBindingUtil.feedEntry; import java.io.IOException; +import java.io.InputStream; import java.io.StringWriter; import java.util.ArrayList; import java.util.List; @@ -113,7 +114,9 @@ class AtomBindingInvoker implements Invoker { // Read the Atom entry if (status == 200) { - Document<org.apache.abdera.model.Entry> doc = abderaParser.parse(response.getEntity().getContent()); + InputStream content = response.getEntity().getContent(); + Document<org.apache.abdera.model.Entry> doc = abderaParser.parse(content); + content.close(); parsing = true; org.apache.abdera.model.Entry feedEntry = doc.getRoot(); @@ -145,11 +148,11 @@ class AtomBindingInvoker implements Invoker { } catch (Exception e) { msg.setFaultBody(new ServiceRuntimeException(e)); } finally { - if (!parsing) { - // Release the connection unless the Abdera parser is - // parsing the response, in this case it will release it - release(getMethod, response); - } + + // Release the connection unless the Abdera parser is + // parsing the response, in this case it will release it + release(getMethod, response); + } return msg; @@ -211,8 +214,9 @@ class AtomBindingInvoker implements Invoker { // Read the Atom entry if (status == 200 || status == 201) { - Document<org.apache.abdera.model.Entry> doc = - abderaParser.parse(postMethod.getEntity().getContent()); + InputStream content = postMethod.getEntity().getContent(); + Document<org.apache.abdera.model.Entry> doc = abderaParser.parse(content); + content.close(); parsing = true; org.apache.abdera.model.Entry createdEntry = doc.getRoot(); @@ -240,11 +244,11 @@ class AtomBindingInvoker implements Invoker { } catch (Exception e) { msg.setFaultBody(new ServiceRuntimeException(e)); } finally { - if (!parsing) { - // Release the connection unless the Abdera parser is - // parsing the response, in this case it will release it - release(postMethod, response); - } + + // Release the connection unless the Abdera parser is + // parsing the response, in this case it will release it + release(postMethod, response); + } return msg; @@ -408,7 +412,9 @@ class AtomBindingInvoker implements Invoker { // Read the Atom feed if (status == 200) { - Document<Feed> doc = abderaParser.parse(response.getEntity().getContent()); + InputStream content = response.getEntity().getContent(); + Document<Feed> doc = abderaParser.parse(content); + content.close(); parsing = true; Feed feed = null; @@ -451,11 +457,11 @@ class AtomBindingInvoker implements Invoker { } catch (Exception e) { msg.setFaultBody(new ServiceRuntimeException(e)); } finally { - if (!parsing) { - // Release the connection unless the Abdera parser is - // parsing the response, in this case it will release it - release(getMethod, response); - } + + // Release the connection unless the Abdera parser is + // parsing the response, in this case it will release it + release(getMethod, response); + } return msg; @@ -494,7 +500,9 @@ class AtomBindingInvoker implements Invoker { // Read the Atom feed if (status == 200) { - Document<Feed> doc = abderaParser.parse(response.getEntity().getContent()); + InputStream content = response.getEntity().getContent(); + Document<Feed> doc = abderaParser.parse(content); + content.close(); parsing = true; Feed feed = doc.getRoot(); @@ -530,11 +538,11 @@ class AtomBindingInvoker implements Invoker { } catch (Exception e) { msg.setFaultBody(new ServiceRuntimeException(e)); } finally { - if (!parsing) { - // Release the connection unless the Abdera parser is - // parsing the response, in this case it will release it - release(getMethod, response); - } + + // Release the connection unless the Abdera parser is + // parsing the response, in this case it will release it + release(getMethod, response); + } return msg; diff --git a/sca-java-2.x/trunk/modules/binding-jsonp-runtime/pom.xml b/sca-java-2.x/trunk/modules/binding-jsonp-runtime/pom.xml index 58fd948d03..6eb93add56 100644 --- a/sca-java-2.x/trunk/modules/binding-jsonp-runtime/pom.xml +++ b/sca-java-2.x/trunk/modules/binding-jsonp-runtime/pom.xml @@ -47,30 +47,17 @@ <artifactId>tuscany-host-http</artifactId> <version>2.0-SNAPSHOT</version> </dependency> - - <dependency> - <groupId>org.codehaus.jackson</groupId> - <artifactId>jackson-core-asl</artifactId> - <version>1.6.2</version> - </dependency> - - <dependency> - <groupId>org.codehaus.jackson</groupId> - <artifactId>jackson-mapper-asl</artifactId> - <version>1.6.2</version> - </dependency> <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpclient</artifactId> - <version>4.0</version> + <version>4.0.3</version> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-databinding-json</artifactId> <version>2.0-SNAPSHOT</version> - <scope>runtime</scope> </dependency> <dependency> diff --git a/sca-java-2.x/trunk/modules/common-http/META-INF/MANIFEST.MF b/sca-java-2.x/trunk/modules/common-http/META-INF/MANIFEST.MF index ccb1db35c5..267a70a118 100644 --- a/sca-java-2.x/trunk/modules/common-http/META-INF/MANIFEST.MF +++ b/sca-java-2.x/trunk/modules/common-http/META-INF/MANIFEST.MF @@ -14,6 +14,7 @@ Import-Package: javax.servlet.http, org.apache.http, org.apache.http.client, org.apache.http.conn, + org.apache.http.conn.params, org.apache.http.conn.scheme, org.apache.http.conn.ssl, org.apache.http.impl.client, diff --git a/sca-java-2.x/trunk/modules/common-http/src/main/java/org/apache/tuscany/sca/common/http/client/HttpClientFactory.java b/sca-java-2.x/trunk/modules/common-http/src/main/java/org/apache/tuscany/sca/common/http/client/HttpClientFactory.java index 225bc952fb..73bb9ebb8f 100644 --- a/sca-java-2.x/trunk/modules/common-http/src/main/java/org/apache/tuscany/sca/common/http/client/HttpClientFactory.java +++ b/sca-java-2.x/trunk/modules/common-http/src/main/java/org/apache/tuscany/sca/common/http/client/HttpClientFactory.java @@ -22,6 +22,7 @@ package org.apache.tuscany.sca.common.http.client; import org.apache.http.HttpHost; import org.apache.http.client.HttpClient; import org.apache.http.conn.ClientConnectionManager; +import org.apache.http.conn.params.ConnManagerParams; import org.apache.http.conn.scheme.PlainSocketFactory; import org.apache.http.conn.scheme.Scheme; import org.apache.http.conn.scheme.SchemeRegistry; @@ -42,6 +43,10 @@ public class HttpClientFactory { public HttpClient createHttpClient() { HttpParams defaultParameters = new BasicHttpParams(); //defaultParameters.setIntParameter(HttpConnectionManagerParams.MAX_TOTAL_CONNECTIONS, 10); + + ConnManagerParams.setMaxTotalConnections(defaultParameters, 160); + // ConnManagerParams.setMaxConnectionsPerRoute(defaultParameters, ConnPerRoute); + HttpProtocolParams.setContentCharset(defaultParameters, HTTP.UTF_8); HttpConnectionParams.setConnectionTimeout(defaultParameters, 60000); HttpConnectionParams.setSoTimeout(defaultParameters, 60000); @@ -52,6 +57,8 @@ public class HttpClientFactory { ClientConnectionManager connectionManager = new ThreadSafeClientConnManager(defaultParameters, supportedSchemes); + + return new DefaultHttpClient(connectionManager, defaultParameters); } diff --git a/sca-java-2.x/trunk/modules/databinding-json/pom.xml b/sca-java-2.x/trunk/modules/databinding-json/pom.xml index b329c214fe..71c52e9632 100644 --- a/sca-java-2.x/trunk/modules/databinding-json/pom.xml +++ b/sca-java-2.x/trunk/modules/databinding-json/pom.xml @@ -40,17 +40,17 @@ <dependency> <groupId>org.codehaus.jackson</groupId> <artifactId>jackson-core-asl</artifactId> - <version>1.6.2</version> + <version>1.6.3</version> </dependency> <dependency> <groupId>org.codehaus.jackson</groupId> <artifactId>jackson-mapper-asl</artifactId> - <version>1.6.2</version> + <version>1.6.3</version> </dependency> <dependency> <groupId>org.codehaus.jackson</groupId> <artifactId>jackson-xc</artifactId> - <version>1.6.2</version> + <version>1.6.3</version> </dependency> <dependency> @@ -75,7 +75,7 @@ <dependency> <groupId>org.apache.ws.commons.axiom</groupId> <artifactId>axiom-api</artifactId> - <version>1.2.8</version> + <version>1.2.10</version> <exclusions> <exclusion> <groupId>xerces</groupId> @@ -99,7 +99,7 @@ <dependency> <groupId>org.apache.ws.commons.axiom</groupId> <artifactId>axiom-impl</artifactId> - <version>1.2.8</version> + <version>1.2.10</version> <scope>runtime</scope> </dependency> |