You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2016/04/27 17:42:50 UTC
[1/4] cxf git commit: More stream work
Repository: cxf
Updated Branches:
refs/heads/3.1.x-fixes 3b45e6080 -> 30ad57d55
More stream work
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/bca5ead5
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/bca5ead5
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/bca5ead5
Branch: refs/heads/3.1.x-fixes
Commit: bca5ead51899b3aa4864d8b4a675c829096bcd3b
Parents: 3b45e60
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Wed Apr 27 11:40:37 2016 +0100
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Wed Apr 27 14:31:06 2016 +0100
----------------------------------------------------------------------
.../org/apache/cxf/staxutils/StaxUtilsTest.java | 2 ++
.../org/apache/cxf/tools/util/PropertyUtil.java | 30 ++++++++++----------
.../tools/validator/internal/Stax2DOMTest.java | 6 ++--
3 files changed, 20 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/bca5ead5/core/src/test/java/org/apache/cxf/staxutils/StaxUtilsTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/cxf/staxutils/StaxUtilsTest.java b/core/src/test/java/org/apache/cxf/staxutils/StaxUtilsTest.java
index 818d262..eda6049 100644
--- a/core/src/test/java/org/apache/cxf/staxutils/StaxUtilsTest.java
+++ b/core/src/test/java/org/apache/cxf/staxutils/StaxUtilsTest.java
@@ -111,6 +111,7 @@ public class StaxUtilsTest extends Assert {
// write output to a string
String output = baos.toString();
+ baos.close();
// re-read the input xml doc to a string
InputStreamReader inputStreamReader = new InputStreamReader(getTestStream(soapMessage));
@@ -123,6 +124,7 @@ public class StaxUtilsTest extends Assert {
n = inputStreamReader.read(buffer);
}
String input = stringWriter.toString();
+ stringWriter.close();
// seach for the first begin of "<soap:Envelope" to escape the apache licenses header
int beginIndex = input.indexOf("<soap:Envelope");
input = input.substring(beginIndex);
http://git-wip-us.apache.org/repos/asf/cxf/blob/bca5ead5/tools/common/src/main/java/org/apache/cxf/tools/util/PropertyUtil.java
----------------------------------------------------------------------
diff --git a/tools/common/src/main/java/org/apache/cxf/tools/util/PropertyUtil.java b/tools/common/src/main/java/org/apache/cxf/tools/util/PropertyUtil.java
index e1e7a0a..02061cb 100644
--- a/tools/common/src/main/java/org/apache/cxf/tools/util/PropertyUtil.java
+++ b/tools/common/src/main/java/org/apache/cxf/tools/util/PropertyUtil.java
@@ -34,24 +34,24 @@ public class PropertyUtil {
private Map<String, String> maps = new HashMap<String, String>();
public void load(InputStream is, String delim) throws IOException {
- BufferedReader br = new BufferedReader(new InputStreamReader(is));
- String line = br.readLine();
- while (!StringUtils.isEmpty(line)) {
- StringTokenizer st = new StringTokenizer(line, delim);
- String key = null;
- String value = null;
- if (st.hasMoreTokens()) {
- key = st.nextToken().trim();
- }
- if (st.hasMoreTokens()) {
- value = st.nextToken().trim();
- }
+ try (BufferedReader br = new BufferedReader(new InputStreamReader(is))) {
+ String line = br.readLine();
+ while (!StringUtils.isEmpty(line)) {
+ StringTokenizer st = new StringTokenizer(line, delim);
+ String key = null;
+ String value = null;
+ if (st.hasMoreTokens()) {
+ key = st.nextToken().trim();
+ }
+ if (st.hasMoreTokens()) {
+ value = st.nextToken().trim();
+ }
- maps.put(key, value);
+ maps.put(key, value);
- line = br.readLine();
+ line = br.readLine();
+ }
}
- br.close();
}
public void load(InputStream is) throws IOException {
http://git-wip-us.apache.org/repos/asf/cxf/blob/bca5ead5/tools/validator/src/test/java/org/apache/cxf/tools/validator/internal/Stax2DOMTest.java
----------------------------------------------------------------------
diff --git a/tools/validator/src/test/java/org/apache/cxf/tools/validator/internal/Stax2DOMTest.java b/tools/validator/src/test/java/org/apache/cxf/tools/validator/internal/Stax2DOMTest.java
index c0b4141..7340fcc 100644
--- a/tools/validator/src/test/java/org/apache/cxf/tools/validator/internal/Stax2DOMTest.java
+++ b/tools/validator/src/test/java/org/apache/cxf/tools/validator/internal/Stax2DOMTest.java
@@ -83,9 +83,9 @@ public class Stax2DOMTest extends Assert {
File wsdlFile = new File(getClass().getResource(
"/validator_wsdl/jms_test.wsdl").toURI());
File tempFile = File.createTempFile("Stax2DOMTest", ".wsdl");
- FileOutputStream output = new FileOutputStream(tempFile);
- IOUtils.copyAndCloseInput(new FileInputStream(wsdlFile), output);
- output.close();
+ try (FileOutputStream output = new FileOutputStream(tempFile)) {
+ IOUtils.copyAndCloseInput(new FileInputStream(wsdlFile), output);
+ }
return tempFile;
}
[4/4] cxf git commit: Recording .gitmergeinfo Changes
Posted by co...@apache.org.
Recording .gitmergeinfo Changes
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/30ad57d5
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/30ad57d5
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/30ad57d5
Branch: refs/heads/3.1.x-fixes
Commit: 30ad57d5590257960030161c2bd20ab4131d9c7b
Parents: b4a1e35
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Wed Apr 27 15:49:12 2016 +0100
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Wed Apr 27 15:49:12 2016 +0100
----------------------------------------------------------------------
.gitmergeinfo | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/30ad57d5/.gitmergeinfo
----------------------------------------------------------------------
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 0aaee81..fc95715 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -43,6 +43,7 @@ B e1c60863ac10b56d423613c7d3d2f45c7ce18e14
B e61a83d4ac18fc760fc5d4bc8fb19d6072aaac52
B e6f0722615190861192972a51b3986b34efd1f0e
B ec3103f88b20fc05e92994b6a06b65b4a91dd75a
+B ee6e9e7d037de08ebc4a017ca7525d3ca67d2adb
B efb1f0830f5441777198737fb26e9305ab969f66
B f0e08b7bea2660542e18294d490e68c7b14aaa4b
B f1b56150d6520e73d2ade2296c3b2f13839e63e5
[3/4] cxf git commit: Recording .gitmergeinfo Changes
Posted by co...@apache.org.
Recording .gitmergeinfo Changes
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/b4a1e352
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/b4a1e352
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/b4a1e352
Branch: refs/heads/3.1.x-fixes
Commit: b4a1e352028e992ce6ff8f71666467ea4f96d7f8
Parents: bec4827
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Wed Apr 27 14:36:07 2016 +0100
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Wed Apr 27 14:36:07 2016 +0100
----------------------------------------------------------------------
.gitmergeinfo | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/b4a1e352/.gitmergeinfo
----------------------------------------------------------------------
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 9d2ac0d..0aaee81 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -65,6 +65,7 @@ M 746914a5084f5db8d0c0f052802c7ef2217b9b6b
M 7690a1fd087aff24ad8e8e1ab2e0722e24bf3d81
M 8118c5a301f22dea16c9d235ad378584a0ae2466
M 8583a24ac541dc373503d7a6c59cd90890acdae3
+M 896f1abec915897967905762d6e850cfb6bac3bc
M 8aebfa30047f32e3a6b4feb7ffdd89208ec4f435
M 8e131133c8566a124605cb06e0b6db98fddb5972
M 8e650cfe3efd63a06c25b7e912d9d4db61598eb1
[2/4] cxf git commit: Updating a few dependencies
Posted by co...@apache.org.
Updating a few dependencies
# Conflicts:
# parent/pom.xml
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/bec48272
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/bec48272
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/bec48272
Branch: refs/heads/3.1.x-fixes
Commit: bec482729cf3c0938658cbe2ccb542e1a9ab034d
Parents: bca5ead
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Wed Apr 27 14:30:43 2016 +0100
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Wed Apr 27 14:36:07 2016 +0100
----------------------------------------------------------------------
parent/pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/bec48272/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 0bba8d4..817f37b 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -91,7 +91,7 @@
<cxf.httpcomponents.client.version>4.5.2</cxf.httpcomponents.client.version>
<cxf.httpcomponents.core.version>4.4.4</cxf.httpcomponents.core.version>
<cxf.httpcomponents.core.version.range>[4.3,4.5.0)</cxf.httpcomponents.core.version.range>
- <cxf.jackson.version>2.6.5</cxf.jackson.version>
+ <cxf.jackson.version>2.6.6</cxf.jackson.version>
<cxf.james.mim4j.version>0.7.2</cxf.james.mim4j.version>
<cxf.logback.classic.version>1.0.13</cxf.logback.classic.version>
<cxf.log4j.version>1.2.17</cxf.log4j.version>
@@ -138,7 +138,7 @@
<cxf.servlet-api.version>1.0</cxf.servlet-api.version>
<cxf.servlet-api-2.5.artifact>geronimo-servlet_2.5_spec</cxf.servlet-api-2.5.artifact>
<cxf.servlet-api-2.5.version>1.1.2</cxf.servlet-api-2.5.version>
- <cxf.slf4j.version>1.7.19</cxf.slf4j.version>
+ <cxf.slf4j.version>1.7.21</cxf.slf4j.version>
<cxf.specs.jaxws.api.version>1.2</cxf.specs.jaxws.api.version>
<cxf.spring.version>4.1.9.RELEASE</cxf.spring.version>
<cxf.spring.security.version>3.2.9.RELEASE</cxf.spring.security.version>