[cxf] branch 3.3.x-fixes updated: CXF-8094 Register additional classes for WADL (#575)
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 3.3.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/3.3.x-fixes by this push:
new 4395aa2 CXF-8094 Register additional classes for WADL (#575)
4395aa2 is described below
commit 4395aa2a1727d1d935f65b01184b4c5e94d3d046
Author: Yury Molchan
AuthorDate: Wed Aug 28 14:12:14 2019 +0300
CXF-8094 Register additional classes for WADL (#575)
* CXF-8094 Register additional classes for WADL
It is useful in case when classes are provided by 3rd party and cannot be
annotated by @XmlSeeAlso.
* CXF-8094 Simplify code
* Missprint
---
.../java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java | 13 -
1 file changed, 12 insertions(+), 1 deletion(-)
diff --git
a/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
b/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
index 98d9e7d..ab23ff1 100644
---
a/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
+++
b/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
@@ -200,6 +200,8 @@ public class WadlGenerator implements
ContainerRequestFilter {
private ResourceIdGenerator idGenerator;
private Map jaxbContextProperties;
+private List> extraClasses = Collections.emptyList();
+
public WadlGenerator() {
}
@@ -208,6 +210,15 @@ public class WadlGenerator implements
ContainerRequestFilter {
this.bus.setProperty("wadl.service.description.available", "true");
}
+/**
+ * The list of classes which should be added to the generated scheme also.
+ */
+public void setExtraClasses(List> extraClasses) {
+if (extraClasses != null) {
+this.extraClasses = extraClasses;
+}
+}
+
@Override
public void filter(ContainerRequestContext context) {
Message m = JAXRSUtils.getCurrentMessage();
@@ -491,7 +502,7 @@ public class WadlGenerator implements
ContainerRequestFilter {
if (!this.useJaxbContextForQnames) {
return;
}
-List> extraClasses = new LinkedList<>();
+List> extraClasses = new LinkedList<>(this.extraClasses);
for (Class cls : resourceTypes.getAllTypes().keySet()) {
if (!isXmlRoot(cls) || Modifier.isAbstract(cls.getModifiers())) {
XmlSeeAlso seeAlsoAnn = cls.getAnnotation(XmlSeeAlso.class);
[cxf] branch master updated: CXF-8094 Register additional classes for WADL (#575)
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/master by this push:
new b779018 CXF-8094 Register additional classes for WADL (#575)
b779018 is described below
commit b7790182d73bfd099688f64394f48ff82bf5aa10
Author: Yury Molchan
AuthorDate: Wed Aug 28 14:12:14 2019 +0300
CXF-8094 Register additional classes for WADL (#575)
* CXF-8094 Register additional classes for WADL
It is useful in case when classes are provided by 3rd party and cannot be
annotated by @XmlSeeAlso.
* CXF-8094 Simplify code
* Missprint
---
.../java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java | 13 -
1 file changed, 12 insertions(+), 1 deletion(-)
diff --git
a/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
b/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
index 98d9e7d..ab23ff1 100644
---
a/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
+++
b/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
@@ -200,6 +200,8 @@ public class WadlGenerator implements
ContainerRequestFilter {
private ResourceIdGenerator idGenerator;
private Map jaxbContextProperties;
+private List> extraClasses = Collections.emptyList();
+
public WadlGenerator() {
}
@@ -208,6 +210,15 @@ public class WadlGenerator implements
ContainerRequestFilter {
this.bus.setProperty("wadl.service.description.available", "true");
}
+/**
+ * The list of classes which should be added to the generated scheme also.
+ */
+public void setExtraClasses(List> extraClasses) {
+if (extraClasses != null) {
+this.extraClasses = extraClasses;
+}
+}
+
@Override
public void filter(ContainerRequestContext context) {
Message m = JAXRSUtils.getCurrentMessage();
@@ -491,7 +502,7 @@ public class WadlGenerator implements
ContainerRequestFilter {
if (!this.useJaxbContextForQnames) {
return;
}
-List> extraClasses = new LinkedList<>();
+List> extraClasses = new LinkedList<>(this.extraClasses);
for (Class cls : resourceTypes.getAllTypes().keySet()) {
if (!isXmlRoot(cls) || Modifier.isAbstract(cls.getModifiers())) {
XmlSeeAlso seeAlsoAnn = cls.getAnnotation(XmlSeeAlso.class);
[cxf] branch master updated: CXF-8101 - Build fails behind maven proxy repository
This is an automated email from the ASF dual-hosted git repository. coheigea pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/cxf.git The following commit(s) were added to refs/heads/master by this push: new 5c7e20e CXF-8101 - Build fails behind maven proxy repository 5c7e20e is described below commit 5c7e20e8a6bf7fa5bc2f160b4e3497c73b66af39 Author: Colm O hEigeartaigh AuthorDate: Wed Aug 28 12:28:03 2019 +0100 CXF-8101 - Build fails behind maven proxy repository --- rt/transports/jms/pom.xml | 6 ++ systests/transport-jms/pom.xml | 6 ++ systests/uncategorized/pom.xml | 6 ++ 3 files changed, 18 insertions(+) diff --git a/rt/transports/jms/pom.xml b/rt/transports/jms/pom.xml index 10b0bdc..eb5c9eb 100644 --- a/rt/transports/jms/pom.xml +++ b/rt/transports/jms/pom.xml @@ -105,6 +105,12 @@ org.apache.activemq activemq-pool test + + +org.apache.geronimo.specs +geronimo-jta_1.0.1B_spec + + org.apache.activemq diff --git a/systests/transport-jms/pom.xml b/systests/transport-jms/pom.xml index 01733ed..ba650bc 100644 --- a/systests/transport-jms/pom.xml +++ b/systests/transport-jms/pom.xml @@ -228,6 +228,12 @@ org.apache.activemq activemq-pool test + + +org.apache.geronimo.specs +geronimo-jta_1.0.1B_spec + + org.apache.activemq diff --git a/systests/uncategorized/pom.xml b/systests/uncategorized/pom.xml index 2dd8094..b9dbe35 100644 --- a/systests/uncategorized/pom.xml +++ b/systests/uncategorized/pom.xml @@ -308,6 +308,12 @@ org.apache.activemq activemq-pool test + + +org.apache.geronimo.specs +geronimo-jta_1.0.1B_spec + + org.apache.activemq
[cxf] branch 3.2.x-fixes updated: Recording .gitmergeinfo Changes
This is an automated email from the ASF dual-hosted git repository. coheigea pushed a commit to branch 3.2.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf.git The following commit(s) were added to refs/heads/3.2.x-fixes by this push: new 60205b2 Recording .gitmergeinfo Changes 60205b2 is described below commit 60205b2452bbe4ea057b18a77695d79407c50b45 Author: Colm O hEigeartaigh AuthorDate: Wed Aug 28 12:29:08 2019 +0100 Recording .gitmergeinfo Changes --- .gitmergeinfo | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitmergeinfo b/.gitmergeinfo index a1ce095..791520f 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -631,6 +631,7 @@ B f8c59c182755eaa3570831916718d69f5eed1efb B fa3c4d45a9891bc17882cf43a5ef8653f1659da0 B fa5387c54e7a2600cc437e6cf9834256a2af1286 B fba2a61edbe1f0410b1818a3e8891e47ae164659 +B fbddcb6811692fab89a183cf81746c0c94f94ab5 B fc656dc1311963f5fc833856984b36b7ccd26042 B fc89f35c1f80863d8500eef359ba6259fac49e44 B fd6478bcbde370ce969e3def03a57f194568ef6a
[cxf] branch 3.3.x-fixes updated: CXF-8101 - Build fails behind maven proxy repository
This is an automated email from the ASF dual-hosted git repository. coheigea pushed a commit to branch 3.3.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf.git The following commit(s) were added to refs/heads/3.3.x-fixes by this push: new fbddcb6 CXF-8101 - Build fails behind maven proxy repository fbddcb6 is described below commit fbddcb6811692fab89a183cf81746c0c94f94ab5 Author: Colm O hEigeartaigh AuthorDate: Wed Aug 28 12:28:03 2019 +0100 CXF-8101 - Build fails behind maven proxy repository (cherry picked from commit 5c7e20e8a6bf7fa5bc2f160b4e3497c73b66af39) --- rt/transports/jms/pom.xml | 6 ++ systests/transport-jms/pom.xml | 6 ++ systests/uncategorized/pom.xml | 6 ++ 3 files changed, 18 insertions(+) diff --git a/rt/transports/jms/pom.xml b/rt/transports/jms/pom.xml index d10ef48..ebd7ae7 100644 --- a/rt/transports/jms/pom.xml +++ b/rt/transports/jms/pom.xml @@ -105,6 +105,12 @@ org.apache.activemq activemq-pool test + + +org.apache.geronimo.specs +geronimo-jta_1.0.1B_spec + + org.apache.activemq diff --git a/systests/transport-jms/pom.xml b/systests/transport-jms/pom.xml index 67eed92..6ece7b8 100644 --- a/systests/transport-jms/pom.xml +++ b/systests/transport-jms/pom.xml @@ -228,6 +228,12 @@ org.apache.activemq activemq-pool test + + +org.apache.geronimo.specs +geronimo-jta_1.0.1B_spec + + org.apache.activemq diff --git a/systests/uncategorized/pom.xml b/systests/uncategorized/pom.xml index 7981f44..22643d3 100644 --- a/systests/uncategorized/pom.xml +++ b/systests/uncategorized/pom.xml @@ -308,6 +308,12 @@ org.apache.activemq activemq-pool test + + +org.apache.geronimo.specs +geronimo-jta_1.0.1B_spec + + org.apache.activemq
[cxf] branch 3.2.x-fixes updated: CXF-8094 Register additional classes for WADL (#575)
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 3.2.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/3.2.x-fixes by this push:
new b5f360f CXF-8094 Register additional classes for WADL (#575)
b5f360f is described below
commit b5f360fb8591c3dc3c27d342892ebbca1f30ef1f
Author: Yury Molchan
AuthorDate: Wed Aug 28 14:12:14 2019 +0300
CXF-8094 Register additional classes for WADL (#575)
* CXF-8094 Register additional classes for WADL
It is useful in case when classes are provided by 3rd party and cannot be
annotated by @XmlSeeAlso.
* CXF-8094 Simplify code
* Missprint
---
.../java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java | 13 -
1 file changed, 12 insertions(+), 1 deletion(-)
diff --git
a/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
b/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
index 6358a2f..7f047c3 100644
---
a/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
+++
b/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
@@ -200,6 +200,8 @@ public class WadlGenerator implements
ContainerRequestFilter {
private ResourceIdGenerator idGenerator;
private Map jaxbContextProperties;
+private List> extraClasses = Collections.emptyList();
+
public WadlGenerator() {
}
@@ -208,6 +210,15 @@ public class WadlGenerator implements
ContainerRequestFilter {
this.bus.setProperty("wadl.service.description.available", "true");
}
+/**
+ * The list of classes which should be added to the generated scheme also.
+ */
+public void setExtraClasses(List> extraClasses) {
+if (extraClasses != null) {
+this.extraClasses = extraClasses;
+}
+}
+
@Override
public void filter(ContainerRequestContext context) {
Message m = JAXRSUtils.getCurrentMessage();
@@ -490,7 +501,7 @@ public class WadlGenerator implements
ContainerRequestFilter {
if (!this.useJaxbContextForQnames) {
return;
}
-List> extraClasses = new LinkedList<>();
+List> extraClasses = new LinkedList<>(this.extraClasses);
for (Class cls : resourceTypes.getAllTypes().keySet()) {
if (!isXmlRoot(cls) || Modifier.isAbstract(cls.getModifiers())) {
XmlSeeAlso seeAlsoAnn = cls.getAnnotation(XmlSeeAlso.class);
[cxf] branch 3.3.x-fixes updated: Fixing checksyle issue
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 3.3.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/3.3.x-fixes by this push:
new d011972 Fixing checksyle issue
d011972 is described below
commit d011972b2bc776380d74739e5cccd73aa322a9b8
Author: reta
AuthorDate: Wed Aug 28 09:47:09 2019 -0400
Fixing checksyle issue
(cherry picked from commit 5e6f22d91acbc8ca2d89ee79033af02c98003e6a)
---
.../main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java| 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git
a/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
b/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
index ab23ff1..90e1aca 100644
---
a/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
+++
b/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
@@ -502,7 +502,7 @@ public class WadlGenerator implements
ContainerRequestFilter {
if (!this.useJaxbContextForQnames) {
return;
}
-List> extraClasses = new LinkedList<>(this.extraClasses);
+List> extra = new LinkedList<>(extraClasses);
for (Class cls : resourceTypes.getAllTypes().keySet()) {
if (!isXmlRoot(cls) || Modifier.isAbstract(cls.getModifiers())) {
XmlSeeAlso seeAlsoAnn = cls.getAnnotation(XmlSeeAlso.class);
@@ -513,11 +513,11 @@ public class WadlGenerator implements
ContainerRequestFilter {
resourceTypes.getSubstitutions().put(seeAlsoCls,
cls);
}
}
-extraClasses.addAll(seeAlsoList);
+extra.addAll(seeAlsoList);
}
}
}
-for (Class cls : extraClasses) {
+for (Class cls : extra) {
resourceTypes.getAllTypes().put(cls, cls);
}
}
[cxf] branch 3.2.x-fixes updated: Fixing checksyle issue
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 3.2.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/3.2.x-fixes by this push:
new 1b11e2a Fixing checksyle issue
1b11e2a is described below
commit 1b11e2af514c3b54da66b91c1a3dd9efdbfa0d27
Author: reta
AuthorDate: Wed Aug 28 09:47:09 2019 -0400
Fixing checksyle issue
(cherry picked from commit 5e6f22d91acbc8ca2d89ee79033af02c98003e6a)
(cherry picked from commit d011972b2bc776380d74739e5cccd73aa322a9b8)
---
.../main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java| 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git
a/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
b/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
index 7f047c3..cf6bff1 100644
---
a/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
+++
b/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
@@ -501,7 +501,7 @@ public class WadlGenerator implements
ContainerRequestFilter {
if (!this.useJaxbContextForQnames) {
return;
}
-List> extraClasses = new LinkedList<>(this.extraClasses);
+List> extra = new LinkedList<>(extraClasses);
for (Class cls : resourceTypes.getAllTypes().keySet()) {
if (!isXmlRoot(cls) || Modifier.isAbstract(cls.getModifiers())) {
XmlSeeAlso seeAlsoAnn = cls.getAnnotation(XmlSeeAlso.class);
@@ -512,11 +512,11 @@ public class WadlGenerator implements
ContainerRequestFilter {
resourceTypes.getSubstitutions().put(seeAlsoCls,
cls);
}
}
-extraClasses.addAll(seeAlsoList);
+extra.addAll(seeAlsoList);
}
}
}
-for (Class cls : extraClasses) {
+for (Class cls : extra) {
resourceTypes.getAllTypes().put(cls, cls);
}
}
[cxf] branch master updated: Fixing checksyle issue
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/master by this push:
new 5e6f22d Fixing checksyle issue
5e6f22d is described below
commit 5e6f22d91acbc8ca2d89ee79033af02c98003e6a
Author: reta
AuthorDate: Wed Aug 28 09:47:09 2019 -0400
Fixing checksyle issue
---
.../main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java| 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git
a/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
b/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
index ab23ff1..90e1aca 100644
---
a/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
+++
b/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
@@ -502,7 +502,7 @@ public class WadlGenerator implements
ContainerRequestFilter {
if (!this.useJaxbContextForQnames) {
return;
}
-List> extraClasses = new LinkedList<>(this.extraClasses);
+List> extra = new LinkedList<>(extraClasses);
for (Class cls : resourceTypes.getAllTypes().keySet()) {
if (!isXmlRoot(cls) || Modifier.isAbstract(cls.getModifiers())) {
XmlSeeAlso seeAlsoAnn = cls.getAnnotation(XmlSeeAlso.class);
@@ -513,11 +513,11 @@ public class WadlGenerator implements
ContainerRequestFilter {
resourceTypes.getSubstitutions().put(seeAlsoCls,
cls);
}
}
-extraClasses.addAll(seeAlsoList);
+extra.addAll(seeAlsoList);
}
}
}
-for (Class cls : extraClasses) {
+for (Class cls : extra) {
resourceTypes.getAllTypes().put(cls, cls);
}
}
buildbot failure in on cxf-site-production
The Buildbot has detected a new failure on builder cxf-site-production while building . Full details are available at: https://ci.apache.org/builders/cxf-site-production/builds/34851 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: bb-cms-slave Build Reason: The Nightly scheduler named 'cxf-site-production' triggered this build Build Source Stamp: [branch cxf/web] HEAD Blamelist: BUILD FAILED: failed compile Sincerely, -The Buildbot
buildbot success in on cxf-site-production
The Buildbot has detected a restored build on builder cxf-site-production while building . Full details are available at: https://ci.apache.org/builders/cxf-site-production/builds/34852 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: bb-cms-slave Build Reason: The Nightly scheduler named 'cxf-site-production' triggered this build Build Source Stamp: [branch cxf/web] HEAD Blamelist: Build succeeded! Sincerely, -The Buildbot
