You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2016/03/08 17:15:22 UTC
[1/6] cxf git commit: Fix some eclipse errors/warnings
Repository: cxf
Updated Branches:
refs/heads/3.1.x-fixes 283406f23 -> 04932cc6e
Fix some eclipse errors/warnings
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/40e31a9f
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/40e31a9f
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/40e31a9f
Branch: refs/heads/3.1.x-fixes
Commit: 40e31a9f14bb9e494c9240463e17ed232e201876
Parents: 0cdd2c0
Author: Daniel Kulp <dk...@apache.org>
Authored: Thu Feb 25 15:52:01 2016 -0500
Committer: Daniel Kulp <dk...@apache.org>
Committed: Tue Mar 8 11:15:15 2016 -0500
----------------------------------------------------------------------
.../src/test/java/org/apache/cxf/ws/rm/RMOutInterceptorTest.java | 4 ++--
.../org/apache/cxf/sts/rest/RESTSecurityTokenServiceImpl.java | 2 +-
.../test/java/org/apache/cxf/systest/jaxrs/AsyncResource.java | 2 +-
.../org/apache/cxf/jaxrs/servlet/jetty/AbstractJettyServer.java | 2 +-
.../test/java/org/apache/cxf/systest/http/HTTPConduitTest.java | 2 +-
.../org/apache/cxf/systest/https/conduit/HTTPSConduitTest.java | 2 +-
6 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/40e31a9f/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMOutInterceptorTest.java
----------------------------------------------------------------------
diff --git a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMOutInterceptorTest.java b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMOutInterceptorTest.java
index bb65576..d83a57e 100644
--- a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMOutInterceptorTest.java
+++ b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMOutInterceptorTest.java
@@ -50,7 +50,7 @@ public class RMOutInterceptorTest extends Assert {
@Test
public void testHandleRuntimeFault() throws NoSuchMethodException, SequenceFault, RMException {
- Method[] mocked = new Method[] {
+ Method[] mocked = new Method[] {
RMOutInterceptor.class.getDeclaredMethod("isRuntimeFault", new Class[] {Message.class})
};
RMOutInterceptor interceptor =
@@ -65,7 +65,7 @@ public class RMOutInterceptorTest extends Assert {
@Test
public void testHandleNoMAPs() throws NoSuchMethodException, SequenceFault, RMException {
- Method[] mocked = new Method[] {
+ Method[] mocked = new Method[] {
RMOutInterceptor.class.getDeclaredMethod("isRuntimeFault", new Class[] {Message.class})
};
RMOutInterceptor interceptor =
http://git-wip-us.apache.org/repos/asf/cxf/blob/40e31a9f/services/sts/sts-core/src/main/java/org/apache/cxf/sts/rest/RESTSecurityTokenServiceImpl.java
----------------------------------------------------------------------
diff --git a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/rest/RESTSecurityTokenServiceImpl.java b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/rest/RESTSecurityTokenServiceImpl.java
index 631e8fc..cdeffcb 100644
--- a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/rest/RESTSecurityTokenServiceImpl.java
+++ b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/rest/RESTSecurityTokenServiceImpl.java
@@ -414,7 +414,7 @@ public class RESTSecurityTokenServiceImpl extends SecurityTokenServiceImpl imple
private static class JSONWrapper {
private String token;
- public JSONWrapper(String token) {
+ JSONWrapper(String token) {
this.token = token;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/40e31a9f/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/AsyncResource.java
----------------------------------------------------------------------
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/AsyncResource.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/AsyncResource.java
index 13856c4..a2c66c6 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/AsyncResource.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/AsyncResource.java
@@ -39,7 +39,7 @@ public class AsyncResource {
public static final String FALSE = "A method returned false";
public static final String TRUE = "A method return true";
- private static final AsyncResponseQueue[] ASYNC_RESPONSES = {
+ private static final AsyncResponseQueue[] ASYNC_RESPONSES = {
new AsyncResponseQueue(), new AsyncResponseQueue(), new AsyncResponseQueue() };
@GET
http://git-wip-us.apache.org/repos/asf/cxf/blob/40e31a9f/systests/rs-http-sci/src/test/java/org/apache/cxf/jaxrs/servlet/jetty/AbstractJettyServer.java
----------------------------------------------------------------------
diff --git a/systests/rs-http-sci/src/test/java/org/apache/cxf/jaxrs/servlet/jetty/AbstractJettyServer.java b/systests/rs-http-sci/src/test/java/org/apache/cxf/jaxrs/servlet/jetty/AbstractJettyServer.java
index 4f8517d..66b991d 100644
--- a/systests/rs-http-sci/src/test/java/org/apache/cxf/jaxrs/servlet/jetty/AbstractJettyServer.java
+++ b/systests/rs-http-sci/src/test/java/org/apache/cxf/jaxrs/servlet/jetty/AbstractJettyServer.java
@@ -46,7 +46,7 @@ public abstract class AbstractJettyServer extends AbstractBusTestServerBase {
final WebAppContext context = new WebAppContext();
context.setContextPath(contextPath);
- context.setConfigurations(new Configuration[] {
+ context.setConfigurations(new Configuration[] {
new WebXmlConfiguration(),
new AnnotationConfiguration()
});
http://git-wip-us.apache.org/repos/asf/cxf/blob/40e31a9f/systests/transports/src/test/java/org/apache/cxf/systest/http/HTTPConduitTest.java
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/http/HTTPConduitTest.java b/systests/transports/src/test/java/org/apache/cxf/systest/http/HTTPConduitTest.java
index bd35ade..c15b51c 100644
--- a/systests/transports/src/test/java/org/apache/cxf/systest/http/HTTPConduitTest.java
+++ b/systests/transports/src/test/java/org/apache/cxf/systest/http/HTTPConduitTest.java
@@ -114,7 +114,7 @@ public class HTTPConduitTest extends AbstractBusClientServerTestBase {
BusFactory.setDefaultBus(null);
BusFactory.setThreadDefaultBus(null);
boolean server = launchServer(Server.class, null,
- new String[] {
+ new String[] {
name,
addrMap.get(name),
serverC.toString() },
http://git-wip-us.apache.org/repos/asf/cxf/blob/40e31a9f/systests/transports/src/test/java/org/apache/cxf/systest/https/conduit/HTTPSConduitTest.java
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/https/conduit/HTTPSConduitTest.java b/systests/transports/src/test/java/org/apache/cxf/systest/https/conduit/HTTPSConduitTest.java
index 2f68449..2a9ffbb 100644
--- a/systests/transports/src/test/java/org/apache/cxf/systest/https/conduit/HTTPSConduitTest.java
+++ b/systests/transports/src/test/java/org/apache/cxf/systest/https/conduit/HTTPSConduitTest.java
@@ -171,7 +171,7 @@ public class HTTPSConduitTest extends AbstractBusClientServerTestBase {
BusFactory.setDefaultBus(null);
BusFactory.setThreadDefaultBus(null);
boolean server = launchServer(Server.class, null,
- new String[] {
+ new String[] {
name,
addrMap.get(name),
serverC.toString() },
[6/6] cxf git commit: Fix warnings in eclipse
Posted by dk...@apache.org.
Fix warnings in eclipse
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/411dff10
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/411dff10
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/411dff10
Branch: refs/heads/3.1.x-fixes
Commit: 411dff107d089001ffa836bc196f91ab873f76cf
Parents: 40e31a9
Author: Daniel Kulp <dk...@apache.org>
Authored: Fri Feb 26 10:41:56 2016 -0500
Committer: Daniel Kulp <dk...@apache.org>
Committed: Tue Mar 8 11:15:16 2016 -0500
----------------------------------------------------------------------
.../interceptors/WebFaultOutInterceptorTestCase.java | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/411dff10/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/interceptors/WebFaultOutInterceptorTestCase.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/interceptors/WebFaultOutInterceptorTestCase.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/interceptors/WebFaultOutInterceptorTestCase.java
index de769b1..63003ea 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/interceptors/WebFaultOutInterceptorTestCase.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/interceptors/WebFaultOutInterceptorTestCase.java
@@ -49,22 +49,16 @@ import org.junit.Assert;
import org.junit.Test;
/**
- * Test case for https://bugzilla.redhat.com/show_bug.cgi?id=1177704
- *
- * Scenario:
- *
* Let WebFaultOutInterceptor process a message containing a SoapFault.
*
* If SoapFault's exception or its' cause is instance of SOAPFaultException, values of SOAPFaultException.subCodes
* should be copied to SoapFault.subCodes.
- *
- * @author Tomas Hofman (thofman@redhat.com)
*/
public class WebFaultOutInterceptorTestCase {
private static final QName CODE = new QName("ns", "code");
private static final QName SUBCODE = new QName("ns", "subcode");
- private static final List SUBCODES = Collections.singletonList(SUBCODE);
+ private static final List<QName> SUBCODES = Collections.singletonList(SUBCODE);
private WebFaultOutInterceptor interceptor = new WebFaultOutInterceptor();
@@ -78,6 +72,9 @@ public class WebFaultOutInterceptorTestCase {
interceptor.handleMessage(message);
+
+
+
Assert.assertNotNull(soapFault.getSubCodes());
Assert.assertEquals(1, soapFault.getSubCodes().size());
Assert.assertEquals(SUBCODE, soapFault.getSubCodes().get(0));
@@ -133,6 +130,7 @@ public class WebFaultOutInterceptorTestCase {
return message;
}
+ @SuppressWarnings("rawtypes") // old SAAJ API doesn't have generics
private class SOAPFaultStub implements SOAPFault {
@Override
@@ -161,7 +159,7 @@ public class WebFaultOutInterceptorTestCase {
}
@Override
- public Iterator getFaultSubcodes() {
+ public Iterator<QName> getFaultSubcodes() {
return SUBCODES.iterator();
}
[3/6] cxf git commit: [CXF-6818] Upgrade to latest Jetty8
8.1.19.v20160209 This closes #117
Posted by dk...@apache.org.
[CXF-6818] Upgrade to latest Jetty8 8.1.19.v20160209
This closes #117
# Conflicts:
# parent/pom.xml
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/3e648504
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/3e648504
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/3e648504
Branch: refs/heads/3.1.x-fixes
Commit: 3e648504409d9fbe56a92b62a7b0f581211ef7f2
Parents: 411dff1
Author: Andrea Cosentino <an...@gmail.com>
Authored: Fri Mar 4 09:54:53 2016 +0100
Committer: Daniel Kulp <dk...@apache.org>
Committed: Tue Mar 8 11:15:16 2016 -0500
----------------------------------------------------------------------
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/3e648504/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 042bc5c..bcaa53a 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -114,7 +114,7 @@
<cxf.joda.time.version>2.7</cxf.joda.time.version>
<cxf.jdom.version>1.0</cxf.jdom.version>
<cxf.jettison.version>1.3.7</cxf.jettison.version>
- <cxf.jetty8.version>8.1.17.v20150415</cxf.jetty8.version>
+ <cxf.jetty8.version>8.1.19.v20160209</cxf.jetty8.version>
<cxf.jetty9.version>9.2.11.v20150529</cxf.jetty9.version>
<cxf.jetty.version>${cxf.jetty9.version}</cxf.jetty.version>
<cxf.jetty.osgi.version>[8.1,10)</cxf.jetty.osgi.version>
[4/6] cxf git commit: [CXF-6783],
WSDL-generation: don't create anonymous top-level types This closes
#110 This closes #109
Posted by dk...@apache.org.
[CXF-6783], WSDL-generation: don't create anonymous top-level types
This closes #110
This closes #109
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/5cd57eb1
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/5cd57eb1
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/5cd57eb1
Branch: refs/heads/3.1.x-fixes
Commit: 5cd57eb14d0e5e5166234fb0015648d295132ff2
Parents: 3e64850
Author: Barnabas Bodnar <ba...@ser.de>
Authored: Thu Feb 18 17:52:15 2016 +0100
Committer: Daniel Kulp <dk...@apache.org>
Committed: Tue Mar 8 11:15:16 2016 -0500
----------------------------------------------------------------------
.../cxf/wsdl/service/factory/ReflectionServiceFactoryBean.java | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/5cd57eb1/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/ReflectionServiceFactoryBean.java
----------------------------------------------------------------------
diff --git a/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/ReflectionServiceFactoryBean.java b/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/ReflectionServiceFactoryBean.java
index f3cc641..1c65fac 100644
--- a/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/ReflectionServiceFactoryBean.java
+++ b/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/ReflectionServiceFactoryBean.java
@@ -1297,9 +1297,11 @@ public class ReflectionServiceFactoryBean extends org.apache.cxf.service.factory
wrappedMessage.getFirstMessagePart().setXmlSchema(el);
- XmlSchemaComplexType ct = new XmlSchemaComplexType(schema, true);
+ boolean anonymousType = isAnonymousWrapperTypes();
+ XmlSchemaComplexType ct = new XmlSchemaComplexType(schema,
+ /*CXF-6783: don't create anonymous top-level types*/!anonymousType);
- if (!isAnonymousWrapperTypes()) {
+ if (!anonymousType) {
ct.setName(wrapperName.getLocalPart());
el.setSchemaTypeName(wrapperName);
}
[5/6] cxf git commit: Recording .gitmergeinfo Changes
Posted by dk...@apache.org.
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/04932cc6
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/04932cc6
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/04932cc6
Branch: refs/heads/3.1.x-fixes
Commit: 04932cc6e66a6bca0ae25f2bf68e97f6241736eb
Parents: 5cd57eb
Author: Daniel Kulp <dk...@apache.org>
Authored: Tue Mar 8 10:40:42 2016 -0500
Committer: Daniel Kulp <dk...@apache.org>
Committed: Tue Mar 8 11:15:16 2016 -0500
----------------------------------------------------------------------
.gitmergeinfo | 10 ++++++++++
1 file changed, 10 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/04932cc6/.gitmergeinfo
----------------------------------------------------------------------
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 192e70b..889afbb 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -5,12 +5,14 @@ B 0336a2399b1980e04372c651368f8718f75a4f14
B 0d4cd0bbcaa6a4f80552d6b38f2a5e721ab20de9
B 0dfaf8d72574511ad9027c663707f9e30b945fbc
B 111d52fd4b92d0222af9bf1c22156145ea01ed01
+B 22755d26ec2f6255004f57deec711ee68ce11d6c
B 248c8f0458ce938a65c35006d484c6a4610cde1b
B 304c62a11b8dbe000cdfb5de857619703bca79f7
B 343d06d94838cd26f682f7afbcea0e422aa1597d
B 39851b83af116611ce0efe70c4b9a32ee8491523
B 3b2f2ed2db01f05fa9b648693ce33978ccc8ede8
B 47a431412dbd7669d89a70d6fed49053e70dfed1
+B 4f1afbf76d3e525163663b71104ce2adb9cb7a85
B 53a46205871434d8c47ed45822e078e5ad6d2c60
B 59b8615053ddcad353fbebcd9a5b1109ae0897a1
B 65e1e07fdb810ec9de135530ca3e3d23821836a3
@@ -23,6 +25,7 @@ B 85c397f853c6b7ca0ed6d924445d6173962e1ec4
B 8a4e85b24d6d5b438ceb28257c53773d46b5816d
B 8b92fe57dd9a661dab382da7d556b1972f513a93
B 8f98be8e72d4dbe18347a7efab91f4b008d8385f
+B 9b6666816a21d8b85cc051be59a8ab6e968c5d0d
B a219766354d6aee53c7f7a4da91f434af552b437
B a261507ebd3104b1a00298801ec9815ed1e7a728
B a7362dfaf2141cb4f303f81bbb94c6df81be75cb
@@ -30,13 +33,18 @@ B ab05d4ee361670d3c251712f5819a0f0b7e114d6
B bceee342b32f3704ca75176d06067f90c6d3fbdc
B befeb0484cb195cbcd6163f65c54a94ba26d8335
B c1eaf69cb16583f672ddef646dcd7a52cfa23b5d
+B c63f06f3782148373912c1e4dc86de0d0c312229
B ced98c6e937bd93f92dac9043fa0406c696bfd84
B cf9ab27a843df4532d9bd78209aebcafee2ffffc
B d26570e26de80d0e0c6870ae5d959bfc8c0d19e4
+B e1c60863ac10b56d423613c7d3d2f45c7ce18e14
+B e61a83d4ac18fc760fc5d4bc8fb19d6072aaac52
+B e6f0722615190861192972a51b3986b34efd1f0e
B ec3103f88b20fc05e92994b6a06b65b4a91dd75a
B efb1f0830f5441777198737fb26e9305ab969f66
B f0e08b7bea2660542e18294d490e68c7b14aaa4b
B f1b56150d6520e73d2ade2296c3b2f13839e63e5
+B f2f8b95ad823b38aa68e7a2071eac0b5b637b2aa
B f94e1dd9b2a8d27ec5a27bfb7c026e3ae2350e39
B f98785bd8490c4717353f1a9688cae3e7a823ec2
B fb30f8bffc85fcc3208fcc0e1eda4b54a89b5d37
@@ -49,6 +57,7 @@ M 63a1088a9253da0452497440e900d35a5415c3c9
M 7304dfbd8f3044d8d46981abf2058c6cb732d219
M 746914a5084f5db8d0c0f052802c7ef2217b9b6b
M 7690a1fd087aff24ad8e8e1ab2e0722e24bf3d81
+M 8118c5a301f22dea16c9d235ad378584a0ae2466
M 8583a24ac541dc373503d7a6c59cd90890acdae3
M 8aebfa30047f32e3a6b4feb7ffdd89208ec4f435
M 8e131133c8566a124605cb06e0b6db98fddb5972
@@ -58,4 +67,5 @@ M 9b6666816a21d8b85cc051be59a8ab6e968c5d0d
M 9ecea375930d1a217f35da65e0d6073f7a80bf7d
M a1710bdd783afcd667d9e72ccb031480d3806850
M abcc137cb9b27e0da0b4270a18ac2a32df1e9990
+M b2b6f0137cd9f1bafff5d487e8383453692a2ff0
M fe89bf0fb8379428667f66312e6942e906142d6f
[2/6] cxf git commit: Remove redundant modifier
Posted by dk...@apache.org.
Remove redundant modifier
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/0cdd2c03
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/0cdd2c03
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/0cdd2c03
Branch: refs/heads/3.1.x-fixes
Commit: 0cdd2c03fed0ca51386312e1772ac49edccf1ae3
Parents: 283406f
Author: Daniel Kulp <dk...@apache.org>
Authored: Thu Feb 4 15:44:58 2016 -0500
Committer: Daniel Kulp <dk...@apache.org>
Committed: Tue Mar 8 11:15:15 2016 -0500
----------------------------------------------------------------------
.../java/org/apache/cxf/sts/rest/RESTSecurityTokenService.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/0cdd2c03/services/sts/sts-core/src/main/java/org/apache/cxf/sts/rest/RESTSecurityTokenService.java
----------------------------------------------------------------------
diff --git a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/rest/RESTSecurityTokenService.java b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/rest/RESTSecurityTokenService.java
index 727ee4b..3768e16 100644
--- a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/rest/RESTSecurityTokenService.java
+++ b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/rest/RESTSecurityTokenService.java
@@ -44,7 +44,7 @@ public interface RESTSecurityTokenService {
cancel("cancel");
private String value;
- private Action(String value) {
+ Action(String value) {
this.value = value;
}