cxf git commit: Recording .gitmergeinfo Changes
Repository: cxf Updated Branches: refs/heads/3.0.x-fixes 727e403f7 -> 81a5cb603 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/81a5cb60 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/81a5cb60 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/81a5cb60 Branch: refs/heads/3.0.x-fixes Commit: 81a5cb603c452ac85668d79306a6a8c0dc0869ac Parents: 727e403 Author: Colm O hEigeartaigh Authored: Thu Apr 14 17:59:05 2016 +0100 Committer: Colm O hEigeartaigh Committed: Thu Apr 14 17:59:05 2016 +0100 -- .gitmergeinfo | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/81a5cb60/.gitmergeinfo -- diff --git a/.gitmergeinfo b/.gitmergeinfo index b3449d0..ecb5403 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -316,6 +316,7 @@ B 58d40a843e50f7c581a9cc2373b431bf4a3f9780 B 58d5200bdc0f15e99f1c624c53299120518a B 5902802031e7cf156fe5f0c7a804ec1a53127c27 B 593525139909e081ae809278d301688c0ba03697 +B 59abba0189020ca634cafe4f0e667455a01664fb B 59b7fd7072a71498aecb1b5da6ec51ea89f7381b B 59bbab2f13a9e56dcd2dfff971bd608549454b91 B 5a1dd7723e3c21267e12d1562f4a2425049bc7ad
cxf git commit: Close some streams
Repository: cxf
Updated Branches:
refs/heads/3.1.x-fixes 4edaad797 -> 59abba018
Close some streams
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/59abba01
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/59abba01
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/59abba01
Branch: refs/heads/3.1.x-fixes
Commit: 59abba0189020ca634cafe4f0e667455a01664fb
Parents: 4edaad7
Author: Colm O hEigeartaigh
Authored: Thu Apr 14 14:18:08 2016 +0100
Committer: Colm O hEigeartaigh
Committed: Thu Apr 14 17:58:45 2016 +0100
--
.../java/org/apache/cxf/helpers/IOUtils.java| 53 ++--
.../transport/servlet/AbstractHTTPServlet.java | 3 +-
...ingConfiguredAutoRewriteSoapAddressTest.java | 5 +-
.../provider/AbstractSourcePayloadProvider.java | 12 ++---
.../systest/servlet/AbstractServletTest.java| 1 +
5 files changed, 39 insertions(+), 35 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/59abba01/core/src/main/java/org/apache/cxf/helpers/IOUtils.java
--
diff --git a/core/src/main/java/org/apache/cxf/helpers/IOUtils.java
b/core/src/main/java/org/apache/cxf/helpers/IOUtils.java
index 82c5535..7c3b828 100644
--- a/core/src/main/java/org/apache/cxf/helpers/IOUtils.java
+++ b/core/src/main/java/org/apache/cxf/helpers/IOUtils.java
@@ -264,15 +264,8 @@ public final class IOUtils {
if (Transferable.class.isAssignableFrom(inputStream.getClass())) {
((Transferable)inputStream).transferTo(destinationFile);
} else {
-FileOutputStream fout = new FileOutputStream(destinationFile);
-try {
+try (FileOutputStream fout = new
FileOutputStream(destinationFile)) {
copyAndCloseInput(inputStream, fout);
-} finally {
-try {
-fout.close();
-} catch (IOException ex) {
-//ignore
-}
}
}
}
@@ -308,17 +301,20 @@ public final class IOUtils {
StringBuilder buf = new StringBuilder();
final char[] buffer = new char[bufSize];
-int n = 0;
-n = input.read(buffer);
-while (-1 != n) {
-if (n == 0) {
-throw new IOException("0 bytes read in violation of
InputStream.read(byte[])");
-}
-buf.append(new String(buffer, 0, n));
+try {
+int n = 0;
n = input.read(buffer);
+while (-1 != n) {
+if (n == 0) {
+throw new IOException("0 bytes read in violation of
InputStream.read(byte[])");
+}
+buf.append(new String(buffer, 0, n));
+n = input.read(buffer);
+}
+return buf.toString();
+} finally {
+input.close();
}
-input.close();
-return buf.toString();
}
public static String readStringFromStream(InputStream in)
@@ -326,13 +322,14 @@ public final class IOUtils {
StringBuilder sb = new StringBuilder(1024);
-for (int i = in.read(); i != -1; i = in.read()) {
-sb.append((char) i);
+try {
+for (int i = in.read(); i != -1; i = in.read()) {
+sb.append((char) i);
+}
+return sb.toString();
+} finally {
+in.close();
}
-
-in.close();
-
-return sb.toString();
}
/**
@@ -407,9 +404,11 @@ public final class IOUtils {
if (i < DEFAULT_BUFFER_SIZE) {
i = DEFAULT_BUFFER_SIZE;
}
-ByteArrayOutputStream bos = new ByteArrayOutputStream(i);
-copy(in, bos);
-in.close();
-return bos.toByteArray();
+try (ByteArrayOutputStream bos = new ByteArrayOutputStream(i)) {
+copy(in, bos);
+return bos.toByteArray();
+} finally {
+in.close();
+}
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/59abba01/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/AbstractHTTPServlet.java
--
diff --git
a/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/AbstractHTTPServlet.java
b/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/AbstractHTTPServlet.java
index 2b78fe6..d013bdf 100644
---
a/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/AbstractHTTPServlet.java
+++
b/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/AbstractHTTPServlet.java
@@ -136,6 +136,7 @@ public abstract class AbstractHTTPServlet extends
HttpServlet implements Filter
for (Str
cxf git commit: Updating a test blueprint noosgi dep
Repository: cxf Updated Branches: refs/heads/3.1.x-fixes aa7aef8dc -> 4edaad797 Updating a test blueprint noosgi dep Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/4edaad79 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/4edaad79 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/4edaad79 Branch: refs/heads/3.1.x-fixes Commit: 4edaad797a57d6968f5ba293b100b856a72c52ab Parents: aa7aef8 Author: Sergey Beryozkin Authored: Thu Apr 14 17:35:00 2016 +0100 Committer: Sergey Beryozkin Committed: Thu Apr 14 17:35:48 2016 +0100 -- systests/jaxrs/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/4edaad79/systests/jaxrs/pom.xml -- diff --git a/systests/jaxrs/pom.xml b/systests/jaxrs/pom.xml index cefdd2f..74075a3 100644 --- a/systests/jaxrs/pom.xml +++ b/systests/jaxrs/pom.xml @@ -114,7 +114,7 @@ org.apache.aries.blueprint org.apache.aries.blueprint.noosgi -1.1.1 +1.1.2 test
cxf git commit: Updating a test blueprint noosgi dep
Repository: cxf Updated Branches: refs/heads/master 5c9993600 -> d2661a973 Updating a test blueprint noosgi dep Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/d2661a97 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/d2661a97 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/d2661a97 Branch: refs/heads/master Commit: d2661a973accf6dfea64f6304d6ecbe5bf1adced Parents: 5c99936 Author: Sergey Beryozkin Authored: Thu Apr 14 17:35:00 2016 +0100 Committer: Sergey Beryozkin Committed: Thu Apr 14 17:35:00 2016 +0100 -- systests/jaxrs/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/d2661a97/systests/jaxrs/pom.xml -- diff --git a/systests/jaxrs/pom.xml b/systests/jaxrs/pom.xml index 1733af0..8a2fc9e 100644 --- a/systests/jaxrs/pom.xml +++ b/systests/jaxrs/pom.xml @@ -114,7 +114,7 @@ org.apache.aries.blueprint org.apache.aries.blueprint.noosgi -1.1.1 +1.1.2 test
[1/2] cxf git commit: Setting a correct token to permission relationship
Repository: cxf
Updated Branches:
refs/heads/3.1.x-fixes e5a5d5b64 -> aa7aef8dc
Setting a correct token to permission relationship
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/3f90fa6a
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/3f90fa6a
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/3f90fa6a
Branch: refs/heads/3.1.x-fixes
Commit: 3f90fa6a7adb9c3311663424950fa352d7d5bdbb
Parents: e5a5d5b
Author: Sergey Beryozkin
Authored: Thu Apr 14 17:13:55 2016 +0100
Committer: Sergey Beryozkin
Committed: Thu Apr 14 17:17:06 2016 +0100
--
rt/rs/security/oauth-parent/oauth2/pom.xml | 13 +
.../oauth2/common/ServerAccessToken.java| 4 +--
.../oauth2/provider/JPAOAuthDataProvider.java | 12
.../provider/JPAOAuthDataProviderTest.java | 6
.../src/test/resources/META-INF/persistence.xml | 1 +
rt/rs/security/sso/oidc/pom.xml | 30 ++--
.../oidc/idp/JPAOidcUserSubjectTest.java| 22 +++---
.../src/test/resources/META-INF/persistence.xml | 1 -
8 files changed, 49 insertions(+), 40 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/3f90fa6a/rt/rs/security/oauth-parent/oauth2/pom.xml
--
diff --git a/rt/rs/security/oauth-parent/oauth2/pom.xml
b/rt/rs/security/oauth-parent/oauth2/pom.xml
index 975c74a..602b884 100644
--- a/rt/rs/security/oauth-parent/oauth2/pom.xml
+++ b/rt/rs/security/oauth-parent/oauth2/pom.xml
@@ -96,6 +96,12 @@
easymock
test
+
+hsqldb
+hsqldb
+${hsqldb.version}
+test
+
-hsqldb
-hsqldb
-${hsqldb.version}
+junit
+junit
test
-org.hibernate
-hibernate-entitymanager
-${hibernate.em.version}
+org.easymock
+easymock
+test
+
+
+hsqldb
+hsqldb
+${hsqldb.version}
test
-
-
-junit
-junit
-test
-
-org.easymock
-easymock
+org.hibernate
+hibernate-entitymanager
+${hibernate.em.version}
test
http://git-wip-us.apache.org/repos/asf/cxf/blob/3f90fa6a/rt/rs/security/sso/oidc/src/test/java/org/apache/cxf/rs/security/oidc/idp/JPAOidcUserSubjectTest.java
--
diff --git
a/rt/rs/security/sso/oidc/src/test/java/org/apache/cxf/rs/security/oidc/idp/JPAOidcUserSubjectTest.java
b/rt/rs/security/sso/oidc/src/test/java/org/apache/cxf/rs/security/oidc/idp/JPAOidcUserSubjectTest.java
index 6799297..4b18902 100644
---
a/rt/rs/security/sso/oidc/src/test/java/org/apache/cxf/rs/security/oidc/idp/JPAOidcUserSubjectTest.java
+++
b/rt/rs/security/sso/oidc/src/test/java/org/apache/cxf/rs/security/oidc/idp/JPAOidcUserSubjectTest.java
@@ -86,17 +86,17 @@ public class JPAOidcUserSubjectTest extends Assert {
OidcUserSubject oidcSubject2 = (OidcUserSubject)at2.getSubject();
assertEquals(c.getClientId(), oidcSubject2.getIdToken().getAudience());
-//OidcUserSubject oidcSubject3 = new OidcUserSubject();
-//oidcSubject3.setLogin("bob");
-//IdToken idToken2 = new IdToken();
-//idToken2.setAudience(c.getClientId());
-//oidcSubject3.setIdToken(idToken2);
-//atr.setSubject(oidcSubject3);
-//
-//ServerAccessToken at3 = provider.createAccessToken(atr);
-//ServerAccessToken at4 = provider.getAccessToken(at3.getTokenKey());
-//OidcUserSubject oidcSubject4 = (OidcUserSubject)at4.getSubject();
-//assertEquals(c.getClientId(),
oidcSubject4.getIdToken().getAudience());
+OidcUserSubject oidcSubject3 = new OidcUserSubject();
+oidcSubject3.setLogin("bob");
+IdToken idToken2 = new IdToken();
+idToken2.setAudience(c.getClientId());
+oidcSubject3.setIdToken(idToken2);
+atr.setSubject(oidcSubject3);
+
+ServerAccessToken at3 = provider.createAccessToken(atr);
+ServerAccessToken at4 = provider.getAccessToken(at3.getTokenKey());
+OidcUserSubject oidcSubject4 = (OidcUserSubject)at4.getSubject();
+assertEquals(c.getClientId(), oidcSubject4.getIdToken().getAudience());
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/3f90fa6a/rt/rs/security/sso/oidc/src/test/resources/META-INF/persistence.xml
--
diff --gi
[2/2] cxf git commit: Fixing a typo
Fixing a typo
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/aa7aef8d
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/aa7aef8d
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/aa7aef8d
Branch: refs/heads/3.1.x-fixes
Commit: aa7aef8dc771ecfd8cfa428a83d3f529accbd10a
Parents: 3f90fa6
Author: Sergey Beryozkin
Authored: Thu Apr 14 17:15:23 2016 +0100
Committer: Sergey Beryozkin
Committed: Thu Apr 14 17:17:07 2016 +0100
--
.../cxf/rs/security/oauth2/provider/JPAOAuthDataProviderTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/aa7aef8d/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/provider/JPAOAuthDataProviderTest.java
--
diff --git
a/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/provider/JPAOAuthDataProviderTest.java
b/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/provider/JPAOAuthDataProviderTest.java
index ec0c020..8b23e22 100644
---
a/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/provider/JPAOAuthDataProviderTest.java
+++
b/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/provider/JPAOAuthDataProviderTest.java
@@ -74,7 +74,7 @@ public class JPAOAuthDataProviderTest extends Assert {
compareClients(c, c2);
c2.setClientSecret("567");
-provider.setClient(c);
+provider.setClient(c2);
Client c22 = provider.getClient(c.getClientId());
compareClients(c2, c22);
cxf git commit: Fixing a typo
Repository: cxf
Updated Branches:
refs/heads/master 0caf56378 -> 5c9993600
Fixing a typo
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/5c999360
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/5c999360
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/5c999360
Branch: refs/heads/master
Commit: 5c999360016e11d9173888936e08b185a89e009a
Parents: 0caf563
Author: Sergey Beryozkin
Authored: Thu Apr 14 17:15:23 2016 +0100
Committer: Sergey Beryozkin
Committed: Thu Apr 14 17:15:23 2016 +0100
--
.../cxf/rs/security/oauth2/provider/JPAOAuthDataProviderTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/5c999360/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/provider/JPAOAuthDataProviderTest.java
--
diff --git
a/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/provider/JPAOAuthDataProviderTest.java
b/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/provider/JPAOAuthDataProviderTest.java
index ec0c020..8b23e22 100644
---
a/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/provider/JPAOAuthDataProviderTest.java
+++
b/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/provider/JPAOAuthDataProviderTest.java
@@ -74,7 +74,7 @@ public class JPAOAuthDataProviderTest extends Assert {
compareClients(c, c2);
c2.setClientSecret("567");
-provider.setClient(c);
+provider.setClient(c2);
Client c22 = provider.getClient(c.getClientId());
compareClients(c2, c22);
cxf git commit: Setting a correct token to permission relationship
Repository: cxf
Updated Branches:
refs/heads/master 1963e01b4 -> 0caf56378
Setting a correct token to permission relationship
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/0caf5637
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/0caf5637
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/0caf5637
Branch: refs/heads/master
Commit: 0caf563789f6968e2480bc885abd9ab01c8eae35
Parents: 1963e01
Author: Sergey Beryozkin
Authored: Thu Apr 14 17:13:55 2016 +0100
Committer: Sergey Beryozkin
Committed: Thu Apr 14 17:13:55 2016 +0100
--
rt/rs/security/oauth-parent/oauth2/pom.xml | 13 +
.../oauth2/common/ServerAccessToken.java| 4 +--
.../oauth2/provider/JPAOAuthDataProvider.java | 12
.../provider/JPAOAuthDataProviderTest.java | 6
.../src/test/resources/META-INF/persistence.xml | 1 +
rt/rs/security/sso/oidc/pom.xml | 30 ++--
.../oidc/idp/JPAOidcUserSubjectTest.java| 22 +++---
.../src/test/resources/META-INF/persistence.xml | 1 -
8 files changed, 49 insertions(+), 40 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/0caf5637/rt/rs/security/oauth-parent/oauth2/pom.xml
--
diff --git a/rt/rs/security/oauth-parent/oauth2/pom.xml
b/rt/rs/security/oauth-parent/oauth2/pom.xml
index e0d78f9..b15a3b6 100644
--- a/rt/rs/security/oauth-parent/oauth2/pom.xml
+++ b/rt/rs/security/oauth-parent/oauth2/pom.xml
@@ -96,6 +96,12 @@
easymock
test
+
+hsqldb
+hsqldb
+${hsqldb.version}
+test
+
-hsqldb
-hsqldb
-${hsqldb.version}
+junit
+junit
test
-org.hibernate
-hibernate-entitymanager
-${hibernate.em.version}
+org.easymock
+easymock
+test
+
+
+hsqldb
+hsqldb
+${hsqldb.version}
test
-
-
-junit
-junit
-test
-
-org.easymock
-easymock
+org.hibernate
+hibernate-entitymanager
+${hibernate.em.version}
test
http://git-wip-us.apache.org/repos/asf/cxf/blob/0caf5637/rt/rs/security/sso/oidc/src/test/java/org/apache/cxf/rs/security/oidc/idp/JPAOidcUserSubjectTest.java
--
diff --git
a/rt/rs/security/sso/oidc/src/test/java/org/apache/cxf/rs/security/oidc/idp/JPAOidcUserSubjectTest.java
b/rt/rs/security/sso/oidc/src/test/java/org/apache/cxf/rs/security/oidc/idp/JPAOidcUserSubjectTest.java
index 6799297..4b18902 100644
---
a/rt/rs/security/sso/oidc/src/test/java/org/apache/cxf/rs/security/oidc/idp/JPAOidcUserSubjectTest.java
+++
b/rt/rs/security/sso/oidc/src/test/java/org/apache/cxf/rs/security/oidc/idp/JPAOidcUserSubjectTest.java
@@ -86,17 +86,17 @@ public class JPAOidcUserSubjectTest extends Assert {
OidcUserSubject oidcSubject2 = (OidcUserSubject)at2.getSubject();
assertEquals(c.getClientId(), oidcSubject2.getIdToken().getAudience());
-//OidcUserSubject oidcSubject3 = new OidcUserSubject();
-//oidcSubject3.setLogin("bob");
-//IdToken idToken2 = new IdToken();
-//idToken2.setAudience(c.getClientId());
-//oidcSubject3.setIdToken(idToken2);
-//atr.setSubject(oidcSubject3);
-//
-//ServerAccessToken at3 = provider.createAccessToken(atr);
-//ServerAccessToken at4 = provider.getAccessToken(at3.getTokenKey());
-//OidcUserSubject oidcSubject4 = (OidcUserSubject)at4.getSubject();
-//assertEquals(c.getClientId(),
oidcSubject4.getIdToken().getAudience());
+OidcUserSubject oidcSubject3 = new OidcUserSubject();
+oidcSubject3.setLogin("bob");
+IdToken idToken2 = new IdToken();
+idToken2.setAudience(c.getClientId());
+oidcSubject3.setIdToken(idToken2);
+atr.setSubject(oidcSubject3);
+
+ServerAccessToken at3 = provider.createAccessToken(atr);
+ServerAccessToken at4 = provider.getAccessToken(at3.getTokenKey());
+OidcUserSubject oidcSubject4 = (OidcUserSubject)at4.getSubject();
+assertEquals(c.getClientId(), oidcSubject4.getIdToken().getAudience());
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/0caf5637/rt/rs/security/sso/oidc/src/test/resources/META-INF/persistence.xml
--
diff --git
a/rt/rs
cxf git commit: Fixing 3.1.x compilation failure
Repository: cxf
Updated Branches:
refs/heads/3.1.x-fixes 11f3e36e1 -> e5a5d5b64
Fixing 3.1.x compilation failure
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/e5a5d5b6
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/e5a5d5b6
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/e5a5d5b6
Branch: refs/heads/3.1.x-fixes
Commit: e5a5d5b64015faffa3479ac009631c66f9f56036
Parents: 11f3e36
Author: Sergey Beryozkin
Authored: Thu Apr 14 16:19:21 2016 +0100
Committer: Sergey Beryozkin
Committed: Thu Apr 14 16:19:21 2016 +0100
--
.../org/apache/cxf/jaxrs/provider/ProviderCache.java| 12 ++--
1 file changed, 10 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/e5a5d5b6/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderCache.java
--
diff --git
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderCache.java
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderCache.java
index 37aeb7b..15fdd03 100644
---
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderCache.java
+++
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderCache.java
@@ -51,7 +51,11 @@ public class ProviderCache {
String key = getKey(type, mt);
List>> list =
readerProviderCache.get(key);
-return list != null ? list : Collections.emptyList();
+if (list != null) {
+return list;
+} else {
+return Collections.emptyList();
+}
}
public List>> getWriters(Class type,
MediaType mt) {
if (writerProviderCache.isEmpty()) {
@@ -61,7 +65,11 @@ public class ProviderCache {
String key = getKey(type, mt);
List>> list =
writerProviderCache.get(key);
-return list != null ? list : Collections.emptyList();
+if (list != null) {
+return list;
+} else {
+return Collections.emptyList();
+}
}
public void putReaders(Class type, MediaType mt,
List>> candidates) {
cxf git commit: Close some streams
Repository: cxf
Updated Branches:
refs/heads/master 0abb19515 -> 1963e01b4
Close some streams
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/1963e01b
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/1963e01b
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/1963e01b
Branch: refs/heads/master
Commit: 1963e01b4364fd43de43b151338dff63314c8d8d
Parents: 0abb195
Author: Colm O hEigeartaigh
Authored: Thu Apr 14 14:18:08 2016 +0100
Committer: Colm O hEigeartaigh
Committed: Thu Apr 14 14:18:31 2016 +0100
--
.../java/org/apache/cxf/helpers/IOUtils.java| 53 ++--
.../transport/servlet/AbstractHTTPServlet.java | 3 +-
...ingConfiguredAutoRewriteSoapAddressTest.java | 5 +-
.../provider/AbstractSourcePayloadProvider.java | 12 ++---
.../systest/servlet/AbstractServletTest.java| 1 +
5 files changed, 39 insertions(+), 35 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/1963e01b/core/src/main/java/org/apache/cxf/helpers/IOUtils.java
--
diff --git a/core/src/main/java/org/apache/cxf/helpers/IOUtils.java
b/core/src/main/java/org/apache/cxf/helpers/IOUtils.java
index 82c5535..7c3b828 100644
--- a/core/src/main/java/org/apache/cxf/helpers/IOUtils.java
+++ b/core/src/main/java/org/apache/cxf/helpers/IOUtils.java
@@ -264,15 +264,8 @@ public final class IOUtils {
if (Transferable.class.isAssignableFrom(inputStream.getClass())) {
((Transferable)inputStream).transferTo(destinationFile);
} else {
-FileOutputStream fout = new FileOutputStream(destinationFile);
-try {
+try (FileOutputStream fout = new
FileOutputStream(destinationFile)) {
copyAndCloseInput(inputStream, fout);
-} finally {
-try {
-fout.close();
-} catch (IOException ex) {
-//ignore
-}
}
}
}
@@ -308,17 +301,20 @@ public final class IOUtils {
StringBuilder buf = new StringBuilder();
final char[] buffer = new char[bufSize];
-int n = 0;
-n = input.read(buffer);
-while (-1 != n) {
-if (n == 0) {
-throw new IOException("0 bytes read in violation of
InputStream.read(byte[])");
-}
-buf.append(new String(buffer, 0, n));
+try {
+int n = 0;
n = input.read(buffer);
+while (-1 != n) {
+if (n == 0) {
+throw new IOException("0 bytes read in violation of
InputStream.read(byte[])");
+}
+buf.append(new String(buffer, 0, n));
+n = input.read(buffer);
+}
+return buf.toString();
+} finally {
+input.close();
}
-input.close();
-return buf.toString();
}
public static String readStringFromStream(InputStream in)
@@ -326,13 +322,14 @@ public final class IOUtils {
StringBuilder sb = new StringBuilder(1024);
-for (int i = in.read(); i != -1; i = in.read()) {
-sb.append((char) i);
+try {
+for (int i = in.read(); i != -1; i = in.read()) {
+sb.append((char) i);
+}
+return sb.toString();
+} finally {
+in.close();
}
-
-in.close();
-
-return sb.toString();
}
/**
@@ -407,9 +404,11 @@ public final class IOUtils {
if (i < DEFAULT_BUFFER_SIZE) {
i = DEFAULT_BUFFER_SIZE;
}
-ByteArrayOutputStream bos = new ByteArrayOutputStream(i);
-copy(in, bos);
-in.close();
-return bos.toByteArray();
+try (ByteArrayOutputStream bos = new ByteArrayOutputStream(i)) {
+copy(in, bos);
+return bos.toByteArray();
+} finally {
+in.close();
+}
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/1963e01b/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/AbstractHTTPServlet.java
--
diff --git
a/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/AbstractHTTPServlet.java
b/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/AbstractHTTPServlet.java
index 2b78fe6..d013bdf 100644
---
a/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/AbstractHTTPServlet.java
+++
b/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/AbstractHTTPServlet.java
@@ -136,6 +136,7 @@ public abstract class AbstractHTTPServlet extends
HttpServlet implements Filter
for (String name :
cxf git commit: [CXF-6837] Prototyping MBR/MBW cache code, a patch from Neal Hu with modifications applied
Repository: cxf
Updated Branches:
refs/heads/3.1.x-fixes c7234f413 -> 11f3e36e1
[CXF-6837] Prototyping MBR/MBW cache code, a patch from Neal Hu with
modifications applied
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/11f3e36e
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/11f3e36e
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/11f3e36e
Branch: refs/heads/3.1.x-fixes
Commit: 11f3e36e1af5d979a84040f79a8e9cb0f6840d9d
Parents: c7234f4
Author: Sergey Beryozkin
Authored: Thu Apr 14 13:31:21 2016 +0100
Committer: Sergey Beryozkin
Committed: Thu Apr 14 13:32:16 2016 +0100
--
.../cxf/jaxrs/provider/ProviderCache.java | 106 ++
.../cxf/jaxrs/provider/ProviderFactory.java | 139 +++
2 files changed, 219 insertions(+), 26 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/11f3e36e/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderCache.java
--
diff --git
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderCache.java
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderCache.java
new file mode 100644
index 000..37aeb7b
--- /dev/null
+++
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderCache.java
@@ -0,0 +1,106 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.cxf.jaxrs.provider;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.ext.MessageBodyReader;
+import javax.ws.rs.ext.MessageBodyWriter;
+
+import org.apache.cxf.jaxrs.model.ProviderInfo;
+
+public class ProviderCache {
+private static final int MAX_PROVIDER_CACHE_SIZE =
+Integer.getInteger("org.apache.cxf.jaxrs.max_provider_cache_size",
100);
+private final Map>>>
+readerProviderCache = new ConcurrentHashMap>>>();
+
+private final Map>>>
+writerProviderCache = new ConcurrentHashMap>>>();
+
+private boolean checkAllCandidates;
+public ProviderCache(boolean checkAllCandidates) {
+this.checkAllCandidates = checkAllCandidates;
+}
+
+public List>> getReaders(Class type,
MediaType mt) {
+if (readerProviderCache.isEmpty()) {
+return Collections.emptyList();
+}
+String key = getKey(type, mt);
+
+List>> list =
readerProviderCache.get(key);
+return list != null ? list : Collections.emptyList();
+}
+public List>> getWriters(Class type,
MediaType mt) {
+if (writerProviderCache.isEmpty()) {
+return Collections.emptyList();
+}
+
+String key = getKey(type, mt);
+
+List>> list =
writerProviderCache.get(key);
+return list != null ? list : Collections.emptyList();
+}
+
+public void putReaders(Class type, MediaType mt,
List>> candidates) {
+if (candidates == null || candidates.isEmpty()) {
+return;
+}
+checkCacheSize(readerProviderCache);
+
+String key = getKey(type, mt);
+readerProviderCache.put(key, candidates);
+}
+
+public void putWriters(Class type, MediaType mt,
List>> candidates) {
+if (candidates == null || candidates.isEmpty()) {
+return;
+}
+checkCacheSize(writerProviderCache);
+
+String key = getKey(type, mt);
+writerProviderCache.put(key, candidates);
+}
+
+public void destroy() {
+this.readerProviderCache.clear();
+this.writerProviderCache.clear();
+}
+
+private String getKey(Class type, MediaType mt) {
+return type.getName() + "-" + mt.toString();
+}
+
+private static void checkCacheSize(Map map) {
+final int size = map.size();
+if (size >= MAX_PROVIDER_CACHE_SIZE) {
+map.clear();
+}
+}
+
+pu
cxf git commit: [CXF-6837] Prototyping MBR/MBW cache code, a patch from Neal Hu with modifications applied
Repository: cxf
Updated Branches:
refs/heads/master 26edcd457 -> 0abb19515
[CXF-6837] Prototyping MBR/MBW cache code, a patch from Neal Hu with
modifications applied
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/0abb1951
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/0abb1951
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/0abb1951
Branch: refs/heads/master
Commit: 0abb1951545fe2e271daac373669a75e501a8434
Parents: 26edcd4
Author: Sergey Beryozkin
Authored: Thu Apr 14 13:31:21 2016 +0100
Committer: Sergey Beryozkin
Committed: Thu Apr 14 13:31:21 2016 +0100
--
.../cxf/jaxrs/provider/ProviderCache.java | 106 ++
.../cxf/jaxrs/provider/ProviderFactory.java | 139 +++
2 files changed, 219 insertions(+), 26 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/0abb1951/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderCache.java
--
diff --git
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderCache.java
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderCache.java
new file mode 100644
index 000..37aeb7b
--- /dev/null
+++
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderCache.java
@@ -0,0 +1,106 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.cxf.jaxrs.provider;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.ext.MessageBodyReader;
+import javax.ws.rs.ext.MessageBodyWriter;
+
+import org.apache.cxf.jaxrs.model.ProviderInfo;
+
+public class ProviderCache {
+private static final int MAX_PROVIDER_CACHE_SIZE =
+Integer.getInteger("org.apache.cxf.jaxrs.max_provider_cache_size",
100);
+private final Map>>>
+readerProviderCache = new ConcurrentHashMap>>>();
+
+private final Map>>>
+writerProviderCache = new ConcurrentHashMap>>>();
+
+private boolean checkAllCandidates;
+public ProviderCache(boolean checkAllCandidates) {
+this.checkAllCandidates = checkAllCandidates;
+}
+
+public List>> getReaders(Class type,
MediaType mt) {
+if (readerProviderCache.isEmpty()) {
+return Collections.emptyList();
+}
+String key = getKey(type, mt);
+
+List>> list =
readerProviderCache.get(key);
+return list != null ? list : Collections.emptyList();
+}
+public List>> getWriters(Class type,
MediaType mt) {
+if (writerProviderCache.isEmpty()) {
+return Collections.emptyList();
+}
+
+String key = getKey(type, mt);
+
+List>> list =
writerProviderCache.get(key);
+return list != null ? list : Collections.emptyList();
+}
+
+public void putReaders(Class type, MediaType mt,
List>> candidates) {
+if (candidates == null || candidates.isEmpty()) {
+return;
+}
+checkCacheSize(readerProviderCache);
+
+String key = getKey(type, mt);
+readerProviderCache.put(key, candidates);
+}
+
+public void putWriters(Class type, MediaType mt,
List>> candidates) {
+if (candidates == null || candidates.isEmpty()) {
+return;
+}
+checkCacheSize(writerProviderCache);
+
+String key = getKey(type, mt);
+writerProviderCache.put(key, candidates);
+}
+
+public void destroy() {
+this.readerProviderCache.clear();
+this.writerProviderCache.clear();
+}
+
+private String getKey(Class type, MediaType mt) {
+return type.getName() + "-" + mt.toString();
+}
+
+private static void checkCacheSize(Map map) {
+final int size = map.size();
+if (size >= MAX_PROVIDER_CACHE_SIZE) {
+map.clear();
+}
+}
+
+public boole
cxf-fediz git commit: Add accessors for AuthnRequestParser
Repository: cxf-fediz
Updated Branches:
refs/heads/master cc8708e1b -> e280eb1a5
Add accessors for AuthnRequestParser
Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/e280eb1a
Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/e280eb1a
Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/e280eb1a
Branch: refs/heads/master
Commit: e280eb1a5f8ac7270d388e9e71017e4351ff2184
Parents: cc8708e
Author: Colm O hEigeartaigh
Authored: Thu Apr 14 12:09:44 2016 +0100
Committer: Colm O hEigeartaigh
Committed: Thu Apr 14 12:09:44 2016 +0100
--
.../fediz/service/idp/beans/samlsso/AuthnRequestParser.java | 7 +++
1 file changed, 7 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/e280eb1a/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/beans/samlsso/AuthnRequestParser.java
--
diff --git
a/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/beans/samlsso/AuthnRequestParser.java
b/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/beans/samlsso/AuthnRequestParser.java
index 8a09b03..b9e15f8 100644
---
a/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/beans/samlsso/AuthnRequestParser.java
+++
b/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/beans/samlsso/AuthnRequestParser.java
@@ -152,4 +152,11 @@ public class AuthnRequestParser {
return request;
}
+public boolean isSupportDeflateEncoding() {
+return supportDeflateEncoding;
+}
+
+public void setSupportDeflateEncoding(boolean supportDeflateEncoding) {
+this.supportDeflateEncoding = supportDeflateEncoding;
+}
}
[1/2] cxf git commit: [CXF-6867] Ensure Envelope and Body element prefixes are not changed when processing messages without headers
Repository: cxf
Updated Branches:
refs/heads/3.0.x-fixes f01d17173 -> 727e403f7
[CXF-6867] Ensure Envelope and Body element prefixes are not changed when
processing messages without headers
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/93c84a17
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/93c84a17
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/93c84a17
Branch: refs/heads/3.0.x-fixes
Commit: 93c84a176cb94d0491971a7a394f61fad945d6fe
Parents: f01d171
Author: Alessio Soldano
Authored: Wed Apr 13 23:02:56 2016 +0200
Committer: Alessio Soldano
Committed: Thu Apr 14 11:49:13 2016 +0200
--
.../interceptor/ReadHeadersInterceptor.java | 21
.../binding/soap/saaj/SAAJInInterceptor.java| 10 ++
.../cxf/binding/soap/saaj/SAAJStreamWriter.java | 17 ++--
.../apache/cxf/binding/soap/saaj/SAAJUtils.java | 17
4 files changed, 50 insertions(+), 15 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/93c84a17/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/ReadHeadersInterceptor.java
--
diff --git
a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/ReadHeadersInterceptor.java
b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/ReadHeadersInterceptor.java
index 88709a1..7b18d1c 100644
---
a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/ReadHeadersInterceptor.java
+++
b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/ReadHeadersInterceptor.java
@@ -70,6 +70,8 @@ public class ReadHeadersInterceptor extends
AbstractSoapInterceptor {
public static final String ENVELOPE_EVENTS = "envelope.events";
public static final String BODY_EVENTS = "body.events";
+public static final String ENVELOPE_PREFIX = "envelope.prefix";
+public static final String BODY_PREFIX = "body.prefix";
/**
*
*/
@@ -205,6 +207,8 @@ public class ReadHeadersInterceptor extends
AbstractSoapInterceptor {
} else {
message.put(ENVELOPE_EVENTS,
processor.getEnvAttributeAndNamespaceEvents());
message.put(BODY_EVENTS,
processor.getBodyAttributeAndNamespaceEvents());
+message.put(ENVELOPE_PREFIX,
processor.getEnvelopePrefix());
+message.put(BODY_PREFIX, processor.getBodyPrefix());
}
if (addNC) {
// add the Body-level declarations
@@ -326,6 +330,8 @@ public class ReadHeadersInterceptor extends
AbstractSoapInterceptor {
private Document doc;
private Node parent;
private QName lastStartElementQName;
+private String envelopePrefix;
+private String bodyPrefix;
public HeadersProcessor(SoapVersion version) {
this.header = version.getHeader().getLocalPart();
@@ -409,6 +415,13 @@ public class ReadHeadersInterceptor extends
AbstractSoapInterceptor {
throw new Fault(e);
}
} else {
+if (ns.equals(lastStartElementQName.getNamespaceURI())) {
+if (body.equals(lastStartElementQName.getLocalPart()))
{
+bodyPrefix = lastStartElementQName.getPrefix();
+} else if
(envelope.equals(lastStartElementQName.getLocalPart())) {
+envelopePrefix = lastStartElementQName.getPrefix();
+}
+}
events.add(event);
}
} else {
@@ -445,5 +458,13 @@ public class ReadHeadersInterceptor extends
AbstractSoapInterceptor {
return Collections.unmodifiableList(envEvents);
}
}
+
+public String getEnvelopePrefix() {
+return envelopePrefix;
+}
+
+public String getBodyPrefix() {
+return bodyPrefix;
+}
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/93c84a17/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJInInterceptor.java
--
diff --git
a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJInInterceptor.java
b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJInInterceptor.java
index 1f12f8f..37b88c5 100644
---
a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJInInterceptor.java
+++
b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJInInterceptor.java
@@ -193,6 +193,10 @@ publ
[2/2] cxf git commit: Recording .gitmergeinfo Changes
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/727e403f Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/727e403f Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/727e403f Branch: refs/heads/3.0.x-fixes Commit: 727e403f7b3f8dc3c64bcc19ce3e2eddb166a9aa Parents: 93c84a1 Author: Alessio Soldano Authored: Thu Apr 14 11:51:10 2016 +0200 Committer: Alessio Soldano Committed: Thu Apr 14 11:51:10 2016 +0200 -- .gitmergeinfo | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/727e403f/.gitmergeinfo -- diff --git a/.gitmergeinfo b/.gitmergeinfo index e366d84..b3449d0 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -1131,6 +1131,7 @@ M b4aa01a0de28462f7338d232e2e88be8512882af M b5320827561467de7e04afdba15a6063d26493a3 M b7d33366f3311dc33c7da389f98fced6fd470c93 M b9e4fcf44fc690c328afbfa166acca26ecb4c16a +M bbc3ca287cca8cf982b62fb85c6a2bbc5bb59754 M bc5e828cd8a25c4c4107c76e1582f807e75c9a77 M bd1d31f195caab56fbe565fbfb63d9170a0c9406 M bd7babd656fc06f3e5839bf11e186ec12fdeb6fa
