cxf git commit: [CXF-7316] Initializing the customizer earlier

[sergeyb]

Repository: cxf
Updated Branches:
  refs/heads/master 720b41e21 -> 5e2d2a1a6


[CXF-7316] Initializing the customizer earlier


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

Branch: refs/heads/master
Commit: 5e2d2a1a60dcf11fd4bf70e592e60b7d8ddd4e41
Parents: 720b41e
Author: Sergey Beryozkin 
Authored: Tue Aug 1 22:15:03 2017 +0100
Committer: Sergey Beryozkin 
Committed: Tue Aug 1 22:15:03 2017 +0100

--
 .../java/org/apache/cxf/jaxrs/swagger/Swagger2Feature.java| 7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/5e2d2a1a/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/Swagger2Feature.java
--
diff --git 
a/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/Swagger2Feature.java
 
b/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/Swagger2Feature.java
index 562e5db..bf0b658 100644
--- 
a/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/Swagger2Feature.java
+++ 
b/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/Swagger2Feature.java
@@ -130,6 +130,10 @@ public class Swagger2Feature extends 
AbstractSwaggerFeature {
 }
 
 List swaggerResources = new LinkedList<>();
+
+if (swagger2Serializers == null && customizer == null) {
+customizer = new Swagger2Customizer();
+}
 ApiListingResource apiListingResource = new 
Swagger2ApiListingResource(customizer);
 swaggerResources.add(apiListingResource);
 
@@ -169,9 +173,6 @@ public class Swagger2Feature extends AbstractSwaggerFeature 
{
 swagger2Serializers.setDynamicBasePath(dynamicBasePath);
 providers.add(swagger2Serializers);
 } else {
-if (customizer == null) {
-customizer = new Swagger2Customizer();
-}
 customizer.setClassResourceInfos(cris);
 customizer.setDynamicBasePath(dynamicBasePath);
 }

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

[dkulp]

Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes b1a3bcfd8 -> 46bb02fe8


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

Branch: refs/heads/3.1.x-fixes
Commit: 46bb02fe8243f1954aa1e2a6bcf9d08a3226f73b
Parents: 88c48ed
Author: Daniel Kulp 
Authored: Tue Aug 1 15:06:25 2017 -0400
Committer: Daniel Kulp 
Committed: Tue Aug 1 15:06:25 2017 -0400

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


http://git-wip-us.apache.org/repos/asf/cxf/blob/46bb02fe/.gitmergeinfo
--
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 2d6364d..7c96601 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -162,6 +162,7 @@ B 5ce0b6eb1488d8ac575ee055d5f8cf83863546bf
 B 5d73e20b4539bfa4c8ca607b27a1c1ea1850e095
 B 5e068d215b750e3211aaaf3d0b7b366d6a220fc2
 B 5ea90a91d9148aa59aeb9b7e6611b58fb8da1fe4
+B 5fa39c84511e3a329e9e84be2f7cf333b122f375
 B 604167d9f0cfc67e01219a19a95353176ce38f79
 B 61a361610d57aaf18f2c574916621ac09af45151
 B 61eadf5265cbcf47c8b2d5a6d6235eb2f621b456

cxf git commit: [CXF-7438] Expand the checks for MTOM and schema validation Patch from Casper Biever applied

[dkulp]

Repository: cxf
Updated Branches:
  refs/heads/master 6a1bc2963 -> 720b41e21


[CXF-7438] Expand the checks for MTOM and schema validation
Patch from Casper Biever applied


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

Branch: refs/heads/master
Commit: 720b41e218cf0b8103b397ff869aa08222cd98d4
Parents: 6a1bc29
Author: Daniel Kulp 
Authored: Tue Aug 1 14:31:09 2017 -0400
Committer: Daniel Kulp 
Committed: Tue Aug 1 14:32:21 2017 -0400

--
 .../org/apache/cxf/databinding/source/XMLStreamDataWriter.java  | 2 +-
 .../src/main/java/org/apache/cxf/jaxb/io/DataWriterImpl.java| 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/720b41e2/core/src/main/java/org/apache/cxf/databinding/source/XMLStreamDataWriter.java
