cxf git commit: [CXF-6579] Fixing the inflation code not to lose the existing inflated content

[sergeyb]

Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes 7a812e99f -> 5130728d3


[CXF-6579] Fixing the inflation code not to lose the existing inflated content


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/5130728d
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/5130728d
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/5130728d

Branch: refs/heads/3.0.x-fixes
Commit: 5130728d3419921a4381843f068d74039b6e0bd8
Parents: 7a812e9
Author: Sergey Beryozkin 
Authored: Wed Sep 9 13:07:13 2015 +0100
Committer: Sergey Beryozkin 
Committed: Wed Sep 9 13:08:07 2015 +0100

--
 .../main/java/org/apache/cxf/common/util/CompressionUtils.java  | 5 -
 .../apache/cxf/rs/security/saml/DeflateEncoderDecoderTest.java  | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/5130728d/core/src/main/java/org/apache/cxf/common/util/CompressionUtils.java
--
diff --git 
a/core/src/main/java/org/apache/cxf/common/util/CompressionUtils.java 
b/core/src/main/java/org/apache/cxf/common/util/CompressionUtils.java
index c80352e..a67a789 100644
--- a/core/src/main/java/org/apache/cxf/common/util/CompressionUtils.java
+++ b/core/src/main/java/org/apache/cxf/common/util/CompressionUtils.java
@@ -53,8 +53,11 @@ public final class CompressionUtils {
 break;
 }
 }
-
+byte[] lastInflatedToken = inflatedToken;
 inflatedToken = new byte[input.length + inflatedLen];
+if (lastInflatedToken != input) {
+System.arraycopy(lastInflatedToken, 0, inflatedToken, 0, 
inflatedLen);
+}
 System.arraycopy(input, 0, inflatedToken, inflatedLen, 
inputLen);
 inflatedLen += inputLen;
 }

http://git-wip-us.apache.org/repos/asf/cxf/blob/5130728d/rt/rs/security/xml/src/test/java/org/apache/cxf/rs/security/saml/DeflateEncoderDecoderTest.java
--
diff --git 
a/rt/rs/security/xml/src/test/java/org/apache/cxf/rs/security/saml/DeflateEncoderDecoderTest.java
 
b/rt/rs/security/xml/src/test/java/org/apache/cxf/rs/security/saml/DeflateEncoderDecoderTest.java
index 15a2512..38bfdf4 100644
--- 
a/rt/rs/security/xml/src/test/java/org/apache/cxf/rs/security/saml/DeflateEncoderDecoderTest.java
+++ 
b/rt/rs/security/xml/src/test/java/org/apache/cxf/rs/security/saml/DeflateEncoderDecoderTest.java
@@ -70,7 +70,7 @@ public class DeflateEncoderDecoderTest extends Assert {
 String token = "valid_grant valid_grant valid_grant valid_grant 
valid_grant valid_grant";
 
 DeflateEncoderDecoder deflateEncoderDecoder = new 
DeflateEncoderDecoder();
-byte[] deflatedToken = 
deflateEncoderDecoder.deflateToken(token.getBytes(), 0, true);
+byte[] deflatedToken = 
deflateEncoderDecoder.deflateToken(token.getBytes());
 
 String cxfInflatedToken = IOUtils
 .toString(deflateEncoderDecoder.inflateToken(deflatedToken));

cxf git commit: [CXF-6579] Fixing the inflation code not to lose the existing inflated content

[sergeyb]

Repository: cxf
Updated Branches:
  refs/heads/master 8accdcea3 -> 9c3ee8bd3


[CXF-6579] Fixing the inflation code not to lose the existing inflated content


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/9c3ee8bd
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/9c3ee8bd
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/9c3ee8bd

Branch: refs/heads/master
Commit: 9c3ee8bd3105155d7fe7b3a661cbb1779ad82da0
Parents: 8accdce
Author: Sergey Beryozkin 
Authored: Wed Sep 9 13:07:13 2015 +0100
Committer: Sergey Beryozkin 
Committed: Wed Sep 9 13:07:13 2015 +0100

--
 .../main/java/org/apache/cxf/common/util/CompressionUtils.java  | 5 -
 .../apache/cxf/rs/security/saml/DeflateEncoderDecoderTest.java  | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/9c3ee8bd/core/src/main/java/org/apache/cxf/common/util/CompressionUtils.java
--
diff --git 
a/core/src/main/java/org/apache/cxf/common/util/CompressionUtils.java 
b/core/src/main/java/org/apache/cxf/common/util/CompressionUtils.java
index c80352e..a67a789 100644
--- a/core/src/main/java/org/apache/cxf/common/util/CompressionUtils.java
+++ b/core/src/main/java/org/apache/cxf/common/util/CompressionUtils.java
@@ -53,8 +53,11 @@ public final class CompressionUtils {
 break;
 }
 }
-
+byte[] lastInflatedToken = inflatedToken;
 inflatedToken = new byte[input.length + inflatedLen];
+if (lastInflatedToken != input) {
+System.arraycopy(lastInflatedToken, 0, inflatedToken, 0, 
inflatedLen);
+}
 System.arraycopy(input, 0, inflatedToken, inflatedLen, 
inputLen);
 inflatedLen += inputLen;
 }

http://git-wip-us.apache.org/repos/asf/cxf/blob/9c3ee8bd/rt/rs/security/xml/src/test/java/org/apache/cxf/rs/security/saml/DeflateEncoderDecoderTest.java
--
diff --git 
a/rt/rs/security/xml/src/test/java/org/apache/cxf/rs/security/saml/DeflateEncoderDecoderTest.java
 
