cxf git commit: Fixing Sagger2 systests

2016-03-19 Thread ilgrosso 
Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes d13b22b37 -> f49297cff


Fixing Sagger2 systests


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

Branch: refs/heads/3.0.x-fixes
Commit: f49297cffa234d2838106bad65869fb57068c95a
Parents: d13b22b
Author: Francesco Chicchiriccò 
Authored: Fri Mar 18 15:51:13 2016 +0100
Committer: Francesco Chicchiriccò 
Committed: Fri Mar 18 17:14:55 2016 +0100

--
 .../AbstractSwagger2ServiceDescriptionTest.java |  1 +
 ...gger2NonAnnotatedServiceDescriptionTest.java |  2 +-
 .../jaxrs/description/swagger2-noano-yaml.txt   |  4 ++-
 .../systest/jaxrs/description/swagger2-yaml.txt | 33 ++--
 4 files changed, 36 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/f49297cf/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 3332f47..bf4b168 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
@@ -55,6 +55,7 @@ public abstract class AbstractSwagger2ServiceDescriptionTest 
extends AbstractBus
 this.runAsFilter = runAsFilter;
 }
 
+@Override
 protected void run() {
 final JAXRSServerFactoryBean sf = new JAXRSServerFactoryBean();
 sf.setResourceClasses(BookStoreSwagger2.class);

http://git-wip-us.apache.org/repos/asf/cxf/blob/f49297cf/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/description/Swagger2NonAnnotatedServiceDescriptionTest.java
--
diff --git 
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/description/Swagger2NonAnnotatedServiceDescriptionTest.java
 
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/description/Swagger2NonAnnotatedServiceDescriptionTest.java
index f47af93..dd56fe2 100644
--- 
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/description/Swagger2NonAnnotatedServiceDescriptionTest.java
+++ 
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/description/Swagger2NonAnnotatedServiceDescriptionTest.java
@@ -77,6 +77,6 @@ public class Swagger2NonAnnotatedServiceDescriptionTest 
extends AbstractSwagger2
 
 @Override
 protected String getExpectedFileYaml() {
-return "swagger2-noano-json.txt";
+return "swagger2-noano-yaml.txt";
 }
 }

http://git-wip-us.apache.org/repos/asf/cxf/blob/f49297cf/systests/jaxrs/src/test/resources/org/apache/cxf/systest/jaxrs/description/swagger2-noano-yaml.txt
--
diff --git 
a/systests/jaxrs/src/test/resources/org/apache/cxf/systest/jaxrs/description/swagger2-noano-yaml.txt
 
b/systests/jaxrs/src/test/resources/org/apache/cxf/systest/jaxrs/description/swagger2-noano-yaml.txt
index 8bd33ee..5ef0eb4 100644
--- 
a/systests/jaxrs/src/test/resources/org/apache/cxf/systest/jaxrs/description/swagger2-noano-yaml.txt
+++ 
b/systests/jaxrs/src/test/resources/org/apache/cxf/systest/jaxrs/description/swagger2-noano-yaml.txt
@@ -29,12 +29,14 @@ paths:
   /bookstore/names:
 get:
   operationId: "getBookNames"
+  produces:
+  - "application/json"
   parameters:
   - name: "page"
 in: "query"
 required: false
 type: "integer"
-default: "1"
+default: 1
 format: "int32"
   responses:
 default:

http://git-wip-us.apache.org/repos/asf/cxf/blob/f49297cf/systests/jaxrs/src/test/resources/org/apache/cxf/systest/jaxrs/description/swagger2-yaml.txt
--
diff --git 
a/systests/jaxrs/src/test/resources/org/apache/cxf/systest/jaxrs/description/swagger2-yaml.txt
 
b/systests/jaxrs/src/test/resources/org/apache/cxf/systest/jaxrs/description/swagger2-yaml.txt
index 75c34d0..1947c41 100644
--- 
a/systests/jaxrs/src/test/resources/org/apache/cxf/systest/jaxrs/description/swagger2-yaml.txt
+++ 
b/systests/jaxrs/src/test/resources/org/apache/cxf/systest/jaxrs/description/swagger2-yaml.txt
@@ -29,7 +29,7 @@ paths:
 description: "Page