--
diff --git 
a/core/src/main/java/org/apache/cxf/databinding/source/XMLStreamDataWriter.java 
b/core/src/main/java/org/apache/cxf/databinding/source/XMLStreamDataWriter.java
index d74166a..f82e3ee 100644
--- 
a/core/src/main/java/org/apache/cxf/databinding/source/XMLStreamDataWriter.java
+++ 
b/core/src/main/java/org/apache/cxf/databinding/source/XMLStreamDataWriter.java
@@ -222,7 +222,7 @@ public class XMLStreamDataWriter implements 
DataWriter {
 
 private boolean isCVC312Exception(SAXParseException exception) {
 String msg = exception.getMessage();
-return msg.startsWith("cvc-type.3.1.2") 
+return (msg.startsWith("cvc-type.3.1.2") || 
msg.startsWith("cvc-complex-type.2.2"))
 && msg.endsWith("is a simple type, so it must have no element 
information item [children].");
 


http://git-wip-us.apache.org/repos/asf/cxf/blob/720b41e2/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/io/DataWriterImpl.java
--
diff --git 
a/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/io/DataWriterImpl.java 
b/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/io/DataWriterImpl.java
index ebc78ec..37555e5 100644
--- 
a/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/io/DataWriterImpl.java
+++ 
b/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/io/DataWriterImpl.java
@@ -92,9 +92,10 @@ public class DataWriterImpl extends JAXBDataBase 
implements DataWriter {
 }
 
 public boolean handleEvent(ValidationEvent event) {
-// CXF-1194 this hack is specific to MTOM, so pretty safe to leave 
in here before calling the origHandler.
+// CXF-1194/CXF-7438 this hack is specific to MTOM, so pretty safe 
to leave in
+// here before calling the origHandler.
 String msg = event.getMessage();
-if (msg.startsWith("cvc-type.3.1.2")
+if ((msg.startsWith("cvc-type.3.1.2") || 
msg.startsWith("cvc-complex-type.2.2"))
 && 
msg.contains(marshaller.getLastMTOMElementName().getLocalPart())) {
 return true;
 }

cxf git commit: [CXF-7316] Activating Swagger2Customizer by default

[sergeyb]

Repository: cxf
Updated Branches:
  refs/heads/master 5fa39c845 -> 6a1bc2963


[CXF-7316] Activating Swagger2Customizer by default


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

Branch: refs/heads/master
Commit: 6a1bc29634a5328fb3d5f5927cdebbde9af63715
Parents: 5fa39c8
Author: Sergey Beryozkin 
Authored: Tue Aug 1 16:53:54 2017 +0100
Committer: Sergey Beryozkin 
Committed: Tue Aug 1 16:53:54 2017 +0100

--
 .../java/org/apache/cxf/jaxrs/swagger/Swagger2Feature.java   | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/6a1bc296/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/Swagger2Feature.java
--
diff --git 
a/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/Swagger2Feature.java
 
b/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/Swagger2Feature.java
index 8dceb29..562e5db 100644
--- 
a/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/Swagger2Feature.java
+++ 
b/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/Swagger2Feature.java
@@ -164,14 +164,14 @@ public class Swagger2Feature extends 
AbstractSwaggerFeature {
 }
 }
 }
-if (customizer == null) {
-if (swagger2Serializers == null) {
-swagger2Serializers = new DefaultSwagger2Serializers();
-}
+if (swagger2Serializers != null) {
 swagger2Serializers.setClassResourceInfos(cris);
 swagger2Serializers.setDynamicBasePath(dynamicBasePath);
 providers.add(swagger2Serializers);
 } else {
+if (customizer == null) {
+customizer = new Swagger2Customizer();
+}
 customizer.setClassResourceInfos(cris);
 customizer.setDynamicBasePath(dynamicBasePath);
 }

cxf git commit: [CXF-7316] Update the swagger version and update features.xml for OpenSAML 3.3

[dkulp]

Repository: cxf
Updated Branches:
  refs/heads/master b09959c9a -> 5fa39c845


[CXF-7316] Update the swagger version and update features.xml for OpenSAML 3.3


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

Branch: refs/heads/master
Commit: 5fa39c84511e3a329e9e84be2f7cf333b122f375
Parents: b09959c
Author: Daniel Kulp 
Authored: Tue Aug 1 11:01:17 2017 -0400
Committer: Daniel Kulp 
Committed: Tue Aug 1 11:02:41 2017 -0400

--
 osgi/karaf/features/src/main/resources/features.xml | 1 +
 parent/pom.xml  | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/5fa39c84/osgi/karaf/features/src/main/resources/features.xml
--
diff --git a/osgi/karaf/features/src/main/resources/features.xml 
b/osgi/karaf/features/src/main/resources/features.xml
index 9d294f1..2e1aeb4 100644
--- a/osgi/karaf/features/src/main/resources/features.xml
+++ b/osgi/karaf/features/src/main/resources/features.xml
@@ -61,6 +61,7 @@
 mvn:commons-codec/commons-codec/${cxf.commons-codec.version}
 mvn:org.apache.santuario/xmlsec/${cxf.xmlsec.bundle.version}
 mvn:com.google.guava/guava/${cxf.guava.version}
+mvn:io.dropwizard.metrics/metrics-core/${cxf.dropwizard.version}
 mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.opensaml/${cxf.opensaml.osgi.version}
 mvn:org.jvnet.staxex/stax-ex/${cxf.stax-ex.version}
 mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.saaj-impl/${cxf.saaj-impl.bundle.version}

http://git-wip-us.apache.org/repos/asf/cxf/blob/5fa39c84/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 0140373..1aa026b 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -86,7 +86,7 @@
 2.10.3
 3.0.3
 
1.2.13_1
-18.0
+20.0
 3.7.4
 
4.1.3
 
[4.0,4.2)
@@ -157,7 +157,7 @@
 1.2.1
 2.3.1.RELEASE
 spring-test
-1.5.12
+1.5.16
 1.7
 5.0.3
 3.1.4

cxf git commit: Updating to OpenSAML 3.3.0

[coheigea]

Repository: cxf
Updated Branches:
  refs/heads/master 333a2c022 -> b09959c9a


Updating to OpenSAML 3.3.0


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

Branch: refs/heads/master
Commit: b09959c9aa05b77e40523da8574a5aa2947897cd
Parents: 333a2c0
Author: Colm O hEigeartaigh 
Authored: Tue Aug 1 15:58:35 2017 +0100
Committer: Colm O hEigeartaigh 
Committed: Tue Aug 1 15:58:35 2017 +0100

--
 parent/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/b09959c9/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 972fd3c..0140373 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -138,8 +138,8 @@
 [4,5)
 20100527_1
 20100527
-3.2.0
-3.2.0_2
+3.3.0
+3.3.0_2
 
[3.1,4)
 1.7R2
 
0.9.10_3

cxf git commit: Try to get test to pass

[sergeyb]

Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes e985c12cd -> b1a3bcfd8


Try to get test to pass


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

Branch: refs/heads/3.1.x-fixes
Commit: b1a3bcfd804594d649b92582b74dc3d88e4c872b
Parents: e985c12
Author: Daniel Kulp 
Authored: Mon Jul 31 16:29:38 2017 -0400
Committer: Sergey Beryozkin 
Committed: Tue Aug 1 12:33:18 2017 +0300

--
 .../AbstractSwagger2ServiceDescriptionTest.java  | 11 +++
 1 file changed, 7 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/b1a3bcfd/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/description/AbstractSwagger2ServiceDescriptionTest.java
--
diff --git 
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/description/AbstractSwagger2ServiceDescriptionTest.java
 
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/description/AbstractSwagger2ServiceDescriptionTest.java
index 0d9b652..aaddb93 100644
--- 
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/description/AbstractSwagger2ServiceDescriptionTest.java
+++ 
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/description/AbstractSwagger2ServiceDescriptionTest.java
@@ -129,26 +129,29 @@ public abstract class 
AbstractSwagger2ServiceDescriptionTest extends AbstractBus
 assertNotNull(urs);
 assertEquals(1, urs.size());
 UserResource r = urs.get(0);
-assertEquals("/bookstore", r.getPath());
+String basePath = "";
+if (!"/".equals(r.getPath())) {
+basePath = r.getPath();
+}
 Map map = r.getOperationsAsMap();
 assertEquals(3, map.size());
 UserOperation getBooksOp = map.get("getBooks");
 assertEquals(HttpMethod.GET, getBooksOp.getVerb());
-assertEquals("/", getBooksOp.getPath());
+assertEquals("/bookstore", basePath + getBooksOp.getPath());
 assertEquals(MediaType.APPLICATION_JSON, getBooksOp.getProduces());
 List getBooksOpParams = getBooksOp.getParameters();
 assertEquals(1, getBooksOpParams.size());
 assertEquals(ParameterType.QUERY, 
getBooksOpParams.get(0).getType());
 UserOperation getBookOp = map.get("getBook");
 assertEquals(HttpMethod.GET, getBookOp.getVerb());
-assertEquals("/{id}", getBookOp.getPath());
+assertEquals("/bookstore/{id}", basePath + getBookOp.getPath());
 assertEquals(MediaType.APPLICATION_JSON, getBookOp.getProduces());
 List getBookOpParams = getBookOp.getParameters();
 assertEquals(1, getBookOpParams.size());
 assertEquals(ParameterType.PATH, getBookOpParams.get(0).getType());
 UserOperation deleteOp = map.get("delete");
 assertEquals(HttpMethod.DELETE, deleteOp.getVerb());
-assertEquals("/{id}", deleteOp.getPath());
+assertEquals("/bookstore/{id}", basePath + deleteOp.getPath());
 List delOpParams = deleteOp.getParameters();
 assertEquals(1, delOpParams.size());
 assertEquals(ParameterType.PATH, delOpParams.get(0).getType());