b/rt/rs/security/xml/src/test/java/org/apache/cxf/rs/security/saml/DeflateEncoderDecoderTest.java
index 15a2512..38bfdf4 100644
--- 
a/rt/rs/security/xml/src/test/java/org/apache/cxf/rs/security/saml/DeflateEncoderDecoderTest.java
+++ 
b/rt/rs/security/xml/src/test/java/org/apache/cxf/rs/security/saml/DeflateEncoderDecoderTest.java
@@ -70,7 +70,7 @@ public class DeflateEncoderDecoderTest extends Assert {
 String token = "valid_grant valid_grant valid_grant valid_grant 
valid_grant valid_grant";
 
 DeflateEncoderDecoder deflateEncoderDecoder = new 
DeflateEncoderDecoder();
-byte[] deflatedToken = 
deflateEncoderDecoder.deflateToken(token.getBytes(), 0, true);
+byte[] deflatedToken = 
deflateEncoderDecoder.deflateToken(token.getBytes());
 
 String cxfInflatedToken = IOUtils
 .toString(deflateEncoderDecoder.inflateToken(deflatedToken));

cxf git commit: [CXF-6580] wsdl2java - Issue with import to default namespace

[ay]

Repository: cxf
Updated Branches:
  refs/heads/2.7.x-fixes 3124e094c -> 400a46825


[CXF-6580] wsdl2java - Issue with import to default namespace


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/400a4682
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/400a4682
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/400a4682

Branch: refs/heads/2.7.x-fixes
Commit: 400a46825f2f76b7893e18d127d267a2bdb716b6
Parents: 3124e09
Author: Akitoshi Yoshida 
Authored: Wed Sep 9 10:57:57 2015 +0200
Committer: Akitoshi Yoshida 
Committed: Wed Sep 9 11:32:12 2015 +0200

--
 .../databinding/jaxb/JAXBDataBinding.java   |  4 +-
 .../cxf/tools/wsdlto/jaxws/CodeGenTest.java | 13 +++
 .../wsdl2java_wsdl/cxf6580/catalog.xml  | 24 ++
 .../wsdl2java_wsdl/cxf6580/hello_default.xsd| 28 +++
 .../wsdl2java_wsdl/cxf6580/hello_import.wsdl| 83 
 .../wsdl2java_wsdl/cxf6580/hello_types2.xsd | 27 +++
 6 files changed, 177 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/400a4682/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java
--
diff --git 
a/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java
 
b/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java
index feba1fc..3aa7c61 100644
--- 
a/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java
+++ 
b/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java
@@ -674,8 +674,8 @@ public class JAXBDataBinding implements DataBindingProfile {
 continue;
 }
 String key = schema.getSourceURI();
-String tns = schema.getTargetNamespace();
-if (ids.contains(key) || tns == null) {
+// accepting also a null tns (e.g., reported by 
apache.ws.xmlschema for no-namespace)
+if (ids.contains(key)) {
 continue;
 }
 if (key.startsWith("file:") || key.startsWith("jar:")) {

http://git-wip-us.apache.org/repos/asf/cxf/blob/400a4682/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenTest.java
--
diff --git 
a/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenTest.java
 
b/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenTest.java
index 2de299b..dd4ef28 100644
--- 
a/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenTest.java
+++ 
b/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenTest.java
@@ -1586,6 +1586,19 @@ public class CodeGenTest extends AbstractCodeGenTest {
 assertEquals(Exception.class, fault.getSuperclass());
 }
 @Test
+public void testNoTargetNamespaceSchema() throws Exception {
+env.put(ToolConstants.CFG_WSDLURL, 
getLocation("/wsdl2java_wsdl/cxf6580/hello_import.wsdl"));
+env.put(ToolConstants.CFG_CATALOG, 
getLocation("/wsdl2java_wsdl/cxf6580/catalog.xml"));
+
+processor.setContext(env);
+processor.execute();
+
+File helloFile = new File(output, 
"org/apache/hello_soap_http/types/Hello.java");
+assertTrue(helloFile.exists());
+helloFile = new File(output, 
"org/apache/hello_soap_http/types/HelloResponse.java");
+assertTrue(helloFile.exists());
+}
+@Test
 public void testExceptionSuper() throws Exception {
 env.put(ToolConstants.CFG_WSDLURL, 
getLocation("/wsdl2java_wsdl/hello_world.wsdl"));
 env.put(ToolConstants.CFG_EXCEPTION_SUPER, 
"java.lang.RuntimeException");

http://git-wip-us.apache.org/repos/asf/cxf/blob/400a4682/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf6580/catalog.xml
--
diff --git 
a/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf6580/catalog.xml 
b/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf6580/catalog.xml
new file mode 100644
index 000..609a158
--- /dev/null
+++ b/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf6580/catalog.xml
@@ -0,0 +1,24 @@
+
+
+http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd;>
+
+http://apache.org/hello_soap_http/hello_types2.xsd"/>
+http://apache.org/hello_soap_http/hello_default.xsd"/>
+

http://git-wip-us.apache.org/repos/asf/cxf/blob/400a4682/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf6580/hello_default.xsd

cxf git commit: [CXF-6580] wsdl2java - Issue with import to default namespace

[ay]

Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes 97b94261b -> 799035874


[CXF-6580] wsdl2java - Issue with import to default namespace


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/79903587
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/79903587
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/79903587

Branch: refs/heads/3.0.x-fixes
Commit: 79903587492d6f8d0290ce8ea45a922e143fe19d
Parents: 97b9426
Author: Akitoshi Yoshida 
Authored: Wed Sep 9 10:57:57 2015 +0200
Committer: Akitoshi Yoshida 
Committed: Wed Sep 9 11:30:43 2015 +0200

--
 .../databinding/jaxb/JAXBDataBinding.java   |  4 +-
 .../cxf/tools/wsdlto/jaxws/CodeGenTest.java | 13 +++
 .../wsdl2java_wsdl/cxf6580/catalog.xml  | 24 ++
 .../wsdl2java_wsdl/cxf6580/hello_default.xsd| 28 +++
 .../wsdl2java_wsdl/cxf6580/hello_import.wsdl| 83 
 .../wsdl2java_wsdl/cxf6580/hello_types2.xsd | 27 +++
 6 files changed, 177 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/79903587/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java
--
diff --git 
a/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java
 
b/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java
index d06e92a..8daf996 100644
--- 
a/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java
+++ 
b/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java
@@ -672,8 +672,8 @@ public class JAXBDataBinding implements DataBindingProfile {
 continue;
 }
 String key = schema.getSourceURI();
-String tns = schema.getTargetNamespace();
-if (ids.contains(key) || tns == null) {
+// accepting also a null tns (e.g., reported by 
apache.ws.xmlschema for no-namespace)
+if (ids.contains(key)) {
 continue;
 }
 if (key.startsWith("file:") || key.startsWith("jar:")) {

http://git-wip-us.apache.org/repos/asf/cxf/blob/79903587/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenTest.java
--
diff --git 
a/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenTest.java
 
b/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenTest.java
index 15f64ea..962a00b 100644
--- 
a/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenTest.java
+++ 
b/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenTest.java
@@ -1589,6 +1589,19 @@ public class CodeGenTest extends AbstractCodeGenTest {
 assertEquals(Exception.class, fault.getSuperclass());
 }
 @Test
+public void testNoTargetNamespaceSchema() throws Exception {
+env.put(ToolConstants.CFG_WSDLURL, 
getLocation("/wsdl2java_wsdl/cxf6580/hello_import.wsdl"));
+env.put(ToolConstants.CFG_CATALOG, 
getLocation("/wsdl2java_wsdl/cxf6580/catalog.xml"));
+
+processor.setContext(env);
+processor.execute();
+
+File helloFile = new File(output, 
"org/apache/hello_soap_http/types/Hello.java");
+assertTrue(helloFile.exists());
+helloFile = new File(output, 
"org/apache/hello_soap_http/types/HelloResponse.java");
+assertTrue(helloFile.exists());
+}
+@Test
 public void testExceptionSuper() throws Exception {
 env.put(ToolConstants.CFG_WSDLURL, 
getLocation("/wsdl2java_wsdl/hello_world.wsdl"));
 env.put(ToolConstants.CFG_EXCEPTION_SUPER, 
"java.lang.RuntimeException");

http://git-wip-us.apache.org/repos/asf/cxf/blob/79903587/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf6580/catalog.xml
--
diff --git 
a/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf6580/catalog.xml 
b/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf6580/catalog.xml
new file mode 100644
index 000..609a158
--- /dev/null
+++ b/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf6580/catalog.xml
@@ -0,0 +1,24 @@
+
+
+http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd;>
+
+http://apache.org/hello_soap_http/hello_types2.xsd"/>
+http://apache.org/hello_soap_http/hello_default.xsd"/>
+

http://git-wip-us.apache.org/repos/asf/cxf/blob/79903587/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf6580/hello_default.xsd

cxf git commit: [CXF-6586] fix the typos

[ay]

Repository: cxf
Updated Branches:
  refs/heads/master e695fde31 -> 8accdcea3


[CXF-6586] fix the typos


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/8accdcea
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/8accdcea
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/8accdcea

Branch: refs/heads/master
Commit: 8accdcea3145f628b7d56f45e6b0ceccbaa14c6f
Parents: e695fde
Author: Akitoshi Yoshida 
Authored: Wed Sep 9 14:00:09 2015 +0200
Committer: Akitoshi Yoshida 
Committed: Wed Sep 9 14:00:09 2015 +0200

--
 .../apache/cxf/jaxrs/swagger/AbstractSwaggerFeature.java  | 10 +-
 .../org/apache/cxf/jaxrs/swagger/Swagger2Feature.java |  2 +-
 .../java/org/apache/cxf/jaxrs/swagger/SwaggerFeature.java |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/8accdcea/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/swagger/AbstractSwaggerFeature.java
--
diff --git 
a/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/swagger/AbstractSwaggerFeature.java
 
b/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/swagger/AbstractSwaggerFeature.java
index a0aef8f..87dfdfe 100644
--- 
a/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/swagger/AbstractSwaggerFeature.java
+++ 
b/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/swagger/AbstractSwaggerFeature.java
@@ -36,7 +36,7 @@ public abstract class AbstractSwaggerFeature extends 
AbstractFeature {
 private String contact = "us...@cxf.apache.org";
 private String license = "Apache 2.0 License";
 private String licenseUrl = 
"http://www.apache.org/licenses/LICENSE-2.0.html;;
-private String termOfServiceUrl;
+private String termsOfServiceUrl;
 private String filterClass;
 
 @Override
@@ -118,11 +118,11 @@ public abstract class AbstractSwaggerFeature extends 
AbstractFeature {
 public void setLicenseUrl(String licenseUrl) {
 this.licenseUrl = licenseUrl;
 }
-public String getTermOfServiceUrl() {
-return termOfServiceUrl;
+public String getTermsOfServiceUrl() {
+return termsOfServiceUrl;
 }
-public void setTermOfServiceUrl(String termOfServiceUrl) {
-this.termOfServiceUrl = termOfServiceUrl;
+public void setTermsOfServiceUrl(String termsOfServiceUrl) {
+this.termsOfServiceUrl = termsOfServiceUrl;
 }
 public boolean isScan() {
 return scan;

http://git-wip-us.apache.org/repos/asf/cxf/blob/8accdcea/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/swagger/Swagger2Feature.java
--
diff --git 
a/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/swagger/Swagger2Feature.java
 
b/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/swagger/Swagger2Feature.java
index 8955418..432b08f 100644
--- 
a/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/swagger/Swagger2Feature.java
+++ 
b/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/swagger/Swagger2Feature.java
@@ -89,7 +89,7 @@ public class Swagger2Feature extends AbstractSwaggerFeature {
 beanConfig.setContact(getContact());
 beanConfig.setLicense(getLicense());
 beanConfig.setLicenseUrl(getLicenseUrl());
-beanConfig.setTermsOfServiceUrl(getTermOfServiceUrl());
+beanConfig.setTermsOfServiceUrl(getTermsOfServiceUrl());
 beanConfig.setScan(isScan());
 beanConfig.setPrettyPrint(isPrettyPrint());
 beanConfig.setFilterClass(getFilterClass());

http://git-wip-us.apache.org/repos/asf/cxf/blob/8accdcea/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/swagger/SwaggerFeature.java
--
diff --git 
a/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/swagger/SwaggerFeature.java
 
b/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/swagger/SwaggerFeature.java
index e0ed632..2f87179 100644
--- 
a/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/swagger/SwaggerFeature.java
+++ 
b/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/swagger/SwaggerFeature.java
@@ -70,7 +70,7 @@ public class SwaggerFeature extends AbstractSwaggerFeature {
 beanConfig.setContact(getContact());
 beanConfig.setLicense(getLicense());
 beanConfig.setLicenseUrl(getLicenseUrl());
-beanConfig.setTermsOfServiceUrl(getTermOfServiceUrl());
+beanConfig.setTermsOfServiceUrl(getTermsOfServiceUrl());
 beanConfig.setScan(isScan());
 beanConfig.setFilterClass(getFilterClass());
 }

cxf git commit: [CXF-6586] fix the typos

[ay]

Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes fc9279030 -> 7a812e99f


[CXF-6586] fix the typos


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/7a812e99
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/7a812e99
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/7a812e99

Branch: refs/heads/3.0.x-fixes
Commit: 7a812e99f5cac5e54d5a2ac208c95f0a173ebf13
Parents: fc92790
Author: Akitoshi Yoshida 
Authored: Wed Sep 9 14:00:09 2015 +0200
Committer: Akitoshi Yoshida 
Committed: Wed Sep 9 14:00:42 2015 +0200

--
 .../apache/cxf/jaxrs/swagger/AbstractSwaggerFeature.java  | 10 +-
 .../org/apache/cxf/jaxrs/swagger/Swagger2Feature.java |  2 +-
 .../java/org/apache/cxf/jaxrs/swagger/SwaggerFeature.java |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/7a812e99/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/swagger/AbstractSwaggerFeature.java
--
diff --git 
a/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/swagger/AbstractSwaggerFeature.java
 
b/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/swagger/AbstractSwaggerFeature.java
index a0aef8f..87dfdfe 100644
--- 
a/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/swagger/AbstractSwaggerFeature.java
+++ 
b/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/swagger/AbstractSwaggerFeature.java
@@ -36,7 +36,7 @@ public abstract class AbstractSwaggerFeature extends 
AbstractFeature {
 private String contact = "us...@cxf.apache.org";
 private String license = "Apache 2.0 License";
 private String licenseUrl = 
"http://www.apache.org/licenses/LICENSE-2.0.html;;
-private String termOfServiceUrl;
+private String termsOfServiceUrl;
 private String filterClass;
 
 @Override
@@ -118,11 +118,11 @@ public abstract class AbstractSwaggerFeature extends 
AbstractFeature {
 public void setLicenseUrl(String licenseUrl) {
 this.licenseUrl = licenseUrl;
 }
-public String getTermOfServiceUrl() {
-return termOfServiceUrl;
+public String getTermsOfServiceUrl() {
+return termsOfServiceUrl;
 }
-public void setTermOfServiceUrl(String termOfServiceUrl) {
-this.termOfServiceUrl = termOfServiceUrl;
+public void setTermsOfServiceUrl(String termsOfServiceUrl) {
+this.termsOfServiceUrl = termsOfServiceUrl;
 }
 public boolean isScan() {
 return scan;

http://git-wip-us.apache.org/repos/asf/cxf/blob/7a812e99/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/swagger/Swagger2Feature.java
--
diff --git 
a/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/swagger/Swagger2Feature.java
 
b/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/swagger/Swagger2Feature.java
index 8955418..432b08f 100644
--- 
a/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/swagger/Swagger2Feature.java
+++ 
b/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/swagger/Swagger2Feature.java
@@ -89,7 +89,7 @@ public class Swagger2Feature extends AbstractSwaggerFeature {
 beanConfig.setContact(getContact());
 beanConfig.setLicense(getLicense());
 beanConfig.setLicenseUrl(getLicenseUrl());
-beanConfig.setTermsOfServiceUrl(getTermOfServiceUrl());
+beanConfig.setTermsOfServiceUrl(getTermsOfServiceUrl());
 beanConfig.setScan(isScan());
 beanConfig.setPrettyPrint(isPrettyPrint());
 beanConfig.setFilterClass(getFilterClass());

http://git-wip-us.apache.org/repos/asf/cxf/blob/7a812e99/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/swagger/SwaggerFeature.java
--
diff --git 
a/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/swagger/SwaggerFeature.java
 
b/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/swagger/SwaggerFeature.java
index e0ed632..2f87179 100644
--- 
a/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/swagger/SwaggerFeature.java
+++ 
b/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/swagger/SwaggerFeature.java
@@ -70,7 +70,7 @@ public class SwaggerFeature extends AbstractSwaggerFeature {
 beanConfig.setContact(getContact());
 beanConfig.setLicense(getLicense());
 beanConfig.setLicenseUrl(getLicenseUrl());
-beanConfig.setTermsOfServiceUrl(getTermOfServiceUrl());
+beanConfig.setTermsOfServiceUrl(getTermsOfServiceUrl());
 beanConfig.setScan(isScan());
 beanConfig.setFilterClass(getFilterClass());
 }

svn commit: r964876 - in /websites/production/cxf/content: cache/docs.pageCache docs/featureslist.html docs/swagger2feature.html

[buildbot]

Author: buildbot
Date: Wed Sep  9 10:47:34 2015
New Revision: 964876

Log:
Production update by buildbot for cxf

Modified:
websites/production/cxf/content/cache/docs.pageCache
websites/production/cxf/content/docs/featureslist.html
websites/production/cxf/content/docs/swagger2feature.html

Modified: websites/production/cxf/content/cache/docs.pageCache
==
Binary files - no diff available.

Modified: websites/production/cxf/content/docs/featureslist.html
==
--- websites/production/cxf/content/docs/featureslist.html (original)
+++ websites/production/cxf/content/docs/featureslist.html Wed Sep  9 10:47:34 
2015
@@ -107,7 +107,7 @@ Apache CXF -- FeaturesList
  


-CXF 
FeaturesThe following elements can appear as child elements of the 
features element in the http://org.apache.cxf/core; 
rel="nofollow">http://org.apache.cxf/core, http://org.apache.cxf/jaxws; 
rel="nofollow">http://org.apache.cxf/jaxws and http://org.apache.cxf/jaxrs; 
rel="nofollow">http://org.apache.cxf/jaxrs namespaces:NameNamespaceDescriptionImplementation ClassModuleaddressinghttp://cxf.apache.org/ws/addressing;>http://cxf.apache.org/ws/addressingEnables and controls the use 
of WS-Addressing.org.apache.cxf.ws.addressing.WSAddressingFeaturecxf-rt-ws-addrenableColochttp://cxf.apache.org/binding/coloc;>http://cxf.apache.org/binding/colocAllowing a direct service 
invocation to the service registered on the same bus as the client.http://cxf.apache.org/docs/coloc-feature.html;
 >org.apache.cxf.binding.coloc.feature.ColocFeaturerowspan="1" 
 >class="confluenceTd">cxf-rt-bindings-coloccolspan="1" rowspan="1" class="confluenceTd">failovercolspan="1" rowspan="1" class="confluenceTd">href="http://cxf.apache.org/clustering;>http://cxf.apache.org/clustering colspan="1" rowspan="1" class="confluenceTd">Feature that allows clients 
 >to failover from the initial target endpoint to another, compatible endpoint 
 >for the target service.class="confluenceTd">href="failoverfeature.html">org.apache.cxf.clustering.FailoverFeature colspan="1" rowspan="1" 
 >class="confluenceTd">cxf-coreclass="confluenceTd">loadDistributorclass="confluenceTd">href="http://cxf.apache.org/clustering;>http://cxf.apache.org/clusteri
 ngFailover 
Feature extension that allows clients to distribute their callsorg.apache.cxf.clustering.LoadDistributorFeaturecxf-corelogginghttp://cxf.apache.org/core;>http://cxf.apache.org/coreEnables to log the content of 
outbound and inbound messages and faults.org.apache.cxf.feature.LoggingFeaturecxf-corepolicieshttp://cxf.apache.org/policy;>http://cxf.apache.org/policyEnables and controls the use of 
the WS-Policy Framework. Also serves as an attachment point for Policy and 
PolicyReference elements.org.apache.cxf.ws.policy.WSPolicyFeaturecxf-rt-ws-policyreliableMessaginghttp://cxf.apache.org/ws/rm/manager;>http://cxf.apache.org/ws/rm/managerEnables and controls the use 
of WS-RM.org.apache.cxf.ws.rm.feature.RMFeaturecxf-rt-ws-rmbeanspring/blueprintBean Validation 1.1 supporthttp://cxf.apache.org/docs/validationfeature.html;>org.apache.cxf.validation.BeanValidationFeaturecxf-corebeanspring/blueprintTurns on use of FastInfoset to encode 
messages. The default is to negotiate the use of FastInfoset with the server as 
part of the first message, but a "force=true" property can force it, even on 
the first message.org.apac
 he.cxf.feature.FastInfosetFeaturecxf-corebeanspring/blueprintAllows the use of gzip to compress the 
messages on the wire. The default is to negotiate the use of FastInfoset with 
the server as part of the first message, but a "force=true" property can force 
it, even on the first message.org.apache.cxf.transport.http.gzip.GZIPFeaturecxf-corebeanspring/blueprintTurns on collecting various 
performance 
 and service invocation statistics values which can be accessed over 
JMXorg.apache.cxf.management.interceptor.ResponseTimeFeaturecxt-rt-managementbeanspring/blueprintUses Stax's XMLStreamReader as data 
bindingorg.apache.cxf.databinding.stax.StaxDataBindingFeaturecxf-corebeanspring/blueprintLightweight inbound and/or outbound 
transformation
 s.http://cxf.apache.org/docs/transformationfeature.html;>org.apache.cxf.feature.StaxTransformFeaturecxf-corebeanspring/blueprintEnables the generation of Swagger Spec 1.2 
definitions from JAXRS endpointshttp://cxf.apache.org/docs/SwaggerFeature.html;>org.apache.cxf.jaxrs.swagger.SwaggerFeaturecxf-rt-rs-service-descriptionbeanspring/blueprintEnables the generation of Swagger Spec 2.0 definitions from 
JAXRS endpointshttp://cxf.apache.org/docs/Swagger2Feature.html;>org.apache.cxf.jaxrs.swagger.Swagger2Featurecxf-rt-rs-service-descriptionbeanspring/blueprintXSLT based inbound and/or 
outbound 

cxf git commit: [CXF-6584] - EncryptSignature is ignored

[coheigea]

Repository: cxf
Updated Branches:
  refs/heads/master ce2c3121e -> 9c6a35df3


[CXF-6584] - EncryptSignature is ignored


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/9c6a35df
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/9c6a35df
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/9c6a35df

Branch: refs/heads/master
Commit: 9c6a35df3241f9cb3046af9c941fc86116efb541
Parents: ce2c312
Author: Colm O hEigeartaigh 
Authored: Wed Sep 9 11:57:55 2015 +0100
Committer: Colm O hEigeartaigh 
Committed: Wed Sep 9 11:57:55 2015 +0100

--
 .../policyhandlers/AbstractBindingBuilder.java  | 27 +++-
 1 file changed, 21 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/9c6a35df/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
--
diff --git 
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
 
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
index e3e011e..6cff697 100644
--- 
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
+++ 
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
@@ -1867,9 +1867,10 @@ public abstract class AbstractBindingBuilder extends 
AbstractCommonBindingHandle
 try {
 if (supportingToken.getToken().getDerivedKeys() == 
DerivedKeys.RequireDerivedKeys) {
 doSymmSignatureDerived(supportingToken.getToken(), 
token, sigParts,
-   isTokenProtection);
+   isTokenProtection, 
isSigProtect);
 } else {
-doSymmSignature(supportingToken.getToken(), token, 
sigParts, isTokenProtection);
+doSymmSignature(supportingToken.getToken(), token, 
sigParts, 
+isTokenProtection, isSigProtect);
 }
 } catch (Exception e) {
 LOG.log(Level.FINE, e.getMessage(), e);
@@ -1894,9 +1895,10 @@ public abstract class AbstractBindingBuilder extends 
AbstractCommonBindingHandle
 
 if (supportingToken.getToken().getDerivedKeys() == 
DerivedKeys.RequireDerivedKeys) {
 doSymmSignatureDerived(supportingToken.getToken(), 
secToken, sigParts, 
-   isTokenProtection);
+   isTokenProtection, 
isSigProtect);
 } else {
-doSymmSignature(supportingToken.getToken(), secToken, 
sigParts, isTokenProtection);
+doSymmSignature(supportingToken.getToken(), secToken, 
sigParts, 
+isTokenProtection, isSigProtect);
 }
 } catch (Exception e) {
 LOG.log(Level.FINE, e.getMessage(), e);
@@ -1907,7 +1909,8 @@ public abstract class AbstractBindingBuilder extends 
AbstractCommonBindingHandle
 }
 
 private void doSymmSignatureDerived(AbstractToken policyToken, 
SecurityToken tok,
- List sigParts, boolean 
isTokenProtection)
+ List sigParts, boolean 
isTokenProtection,
+ boolean isSigProtect)
 throws WSSecurityException {
 
 Document doc = saaj.getSOAPPart();
@@ -1983,11 +1986,17 @@ public abstract class AbstractBindingBuilder extends 
AbstractCommonBindingHandle
 //Do signature
 dkSign.computeSignature(referenceList, false, null);
 
+if (isSigProtect) {
+WSEncryptionPart part = new WSEncryptionPart(dkSign.getId(), 
"Element");
+encryptedTokensList.add(part);
+}
+
 addSig(dkSign.getSignatureValue());
 }
 
 private void doSymmSignature(AbstractToken policyToken, SecurityToken tok,
- List sigParts, 
boolean isTokenProtection)
+ List sigParts, 
boolean isTokenProtection,
+ boolean isSigProtect)
 throws WSSecurityException {
 
 Document doc = saaj.getSOAPPart();
@@ -2047,6 +2056,12 @@ public abstract class AbstractBindingBuilder extends 
AbstractCommonBindingHandle
 
 //Do signature
 sig.computeSignature(referenceList, false, null);
+ 

cxf git commit: [CXF-6586] Missing some bean properties in Swagger2Feature

[ay]

Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes 799035874 -> fc9279030


[CXF-6586] Missing some bean properties in Swagger2Feature


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/fc927903
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/fc927903
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/fc927903

Branch: refs/heads/3.0.x-fixes
Commit: fc9279030fd32ff7f17aa472ef059e2c3ead6521
Parents: 7990358
Author: Akitoshi Yoshida 
Authored: Wed Sep 9 13:50:50 2015 +0200
Committer: Akitoshi Yoshida 
Committed: Wed Sep 9 13:52:02 2015 +0200

--
 .../jaxrs/swagger/AbstractSwaggerFeature.java   | 14 
 .../cxf/jaxrs/swagger/Swagger2Feature.java  | 23 
 .../cxf/jaxrs/swagger/SwaggerFeature.java   |  2 ++
 3 files changed, 39 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/fc927903/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/swagger/AbstractSwaggerFeature.java
--
diff --git 
a/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/swagger/AbstractSwaggerFeature.java
 
b/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/swagger/AbstractSwaggerFeature.java
index ee53b44..a0aef8f 100644
--- 
a/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/swagger/AbstractSwaggerFeature.java
+++ 
b/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/swagger/AbstractSwaggerFeature.java
@@ -36,6 +36,8 @@ public abstract class AbstractSwaggerFeature extends 
AbstractFeature {
 private String contact = "us...@cxf.apache.org";
 private String license = "Apache 2.0 License";
 private String licenseUrl = 
"http://www.apache.org/licenses/LICENSE-2.0.html;;
+private String termOfServiceUrl;
+private String filterClass;
 
 @Override
 public void initialize(Server server, Bus bus) {
@@ -116,12 +118,24 @@ public abstract class AbstractSwaggerFeature extends 
AbstractFeature {
 public void setLicenseUrl(String licenseUrl) {
 this.licenseUrl = licenseUrl;
 }
+public String getTermOfServiceUrl() {
+return termOfServiceUrl;
+}
+public void setTermOfServiceUrl(String termOfServiceUrl) {
+this.termOfServiceUrl = termOfServiceUrl;
+}
 public boolean isScan() {
 return scan;
 }
 public void setScan(boolean scan) {
 this.scan = scan;
 }
+public String getFilterClass() {
+return filterClass;
+}
+public void setFilterClass(String filterClass) {
+this.filterClass = filterClass;
+}
 
 public boolean isRunAsFilter() {
 return runAsFilter;

http://git-wip-us.apache.org/repos/asf/cxf/blob/fc927903/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/swagger/Swagger2Feature.java
--
diff --git 
a/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/swagger/Swagger2Feature.java
 
b/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/swagger/Swagger2Feature.java
index 42f3950..8955418 100644
--- 
a/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/swagger/Swagger2Feature.java
+++ 
b/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/swagger/Swagger2Feature.java
@@ -48,6 +48,9 @@ import io.swagger.jaxrs.listing.SwaggerSerializers;
 
 public class Swagger2Feature extends AbstractSwaggerFeature {
 private String host;
+private String[] schemes;
+private boolean prettyPrint;
+
 private boolean scanAllResources;
 private String ignoreRoutes;
 
@@ -80,12 +83,16 @@ public class Swagger2Feature extends AbstractSwaggerFeature 
{
 beanConfig.setVersion(getVersion());
 beanConfig.setBasePath(getBasePath());
 beanConfig.setHost(getHost());
+beanConfig.setSchemes(getSchemes());
 beanConfig.setTitle(getTitle());
 beanConfig.setDescription(getDescription());
 beanConfig.setContact(getContact());
 beanConfig.setLicense(getLicense());
 beanConfig.setLicenseUrl(getLicenseUrl());
+beanConfig.setTermsOfServiceUrl(getTermOfServiceUrl());
 beanConfig.setScan(isScan());
+beanConfig.setPrettyPrint(isPrettyPrint());
+beanConfig.setFilterClass(getFilterClass());
 }
 
 public String getHost() {
@@ -95,6 +102,22 @@ public class Swagger2Feature extends AbstractSwaggerFeature 
{
 this.host = host;
 }
 
+public String[] getSchemes() {
+return schemes;
+}
+
+public void setSchemes(String[] schemes) {
+this.schemes = schemes;
+}
+
+public boolean isPrettyPrint() {
+return prettyPrint;
+}
+
+public void setPrettyPrint(boolean prettyPrint) {
+this.prettyPrint = prettyPrint;
+}

cxf git commit: [CXF-6586] Missing some bean properties in Swagger2Feature

[ay]

Repository: cxf
Updated Branches:
  refs/heads/master 9c6a35df3 -> e695fde31


[CXF-6586] Missing some bean properties in Swagger2Feature


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/e695fde3
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/e695fde3
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/e695fde3

Branch: refs/heads/master
Commit: e695fde31a1b1ac583570edb7ebec352434c96ab
Parents: 9c6a35d
Author: Akitoshi Yoshida 
Authored: Wed Sep 9 13:50:50 2015 +0200
Committer: Akitoshi Yoshida 
Committed: Wed Sep 9 13:51:19 2015 +0200

--
 .../jaxrs/swagger/AbstractSwaggerFeature.java   | 14 
 .../cxf/jaxrs/swagger/Swagger2Feature.java  | 23 
 .../cxf/jaxrs/swagger/SwaggerFeature.java   |  2 ++
 3 files changed, 39 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/e695fde3/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/swagger/AbstractSwaggerFeature.java
--
diff --git 
a/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/swagger/AbstractSwaggerFeature.java
 
b/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/swagger/AbstractSwaggerFeature.java
index ee53b44..a0aef8f 100644
--- 
a/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/swagger/AbstractSwaggerFeature.java
+++ 
b/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/swagger/AbstractSwaggerFeature.java
@@ -36,6 +36,8 @@ public abstract class AbstractSwaggerFeature extends 
AbstractFeature {
 private String contact = "us...@cxf.apache.org";
 private String license = "Apache 2.0 License";
 private String licenseUrl = 
"http://www.apache.org/licenses/LICENSE-2.0.html;;
+private String termOfServiceUrl;
+private String filterClass;
 
 @Override
 public void initialize(Server server, Bus bus) {
@@ -116,12 +118,24 @@ public abstract class AbstractSwaggerFeature extends 
AbstractFeature {
 public void setLicenseUrl(String licenseUrl) {
 this.licenseUrl = licenseUrl;
 }
+public String getTermOfServiceUrl() {
+return termOfServiceUrl;
+}
+public void setTermOfServiceUrl(String termOfServiceUrl) {
+this.termOfServiceUrl = termOfServiceUrl;
+}
 public boolean isScan() {
 return scan;
 }
 public void setScan(boolean scan) {
 this.scan = scan;
 }
+public String getFilterClass() {
+return filterClass;
+}
+public void setFilterClass(String filterClass) {
+this.filterClass = filterClass;
+}
 
 public boolean isRunAsFilter() {
 return runAsFilter;

http://git-wip-us.apache.org/repos/asf/cxf/blob/e695fde3/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/swagger/Swagger2Feature.java
--
diff --git 
a/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/swagger/Swagger2Feature.java
 
b/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/swagger/Swagger2Feature.java
index 42f3950..8955418 100644
--- 
a/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/swagger/Swagger2Feature.java
+++ 
b/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/swagger/Swagger2Feature.java
@@ -48,6 +48,9 @@ import io.swagger.jaxrs.listing.SwaggerSerializers;
 
 public class Swagger2Feature extends AbstractSwaggerFeature {
 private String host;
+private String[] schemes;
+private boolean prettyPrint;
+
 private boolean scanAllResources;
 private String ignoreRoutes;
 
@@ -80,12 +83,16 @@ public class Swagger2Feature extends AbstractSwaggerFeature 
{
 beanConfig.setVersion(getVersion());
 beanConfig.setBasePath(getBasePath());
 beanConfig.setHost(getHost());
+beanConfig.setSchemes(getSchemes());
 beanConfig.setTitle(getTitle());
 beanConfig.setDescription(getDescription());
 beanConfig.setContact(getContact());
 beanConfig.setLicense(getLicense());
 beanConfig.setLicenseUrl(getLicenseUrl());
+beanConfig.setTermsOfServiceUrl(getTermOfServiceUrl());
 beanConfig.setScan(isScan());
+beanConfig.setPrettyPrint(isPrettyPrint());
+beanConfig.setFilterClass(getFilterClass());
 }
 
 public String getHost() {
@@ -95,6 +102,22 @@ public class Swagger2Feature extends AbstractSwaggerFeature 
{
 this.host = host;
 }
 
+public String[] getSchemes() {
+return schemes;
+}
+
+public void setSchemes(String[] schemes) {
+this.schemes = schemes;
+}
+
+public boolean isPrettyPrint() {
+return prettyPrint;
+}
+
+public void setPrettyPrint(boolean prettyPrint) {
+this.prettyPrint = prettyPrint;
+}
+
 

cxf git commit: [CXF-6580] wsdl2java - Issue with import to default namespace

[ay]

Repository: cxf
Updated Branches:
  refs/heads/master e28d25804 -> ce2c3121e


[CXF-6580] wsdl2java - Issue with import to default namespace


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/ce2c3121
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/ce2c3121
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/ce2c3121

Branch: refs/heads/master
Commit: ce2c3121e15f3b25d69a75637a6df21ad4d748a7
Parents: e28d258
Author: Akitoshi Yoshida 
Authored: Wed Sep 9 10:57:57 2015 +0200
Committer: Akitoshi Yoshida 
Committed: Wed Sep 9 10:58:24 2015 +0200

--
 .../databinding/jaxb/JAXBDataBinding.java   |  4 +-
 .../cxf/tools/wsdlto/jaxws/CodeGenTest.java | 13 +++
 .../wsdl2java_wsdl/cxf6580/catalog.xml  | 24 ++
 .../wsdl2java_wsdl/cxf6580/hello_default.xsd| 28 +++
 .../wsdl2java_wsdl/cxf6580/hello_import.wsdl| 83 
 .../wsdl2java_wsdl/cxf6580/hello_types2.xsd | 27 +++
 6 files changed, 177 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/ce2c3121/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java
--
diff --git 
a/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java
 
b/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java
index d06e92a..8daf996 100644
--- 
a/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java
+++ 
b/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java
@@ -672,8 +672,8 @@ public class JAXBDataBinding implements DataBindingProfile {
 continue;
 }
 String key = schema.getSourceURI();
-String tns = schema.getTargetNamespace();
-if (ids.contains(key) || tns == null) {
+// accepting also a null tns (e.g., reported by 
apache.ws.xmlschema for no-namespace)
+if (ids.contains(key)) {
 continue;
 }
 if (key.startsWith("file:") || key.startsWith("jar:")) {

http://git-wip-us.apache.org/repos/asf/cxf/blob/ce2c3121/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenTest.java
--
diff --git 
a/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenTest.java
 
b/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenTest.java
index 0575079..c4500cd 100644
--- 
a/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenTest.java
+++ 
b/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenTest.java
@@ -1588,6 +1588,19 @@ public class CodeGenTest extends AbstractCodeGenTest {
 assertEquals(Exception.class, fault.getSuperclass());
 }
 @Test
+public void testNoTargetNamespaceSchema() throws Exception {
+env.put(ToolConstants.CFG_WSDLURL, 
getLocation("/wsdl2java_wsdl/cxf6580/hello_import.wsdl"));
+env.put(ToolConstants.CFG_CATALOG, 
getLocation("/wsdl2java_wsdl/cxf6580/catalog.xml"));
+
+processor.setContext(env);
+processor.execute();
+
+File helloFile = new File(output, 
"org/apache/hello_soap_http/types/Hello.java");
+assertTrue(helloFile.exists());
+helloFile = new File(output, 
"org/apache/hello_soap_http/types/HelloResponse.java");
+assertTrue(helloFile.exists());
+}
+@Test
 public void testExceptionSuper() throws Exception {
 env.put(ToolConstants.CFG_WSDLURL, 
getLocation("/wsdl2java_wsdl/hello_world.wsdl"));
 env.put(ToolConstants.CFG_EXCEPTION_SUPER, 
"java.lang.RuntimeException");

http://git-wip-us.apache.org/repos/asf/cxf/blob/ce2c3121/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf6580/catalog.xml
--
diff --git 
a/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf6580/catalog.xml 
b/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf6580/catalog.xml
new file mode 100644
index 000..609a158
--- /dev/null
+++ b/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf6580/catalog.xml
@@ -0,0 +1,24 @@
+
+
+http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd;>
+
+http://apache.org/hello_soap_http/hello_types2.xsd"/>
+http://apache.org/hello_soap_http/hello_default.xsd"/>
+

http://git-wip-us.apache.org/repos/asf/cxf/blob/ce2c3121/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf6580/hello_default.xsd

svn commit: r964883 - in /websites/production/cxf/content: cache/docs.pageCache docs/featureslist.html

[buildbot]

Author: buildbot
Date: Wed Sep  9 12:47:36 2015
New Revision: 964883

Log:
Production update by buildbot for cxf

Modified:
websites/production/cxf/content/cache/docs.pageCache
websites/production/cxf/content/docs/featureslist.html

Modified: websites/production/cxf/content/cache/docs.pageCache
==
Binary files - no diff available.

Modified: websites/production/cxf/content/docs/featureslist.html
==
--- websites/production/cxf/content/docs/featureslist.html (original)
+++ websites/production/cxf/content/docs/featureslist.html Wed Sep  9 12:47:36 
2015
@@ -107,7 +107,7 @@ Apache CXF -- FeaturesList
  


-CXF 
FeaturesThe following elements can appear as child elements of the 
features element in the http://org.apache.cxf/core; 
rel="nofollow">http://org.apache.cxf/core, http://org.apache.cxf/jaxws; 
rel="nofollow">http://org.apache.cxf/jaxws and http://org.apache.cxf/jaxrs; 
rel="nofollow">http://org.apache.cxf/jaxrs namespaces:NameNamespaceDescriptionImplementation ClassModuleaddressinghttp://cxf.apache.org/ws/addressing;>http://cxf.apache.org/ws/addressingEnables and controls the use 
of WS-Addressing.org.apache.cxf.ws.addressing.WSAddressingFeaturecxf-rt-ws-addrenableColochttp://cxf.apache.org/binding/coloc;>http://cxf.apache.org/binding/colocAllowing a direct service 
invocation to the service registered on the same bus as the client.http://cxf.apache.org/docs/coloc-feature.html;
 >org.apache.cxf.binding.coloc.feature.ColocFeaturerowspan="1" 
 >class="confluenceTd">cxf-rt-bindings-coloccolspan="1" rowspan="1" class="confluenceTd">failovercolspan="1" rowspan="1" class="confluenceTd">href="http://cxf.apache.org/clustering;>http://cxf.apache.org/clustering colspan="1" rowspan="1" class="confluenceTd">Feature that allows clients 
 >to failover from the initial target endpoint to another, compatible endpoint 
 >for the target service.class="confluenceTd">href="failoverfeature.html">org.apache.cxf.clustering.FailoverFeature colspan="1" rowspan="1" 
 >class="confluenceTd">cxf-coreclass="confluenceTd">loadDistributorclass="confluenceTd">href="http://cxf.apache.org/clustering;>http://cxf.apache.org/clusteri
 ngFailover 
Feature extension that allows clients to distribute their callsorg.apache.cxf.clustering.LoadDistributorFeaturecxf-corelogginghttp://cxf.apache.org/core;>http://cxf.apache.org/coreEnables to log the content of 
outbound and inbound messages and faults.org.apache.cxf.feature.LoggingFeaturecxf-corepolicieshttp://cxf.apache.org/policy;>http://cxf.apache.org/policyEnables and controls the use of 
the WS-Policy Framework. Also serves as an attachment point for Policy and 
PolicyReference elements.org.apache.cxf.ws.policy.WSPolicyFeaturecxf-rt-ws-policyreliableMessaginghttp://cxf.apache.org/ws/rm/manager;>http://cxf.apache.org/ws/rm/managerEnables and controls the use 
of WS-RM.org.apache.cxf.ws.rm.feature.RMFeaturecxf-rt-ws-rmbeanspring/blueprintBean Validation 1.1 supporthttp://cxf.apache.org/docs/validationfeature.html;>org.apache.cxf.validation.BeanValidationFeaturecxf-corebeanspring/blueprintTurns on use of FastInfoset to encode 
messages. The default is to negotiate the use of FastInfoset with the server as 
part of the first message, but a "force=true" property can force it, even on 
the first message.org.apac
 he.cxf.feature.FastInfosetFeaturecxf-corebeanspring/blueprintAllows the use of gzip to compress the 
messages on the wire. The default is to negotiate the use of FastInfoset with 
the server as part of the first message, but a "force=true" property can force 
it, even on the first message.org.apache.cxf.transport.http.gzip.GZIPFeaturecxf-corebeanspring/blueprintTurns on collecting various 
performance 
 and service invocation statistics values which can be accessed over 
JMXorg.apache.cxf.management.interceptor.ResponseTimeFeaturecxt-rt-managementbeanspring/blueprintUses Stax's XMLStreamReader as data 
bindingorg.apache.cxf.databinding.stax.StaxDataBindingFeaturecxf-corebeanspring/blueprintLightweight inbound and/or outbound 
transformation
 s.http://cxf.apache.org/docs/transformationfeature.html;>org.apache.cxf.feature.StaxTransformFeaturecxf-corebeanspring/blueprintEnables the generation of Swagger Spec 1.2 
definitions from JAXRS endpointshttps://cwiki.apache.org/confluence/display/CXF20DOC/SwaggerFeature;>org.apache.cxf.jaxrs.swagger.SwaggerFeaturecxf-rt-rs-service-descriptionbeanspring/blueprintEnables the generation of Swagger Spec 
2.0 definitions from JAXRS endpointshttps://cwiki.apache.org/confluence/display/CXF20DOC/Swagger2Feature;>org.apache.cxf.jaxrs.swagger.Swagger2Featurecxf-rt-rs-service-descriptionbeanspring/blueprintXSLT based inbound and/or 
outbound transformations.http://cxf.apache.org/docs/xslt-feature.html;>org.apache.cxf.feature.transform.XSLTFeaturecxf-coreWhere 
the 

svn commit: r964888 - in /websites/production/cxf/content: cache/docs.pageCache docs/featureslist.html docs/swagger2feature.html docs/swaggerfeature.html

[buildbot]

Author: buildbot
Date: Wed Sep  9 13:47:33 2015
New Revision: 964888

Log:
Production update by buildbot for cxf

Removed:
websites/production/cxf/content/docs/swaggerfeature.html
Modified:
websites/production/cxf/content/cache/docs.pageCache
websites/production/cxf/content/docs/featureslist.html
websites/production/cxf/content/docs/swagger2feature.html

Modified: websites/production/cxf/content/cache/docs.pageCache
==
Binary files - no diff available.

Modified: websites/production/cxf/content/docs/featureslist.html
==
--- websites/production/cxf/content/docs/featureslist.html (original)
+++ websites/production/cxf/content/docs/featureslist.html Wed Sep  9 13:47:33 
2015
@@ -107,7 +107,7 @@ Apache CXF -- FeaturesList
  


-CXF 
FeaturesThe following elements can appear as child elements of the 
features element in the http://org.apache.cxf/core; 
rel="nofollow">http://org.apache.cxf/core, http://org.apache.cxf/jaxws; 
rel="nofollow">http://org.apache.cxf/jaxws and http://org.apache.cxf/jaxrs; 
rel="nofollow">http://org.apache.cxf/jaxrs namespaces:NameNamespaceDescriptionImplementation ClassModuleaddressinghttp://cxf.apache.org/ws/addressing;>http://cxf.apache.org/ws/addressingEnables and controls the use 
of WS-Addressing.org.apache.cxf.ws.addressing.WSAddressingFeaturecxf-rt-ws-addrenableColochttp://cxf.apache.org/binding/coloc;>http://cxf.apache.org/binding/colocAllowing a direct service 
invocation to the service registered on the same bus as the client.http://cxf.apache.org/docs/coloc-feature.html;
 >org.apache.cxf.binding.coloc.feature.ColocFeaturerowspan="1" 
 >class="confluenceTd">cxf-rt-bindings-coloccolspan="1" rowspan="1" class="confluenceTd">failovercolspan="1" rowspan="1" class="confluenceTd">href="http://cxf.apache.org/clustering;>http://cxf.apache.org/clustering colspan="1" rowspan="1" class="confluenceTd">Feature that allows clients 
 >to failover from the initial target endpoint to another, compatible endpoint 
 >for the target service.class="confluenceTd">href="failoverfeature.html">org.apache.cxf.clustering.FailoverFeature colspan="1" rowspan="1" 
 >class="confluenceTd">cxf-coreclass="confluenceTd">loadDistributorclass="confluenceTd">href="http://cxf.apache.org/clustering;>http://cxf.apache.org/clusteri
 ngFailover 
Feature extension that allows clients to distribute their callsorg.apache.cxf.clustering.LoadDistributorFeaturecxf-corelogginghttp://cxf.apache.org/core;>http://cxf.apache.org/coreEnables to log the content of 
outbound and inbound messages and faults.org.apache.cxf.feature.LoggingFeaturecxf-corepolicieshttp://cxf.apache.org/policy;>http://cxf.apache.org/policyEnables and controls the use of 
the WS-Policy Framework. Also serves as an attachment point for Policy and 
PolicyReference elements.org.apache.cxf.ws.policy.WSPolicyFeaturecxf-rt-ws-policyreliableMessaginghttp://cxf.apache.org/ws/rm/manager;>http://cxf.apache.org/ws/rm/managerEnables and controls the use 
of WS-RM.org.apache.cxf.ws.rm.feature.RMFeaturecxf-rt-ws-rmbeanspring/blueprintBean Validation 1.1 supporthttp://cxf.apache.org/docs/validationfeature.html;>org.apache.cxf.validation.BeanValidationFeaturecxf-corebeanspring/blueprintTurns on use of FastInfoset to encode 
messages. The default is to negotiate the use of FastInfoset with the server as 
part of the first message, but a "force=true" property can force it, even on 
the first message.org.apac
 he.cxf.feature.FastInfosetFeaturecxf-corebeanspring/blueprintAllows the use of gzip to compress the 
messages on the wire. The default is to negotiate the use of FastInfoset with 
the server as part of the first message, but a "force=true" property can force 
it, even on the first message.org.apache.cxf.transport.http.gzip.GZIPFeaturecxf-corebeanspring/blueprintTurns on collecting various 
performance 
 and service invocation statistics values which can be accessed over 
JMXorg.apache.cxf.management.interceptor.ResponseTimeFeaturecxt-rt-managementbeanspring/blueprintUses Stax's XMLStreamReader as data 
bindingorg.apache.cxf.databinding.stax.StaxDataBindingFeaturecxf-corebeanspring/blueprintLightweight inbound and/or outbound 
transformation
 s.http://cxf.apache.org/docs/transformationfeature.html;>org.apache.cxf.feature.StaxTransformFeaturecxf-corebeanspring/blueprintEnables the generation of Swagger Spec 1.2 
definitions from JAXRS endpointshttp://cxf.apache.org/docs/swaggerfeature.html;>org.apache.cxf.jaxrs.swagger.SwaggerFeaturecxf-rt-rs-service-descriptionbeanspring/blueprintEnables the generation of Swagger Spec 2.0 definitions from 
JAXRS endpointshttp://cxf.apache.org/docs/swagger2feature.html;>org.apache.cxf.jaxrs.swagger.Swagger2Featurecxf-rt-rs-service-descriptionbeanspring/blueprintXSLT based inbound and/or 
outbound 

cxf git commit: [CXF-6579] Fixing the inflation code not to lose the existing inflated content

[sergeyb]

Repository: cxf
Updated Branches:
  refs/heads/2.7.x-fixes 400a46825 -> e1c2055ea


[CXF-6579] Fixing the inflation code not to lose the existing inflated content


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/e1c2055e
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/e1c2055e
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/e1c2055e

Branch: refs/heads/2.7.x-fixes
Commit: e1c2055eaa7c6adb13ecf4793d079c02502e96c3
Parents: 400a468
Author: Sergey Beryozkin 
Authored: Wed Sep 9 13:07:13 2015 +0100
Committer: Sergey Beryozkin 
Committed: Wed Sep 9 14:37:37 2015 +0100

--
 .../org/apache/cxf/rs/security/saml/DeflateEncoderDecoder.java  | 5 -
 .../apache/cxf/rs/security/saml/DeflateEncoderDecoderTest.java  | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/e1c2055e/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/saml/DeflateEncoderDecoder.java
--
diff --git 
a/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/saml/DeflateEncoderDecoder.java
 
b/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/saml/DeflateEncoderDecoder.java
index 76c68ef..951de15 100644
--- 
a/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/saml/DeflateEncoderDecoder.java
+++ 
b/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/saml/DeflateEncoderDecoder.java
@@ -49,8 +49,11 @@ public class DeflateEncoderDecoder {
 break;
 }
 }
-
+byte[] lastInflatedToken = inflatedToken;
 inflatedToken = new byte[input.length + inflatedLen];
+if (lastInflatedToken != input) {
+System.arraycopy(lastInflatedToken, 0, inflatedToken, 0, 
inflatedLen);
+}
 System.arraycopy(input, 0, inflatedToken, inflatedLen, 
inputLen);
 inflatedLen += inputLen;
 }

http://git-wip-us.apache.org/repos/asf/cxf/blob/e1c2055e/rt/rs/security/xml/src/test/java/org/apache/cxf/rs/security/saml/DeflateEncoderDecoderTest.java
--
diff --git 
a/rt/rs/security/xml/src/test/java/org/apache/cxf/rs/security/saml/DeflateEncoderDecoderTest.java
 
b/rt/rs/security/xml/src/test/java/org/apache/cxf/rs/security/saml/DeflateEncoderDecoderTest.java
index 15a2512..38bfdf4 100644
--- 
a/rt/rs/security/xml/src/test/java/org/apache/cxf/rs/security/saml/DeflateEncoderDecoderTest.java
+++ 
b/rt/rs/security/xml/src/test/java/org/apache/cxf/rs/security/saml/DeflateEncoderDecoderTest.java
@@ -70,7 +70,7 @@ public class DeflateEncoderDecoderTest extends Assert {
 String token = "valid_grant valid_grant valid_grant valid_grant 
valid_grant valid_grant";
 
 DeflateEncoderDecoder deflateEncoderDecoder = new 
DeflateEncoderDecoder();
-byte[] deflatedToken = 
deflateEncoderDecoder.deflateToken(token.getBytes(), 0, true);
+byte[] deflatedToken = 
deflateEncoderDecoder.deflateToken(token.getBytes());
 
 String cxfInflatedToken = IOUtils
 .toString(deflateEncoderDecoder.inflateToken(deflatedToken));

cxf git commit: Recording .gitmergeinfo Changes

[coheigea]

Repository: cxf
Updated Branches:
  refs/heads/2.7.x-fixes e1c2055ea -> bf12924ba


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/bf12924b
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/bf12924b
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/bf12924b

Branch: refs/heads/2.7.x-fixes
Commit: bf12924ba5079b94e1102893b547a2dae649d7ed
Parents: e1c2055
Author: Colm O hEigeartaigh 
Authored: Wed Sep 9 14:50:24 2015 +0100
Committer: Colm O hEigeartaigh 
Committed: Wed Sep 9 14:50:24 2015 +0100

--
 .gitmergeinfo | 2 ++
 1 file changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/bf12924b/.gitmergeinfo
--
diff --git a/.gitmergeinfo b/.gitmergeinfo
index cffb906..f536f03 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -957,6 +957,7 @@ B 67de1e34748ee3f031b2783a9a50320cbb623457
 B 6821aca4842eac46f12663b8d733129b36065a75
 B 683fa9276cbb8f419d0a5f82427360e8a1987727
 B 685eb54712e9016c4325f7ad28b395a9826c8680
+B 688d4113326cfdc9ee2bbafce8d4ab686c076353
 B 68b030840e7cadb726f3be292b8456444e815344
 B 6930413189d7f21defbb8276bba1432bc7ff5c6c
 B 69aff5e6a15579ac713e9f109249e42e86623067
@@ -1002,6 +1003,7 @@ B 6e8b999f0e4f724e3e9f1a5aacef87a426d360e9
 B 6ea2061602527aa5a3a15e022aa6efbe0aee5996
 B 6edbd5859bf607dcde8f9a31b6a4658df0b91e21
 B 6f0d2e277a281f961e4c0e333b8e645f1d9d230f
+B 6f0dec6995ac63f25bfb6b5a770501482d737bab
 B 6f7ec449d4fbebb9fefb6e7152eef93edad44730
 B 6f8d4adf33c36671eb1c4a4a64a93122ddfc94fb
 B 6fbbe40e41cf96318c9101f7fb597d0a508ce2f6

cxf git commit: Fixing some outbound policy assertions

[coheigea]

Repository: cxf
Updated Branches:
  refs/heads/master 9c3ee8bd3 -> 73a1199eb


Fixing some outbound policy assertions


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/73a1199e
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/73a1199e
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/73a1199e

Branch: refs/heads/master
Commit: 73a1199ebb4203b0463ae91eb761596ae59722e2
Parents: 9c3ee8b
Author: Colm O hEigeartaigh 
Authored: Wed Sep 9 12:53:11 2015 +0100
Committer: Colm O hEigeartaigh 
Committed: Wed Sep 9 14:44:05 2015 +0100

--
 .../policyhandlers/AbstractBindingBuilder.java  | 14 +---
 .../AbstractCommonBindingHandler.java   |  1 +
 .../AsymmetricBindingHandler.java   | 34 ++--
 .../policyhandlers/SymmetricBindingHandler.java | 13 
 4 files changed, 27 insertions(+), 35 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/73a1199e/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
--
diff --git 
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
 
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
index 6cff697..3903e94 100644
--- 
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
+++ 
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
@@ -369,12 +369,16 @@ public abstract class AbstractBindingBuilder extends 
AbstractCommonBindingHandle
 ai.setNotAsserted(SPConstants.LAYOUT_LAX_TIMESTAMP_FIRST + 
" requires a timestamp");
 } else {
 addTopDownElement(timestampEl.getElement());
+ai.setAsserted(true);
 assertPolicy(
  new 
QName(binding.getLayout().getName().getNamespaceURI(), 
SPConstants.LAYOUT_LAX_TIMESTAMP_FIRST));
 }
 } else if (timestampEl != null) {
+ai.setAsserted(true);
 addTopDownElement(timestampEl.getElement());
+} else {
+ai.setAsserted(true);
 }
 
 assertPolicy(
@@ -1121,18 +1125,20 @@ public abstract class AbstractBindingBuilder extends 
AbstractCommonBindingHandle
 // Store them so that the main Signature doesn't sign them
 if (parts != null) {
 suppTokenParts.add(parts);
+this.assertPolicy(parts.getName());
 }
 if (elements != null) {
 suppTokenParts.add(elements);
+this.assertPolicy(elements.getName());
 }
 } else {
 Collection ais = 
getAllAssertionsByLocalname(SPConstants.SIGNED_PARTS);
 if (!ais.isEmpty()) {
 for (AssertionInfo ai : ais) {
 SignedParts signedParts = (SignedParts)ai.getAssertion();
+ai.setAsserted(true);
 if (!suppTokenParts.contains(signedParts)) {
 parts = signedParts;
-ai.setAsserted(true);
 }
 }
 }
@@ -1141,9 +1147,9 @@ public abstract class AbstractBindingBuilder extends 
AbstractCommonBindingHandle
 if (!ais.isEmpty()) {
 for (AssertionInfo ai : ais) {
 SignedElements signedElements = 
(SignedElements)ai.getAssertion();
+ai.setAsserted(true);
 if (!suppTokenParts.contains(signedElements)) {
 elements = signedElements;
-ai.setAsserted(true);
 }
 }
 }
@@ -1563,7 +1569,7 @@ public abstract class AbstractBindingBuilder extends 
AbstractCommonBindingHandle
 tokenTypeSet = true;
 }
 
-assertPolicy(token);
+assertToken(token);
 
 if (!tokenTypeSet) {
 boolean requestor = isRequestor();
@@ -1704,7 +1710,7 @@ public abstract class AbstractBindingBuilder extends 
AbstractCommonBindingHandle
 sig.setStoreBytesInAttachment(storeBytesInAttachment);
 checkForX509PkiPath(sig, token);
 if (token instanceof IssuedToken || token instanceof SamlToken) {
-assertPolicy(token);
+assertToken(token);
 SecurityToken securityToken = getSecurityToken();
 String tokenType = 

[1/2] cxf git commit: Recording .gitmergeinfo Changes

[coheigea]

Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes 5130728d3 -> 688d41133


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/688d4113
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/688d4113
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/688d4113

Branch: refs/heads/3.0.x-fixes
Commit: 688d4113326cfdc9ee2bbafce8d4ab686c076353
Parents: 6f0dec6
Author: Colm O hEigeartaigh 
Authored: Wed Sep 9 14:44:28 2015 +0100
Committer: Colm O hEigeartaigh 
Committed: Wed Sep 9 14:44:28 2015 +0100

--
 .gitmergeinfo | 2 ++
 1 file changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/688d4113/.gitmergeinfo
--
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 414a071..12a9cdf 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -277,6 +277,7 @@ B 9ae69b3b323f48de033f62be9fc2780f11b0c761
 B 9b93ca4bda4ba8abce2e2248059f2ccfd35391b2
 B 9bd52f477b0063dfd06b98eeb59c19c5732be1d4
 B 9c5f2a65793d73ea010661b5722087cbc692e334
+B 9c6a35df3241f9cb3046af9c941fc86116efb541
 B 9dd4194ce6af00377b0e1bdc6b15744fe03e29c9
 B 9de88cce894ca9ea746abf27943635467e23c153
 B 9dfb278c7739b9f4621f43b8146d057e21fafb64
@@ -548,6 +549,7 @@ M 71a1d1425c7cbfb6d410e6655f3579131d1fab3e
 M 71e16ce666214156a56f4d27dcea14e348da54cb
 M 7272ebcaa16544c779cd1ff2725b5b8efdea7b02
 M 72f81630fba3c74d03e99e724f03c2cd07e0d3dc
+M 73a1199ebb4203b0463ae91eb761596ae59722e2
 M 741ebc5d360db7b850401a4798f79a3996301885
 M 7431af236a19b5b5f899bad317a548a4c5c9cd49
 M 76c4df1bce5e71b439fb37fa5d9e1af12615786b

[2/2] cxf git commit: Fixing some outbound policy assertions

[coheigea]

Fixing some outbound policy assertions


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/6f0dec69
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/6f0dec69
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/6f0dec69

Branch: refs/heads/3.0.x-fixes
Commit: 6f0dec6995ac63f25bfb6b5a770501482d737bab
Parents: 5130728
Author: Colm O hEigeartaigh 
Authored: Wed Sep 9 12:53:11 2015 +0100
Committer: Colm O hEigeartaigh 
Committed: Wed Sep 9 14:44:28 2015 +0100

--
 .../policyhandlers/AbstractBindingBuilder.java  | 14 +---
 .../AbstractCommonBindingHandler.java   |  1 +
 .../AsymmetricBindingHandler.java   | 34 ++--
 .../policyhandlers/SymmetricBindingHandler.java | 13 
 4 files changed, 27 insertions(+), 35 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/6f0dec69/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
--
diff --git 
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
 
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
index d8ec26a..8ffa513 100644
--- 
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
+++ 
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
@@ -363,12 +363,16 @@ public abstract class AbstractBindingBuilder extends 
AbstractCommonBindingHandle
 ai.setNotAsserted(SPConstants.LAYOUT_LAX_TIMESTAMP_FIRST + 
" requires a timestamp");
 } else {
 addTopDownElement(timestampEl.getElement());
+ai.setAsserted(true);
 assertPolicy(
  new 
QName(binding.getLayout().getName().getNamespaceURI(), 
SPConstants.LAYOUT_LAX_TIMESTAMP_FIRST));
 }
 } else if (timestampEl != null) {
+ai.setAsserted(true);
 addTopDownElement(timestampEl.getElement());
+} else {
+ai.setAsserted(true);
 }
 
 assertPolicy(
@@ -1125,18 +1129,20 @@ public abstract class AbstractBindingBuilder extends 
AbstractCommonBindingHandle
 // Store them so that the main Signature doesn't sign them
 if (parts != null) {
 suppTokenParts.add(parts);
+this.assertPolicy(parts.getName());
 }
 if (elements != null) {
 suppTokenParts.add(elements);
+this.assertPolicy(elements.getName());
 }
 } else {
 Collection ais = 
getAllAssertionsByLocalname(SPConstants.SIGNED_PARTS);
 if (!ais.isEmpty()) {
 for (AssertionInfo ai : ais) {
 SignedParts signedParts = (SignedParts)ai.getAssertion();
+ai.setAsserted(true);
 if (!suppTokenParts.contains(signedParts)) {
 parts = signedParts;
-ai.setAsserted(true);
 }
 }
 }
@@ -1145,9 +1151,9 @@ public abstract class AbstractBindingBuilder extends 
AbstractCommonBindingHandle
 if (!ais.isEmpty()) {
 for (AssertionInfo ai : ais) {
 SignedElements signedElements = 
(SignedElements)ai.getAssertion();
+ai.setAsserted(true);
 if (!suppTokenParts.contains(signedElements)) {
 elements = signedElements;
-ai.setAsserted(true);
 }
 }
 }
@@ -1557,7 +1563,7 @@ public abstract class AbstractBindingBuilder extends 
AbstractCommonBindingHandle
 tokenTypeSet = true;
 }
 
-assertPolicy(token);
+assertToken(token);
 
 if (!tokenTypeSet) {
 boolean requestor = isRequestor();
@@ -1676,7 +1682,7 @@ public abstract class AbstractBindingBuilder extends 
AbstractCommonBindingHandle
 sig.setStoreBytesInAttachment(storeBytesInAttachment);
 checkForX509PkiPath(sig, token);
 if (token instanceof IssuedToken || token instanceof SamlToken) {
-assertPolicy(token);
+assertToken(token);
 SecurityToken securityToken = getSecurityToken();
 String tokenType = securityToken.getTokenType();
 

svn commit: r964939 - in /websites/production/cxf/content: cache/docs.pageCache docs/distributed-tracing.html docs/index.html docs/using-apache-htrace.html

[buildbot]

Author: buildbot
Date: Thu Sep 10 01:47:28 2015
New Revision: 964939

Log:
Production update by buildbot for cxf

Added:
websites/production/cxf/content/docs/distributed-tracing.html
websites/production/cxf/content/docs/using-apache-htrace.html
Modified:
websites/production/cxf/content/cache/docs.pageCache
websites/production/cxf/content/docs/index.html

Modified: websites/production/cxf/content/cache/docs.pageCache
==
Binary files - no diff available.

Added: websites/production/cxf/content/docs/distributed-tracing.html
==
--- websites/production/cxf/content/docs/distributed-tracing.html (added)
+++ websites/production/cxf/content/docs/distributed-tracing.html Thu Sep 10 
01:47:28 2015
@@ -0,0 +1,157 @@
+
+http://www.w3.org/TR/html4/loose.dtd;>
+
+
+  
+
+
+
+
+
+
+
+
+
+
+
+
+Apache CXF -- Distributed Tracing
+
+  
+
+
+
+
+  
+
+
+
+  
+  
+
+
+
+  
+
+http://cxf.apache.org/; title="Apache CXF">Apache CXF
+
+http://www.apache.org/; title="The Apache Sofware 
Foundation">http://cxf.apache.org/images/asf-logo.png;>
+
+  
+  
+
+  
+
+  
+
+IndexDistributed Tracing
+
+  
+
+
+  
+
+http://cxf.apache.org/download.html;>Download | http://cxf.apache.org/docs/index.html;>Documentation
+
+  
+
+  
+
+  
+
+
+
+  
+  
+
+
+  
+
+  
+
+  
+
+  
+
+OverviewHow-TosFrontendsDataBindingsTransportsConfigurationDebugging and LoggingToolsRESTful ServicesWSDL BindingsService RoutingDynamic LanguagesWS-* SupportAdvanced IntegrationDeploymentUse of Schemas and 
NamespacesSearchhttp://www.google.com/cse;>
+  
+
+
+
+
+  
+
+http://www.google.com/cse/brand?form=cse-search-box&lang=en";>http://cxf.apache.org/javadoc/latest/;>API 3.1.x (Javadoc)http://cxf.apache.org/javadoc/latest-3.0.x/;>API 3.0.x 
(Javadoc)http://cxf.apache.org/;>CXF 
Website
+
+  
+  
+
+  
+ 
+ 
+   
+   
+Distributed TracingSince the 
adoption of SOA/microservice architectures (with REST services taking a central 
place in them), systems become more and more distributed. The importance of 
having the visibility of how each request travels from the client to the 
service and from service to service till the eventual response is being 
constructed is hard to overestimate. Distributed tracing systems are designed 
to solve that. The most widely used and known ones are http://zipkin.io/; rel="nofollow">Twitter 
Zipkin and http://htrace.incubator.apache.org/;>Apache HTrace (currently in 
incubation), both built on top of Google's paper http://research.google.com/pubs/pub36356.html; 
rel="nofollow">Dapper, a Large-Scale Distributed Systems Tracing 
InfrastructureUsing Apache HTrace
+   
+   
+ 
+
+  
+   
+   
+  
+  
+   
+   
+   
+ 
+   
+   
+ http://cxf.apache.org/privacy-policy.html;>Privacy 
Policy - 
+ (https://cwiki.apache.org/confluence/pages/editpage.action?pageId=61318394;>edit
 page) 
+(https://cwiki.apache.org/confluence/pages/viewpage.action?pageId=61318394showComments=trueshowCommentArea=true#addcomment;>add
 comment)
+   Apache CXF, CXF, Apache, the Apache feather logo are trademarks of The 
Apache Software Foundation.
+All other marks mentioned may be trademarks or registered trademarks 
of their respective owners.
+   
+   
+ 
+   
+   
+   
+  
+  
+
+
+
+  
+
+
+
+var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl."; : 
"http://www.";);
+document.write(unescape("%3Cscript src='" + gaJsHost + 
"google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
+
+
+try {
+var pageTracker = _gat._getTracker("UA-4458903-1");
+pageTracker._trackPageview();
+} catch(err) {}
+
+
+
+

Modified: websites/production/cxf/content/docs/index.html
==
--- websites/production/cxf/content/docs/index.html (original)
+++ websites/production/cxf/content/docs/index.html Thu Sep 10 01:47:28 2015
@@ -113,7 +113,7 @@ Apache CXF -- Index
   
   
 
-OverviewWhy 
CXF?How do I integrate my 
application with CXF  A meta guide to 
integrating your application with CXF - including Bindings, Transports, 
Interceptors, etcHow do I develop a service?  
A meta guide to your options with CXFHow do I develop a 
client?  A meta 

cxf git commit: Updating keystores to work with JDK9

[coheigea]

Repository: cxf
Updated Branches:
  refs/heads/master 73a1199eb -> 3ad862c9d


Updating keystores to work with JDK9


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/3ad862c9
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/3ad862c9
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/3ad862c9

Branch: refs/heads/master
Commit: 3ad862c9dea70ed20a9950d2883de0a8c2510fdd
Parents: 73a1199
Author: Colm O hEigeartaigh 
Authored: Wed Sep 9 17:54:46 2015 +0100
Committer: Colm O hEigeartaigh 
Committed: Wed Sep 9 17:54:46 2015 +0100

--
 .../policyhandlers/AbstractBindingBuilder.java  |   6 +-
 .../data/xkms/certificates/crls/wss40CACRL.cer  | Bin 325 -> 345 bytes
 .../resources/data/xkms/certificates/wss40.cer  | Bin 824 -> 956 bytes
 .../data/xkms/certificates/wss40rev.cer | Bin 824 -> 956 bytes
 .../trustedAuthorityValidator/wss40.cer | Bin 824 -> 956 bytes
 .../trustedAuthorityValidator/wss40CACRL.cer| Bin 325 -> 345 bytes
 .../trustedAuthorityValidator/wss40rev.cer  | Bin 824 -> 956 bytes
 .../src/test/resources/keys/Bethal.cer  | Bin 548 -> 0 bytes
 .../src/test/resources/keys/Bethal.jks  | Bin 1317 -> 2202 bytes
 .../src/test/resources/keys/Bethal.p12  | Bin 1705 -> 2540 bytes
 .../src/test/resources/keys/Gordy.cer   | Bin 544 -> 0 bytes
 .../src/test/resources/keys/Gordy.jks   | Bin 1313 -> 2197 bytes
 .../src/test/resources/keys/Morpit.jks  | Bin 1337 -> 2221 bytes
 .../src/test/resources/keys/Morpit.p12  | Bin 1721 -> 2564 bytes
 .../src/test/resources/keys/Poltim.cer  | Bin 548 -> 0 bytes
 .../src/test/resources/keys/Poltim.jks  | Bin 1318 -> 2203 bytes
 .../src/test/resources/keys/Tarpin.cer  | Bin 548 -> 0 bytes
 .../src/test/resources/keys/Tarpin.jks  | Bin 1319 -> 2201 bytes
 .../src/test/resources/keys/Truststore.jks  | Bin 2942 -> 4447 bytes
 .../src/test/resources/keys/Truststore.pem  | 126 +++
 .../systest/ws/security/SecurityPolicyTest.java |  50 
 .../apache/cxf/systest/ws/security/Bethal.cer   | Bin 548 -> 0 bytes
 .../apache/cxf/systest/ws/security/Bethal.cxf   |  83 
 .../apache/cxf/systest/ws/security/Bethal.jks   | Bin 1317 -> 2202 bytes
 .../apache/cxf/systest/ws/security/Bethal.p12   | Bin 1705 -> 0 bytes
 .../cxf/systest/ws/security/DoubleIt.wsdl   |  26 ++--
 .../apache/cxf/systest/ws/security/Morpit.cxf   |  73 ---
 .../apache/cxf/systest/ws/security/Morpit.jks   | Bin 1337 -> 2221 bytes
 .../apache/cxf/systest/ws/security/Morpit.p12   | Bin 1721 -> 0 bytes
 .../cxf/systest/ws/security/Truststore.jks  | Bin 2942 -> 4447 bytes
 .../cxf/systest/ws/security/Truststore.pem  |  60 -
 .../apache/cxf/systest/ws/security/alice.jks| Bin 1821 -> 0 bytes
 .../cxf/systest/ws/security/alice.properties|  23 
 .../org/apache/cxf/systest/ws/security/bob.jks  | Bin 1820 -> 0 bytes
 .../cxf/systest/ws/security/bob.properties  |  23 
 .../apache/cxf/systest/ws/security/client.xml   |   8 +-
 .../apache/cxf/systest/ws/security/server.xml   |   8 +-
 .../cxf/systest/ws/security/stax-server.xml |   8 +-
 38 files changed, 129 insertions(+), 365 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/3ad862c9/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
--
diff --git 
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
 
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
index 3903e94..0dff3ee 100644
--- 
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
+++ 
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
@@ -375,9 +375,11 @@ public abstract class AbstractBindingBuilder extends 
AbstractCommonBindingHandle
SPConstants.LAYOUT_LAX_TIMESTAMP_FIRST));
 }
 } else if (timestampEl != null) {
-ai.setAsserted(true);
+if (ai != null) {
+ai.setAsserted(true);
+}
 addTopDownElement(timestampEl.getElement());
-} else {
+} else if (ai != null) {
 ai.setAsserted(true);
 }
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/3ad862c9/services/xkms/xkms-itests/src/test/resources/data/xkms/certificates/crls/wss40CACRL.cer
--
diff --git 

[1/3] cxf git commit: Recording .gitmergeinfo Changes

[coheigea]

Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes 688d41133 -> 91f5eddb5


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/ca2908bb
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/ca2908bb
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/ca2908bb

Branch: refs/heads/3.0.x-fixes
Commit: ca2908bba1263a5f8ffaddc479704789a8a49d4f
Parents: c772031
Author: Colm O hEigeartaigh 
Authored: Wed Sep 9 17:56:22 2015 +0100
Committer: Colm O hEigeartaigh 
Committed: Wed Sep 9 17:56:22 2015 +0100

--
 .gitmergeinfo | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/ca2908bb/.gitmergeinfo
--
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 12a9cdf..0d6fab3 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -487,6 +487,7 @@ M 3228637a5070a25f625fb18fc21a7dd54ce16dfd
 M 3348a2999d2693edfeaf1fdd62a94222774186fd
 M 3520a87c8b207f911cdd5e139cc84f2d20634a4e
 M 3656b40f215f9904ea3649163bf2444eeab0c9cc
+M 3ad862c9dea70ed20a9950d2883de0a8c2510fdd
 M 3af7c785c642db6ae64276f92fb05450d7f9aba3
 M 3d3d495a2c58164abfb54b64208b3f72b4d235dd
 M 409f987dd9822b7ed0fca97cd795c9131882e07b

[2/3] cxf git commit: Updating keystores to work with JDK9

[coheigea]

Updating keystores to work with JDK9

Conflicts:

systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/alice.properties

systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/bob.properties


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/c7720313
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/c7720313
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/c7720313

Branch: refs/heads/3.0.x-fixes
Commit: c7720313ccf181218809afd2ff17c02cf894641a
Parents: 688d411
Author: Colm O hEigeartaigh 
Authored: Wed Sep 9 17:54:46 2015 +0100
Committer: Colm O hEigeartaigh 
Committed: Wed Sep 9 17:56:22 2015 +0100

--
 .../policyhandlers/AbstractBindingBuilder.java  |   6 +-
 .../data/xkms/certificates/crls/wss40CACRL.cer  | Bin 325 -> 345 bytes
 .../resources/data/xkms/certificates/wss40.cer  | Bin 824 -> 956 bytes
 .../data/xkms/certificates/wss40rev.cer | Bin 824 -> 956 bytes
 .../trustedAuthorityValidator/wss40.cer | Bin 824 -> 956 bytes
 .../trustedAuthorityValidator/wss40CACRL.cer| Bin 325 -> 345 bytes
 .../trustedAuthorityValidator/wss40rev.cer  | Bin 824 -> 956 bytes
 .../src/test/resources/keys/Bethal.cer  | Bin 548 -> 0 bytes
 .../src/test/resources/keys/Bethal.jks  | Bin 1317 -> 2202 bytes
 .../src/test/resources/keys/Bethal.p12  | Bin 1705 -> 2540 bytes
 .../src/test/resources/keys/Gordy.cer   | Bin 544 -> 0 bytes
 .../src/test/resources/keys/Gordy.jks   | Bin 1313 -> 2197 bytes
 .../src/test/resources/keys/Morpit.jks  | Bin 1337 -> 2221 bytes
 .../src/test/resources/keys/Morpit.p12  | Bin 1721 -> 2564 bytes
 .../src/test/resources/keys/Poltim.cer  | Bin 548 -> 0 bytes
 .../src/test/resources/keys/Poltim.jks  | Bin 1318 -> 2203 bytes
 .../src/test/resources/keys/Tarpin.cer  | Bin 548 -> 0 bytes
 .../src/test/resources/keys/Tarpin.jks  | Bin 1319 -> 2201 bytes
 .../src/test/resources/keys/Truststore.jks  | Bin 2942 -> 4447 bytes
 .../src/test/resources/keys/Truststore.pem  | 126 +++
 .../systest/ws/security/SecurityPolicyTest.java |  50 
 .../apache/cxf/systest/ws/security/Bethal.cer   | Bin 548 -> 0 bytes
 .../apache/cxf/systest/ws/security/Bethal.cxf   |  83 
 .../apache/cxf/systest/ws/security/Bethal.jks   | Bin 1317 -> 2202 bytes
 .../apache/cxf/systest/ws/security/Bethal.p12   | Bin 1705 -> 0 bytes
 .../cxf/systest/ws/security/DoubleIt.wsdl   |  26 ++--
 .../apache/cxf/systest/ws/security/Morpit.cxf   |  73 ---
 .../apache/cxf/systest/ws/security/Morpit.jks   | Bin 1337 -> 2221 bytes
 .../apache/cxf/systest/ws/security/Morpit.p12   | Bin 1721 -> 0 bytes
 .../cxf/systest/ws/security/Truststore.jks  | Bin 2942 -> 4447 bytes
 .../cxf/systest/ws/security/Truststore.pem  |  60 -
 .../apache/cxf/systest/ws/security/alice.jks| Bin 1821 -> 0 bytes
 .../org/apache/cxf/systest/ws/security/bob.jks  | Bin 1820 -> 0 bytes
 .../apache/cxf/systest/ws/security/client.xml   |   8 +-
 .../apache/cxf/systest/ws/security/server.xml   |   8 +-
 .../cxf/systest/ws/security/stax-server.xml |   8 +-
 36 files changed, 129 insertions(+), 319 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/c7720313/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
--
diff --git 
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
 
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
index 8ffa513..c46515e 100644
--- 
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
+++ 
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
@@ -369,9 +369,11 @@ public abstract class AbstractBindingBuilder extends 
AbstractCommonBindingHandle
SPConstants.LAYOUT_LAX_TIMESTAMP_FIRST));
 }
 } else if (timestampEl != null) {
-ai.setAsserted(true);
+if (ai != null) {
+ai.setAsserted(true);
+}
 addTopDownElement(timestampEl.getElement());
-} else {
+} else if (ai != null) {
 ai.setAsserted(true);
 }
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/c7720313/services/xkms/xkms-itests/src/test/resources/data/xkms/certificates/crls/wss40CACRL.cer
--

[3/3] cxf git commit: Removing unused files

[coheigea]

Removing unused files


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/91f5eddb
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/91f5eddb
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/91f5eddb

Branch: refs/heads/3.0.x-fixes
Commit: 91f5eddb5f5e75afbbb5f478f91d01566e9ce996
Parents: ca2908b
Author: Colm O hEigeartaigh 
Authored: Wed Sep 9 18:20:06 2015 +0100
Committer: Colm O hEigeartaigh 
Committed: Wed Sep 9 18:20:06 2015 +0100

--
 .../cxf/systest/ws/security/alice.properties| 23 
 .../cxf/systest/ws/security/bob.properties  | 23 
 2 files changed, 46 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/91f5eddb/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/alice.properties
--
diff --git 
a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/alice.properties
 
b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/alice.properties
deleted file mode 100644
index 20b2bbf..000
--- 
a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/alice.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-#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.
-#
-org.apache.ws.security.crypto.provider=org.apache.ws.security.components.crypto.Merlin
-org.apache.ws.security.crypto.merlin.keystore.type=jks
-org.apache.ws.security.crypto.merlin.keystore.password=password
-org.apache.ws.security.crypto.merlin.keystore.alias=alice
-org.apache.ws.security.crypto.merlin.keystore.file=org/apache/cxf/systest/ws/security/alice.jks

http://git-wip-us.apache.org/repos/asf/cxf/blob/91f5eddb/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/bob.properties
--
diff --git 
a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/bob.properties
 
b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/bob.properties
deleted file mode 100644
index edd3f27..000
--- 
a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/bob.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-#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.
-#
-org.apache.ws.security.crypto.provider=org.apache.ws.security.components.crypto.Merlin
-org.apache.ws.security.crypto.merlin.keystore.type=jks
-org.apache.ws.security.crypto.merlin.keystore.password=password
-org.apache.ws.security.crypto.merlin.keystore.alias=bob
-org.apache.ws.security.crypto.merlin.keystore.file=org/apache/cxf/systest/ws/security/bob.jks

cxf git commit: Recording .gitmergeinfo Changes

[coheigea]

Repository: cxf
Updated Branches:
  refs/heads/2.7.x-fixes bf12924ba -> 6e5cfc6c1


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/6e5cfc6c
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/6e5cfc6c
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/6e5cfc6c

Branch: refs/heads/2.7.x-fixes
Commit: 6e5cfc6c19085ddf9159268711a754fff378
Parents: bf12924
Author: Colm O hEigeartaigh 
Authored: Wed Sep 9 18:20:35 2015 +0100
Committer: Colm O hEigeartaigh 
Committed: Wed Sep 9 18:20:35 2015 +0100

--
 .gitmergeinfo | 3 +++
 1 file changed, 3 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/6e5cfc6c/.gitmergeinfo
--
diff --git a/.gitmergeinfo b/.gitmergeinfo
index f536f03..73b287e 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -1337,6 +1337,7 @@ B 91b35bce7f4e2b267c5c7cb5a4d2d98e32295b0d
 B 91b367b770f6f21d932faa476428bfe41722afac
 B 91c4d3019a2cc058566e7cd4e3b860329639cf92
 B 91e6b02ac476064808a8926815e4442d23f61378
+B 91f5eddb5f5e75afbbb5f478f91d01566e9ce996
 B 92003dbdda20095cab1bf5740a211a6c9b554b50
 B 92203fbada808fccf32814a3d4cda8293b4e8ba1
 B 9221cf9995f0e42c4f5e5c40e6f4f42c3c98ac7b
@@ -1778,6 +1779,7 @@ B c7053bc56654eeec72591e7a80f89b7148b24daf
 B c742aba8d46e8a3a2774cfea37788535093140bf
 B c755e0a939a337679b2bc80b34a0dd4ef69c519e
 B c766f1069dec6b8682865390e0c6fed133ebbe5d
+B c7720313ccf181218809afd2ff17c02cf894641a
 B c775be776e9c6946c55d626847029cbfb6ace677
 B c79696bfc1aee1d1204cbd592f6bc5c83c0d9dae
 B c7a7e9978b7b9e392690d3e5e99c7e6f02f613fe
@@ -1803,6 +1805,7 @@ B c9e85e762130f4f720d792df3332024e83874e9d
 B c9eeeda747e7d178474d87c2abae89f022ff2e44
 B c9f5e018a9fa458f9896bebfb16c78bf68a41e34
 B ca088ea3d42d5ce9acd4f44bd96c19a7bc06ea0c
+B ca2908bba1263a5f8ffaddc479704789a8a49d4f
 B ca2de0d7efa24e380fdb0bbee45d4c383134a207
 B ca3b414cdbe1e7c92056208a9104494bb69018c4
 B ca40783c03222f52dcea0c5410ea67bea400224e