cxf git commit: Fixing Sagger2 systests

2016-03-19 Thread ilgrosso 
Repository: cxf
Updated Branches:
  refs/heads/master ea618d7af -> 4799fef82


Fixing Sagger2 systests


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

Branch: refs/heads/master
Commit: 4799fef822a96f5d1b2827d5cc42ab886fd4e673
Parents: ea618d7
Author: Francesco Chicchiriccò 
Authored: Fri Mar 18 15:51:13 2016 +0100
Committer: Francesco Chicchiriccò 
Committed: Fri Mar 18 17:14:29 2016 +0100

--
 .../AbstractSwagger2ServiceDescriptionTest.java |  1 +
 ...gger2NonAnnotatedServiceDescriptionTest.java |  2 +-
 .../systest/jaxrs/description/swagger2-json.txt |  2 +-
 .../jaxrs/description/swagger2-noano-yaml.txt   |  4 +-
 .../systest/jaxrs/description/swagger2-yaml.txt | 51 
 5 files changed, 37 insertions(+), 23 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/4799fef8/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 3332f47..bf4b168 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
@@ -55,6 +55,7 @@ public abstract class AbstractSwagger2ServiceDescriptionTest 
extends AbstractBus
 this.runAsFilter = runAsFilter;
 }
 
+@Override
 protected void run() {
 final JAXRSServerFactoryBean sf = new JAXRSServerFactoryBean();
 sf.setResourceClasses(BookStoreSwagger2.class);

http://git-wip-us.apache.org/repos/asf/cxf/blob/4799fef8/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/description/Swagger2NonAnnotatedServiceDescriptionTest.java
--
diff --git 
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/description/Swagger2NonAnnotatedServiceDescriptionTest.java
 
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/description/Swagger2NonAnnotatedServiceDescriptionTest.java
index f47af93..dd56fe2 100644
--- 
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/description/Swagger2NonAnnotatedServiceDescriptionTest.java
+++ 
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/description/Swagger2NonAnnotatedServiceDescriptionTest.java
@@ -77,6 +77,6 @@ public class Swagger2NonAnnotatedServiceDescriptionTest 
extends AbstractSwagger2
 
 @Override
 protected String getExpectedFileYaml() {
-return "swagger2-noano-json.txt";
+return "swagger2-noano-yaml.txt";
 }
 }

http://git-wip-us.apache.org/repos/asf/cxf/blob/4799fef8/systests/jaxrs/src/test/resources/org/apache/cxf/systest/jaxrs/description/swagger2-json.txt
--
diff --git 
a/systests/jaxrs/src/test/resources/org/apache/cxf/systest/jaxrs/description/swagger2-json.txt
 
b/systests/jaxrs/src/test/resources/org/apache/cxf/systest/jaxrs/description/swagger2-json.txt
index a1317de..0df74e4 100644
--- 
a/systests/jaxrs/src/test/resources/org/apache/cxf/systest/jaxrs/description/swagger2-json.txt
+++ 
b/systests/jaxrs/src/test/resources/org/apache/cxf/systest/jaxrs/description/swagger2-json.txt
@@ -1 +1 @@
-{"swagger":"2.0","info":{"description":"The 
Application","version":"1.0.0","title":"Sample REST 
Application","contact":{"name":"us...@cxf.apache.org"},"license":{"name":"Apache
 2.0 
License","url":"http://www.apache.org/licenses/LICENSE-2.0.html"}},"host":"localhost:%s","basePath":"/","tags":[{"name":"bookstore"}],"paths":{"/bookstore":{"get":{"tags":["bookstore"],"summary":"Get
 books","description":"Get 
books","operationId":"getBooks","produces":["application/json"],"parameters":[{"name":"page","in":"query","description":"Page
 to 
fetch","required":true,"type":"integer","default":1,"format":"int32"}],"responses":{"200":{"description":"successful
 
operation","schema":{"type":"array","items":{"$ref":"#/definitions/Book"}},"/bookstore/{id}":{"get":{"tags":["bookstore"],"summary":"Get
 book by Id","description":"Get book by 
Id","operationId":"getBook","produces":["application/json"],"parameters":[{"name":"id","in":"path","description":"id","required":true,"type":"integer","format":"int

cxf git commit: Fixing Sagger2 systests

2016-03-19 Thread ilgrosso 
Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes 5d0ac9e12 -> e3ce885aa


Fixing Sagger2 systests


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

Branch: refs/heads/3.1.x-fixes
Commit: e3ce885aaf241dee8c163568199adc4b6aa51805
Parents: 5d0ac9e
Author: Francesco Chicchiriccò 
Authored: Fri Mar 18 15:51:13 2016 +0100
Committer: Francesco Chicchiriccò 
Committed: Fri Mar 18 17:15:10 2016 +0100

--
 .../AbstractSwagger2ServiceDescriptionTest.java |  1 +
 ...gger2NonAnnotatedServiceDescriptionTest.java |  2 +-
 .../jaxrs/description/swagger2-noano-yaml.txt   |  4 ++-
 .../systest/jaxrs/description/swagger2-yaml.txt | 33 ++--
 4 files changed, 36 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/e3ce885a/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 3332f47..bf4b168 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
@@ -55,6 +55,7 @@ public abstract class AbstractSwagger2ServiceDescriptionTest 
extends AbstractBus
 this.runAsFilter = runAsFilter;
 }
 
+@Override
 protected void run() {
 final JAXRSServerFactoryBean sf = new JAXRSServerFactoryBean();
 sf.setResourceClasses(BookStoreSwagger2.class);

http://git-wip-us.apache.org/repos/asf/cxf/blob/e3ce885a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/description/Swagger2NonAnnotatedServiceDescriptionTest.java
--
diff --git 
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/description/Swagger2NonAnnotatedServiceDescriptionTest.java
 
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/description/Swagger2NonAnnotatedServiceDescriptionTest.java
index f47af93..dd56fe2 100644
--- 
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/description/Swagger2NonAnnotatedServiceDescriptionTest.java
+++ 
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/description/Swagger2NonAnnotatedServiceDescriptionTest.java
@@ -77,6 +77,6 @@ public class Swagger2NonAnnotatedServiceDescriptionTest 
extends AbstractSwagger2
 
 @Override
 protected String getExpectedFileYaml() {
-return "swagger2-noano-json.txt";
+return "swagger2-noano-yaml.txt";
 }
 }

http://git-wip-us.apache.org/repos/asf/cxf/blob/e3ce885a/systests/jaxrs/src/test/resources/org/apache/cxf/systest/jaxrs/description/swagger2-noano-yaml.txt
--
diff --git 
a/systests/jaxrs/src/test/resources/org/apache/cxf/systest/jaxrs/description/swagger2-noano-yaml.txt
 
b/systests/jaxrs/src/test/resources/org/apache/cxf/systest/jaxrs/description/swagger2-noano-yaml.txt
index 8bd33ee..5ef0eb4 100644
--- 
a/systests/jaxrs/src/test/resources/org/apache/cxf/systest/jaxrs/description/swagger2-noano-yaml.txt
+++ 
b/systests/jaxrs/src/test/resources/org/apache/cxf/systest/jaxrs/description/swagger2-noano-yaml.txt
@@ -29,12 +29,14 @@ paths:
   /bookstore/names:
 get:
   operationId: "getBookNames"
+  produces:
+  - "application/json"
   parameters:
   - name: "page"
 in: "query"
 required: false
 type: "integer"
-default: "1"
+default: 1
 format: "int32"
   responses:
 default:

http://git-wip-us.apache.org/repos/asf/cxf/blob/e3ce885a/systests/jaxrs/src/test/resources/org/apache/cxf/systest/jaxrs/description/swagger2-yaml.txt
--
diff --git 
a/systests/jaxrs/src/test/resources/org/apache/cxf/systest/jaxrs/description/swagger2-yaml.txt
 
b/systests/jaxrs/src/test/resources/org/apache/cxf/systest/jaxrs/description/swagger2-yaml.txt
index 75c34d0..1947c41 100644
--- 
a/systests/jaxrs/src/test/resources/org/apache/cxf/systest/jaxrs/description/swagger2-yaml.txt
+++ 
b/systests/jaxrs/src/test/resources/org/apache/cxf/systest/jaxrs/description/swagger2-yaml.txt
@@ -29,7 +29,7 @@ paths:
 description: "Page