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 2015/02/09 18:49:11 UTC
[1/9] cxf git commit: Small refactoring of exception wrapping
Repository: cxf
Updated Branches:
refs/heads/3.0.x-fixes 9c7847877 -> 268735e75
Small refactoring of exception wrapping
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/a23a473d
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/a23a473d
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/a23a473d
Branch: refs/heads/3.0.x-fixes
Commit: a23a473d8df5d9b0210d10b10a0e66ef9bbd056f
Parents: 9c78478
Author: Christian Schneider <ch...@die-schneider.net>
Authored: Tue Jan 20 15:33:33 2015 +0100
Committer: Daniel Kulp <dk...@apache.org>
Committed: Mon Feb 9 12:48:54 2015 -0500
----------------------------------------------------------------------
.../apache/cxf/phase/PhaseInterceptorChain.java | 111 ++++++++++---------
1 file changed, 60 insertions(+), 51 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/a23a473d/core/src/main/java/org/apache/cxf/phase/PhaseInterceptorChain.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/phase/PhaseInterceptorChain.java b/core/src/main/java/org/apache/cxf/phase/PhaseInterceptorChain.java
index 8ad2dc8..5287e9a 100644
--- a/core/src/main/java/org/apache/cxf/phase/PhaseInterceptorChain.java
+++ b/core/src/main/java/org/apache/cxf/phase/PhaseInterceptorChain.java
@@ -318,58 +318,9 @@ public class PhaseInterceptorChain implements InterceptorChain {
pause();
throw ex;
} catch (RuntimeException ex) {
-
if (!faultOccurred) {
-
faultOccurred = true;
-
- StringBuilder description = new StringBuilder();
- if (message.getExchange() != null) {
- Exchange exchange = message.getExchange();
- Service service = exchange.get(Service.class);
- if (service != null) {
- description.append('\'');
- description.append(service.getName());
- OperationInfo opInfo = exchange.get(OperationInfo.class);
- if (opInfo != null) {
- description.append("#").append(opInfo.getName());
- }
- description.append("\' ");
- }
- }
-
- message.setContent(Exception.class, ex);
- unwind(message);
- Exception ex2 = message.getContent(Exception.class);
- if (ex2 == null) {
- ex2 = ex;
- }
-
- FaultListener flogger = (FaultListener)
- message.getContextualProperty(FaultListener.class.getName());
- boolean useDefaultLogging = true;
- if (flogger != null) {
- useDefaultLogging = flogger.faultOccurred(ex2, description.toString(), message);
- }
- if (useDefaultLogging) {
- doDefaultLogging(message, ex2, description);
- }
-
- boolean isOneWay = false;
- if (message.getExchange() != null) {
- if (message.getContent(Exception.class) != null) {
- message.getExchange().put(Exception.class, ex2);
- }
- isOneWay = message.getExchange().isOneWay()
- && !MessageUtils.isTrue(message.getContextualProperty(Message.ROBUST_ONEWAY));
- }
-
- if (faultObserver != null && !isOneWay) {
- // CXF-5629. when exchange is one way and robust, it becomes req-resp in order to
- // send the fault
- message.getExchange().setOneWay(false);
- faultObserver.onMessage(message);
- }
+ wrapExceptionAsFault(message, ex);
}
state = State.ABORTED;
}
@@ -383,7 +334,57 @@ public class PhaseInterceptorChain implements InterceptorChain {
}
}
- private void doDefaultLogging(Message message, Exception ex, StringBuilder description) {
+ private void wrapExceptionAsFault(Message message, RuntimeException ex) {
+ String description = getServiceInfo(message);
+
+ message.setContent(Exception.class, ex);
+ unwind(message);
+ Exception ex2 = message.getContent(Exception.class);
+ if (ex2 == null) {
+ ex2 = ex;
+ }
+
+ FaultListener flogger = (FaultListener)
+ message.getContextualProperty(FaultListener.class.getName());
+ boolean useDefaultLogging = true;
+ if (flogger != null) {
+ useDefaultLogging = flogger.faultOccurred(ex2, description, message);
+ }
+ if (useDefaultLogging) {
+ doDefaultLogging(message, ex2, description);
+ }
+
+ if (message.getExchange() != null && message.getContent(Exception.class) != null) {
+ message.getExchange().put(Exception.class, ex2);
+ }
+
+ if (faultObserver != null && !isOneWay(message)) {
+ // CXF-5629. when exchange is one way and robust, it becomes req-resp in order to
+ // send the fault
+ message.getExchange().setOneWay(false);
+ faultObserver.onMessage(message);
+ }
+ }
+
+ private String getServiceInfo(Message message) {
+ StringBuilder description = new StringBuilder();
+ if (message.getExchange() != null) {
+ Exchange exchange = message.getExchange();
+ Service service = exchange.get(Service.class);
+ if (service != null) {
+ description.append('\'');
+ description.append(service.getName());
+ OperationInfo opInfo = exchange.get(OperationInfo.class);
+ if (opInfo != null) {
+ description.append("#").append(opInfo.getName());
+ }
+ description.append("\' ");
+ }
+ }
+ return description.toString();
+ }
+
+ private void doDefaultLogging(Message message, Exception ex, String description) {
FaultMode mode = message.get(FaultMode.class);
if (mode == FaultMode.CHECKED_APPLICATION_FAULT) {
if (isFineLogging) {
@@ -415,6 +416,14 @@ public class PhaseInterceptorChain implements InterceptorChain {
}
}
}
+
+ private boolean isOneWay(Message message) {
+ return (message.getExchange() != null) ? message.getExchange().isOneWay() && !isRobustOneWay(message) : false;
+ }
+
+ private boolean isRobustOneWay(Message message) {
+ return MessageUtils.isTrue(message.getContextualProperty(Message.ROBUST_ONEWAY));
+ }
/**
* Intercept a message, invoking each phase's handlers in turn,
[4/9] cxf git commit: CXF-6234 - Ensure imported schema locations are
resolved correctly Fix checkstyle errors This closes #51
Posted by dk...@apache.org.
CXF-6234 - Ensure imported schema locations are resolved correctly
Fix checkstyle errors
This closes #51
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/92baa900
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/92baa900
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/92baa900
Branch: refs/heads/3.0.x-fixes
Commit: 92baa9006b109c6f192529825be6367ada721169
Parents: 9e4016b
Author: Mustafa Musaji <mm...@redhat.com>
Authored: Mon Feb 2 10:28:32 2015 +0000
Committer: Daniel Kulp <dk...@apache.org>
Committed: Mon Feb 9 12:48:55 2015 -0500
----------------------------------------------------------------------
.../org/apache/cxf/frontend/WSDLGetUtils.java | 47 ++++++++++++++++----
1 file changed, 39 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/92baa900/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetUtils.java
----------------------------------------------------------------------
diff --git a/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetUtils.java b/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetUtils.java
index 07d96e4..c0b545f 100644
--- a/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetUtils.java
+++ b/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetUtils.java
@@ -392,7 +392,7 @@ public class WSDLGetUtils {
: CastUtils.cast(types.getExtensibilityElements(), ExtensibilityElement.class)) {
if (el instanceof Schema) {
Schema see = (Schema)el;
- updateSchemaImports(bus, see, see.getDocumentBaseURI(), doneSchemas, base);
+ updateSchemaImports(bus, see, see.getDocumentBaseURI(), doneSchemas, base, null);
}
}
}
@@ -449,7 +449,8 @@ public class WSDLGetUtils {
Schema schema,
String docBase,
Map<String, SchemaReference> doneSchemas,
- String base) {
+ String base,
+ String parent) {
OASISCatalogManager catalogs = OASISCatalogManager.getCatalogManager(bus);
Collection<List<?>> imports = CastUtils.cast((Collection<?>)schema.getImports().values());
for (List<?> lst : imports) {
@@ -481,14 +482,29 @@ public class WSDLGetUtils {
new URL(start);
} catch (MalformedURLException e) {
if (doneSchemas.put(decodedStart, imp) == null) {
- updateSchemaImports(bus, imp.getReferencedSchema(), docBase, doneSchemas, base);
+ try {
+ //CHECKSTYLE:OFF:NestedIfDepth
+ if (!(new URI(decodedStart).isAbsolute()) && parent != null) {
+ resolvedSchemaLocation = new URI(parent).resolve(decodedStart).toString();
+ decodedStart = URLDecoder.decode(resolvedSchemaLocation, "utf-8");
+ doneSchemas.put(resolvedSchemaLocation, imp);
+ }
+ //CHECKSTYLE:ON:NestedIfDepth
+ } catch (URISyntaxException ex) {
+ // ignore
+ } catch (UnsupportedEncodingException ex) {
+ // ignore
+ }
+ updateSchemaImports(bus, imp.getReferencedSchema(), docBase,
+ doneSchemas, base, decodedStart);
}
}
} else {
if (doneSchemas.put(decodedStart, imp) == null) {
doneSchemas.put(resolvedSchemaLocation, imp);
doneSchemas.put(imp.getSchemaLocationURI(), imp);
- updateSchemaImports(bus, imp.getReferencedSchema(), docBase, doneSchemas, base);
+ updateSchemaImports(bus, imp.getReferencedSchema(), docBase,
+ doneSchemas, base, decodedStart);
}
}
}
@@ -521,7 +537,8 @@ public class WSDLGetUtils {
new URL(start);
} catch (MalformedURLException e) {
if (doneSchemas.put(decodedStart, included) == null) {
- updateSchemaImports(bus, included.getReferencedSchema(), docBase, doneSchemas, base);
+ updateSchemaImports(bus, included.getReferencedSchema(),
+ docBase, doneSchemas, base, decodedStart);
}
}
}
@@ -529,7 +546,7 @@ public class WSDLGetUtils {
|| !doneSchemas.containsKey(resolvedSchemaLocation)) {
doneSchemas.put(decodedStart, included);
doneSchemas.put(resolvedSchemaLocation, included);
- updateSchemaImports(bus, included.getReferencedSchema(), docBase, doneSchemas, base);
+ updateSchemaImports(bus, included.getReferencedSchema(), docBase, doneSchemas, base, decodedStart);
}
}
}
@@ -558,7 +575,21 @@ public class WSDLGetUtils {
new URL(start);
} catch (MalformedURLException e) {
if (doneSchemas.put(decodedStart, included) == null) {
- updateSchemaImports(bus, included.getReferencedSchema(), docBase, doneSchemas, base);
+ try {
+ //CHECKSTYLE:OFF:NestedIfDepth
+ if (!(new URI(decodedStart).isAbsolute()) && parent != null) {
+ resolvedSchemaLocation = new URI(parent).resolve(decodedStart).toString();
+ decodedStart = URLDecoder.decode(resolvedSchemaLocation, "utf-8");
+ doneSchemas.put(resolvedSchemaLocation, included);
+ }
+ //CHECKSTYLE:ON:NestedIfDepth
+ } catch (URISyntaxException ex) {
+ // ignore
+ } catch (UnsupportedEncodingException ex) {
+ // ignore
+ }
+ updateSchemaImports(bus, included.getReferencedSchema(),
+ docBase, doneSchemas, base, decodedStart);
}
}
}
@@ -566,7 +597,7 @@ public class WSDLGetUtils {
|| !doneSchemas.containsKey(resolvedSchemaLocation)) {
doneSchemas.put(decodedStart, included);
doneSchemas.put(resolvedSchemaLocation, included);
- updateSchemaImports(bus, included.getReferencedSchema(), docBase, doneSchemas, base);
+ updateSchemaImports(bus, included.getReferencedSchema(), docBase, doneSchemas, base, decodedStart);
}
}
}
[5/9] cxf git commit: Update xmlschema version
Posted by dk...@apache.org.
Update xmlschema version
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/44df0378
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/44df0378
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/44df0378
Branch: refs/heads/3.0.x-fixes
Commit: 44df0378e105507dbb73339270bf018285285839
Parents: 0ee2950
Author: Daniel Kulp <dk...@apache.org>
Authored: Fri Feb 6 10:31:56 2015 -0500
Committer: Daniel Kulp <dk...@apache.org>
Committed: Mon Feb 9 12:48:55 2015 -0500
----------------------------------------------------------------------
parent/pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/44df0378/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 206bfaf..a8768c0 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -41,7 +41,7 @@
<cxf.compile.show.deprecation>true</cxf.compile.show.deprecation>
<cxf.codegenplugin.forkmode>once</cxf.codegenplugin.forkmode>
<cxf.codegen.jvmArgs />
- <cxf.eclipse.outputDirectory>${basedir}/target/classes</cxf.eclipse.outputDirectory>
+ <cf.eclipse.outputDirectory>${basedir}/target/classes</cxf.eclipse.outputDirectory>
<cxf.saaj.impl.groupId>com.sun.xml.messaging.saaj</cxf.saaj.impl.groupId>
<cxf.saaj.impl.artifactId>saaj-impl</cxf.saaj.impl.artifactId>
<cxf.saaj.impl.version>1.3.23</cxf.saaj.impl.version>
@@ -163,7 +163,7 @@
<cxf.wss4j.version>2.0.3</cxf.wss4j.version>
<cxf.xerces.version>2.11.0</cxf.xerces.version>
<cxf.xmlbeans.version>2.6.0</cxf.xmlbeans.version>
- <cxf.xmlschema.version>2.1.0</cxf.xmlschema.version>
+ <cxf.xmlschema.version>2.2.1</cxf.xmlschema.version>
<cxf.xpp3.bundle.version>1.1.4c_6</cxf.xpp3.bundle.version>
<cxf.validation.api.version>1.1.0.Final</cxf.validation.api.version>
<cxf.cdi.api.version>1.1</cxf.cdi.api.version>
[9/9] 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/b8c8ff27
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/b8c8ff27
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/b8c8ff27
Branch: refs/heads/3.0.x-fixes
Commit: b8c8ff2740307c7c7a874ac7dbbeac7b22959a81
Parents: 0e8b057
Author: Daniel Kulp <dk...@apache.org>
Authored: Mon Feb 9 12:03:31 2015 -0500
Committer: Daniel Kulp <dk...@apache.org>
Committed: Mon Feb 9 12:48:55 2015 -0500
----------------------------------------------------------------------
.gitmergeinfo | 34 ++++++++++++++++++++++++++++++++++
1 file changed, 34 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/b8c8ff27/.gitmergeinfo
----------------------------------------------------------------------
diff --git a/.gitmergeinfo b/.gitmergeinfo
index c32b32d..f1bb4c8 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -1,8 +1,11 @@
origin/master
+B 004321a2e955665005b9c5bfe304feaf9cb622b0
+B 005ee936d42897f7083fd9fe26addec4779d4764
B 035154fb466fb9c833804d1bc747804df9e9992b
B 03bd1b4f0beaddf4df112f7c08d5749862805dfa
B 04f0ef2e32f55d51f14cfc6d7a14616b62a6cce5
+B 07c6322a52c12077567a48c9a87e832ea9362886
B 08d98fbb13440de2da3b19915d8dfe21531cb284
B 0aaa2b5742a53bf31704939e4bc21906100bbc54
B 0ba19453f17be19aa2e46848b1908f776a6abb64
@@ -19,6 +22,7 @@ B 1674e7fb3353fc9e5d2b81deb2d02617cc09a373
B 1805027c9ce9925fb875e92fc5314aa826632151
B 18204e5bb0173ccea83c0afd10e4450f370287a0
B 1824d9cae26c3b141d873d0d01036602ac339c37
+B 1a8fd7c02bc6a620e276086b665d430217116767
B 1b3f01b4f640beea1f1247416ad9891e615f816c
B 1d29dfaa8e686570c1b2ec2da4c31ba380e0b9b0
B 1e927cdfaafb2efc8d29184cb5b7b05ce3c3ad7f
@@ -26,6 +30,7 @@ B 1f02b3d4f2c9d341046ce35222c8f4d7674b10b2
B 2004b1021ce0d0975eb49cae36416863bd8c59bb
B 222137cb2ee577e6582a644b7ae73bbc0a75d4d1
B 27c2c25dc3c2c3019543e31afdca7b166911f278
+B 28e185b27e8c80cd773cac46d1b9b19529c4fab0
B 29f0620a9a025afcd2057cdf97c7d93caf6c179f
B 2afb9d3cacb299bea854d1ff4824e4c981a41d6a
B 2ba77327488a8446e6a92af137f644eaf3b06e2e
@@ -37,12 +42,15 @@ B 3834ba2ea50a164cf2b5ffe15229dcf512e110c6
B 384ad75433037358ea1607c4ddcb0cd978fae10c
B 388d6eaf045c0215c7cffc891526a402c70625ec
B 38bb9fea460262ff2781cbfdf85032d3f4fb9fe1
+B 3aec3e286e4732918589c239ea1b8f7e1d3a9836
B 3b1a8cc3a8c1b213a8f6728ae9154cf14c9c1300
+B 42eba2f948a967d62dc0257a920715ae47ae4310
B 431db5275e3a056d6cedf4608533197580cb6073
B 43aa455461fb8a33b0e5844512b263a262c2420c
B 43c65b07658b8041f6689d16a34ff98132b8a424
B 441cd2cecdd8a88d42e41324643f06a2fccf5a25
B 46838d8a346687e9f8ff2f6e279e3ba83f99c5f3
+B 46ce1778d9a4d6a30e38b393a08dd4ecae2dbb09
B 46f0d5fff8a4d846831b5e9d7ac0405fe06d2ccd
B 470bdcb40597dce5e5cf957000ab60b0b4c1fce4
B 478de215af2da2c03f439bbbd8341b234bb7bee8
@@ -50,6 +58,7 @@ B 47b1a4ae21cfc70cea3b48ebd2be72fd184f1370
B 481466c7a42a57c87c992a02ab560be046bf5797
B 49c35937c3a0813ed4ccf34dd03fd5fa2f41b86c
B 4b44512d8c3fe76620dbac37d220038435c75ba5
+B 4b4a5151c83113bb53d65e0304b8c9fee524d28a
B 4d49814ba85310599ee76e41742208383f3f6450
B 4f61ca801deed173c648b2d424ac231663acd704
B 4f70bdf4199a666829cf9c6c62c508d12afbe251
@@ -58,14 +67,17 @@ B 51f433d54a1d11eac25c32b0dd69f12fef62c060
B 55bda33699ea1c2e84a125253edd594cc2a32ea3
B 593525139909e081ae809278d301688c0ba03697
B 5bac26a132e7999bf0bd108d4cffb674873a56ca
+B 5c678face89e4d38b2879bc4679ce3b92ac3aeb0
B 5e06ba0c4970700477484bd2409a226aa9ec7f0a
B 5fbd407bac5af5e55bb280125405d75b7add872b
B 6256b7c7c42bb01d2cc0d16d659ba1aa3042e7ae
+B 6359c930bb27b0ea589c7c2d7ed552babe4897ed
B 64f232307444269286b7f14fc3838b07187d4c03
B 652d821683f12031258f7727d33157f3ab6ccbe6
B 665eb259fced741f65de061bb026c3ab65a8d99c
B 66cc4a4e3c0e92d9e6931a5d416f11c2f07f268c
B 67432aef1adb8e330c054431de9d0955e3993472
+B 68a567632a063c6f9bb27a73c151d21f6e855f50
B 69176e3dd7c69901d03f6d93bb365df784f06525
B 698cd0483b99f9638ce05557e1137ffce86d4185
B 6e4f0f60785de1f5774644323edafb4741b9e4a4
@@ -74,6 +86,7 @@ B 702f27bc4a334b2d117262252632bf580f20f711
B 71488c6fa7635c88285214a0479379aafef9ed3c
B 716531d62eaa8b1dde566e59e2a5ff0be1b2b33c
B 71ced4709dedf62264a4bb630aaf4780cb94ce48
+B 7456089088a21620ec75dc83fbb4b89ebdfd290e
B 74a2e6f2b1d9787cc9b5cff4cc84e43cfccbfe94
B 75c69b27a7688dfac281d4acdcff3b0acc4c8bee
B 7d1f30f76d95f9eddf0bed995120c71bf1a393b3
@@ -89,6 +102,7 @@ B 8c7e2493dc26e1df4a16168a5491ac96509549d6
B 8e028a617f026fca2499f850bb680ada0692d681
B 8e930bcfc6e68775db59957df8ee38d73499a6f4
B 8f967643447ceec89e58b079d8d8fc00cf232a02
+B 8fd8c552f4c2a980a5138de19a2b74104776a4ba
B 90312bc48f6e564bcafdaaebc3cd596c966ee674
B 91d6630c53f222544e4bb512fb5c918d68518138
B 92502a5e2af6e5d3c544f89396de2d05d539fd41
@@ -96,14 +110,18 @@ B 92c4738f9e6b96fe0ce8586bb36b9c6444d6e225
B 9344b093b8081a68c9f83f0c740d60508e99fd5e
B 944eb0ba1043bd4daf9cf087b66bc9cab10b8ff2
B 94cfe7e48a50104b22457aa47b39d06329d16d32
+B 9511cd40a9701ee1b46ba28b61154f6f0833b7d9
+B 96ed80508cf15f7dc8c2d5a73225a36dbc096ee2
B 970feeed0db20bfe9df5095b6b335146344c222c
B 9896b920035a1d1be1aef28a1d1a5eb876445c82
B 99963f9a08c9782b7c661f2b5ff8e9ce95ab3dbe
+B 9b93ca4bda4ba8abce2e2248059f2ccfd35391b2
B 9dd4194ce6af00377b0e1bdc6b15744fe03e29c9
B 9dfb278c7739b9f4621f43b8146d057e21fafb64
B 9ea935fcbf3869f5fa4fd1e75a0a2309cc780415
B 9fe4c04a1c875b3e8f402268cd9dfe18431b5cc9
B a2855695896d5084ea288b0fa47457e4b7bfac38
+B a2e1e40d3c185f53741c937e7b861bab2808d70f
B a4222c930f7d69608f826c14e4bc7bc9f670097c
B a4315cb442fa31960cbd47f11e95e81b4a71441d
B a5aff3e7a43274b3d47cda706aaf8108bd7a9b07
@@ -111,27 +129,32 @@ B a5f8a4dd4d9ecbfc1f8a1a8e5bcb4af17f561cc5
B a7b79ea692add4f9da0f1232e3bfb338099f4147
B a7c6e78b491c4feb6797a6dddd32a6249189a552
B ab4eaac0be87291b7f053d144dc8fbf9d98634c3
+B ad5763ef8ea1ff3c8ddea2c3a6fabdaae6acddd6
B b18a2bad64c343520795175cf377cdf1b981da2a
B b4536602d376a36bcbd02d21d5ab42f19d4e5b22
B b4872363fda49f205001d4385ecbc35133c2c755
B b54fe0dfdf3c3d76df1e07fb3686d5d8a1061d48
B b5fc90f09c6b039a54564e0825a264310453c550
B b67537dbace0896073b55b375b8ccdc4cce83365
+B b7657a47aca211d46df04998bf79a9e2ca76a545
B ba00202288bce9ba80692f151c2d73b101400c50
B ba8fc3d351121ec8eb2ce37cd12e014f722c741d
B bb1edc5dd96c50ed2c3294f6834310e0a6d4381e
B bcf0c9f825a7b8d1c86405403d7c089fea2955c0
B bea22d764138e365513856c23be760a7719530a0
B bf6bba1082d030298df9b9f1c354da5f92833eae
+B bfbc0a25c377e43395fb1f7beee045e4412c4d8d
B c044f726fae2a2f35ce5c6c3b9ebbfe54125ad11
B c1c9562bb13eeacdd9dae5a46c513e9e03625698
B c5609a479c87ea75e016b61daeafe0021f693332
+B cb19d05174a3bd078b391c4f6c151ee6e34e2956
B cd809b8526fc5620c481d4ee5a8534ccf6babae4
B d0c5c3defab6dbb9619f8fd291f2e06b685cb03c
B d391d9371d8505c7774308c4fbbb9bc57ffd34a6
B d3e9295d3acfe3c970a325bbbafdba83a0d6e83c
B d50ffd09c30e606524fb6ed92119d85ccfa13491
B d54a21628143bc15f51cbe5d63fa42c09d0ab8ac
+B d5b502a60d2934a42e32cb6225224ff75c66aa37
B d8a6bdbd2c84b3fa0187de935e294d5f66974e46
B d9f624e2eca8affa20243583ace087a8cbba3ac8
B df947cb1ca2b9e375f99e199ec65b1afece1c963
@@ -147,6 +170,7 @@ B f2c370690d62cbb9350aa3447ee1ab8336335074
B f2f6aa016cdd1bb49698b319806a8369f149c8dd
B f51fb332753e9600a6b6e6dd17b42c1a1494395a
B f595ca026d56ec5e58a38780677598d8f9d9ded5
+B f71738d894d4143ed57b956ef1dd68aec5b1b41d
B f7a091afedbc7ca809a7205d7c053a1f5386865e
B f942e1e15d6c4fa83e305eb7452dca8fc80cbdcf
B f97778f0c21a4dc0f083e840e8157fe2f8528d90
@@ -154,6 +178,7 @@ B fa37d8722d154bbdec9d2acf4da16a04db0a34f1
B fb94440f6f1d5c7c572b6c0163f275c95073b8ee
B fb9d26581c364c62c7343847ebe4136b8c97700f
B fd3471e58e63ee672babc015ed0929f6cd6862dd
+B fe416234bab8af30f1789c3164ac256af86e3b62
B ff742436a3e177dc61106edf08f2509e727362dd
B ffd429be404953874e141c52a9c8ba46812d73ca
M 0d63846798b590255c45463359e2cb1a28e4d3cb
@@ -164,9 +189,13 @@ M 18a3d43cb0044fcb84d3cc89f138fd9e7110dd04
M 1946e323a0df6e5f9748af82106cff39d7b5d01f
M 19e912e8d4b6d3f3a4c2b88b1d53e691496d7dc0
M 1baae69592a128462ef252916bccfb67cd81095b
+M 27c1bb5a19ea70ef1befccff22d72f1656247b0d
M 2895b7b052e6c96d192abf39d472737b54fcd9c2
M 2b4fe9966c46457177f6412525c57c64d07dbe69
M 2d3ac551c8614516cbbf288195d2a99cadb79659
+M 3af7c785c642db6ae64276f92fb05450d7f9aba3
+M 3d3d495a2c58164abfb54b64208b3f72b4d235dd
+M 40c6734f96ca0a3d82eb37088f43221e93cbd6f2
M 43c8d500b04a13f72077751fdbfaab7bbcfbbf8f
M 4640cf1ea20eee09ae650b706bce765a16affc8b
M 4715a0ddce4864bbf6e1c34a7a1cd9508a52d9cd
@@ -180,6 +209,7 @@ M 51db79ca7bd2c703a4dbbd42d7761c97af3bad84
M 56c0db05126292a61a782f05848321b9b8b8b80c
M 58e6563da54fd3237a9a1d21a2cf7115740795a2
M 5a9a2a09887c69cdfeff5eac22996ab35fbfc0cf
+M 5e919271e2e92f9845d6454b37ab0b86cfc66591
M 5e97d1e29e85d80f0679748cc4df0d8e0647ee16
M 6129ec5f6735a986660a2d05c6b3b0c9230610d9
M 6292346fb110f0517b791f91d03fd2515d575388
@@ -194,20 +224,24 @@ M 816e1a5ef4c0992a7d084a0529e42d9ad6a4a3c6
M 865eb64d44fd4e904f166cb03b0d15ca8b5f0ba5
M 89b87071f3dedd2cd5ed874e56f69ab7dcf7953d
M 8bcb5133c602b1cbe642cfd5fbb46099a28b3016
+M 8fc7bfa3d054e9aebcb43f51e083ff7cf3b47010
M 9043011518147bbc2dac036681fd64d7ce578bc2
M 94585ae070e62d08f0e064df8176fbdbdf1bb37b
M 98a578dbf4b7e19c4555bd2011f24c650d0f54c0
M 98f65f2911e063e70e864e7614b062cc124a0f9d
M 990f4b1d594c8f1446d42a516eaef82020df2747
+M a3bf2a80bafa95ec2ccdd2b28ead26c13866acd7
M a64ded455c40169665e438ae7a25f17bd4f8047a
M a9555675b829acdfb1672bc2157d6f3c08fdd652
M a97f886f36c8aea2a49860ec8cd33b0021b7b9e2
M af2f7d3a52076f60d0f98a2635e2adef256a9efe
+M bc5e828cd8a25c4c4107c76e1582f807e75c9a77
M bd7babd656fc06f3e5839bf11e186ec12fdeb6fa
M bee82ba7d1766b555d965a75b3846ead4686239e
M c1c75b039df7bd1ca9f11ff21f16593fed0c8c16
M c34bf7ad6bc55b6584dfd009f49a3f4eb8ececc9
M c55664128b1223667dedacc2011ccd5945d9c8b9
+M c72cac8cbd73d92a9e0264c816176c2a33dcbcf2
M cda58270486b4d394b98a1a1a1d5bfcb366af2c1
M d2dec5b87788b8cb5059d3719cf3dfd7135a1280
M d4a35c40d53fde17fec3d08c25215c7533dcb667
[8/9] cxf git commit: Fix merges issues
Posted by dk...@apache.org.
Fix merges issues
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/268735e7
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/268735e7
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/268735e7
Branch: refs/heads/3.0.x-fixes
Commit: 268735e75d256ec6b1684bfbb4b581c25b679c2d
Parents: b8c8ff2
Author: Daniel Kulp <dk...@apache.org>
Authored: Mon Feb 9 12:48:41 2015 -0500
Committer: Daniel Kulp <dk...@apache.org>
Committed: Mon Feb 9 12:48:55 2015 -0500
----------------------------------------------------------------------
parent/pom.xml | 2 +-
.../src/main/java/org/apache/cxf/javascript/ParticleInfo.java | 5 +++--
2 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/268735e7/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index a8768c0..0a3a2bc 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -41,7 +41,7 @@
<cxf.compile.show.deprecation>true</cxf.compile.show.deprecation>
<cxf.codegenplugin.forkmode>once</cxf.codegenplugin.forkmode>
<cxf.codegen.jvmArgs />
- <cf.eclipse.outputDirectory>${basedir}/target/classes</cxf.eclipse.outputDirectory>
+ <cxf.eclipse.outputDirectory>${basedir}/target/classes</cxf.eclipse.outputDirectory>
<cxf.saaj.impl.groupId>com.sun.xml.messaging.saaj</cxf.saaj.impl.groupId>
<cxf.saaj.impl.artifactId>saaj-impl</cxf.saaj.impl.artifactId>
<cxf.saaj.impl.version>1.3.23</cxf.saaj.impl.version>
http://git-wip-us.apache.org/repos/asf/cxf/blob/268735e7/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/ParticleInfo.java
----------------------------------------------------------------------
diff --git a/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/ParticleInfo.java b/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/ParticleInfo.java
index 4c53d02..9c51e3b 100644
--- a/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/ParticleInfo.java
+++ b/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/ParticleInfo.java
@@ -172,8 +172,9 @@ public final class ParticleInfo implements ItemInfo {
elementInfo.children = new LinkedList<ParticleInfo>();
- List<XmlSchemaObject> items = choice.getItems();
- for (XmlSchemaObject item : items) {
+ List<?> items = choice.getItems();
+ for (Object i : items) {
+ XmlSchemaObject item = (XmlSchemaObject)i;
XmlSchemaObject schemaObject = JavascriptUtils.getObjectParticle(item, contextName,
currentSchema);
ParticleInfo childParticle = ParticleInfo.forLocalItem(schemaObject, currentSchema, schemaCollection,
[2/9] cxf git commit: [CXF-6235] wsdl2java behaves differently from
cxf-codegen-plugin This closes #50
Posted by dk...@apache.org.
[CXF-6235] wsdl2java behaves differently from cxf-codegen-plugin
This closes #50
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/0e8b0570
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/0e8b0570
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/0e8b0570
Branch: refs/heads/3.0.x-fixes
Commit: 0e8b0570cfae8ffb7d8e0678cea09ae8d68b018c
Parents: 92baa90
Author: gwuireland <gw...@gmail.com>
Authored: Fri Jan 30 16:49:08 2015 +0000
Committer: Daniel Kulp <dk...@apache.org>
Committed: Mon Feb 9 12:48:55 2015 -0500
----------------------------------------------------------------------
.../apache/cxf/tools/wsdlto/WSDLToJavaContainer.java | 12 ++++++++++++
.../cxf/tools/wsdlto/WSDLToJavaContainerTest.java | 11 +++++++++++
2 files changed, 23 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/0e8b0570/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainer.java
----------------------------------------------------------------------
diff --git a/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainer.java b/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainer.java
index 4f7ed77..3b57251 100644
--- a/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainer.java
+++ b/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainer.java
@@ -553,11 +553,22 @@ public class WSDLToJavaContainer extends AbstractCXFToolContainer {
if (!env.containsKey(ToolConstants.CFG_WSDLLOCATION)) {
//make sure the "raw" form is used for the wsdlLocation
//instead of the absolute URI that normalize may return
+ boolean assumeFileURI = false;
try {
URI uri = new URI(wsdl);
+
+ String uriScheme = uri.getScheme();
+ if (uriScheme == null) {
+ assumeFileURI = true;
+ }
+
wsdl = uri.toString();
} catch (Exception e) {
//not a URL, assume file
+ assumeFileURI = true;
+ }
+
+ if (assumeFileURI) {
if (wsdl.indexOf(":") != -1 && !wsdl.startsWith("/")) {
wsdl = "file:/" + wsdl;
} else {
@@ -570,6 +581,7 @@ public class WSDLToJavaContainer extends AbstractCXFToolContainer {
//ignore...
}
}
+
wsdl = wsdl.replace("\\", "/");
env.put(ToolConstants.CFG_WSDLLOCATION, wsdl);
http://git-wip-us.apache.org/repos/asf/cxf/blob/0e8b0570/tools/wsdlto/core/src/test/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainerTest.java
----------------------------------------------------------------------
diff --git a/tools/wsdlto/core/src/test/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainerTest.java b/tools/wsdlto/core/src/test/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainerTest.java
index f4b7213..97d44f5 100644
--- a/tools/wsdlto/core/src/test/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainerTest.java
+++ b/tools/wsdlto/core/src/test/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainerTest.java
@@ -66,6 +66,17 @@ public class WSDLToJavaContainerTest extends Assert {
assertTrue(context.optionSet(ToolConstants.CFG_SUPPRESS_WARNINGS));
}
+ @Test
+ public void testWsdlLocationDefaultSchemeIsFile() throws Exception {
+ WSDLToJavaContainer container = new WSDLToJavaContainer("dummy", null);
+ ToolContext context = new ToolContext();
+ context.put(ToolConstants.CFG_WSDLURL, getLocation("hello_world.wsdl"));
+ container.setContext(context);
+ container.validate(context);
+ String wsdlLocation = (String)context.get(ToolConstants.CFG_WSDLLOCATION);
+ assertTrue("default scheme for wsdlLocation is file", wsdlLocation.startsWith("file:"));
+ }
+
private String getLocation(String wsdlFile) throws URISyntaxException {
return this.getClass().getResource(wsdlFile).toURI().getPath();
}
[7/9] cxf git commit: Fix some checkstyle things that can be common
between checkstyle 5.x and 6.x
Posted by dk...@apache.org.
Fix some checkstyle things that can be common between checkstyle 5.x and 6.x
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/9e4016bf
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/9e4016bf
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/9e4016bf
Branch: refs/heads/3.0.x-fixes
Commit: 9e4016bf1b62efa060e9fe4a5b0abb10e3f203c8
Parents: 44df037
Author: Daniel Kulp <dk...@apache.org>
Authored: Fri Feb 6 16:30:58 2015 -0500
Committer: Daniel Kulp <dk...@apache.org>
Committed: Mon Feb 9 12:48:55 2015 -0500
----------------------------------------------------------------------
.../cxf/common/xmlschema/XmlSchemaUtils.java | 4 ++--
.../jsse/TLSParameterJaxBUtils.java | 3 +--
.../cxf/workqueue/OneShotAsyncExecutor.java | 4 ++--
.../ws/addressing/EndpointReferenceUtils.java | 4 ++--
.../cxf/ws/addressing/VersionTransformer.java | 4 ++--
.../wsdl2java/WsdlOptionLoader.java | 13 ++++++------
.../wsdl2js/WSDL2JavaScriptMojo.java | 7 +++----
.../cxf/aegis/type/DefaultTypeMapping.java | 2 +-
.../cxf/aegis/custom/service/ServiceImpl.java | 1 +
.../aegis/namespaces/ExplicitPrefixTest.java | 3 +--
.../cxf/jaxws/support/JaxWsEndpointImpl.java | 4 ++--
.../org/apache/cxf/jaxws/CodeFirstTest.java | 9 ++++-----
.../apache/cxf/jaxws/holder/HolderService.java | 10 +++++-----
.../cxf/javascript/GreeterClientTest.java | 3 +--
.../cxf/javascript/JsHttpRequestTest.java | 3 +--
.../cxf/transport/https/CertConstraints.java | 9 +++------
.../transport/https/CertConstraintsTest.java | 21 +++++++-------------
.../PolicyInterceptorProviderRegistryImpl.java | 1 +
.../org/apache/cxf/ws/rm/RMManagerTest.java | 3 +--
.../wss4j/PolicyBasedWSS4JOutInterceptor.java | 1 +
.../wss4j/StaxCryptoCoverageChecker.java | 3 +--
.../wss4j/StaxSecurityContextInInterceptor.java | 3 +--
.../ws/security/wss4j/WSS4JInInterceptor.java | 5 +----
.../ws/security/wss4j/WSS4JOutInterceptor.java | 3 +--
.../AbstractStaxBindingHandler.java | 1 +
.../StaxSymmetricBindingHandler.java | 4 ++--
.../cxf/ws/security/wss4j/CustomProcessor.java | 3 +--
.../cxf/ws/security/wss4j/WSS4JInOutTest.java | 3 +--
.../apache/cxf/wsdl11/WSDLServiceBuilder.java | 6 +++---
.../java/org/apache/cxf/sts/QNameConstants.java | 4 ++--
.../cxf/sts/operation/AbstractOperation.java | 6 ++----
.../sts/token/realm/CertConstraintsParser.java | 3 +--
.../cxf/wsn/services/JaxwsSubscription.java | 6 +++---
.../systest/jaxrs/JAXRSLoggingAtomPushTest.java | 6 ++----
.../provider/AbstractSourcePayloadProvider.java | 7 ++++---
.../provider/HWDOMSourceMessageProvider.java | 4 ++--
.../provider/HWDOMSourcePayloadProvider.java | 4 ++--
.../provider/HWSAXSourceMessageProvider.java | 2 +-
.../provider/HWSAXSourcePayloadProvider.java | 4 ++--
.../provider/HWSoapMessageDocProvider.java | 2 +-
.../provider/HWStreamSourceMessageProvider.java | 2 +-
.../provider/HWStreamSourcePayloadProvider.java | 2 +-
.../systest/kerberos/ldap/LDAPClaimsTest.java | 14 ++++++-------
.../cxf/systest/schemaimport/ServiceImpl.java | 6 +++---
.../systest/schemaimport/TestEndpointImpl.java | 4 ++--
.../soap/RPCEncodedSoapActionGreeterImpl.java | 2 +-
.../soap/RPCLitSoapActionGreeterImpl.java | 2 +-
.../JavaFirstAttachmentPolicyService.java | 2 +-
.../JavaFirstAttachmentPolicyServiceImpl.java | 4 ++--
.../ws/policy/JavaFirstPolicyService.java | 2 +-
.../ws/policy/JavaFirstPolicyServiceImpl.java | 4 ++--
.../SslUsernamePasswordAttachmentService.java | 2 +-
...slUsernamePasswordAttachmentServiceImpl.java | 4 ++--
.../NoAlternativesOperationSimpleService.java | 2 +-
...oAlternativesOperationSimpleServiceImpl.java | 6 +++---
.../javafirst/OperationSimpleService.java | 2 +-
.../javafirst/OperationSimpleServiceImpl.java | 5 +++--
.../ws/wssec10/server/PingServiceBase.java | 5 +----
.../cxf/tools/fortest/exception/Echo2Impl.java | 4 ++--
.../cxf/tools/fortest/holder/HolderService.java | 10 +++++-----
60 files changed, 122 insertions(+), 150 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/9e4016bf/core/src/main/java/org/apache/cxf/common/xmlschema/XmlSchemaUtils.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/common/xmlschema/XmlSchemaUtils.java b/core/src/main/java/org/apache/cxf/common/xmlschema/XmlSchemaUtils.java
index 70f2200..dbff0c0 100644
--- a/core/src/main/java/org/apache/cxf/common/xmlschema/XmlSchemaUtils.java
+++ b/core/src/main/java/org/apache/cxf/common/xmlschema/XmlSchemaUtils.java
@@ -238,8 +238,8 @@ public final class XmlSchemaUtils {
return ext.getAttributes();
}
- public static List<XmlSchemaAnnotated>
- getContentAttributes(XmlSchemaComplexType type, SchemaCollection collection) {
+ public static List<XmlSchemaAnnotated> getContentAttributes(XmlSchemaComplexType type,
+ SchemaCollection collection) {
List<XmlSchemaAnnotated> results = new ArrayList<XmlSchemaAnnotated>();
QName baseTypeName = getBaseType(type);
if (baseTypeName != null) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/9e4016bf/core/src/main/java/org/apache/cxf/configuration/jsse/TLSParameterJaxBUtils.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/configuration/jsse/TLSParameterJaxBUtils.java b/core/src/main/java/org/apache/cxf/configuration/jsse/TLSParameterJaxBUtils.java
index 3ce5fcf..65965e9 100644
--- a/core/src/main/java/org/apache/cxf/configuration/jsse/TLSParameterJaxBUtils.java
+++ b/core/src/main/java/org/apache/cxf/configuration/jsse/TLSParameterJaxBUtils.java
@@ -225,8 +225,7 @@ public final class TLSParameterJaxBUtils {
/**
* load the certificates as X.509 certificates
*/
- private static Collection<? extends Certificate>
- loadCertificates(final java.io.InputStream is)
+ private static Collection<? extends Certificate> loadCertificates(final java.io.InputStream is)
throws IOException, CertificateException {
final CertificateFactory factory = CertificateFactory.getInstance("X.509");
http://git-wip-us.apache.org/repos/asf/cxf/blob/9e4016bf/core/src/main/java/org/apache/cxf/workqueue/OneShotAsyncExecutor.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/workqueue/OneShotAsyncExecutor.java b/core/src/main/java/org/apache/cxf/workqueue/OneShotAsyncExecutor.java
index 59203bf..f6d1545 100644
--- a/core/src/main/java/org/apache/cxf/workqueue/OneShotAsyncExecutor.java
+++ b/core/src/main/java/org/apache/cxf/workqueue/OneShotAsyncExecutor.java
@@ -27,8 +27,8 @@ import java.util.concurrent.Executor;
*/
public final class OneShotAsyncExecutor implements Executor {
- private static final OneShotAsyncExecutor INSTANCE = new
- OneShotAsyncExecutor();
+ private static final OneShotAsyncExecutor INSTANCE
+ = new OneShotAsyncExecutor();
private OneShotAsyncExecutor() {
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/9e4016bf/core/src/main/java/org/apache/cxf/ws/addressing/EndpointReferenceUtils.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/ws/addressing/EndpointReferenceUtils.java b/core/src/main/java/org/apache/cxf/ws/addressing/EndpointReferenceUtils.java
index 7ca7387..6710ee4 100644
--- a/core/src/main/java/org/apache/cxf/ws/addressing/EndpointReferenceUtils.java
+++ b/core/src/main/java/org/apache/cxf/ws/addressing/EndpointReferenceUtils.java
@@ -908,8 +908,8 @@ public final class EndpointReferenceUtils {
javax.xml.bind.Marshaller jm = getJAXBContextForEPR().createMarshaller();
jm.setProperty(Marshaller.JAXB_FRAGMENT, true);
QName qname = new QName("http://www.w3.org/2005/08/addressing", "EndpointReference");
- JAXBElement<EndpointReferenceType>
- jaxEle = new JAXBElement<EndpointReferenceType>(qname, EndpointReferenceType.class, epr);
+ JAXBElement<EndpointReferenceType> jaxEle
+ = new JAXBElement<EndpointReferenceType>(qname, EndpointReferenceType.class, epr);
W3CDOMStreamWriter writer = new W3CDOMStreamWriter();
http://git-wip-us.apache.org/repos/asf/cxf/blob/9e4016bf/core/src/main/java/org/apache/cxf/ws/addressing/VersionTransformer.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/ws/addressing/VersionTransformer.java b/core/src/main/java/org/apache/cxf/ws/addressing/VersionTransformer.java
index f13128f..588c83f 100644
--- a/core/src/main/java/org/apache/cxf/ws/addressing/VersionTransformer.java
+++ b/core/src/main/java/org/apache/cxf/ws/addressing/VersionTransformer.java
@@ -112,6 +112,7 @@ public class VersionTransformer {
*/
public static org.apache.cxf.ws.addressing.v200403.AttributedURI
convertTo200403(AttributedURIType internal) {
+
org.apache.cxf.ws.addressing.v200403.AttributedURI exposed = Names200403.WSA_OBJECT_FACTORY
.createAttributedURI();
String exposedValue = Names.WSA_ANONYMOUS_ADDRESS.equals(internal.getValue())
@@ -264,8 +265,7 @@ public class VersionTransformer {
* @param exposed the 2004/03 EndpointReferenceType
* @return an equivalent 2005/08 EndpointReferenceType
*/
- public static EndpointReferenceType
- convert(org.apache.cxf.ws.addressing.v200403.EndpointReferenceType exposed) {
+ public static EndpointReferenceType convert(org.apache.cxf.ws.addressing.v200403.EndpointReferenceType exposed) {
EndpointReferenceType internal = ContextUtils.WSA_OBJECT_FACTORY.createEndpointReferenceType();
internal.setAddress(convert(exposed.getAddress()));
// TODO ref parameters not present in 2004/03
http://git-wip-us.apache.org/repos/asf/cxf/blob/9e4016bf/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2java/WsdlOptionLoader.java
----------------------------------------------------------------------
diff --git a/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2java/WsdlOptionLoader.java b/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2java/WsdlOptionLoader.java
index 8628c9a..9cee2ae 100644
--- a/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2java/WsdlOptionLoader.java
+++ b/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2java/WsdlOptionLoader.java
@@ -41,9 +41,8 @@ public final class WsdlOptionLoader {
private WsdlOptionLoader() {
}
- public static List<GenericWsdlOption>
- loadWsdlOptionsFromDependencies(MavenProject project,
- File outputDir) {
+ public static List<GenericWsdlOption> loadWsdlOptionsFromDependencies(MavenProject project,
+ File outputDir) {
List<GenericWsdlOption> options = new ArrayList<GenericWsdlOption>();
Set<Artifact> dependencies = CastUtils.cast(project.getDependencyArtifacts());
for (Artifact artifact : dependencies) {
@@ -76,10 +75,10 @@ public final class WsdlOptionLoader {
* @return list of one WsdlOption object for each wsdl found
* @throws MojoExecutionException
*/
- public static List<GenericWsdlOption>
- loadWsdlOptionsFromFiles(File wsdlBasedir, String includes[],
- String excludes[],
- File defaultOutputDir)
+ public static List<GenericWsdlOption> loadWsdlOptionsFromFiles(File wsdlBasedir,
+ String includes[],
+ String excludes[],
+ File defaultOutputDir)
throws MojoExecutionException {
if (wsdlBasedir == null) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/9e4016bf/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2js/WSDL2JavaScriptMojo.java
----------------------------------------------------------------------
diff --git a/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2js/WSDL2JavaScriptMojo.java b/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2js/WSDL2JavaScriptMojo.java
index 1ba97e3..836daa4 100644
--- a/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2js/WSDL2JavaScriptMojo.java
+++ b/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2js/WSDL2JavaScriptMojo.java
@@ -256,10 +256,9 @@ public class WSDL2JavaScriptMojo extends AbstractCodegenMoho {
return options;
}
- public static List<GenericWsdlOption>
- loadWsdlOptionsFromDependencies(MavenProject project,
- Option defaultOptions,
- File outputDir) {
+ public static List<GenericWsdlOption> loadWsdlOptionsFromDependencies(MavenProject project,
+ Option defaultOptions,
+ File outputDir) {
List<GenericWsdlOption> options
= new ArrayList<GenericWsdlOption>();
Set<Artifact> dependencies = CastUtils.cast(project.getDependencyArtifacts());
http://git-wip-us.apache.org/repos/asf/cxf/blob/9e4016bf/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/DefaultTypeMapping.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/DefaultTypeMapping.java b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/DefaultTypeMapping.java
index ec16f82..7bc803e 100644
--- a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/DefaultTypeMapping.java
+++ b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/DefaultTypeMapping.java
@@ -340,7 +340,7 @@ public class DefaultTypeMapping implements TypeMapping {
}
public static DefaultTypeMapping createDefaultTypeMapping(boolean defaultNillable,
- boolean enableMtomXmime) {
+ boolean enableMtomXmime) {
return createDefaultTypeMapping(
defaultNillable,
enableMtomXmime,
http://git-wip-us.apache.org/repos/asf/cxf/blob/9e4016bf/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/custom/service/ServiceImpl.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/custom/service/ServiceImpl.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/custom/service/ServiceImpl.java
index 2c4ef23..109bc26 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/custom/service/ServiceImpl.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/custom/service/ServiceImpl.java
@@ -52,6 +52,7 @@ public class ServiceImpl implements Service {
public Map<NoDefaultConstructorBeanKey, Collection<NoDefaultConstructorBean>>
getByNames(Collection<NoDefaultConstructorBeanKey> keys) {
+
if (keys == null) {
throw new IllegalArgumentException("keys is null");
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/9e4016bf/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/namespaces/ExplicitPrefixTest.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/namespaces/ExplicitPrefixTest.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/namespaces/ExplicitPrefixTest.java
index 7e8c4e0..e32730f 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/namespaces/ExplicitPrefixTest.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/namespaces/ExplicitPrefixTest.java
@@ -117,8 +117,7 @@ public class ExplicitPrefixTest extends AbstractAegisTest {
* @param node
* @return
*/
- private Map<String, String>
- getNodeNamespaceDeclarations(Node node) {
+ private Map<String, String> getNodeNamespaceDeclarations(Node node) {
Map<String, String> result = new HashMap<String, String>();
NamedNodeMap attributes = node.getAttributes();
for (int x = 0; x < attributes.getLength(); x++) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/9e4016bf/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsEndpointImpl.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsEndpointImpl.java b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsEndpointImpl.java
index 6f0be97..b3584cf 100644
--- a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsEndpointImpl.java
+++ b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsEndpointImpl.java
@@ -342,8 +342,8 @@ public class JaxWsEndpointImpl extends EndpointImpl {
private void buildWsdlExtensibilities(BindingInfo bindingInfo) {
Addressing addressing = getAddressing();
if (addressing != null) {
- ExtensionRegistry extensionRegistry = getBus().getExtension(WSDLManager.class)
- .getExtensionRegistry();
+ ExtensionRegistry extensionRegistry
+ = getBus().getExtension(WSDLManager.class).getExtensionRegistry();
try {
ExtensibilityElement el = extensionRegistry.createExtension(javax.wsdl.Binding.class,
JAXWSAConstants.
http://git-wip-us.apache.org/repos/asf/cxf/blob/9e4016bf/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/CodeFirstTest.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/CodeFirstTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/CodeFirstTest.java
index 88f98c0..790b83d 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/CodeFirstTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/CodeFirstTest.java
@@ -553,11 +553,10 @@ public class CodeFirstTest extends AbstractJaxWsTest {
targetNamespace = "http://cxf.apache.org/service.wsdl/types",
partName = "returnResponse")
@WebMethod(action = "http://cxf.apache.org/doReturn")
- ReturnResponseType
- doReturn(@WebParam(partName = "returnTrx",
- name = "return-request",
- targetNamespace = "http://cxf.apache.org/service.wsdl/types")
- ReturnRequestType returnTrx);
+ ReturnResponseType doReturn(@WebParam(partName = "returnTrx",
+ name = "return-request",
+ targetNamespace = "http://cxf.apache.org/service.wsdl/types")
+ ReturnRequestType returnTrx);
}
@WebService(targetNamespace = "http://cxf.apache.org/service.wsdl")
public static class CXF2766Impl implements CXF2766 {
http://git-wip-us.apache.org/repos/asf/cxf/blob/9e4016bf/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/holder/HolderService.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/holder/HolderService.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/holder/HolderService.java
index 1b9b465..588f40a 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/holder/HolderService.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/holder/HolderService.java
@@ -26,13 +26,13 @@ import javax.xml.ws.Holder;
@WebService
public interface HolderService {
- String echo(String s1, String s2, @WebParam(mode = Mode.OUT)
- Holder<String> outS2);
+ String echo(String s1, String s2,
+ @WebParam(mode = Mode.OUT) Holder<String> outS2);
- String echo2(String s1, @WebParam(mode = Mode.OUT)
- Holder<String> outS2, String s2);
+ String echo2(String s1,
+ @WebParam(mode = Mode.OUT) Holder<String> outS2, String s2);
String echo3(@WebParam(mode = Mode.INOUT, header = true, name = "header")
- Holder<String> header, String s1);
+ Holder<String> header, String s1);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/9e4016bf/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/GreeterClientTest.java
----------------------------------------------------------------------
diff --git a/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/GreeterClientTest.java b/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/GreeterClientTest.java
index 46c0e06..ba8c14d 100644
--- a/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/GreeterClientTest.java
+++ b/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/GreeterClientTest.java
@@ -50,8 +50,7 @@ public class GreeterClientTest extends JavascriptRhinoTest {
@Before
- public
- void before() throws Exception {
+ public void before() throws Exception {
setupRhino("greeter-service-endpoint",
"/org/apache/cxf/javascript/GreeterTests.js",
SchemaValidationType.BOTH);
http://git-wip-us.apache.org/repos/asf/cxf/blob/9e4016bf/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/JsHttpRequestTest.java
----------------------------------------------------------------------
diff --git a/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/JsHttpRequestTest.java b/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/JsHttpRequestTest.java
index 179fb53..c29f22d 100644
--- a/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/JsHttpRequestTest.java
+++ b/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/JsHttpRequestTest.java
@@ -74,8 +74,7 @@ public class JsHttpRequestTest extends AbstractCXFSpringTest {
@Before
- public
- void setupRhino() throws Exception {
+ public void setupRhino() throws Exception {
testUtilities.setBus(getBean(Bus.class, "cxf"));
testUtilities.initializeRhino();
testUtilities.readResourceIntoRhino("/org/apache/cxf/javascript/XMLHttpRequestTests.js");
http://git-wip-us.apache.org/repos/asf/cxf/blob/9e4016bf/rt/transports/http/src/main/java/org/apache/cxf/transport/https/CertConstraints.java
----------------------------------------------------------------------
diff --git a/rt/transports/http/src/main/java/org/apache/cxf/transport/https/CertConstraints.java b/rt/transports/http/src/main/java/org/apache/cxf/transport/https/CertConstraints.java
index c5ebd31..421c73b 100644
--- a/rt/transports/http/src/main/java/org/apache/cxf/transport/https/CertConstraints.java
+++ b/rt/transports/http/src/main/java/org/apache/cxf/transport/https/CertConstraints.java
@@ -71,8 +71,7 @@ public class CertConstraints {
* ANY. Note that if the combinator is ALL and the list of patterns
* is empty, then any dn will match (by definition of the universal quantifier)
*/
- final boolean
- matches(
+ final boolean matches(
final javax.security.auth.x500.X500Principal dn
) {
boolean atLeastOnePatternMatches = false;
@@ -121,8 +120,7 @@ public class CertConstraints {
/**
* Create a CertificateConstraints from a CertificateConstraintsType specification
*/
- public
- CertConstraints(
+ public CertConstraints(
final java.util.List<String> subjectConstraints,
final Combinator subjectConstraintsCombinator,
final java.util.List<String> issuerConstraints,
@@ -139,8 +137,7 @@ public class CertConstraints {
* subject DNConstraints and the certificate's IssuerDN matches the issuer
* DNConstraints; false, otherwise
*/
- public boolean
- matches(
+ public boolean matches(
final java.security.cert.X509Certificate cert
) {
return
http://git-wip-us.apache.org/repos/asf/cxf/blob/9e4016bf/rt/transports/http/src/test/java/org/apache/cxf/transport/https/CertConstraintsTest.java
----------------------------------------------------------------------
diff --git a/rt/transports/http/src/test/java/org/apache/cxf/transport/https/CertConstraintsTest.java b/rt/transports/http/src/test/java/org/apache/cxf/transport/https/CertConstraintsTest.java
index 4e15b5b..dfa941f 100644
--- a/rt/transports/http/src/test/java/org/apache/cxf/transport/https/CertConstraintsTest.java
+++ b/rt/transports/http/src/test/java/org/apache/cxf/transport/https/CertConstraintsTest.java
@@ -37,8 +37,7 @@ import org.apache.cxf.staxutils.StaxUtils;
public class CertConstraintsTest extends org.junit.Assert {
@org.junit.Test
- public void
- testCertConstraints() throws Exception {
+ public void testCertConstraints() throws Exception {
final X509Certificate bethalCert =
loadCertificate("Bethal.jks", "JKS", "password", "bethal");
final X509Certificate gordyCert =
@@ -91,8 +90,7 @@ public class CertConstraintsTest extends org.junit.Assert {
// Private utilities
//
- private static CertConstraints
- loadCertConstraints(
+ private static CertConstraints loadCertConstraints(
final String id
) throws Exception {
CertificateConstraintsType certsConstraintsType =
@@ -100,8 +98,7 @@ public class CertConstraintsTest extends org.junit.Assert {
return CertConstraintsJaxBUtils.createCertConstraints(certsConstraintsType);
}
- private static CertificateConstraintsType
- loadCertificateConstraintsType(
+ private static CertificateConstraintsType loadCertificateConstraintsType(
final String id
) throws Exception {
return loadGeneratedType(
@@ -112,8 +109,7 @@ public class CertConstraintsTest extends org.junit.Assert {
);
}
- private static X509Certificate
- loadCertificate(
+ private static X509Certificate loadCertificate(
final String keystoreFilename,
final String keystoreType,
final String keystorePassword,
@@ -138,8 +134,7 @@ public class CertConstraintsTest extends org.junit.Assert {
throw new RuntimeException("error in test -- keystore " + id + " has no trusted certs");
}
- private static <T> T
- loadGeneratedType(
+ private static <T> T loadGeneratedType(
final Class<T> cls,
final String elementName,
final String name,
@@ -162,8 +157,7 @@ public class CertConstraintsTest extends org.junit.Assert {
}
- private static org.w3c.dom.Document
- loadDocument(
+ private static org.w3c.dom.Document loadDocument(
final String name
) throws Exception {
final java.io.InputStream inStream =
@@ -171,8 +165,7 @@ public class CertConstraintsTest extends org.junit.Assert {
return StaxUtils.read(inStream);
}
- private static <T> T
- unmarshal(
+ private static <T> T unmarshal(
final Class<T> cls,
final org.w3c.dom.Element elt
) throws JAXBException {
http://git-wip-us.apache.org/repos/asf/cxf/blob/9e4016bf/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyInterceptorProviderRegistryImpl.java
----------------------------------------------------------------------
diff --git a/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyInterceptorProviderRegistryImpl.java b/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyInterceptorProviderRegistryImpl.java
index 7e95a79..133f910 100644
--- a/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyInterceptorProviderRegistryImpl.java
+++ b/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyInterceptorProviderRegistryImpl.java
@@ -110,6 +110,7 @@ public class PolicyInterceptorProviderRegistryImpl
public List<Interceptor<? extends Message>>
getInterceptorsForAlternative(Collection<? extends Assertion> alternative,
boolean out, boolean fault) {
+
List<Interceptor<? extends Message>> interceptors = new ArrayList<Interceptor<? extends Message>>();
for (Assertion a : alternative) {
if (a.isOptional()) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/9e4016bf/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMManagerTest.java
----------------------------------------------------------------------
diff --git a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMManagerTest.java b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMManagerTest.java
index af50827..25c149b 100644
--- a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMManagerTest.java
+++ b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMManagerTest.java
@@ -372,8 +372,7 @@ public class RMManagerTest extends Assert {
@Test
public void testGetExistingSequence() throws NoSuchMethodException, SequenceFault, RMException {
- Method m = RMManager.class
- .getDeclaredMethod("getSource", new Class[] {Message.class});
+ Method m = RMManager.class.getDeclaredMethod("getSource", new Class[] {Message.class});
manager = control.createMock(RMManager.class, new Method[] {m});
Message message = control.createMock(Message.class);
Identifier inSid = control.createMock(Identifier.class);
http://git-wip-us.apache.org/repos/asf/cxf/blob/9e4016bf/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JOutInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JOutInterceptor.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JOutInterceptor.java
index dfb3597..98a6330 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JOutInterceptor.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JOutInterceptor.java
@@ -232,6 +232,7 @@ public class PolicyBasedWSS4JOutInterceptor extends AbstractPhaseInterceptor<Soa
public Collection<PhaseInterceptor<? extends org.apache.cxf.message.Message>>
getAdditionalInterceptors() {
+
return null;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/9e4016bf/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/StaxCryptoCoverageChecker.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/StaxCryptoCoverageChecker.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/StaxCryptoCoverageChecker.java
index 9a131e2..cde80d3 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/StaxCryptoCoverageChecker.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/StaxCryptoCoverageChecker.java
@@ -449,8 +449,7 @@ public class StaxCryptoCoverageChecker extends AbstractPhaseInterceptor<SoapMess
* Otherwise set the Fault/Code/Value to env:Sender and the Fault/Code/Subcode/Value
* as the fault code from the WSSecurityException.
*/
- private SoapFault
- createSoapFault(SoapVersion version, WSSecurityException e) {
+ private SoapFault createSoapFault(SoapVersion version, WSSecurityException e) {
SoapFault fault;
javax.xml.namespace.QName faultCode = e.getFaultCode();
if (version.getVersion() == 1.1 && faultCode != null) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/9e4016bf/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/StaxSecurityContextInInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/StaxSecurityContextInInterceptor.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/StaxSecurityContextInInterceptor.java
index d30c56c..5ba0457 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/StaxSecurityContextInInterceptor.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/StaxSecurityContextInInterceptor.java
@@ -236,8 +236,7 @@ public class StaxSecurityContextInInterceptor extends AbstractPhaseInterceptor<S
* Otherwise set the Fault/Code/Value to env:Sender and the Fault/Code/Subcode/Value
* as the fault code from the WSSecurityException.
*/
- private SoapFault
- createSoapFault(SoapVersion version, WSSecurityException e) {
+ private SoapFault createSoapFault(SoapVersion version, WSSecurityException e) {
SoapFault fault;
javax.xml.namespace.QName faultCode = e.getFaultCode();
if (version.getVersion() == 1.1 && faultCode != null) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/9e4016bf/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java
index 4f3bbf3..07d4e1e 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java
@@ -799,10 +799,7 @@ public class WSS4JInInterceptor extends AbstractWSS4JInterceptor {
* (non-null) processor map, to be used to initialize the
* WSSecurityEngine instance.
*/
- protected static WSSecurityEngine
- createSecurityEngine(
- final Map<QName, Object> map
- ) {
+ protected static WSSecurityEngine createSecurityEngine(final Map<QName, Object> map) {
assert map != null;
final WSSConfig config = WSSConfig.getNewInstance();
for (Map.Entry<QName, Object> entry : map.entrySet()) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/9e4016bf/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JOutInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JOutInterceptor.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JOutInterceptor.java
index ce1c877..ea4fddd 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JOutInterceptor.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JOutInterceptor.java
@@ -357,8 +357,7 @@ public class WSS4JOutInterceptor extends AbstractWSS4JInterceptor {
}
}
- public Collection<PhaseInterceptor<? extends org.apache.cxf.message.Message>>
- getAdditionalInterceptors() {
+ public Collection<PhaseInterceptor<? extends org.apache.cxf.message.Message>> getAdditionalInterceptors() {
return null;
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/9e4016bf/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractStaxBindingHandler.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractStaxBindingHandler.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractStaxBindingHandler.java
index e761ef5..5f80221 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractStaxBindingHandler.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractStaxBindingHandler.java
@@ -1001,6 +1001,7 @@ public abstract class AbstractStaxBindingHandler extends AbstractCommonBindingHa
protected org.apache.xml.security.stax.securityToken.SecurityToken
findInboundSecurityToken(SecurityEventConstants.Event event) throws XMLSecurityException {
+
@SuppressWarnings("unchecked")
final List<SecurityEvent> incomingEventList =
(List<SecurityEvent>) message.getExchange().get(SecurityEvent.class.getName() + ".in");
http://git-wip-us.apache.org/repos/asf/cxf/blob/9e4016bf/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/StaxSymmetricBindingHandler.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/StaxSymmetricBindingHandler.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/StaxSymmetricBindingHandler.java
index e1b0dac..4b41380 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/StaxSymmetricBindingHandler.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/StaxSymmetricBindingHandler.java
@@ -606,8 +606,8 @@ public class StaxSymmetricBindingHandler extends AbstractStaxBindingHandler {
return tempTok.getId();
}
- private org.apache.xml.security.stax.securityToken.SecurityToken
- findEncryptedKeyToken() throws XMLSecurityException {
+ private org.apache.xml.security.stax.securityToken.SecurityToken findEncryptedKeyToken()
+ throws XMLSecurityException {
@SuppressWarnings("unchecked")
final List<SecurityEvent> incomingEventList =
(List<SecurityEvent>) message.getExchange().get(SecurityEvent.class.getName() + ".in");
http://git-wip-us.apache.org/repos/asf/cxf/blob/9e4016bf/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/CustomProcessor.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/CustomProcessor.java b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/CustomProcessor.java
index e1a10e3..b820be0 100644
--- a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/CustomProcessor.java
+++ b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/CustomProcessor.java
@@ -31,8 +31,7 @@ import org.apache.wss4j.dom.validate.Validator;
*/
public class CustomProcessor implements Processor {
- public final java.util.List<WSSecurityEngineResult>
- handleToken(
+ public final java.util.List<WSSecurityEngineResult> handleToken(
final org.w3c.dom.Element elem,
final RequestData data,
final WSDocInfo wsDocInfo
http://git-wip-us.apache.org/repos/asf/cxf/blob/9e4016bf/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/WSS4JInOutTest.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/WSS4JInOutTest.java b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/WSS4JInOutTest.java
index 7db020a..eaa9307 100644
--- a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/WSS4JInOutTest.java
+++ b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/WSS4JInOutTest.java
@@ -502,8 +502,7 @@ public class WSS4JInOutTest extends AbstractSecurityTest {
* null, which will cause the WSS4J runtime to do no
* processing on the input)
*/
- private Map<QName, String>
- createCustomProcessorMap() {
+ private Map<QName, String> createCustomProcessorMap() {
final Map<QName, String> ret = new HashMap<QName, String>();
ret.put(
new QName(
http://git-wip-us.apache.org/repos/asf/cxf/blob/9e4016bf/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/WSDLServiceBuilder.java
----------------------------------------------------------------------
diff --git a/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/WSDLServiceBuilder.java b/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/WSDLServiceBuilder.java
index 577fe71..0fff006 100644
--- a/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/WSDLServiceBuilder.java
+++ b/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/WSDLServiceBuilder.java
@@ -321,9 +321,9 @@ public class WSDLServiceBuilder {
PortType bindingPt = binding.getPortType();
if (bindingPt == null) {
org.apache.cxf.common.i18n.Message msg = new
- org.apache.cxf.common.i18n.Message("BINDING_MISSING_TYPE",
- LOG,
- binding.getQName());
+ org.apache.cxf.common.i18n.Message("BINDING_MISSING_TYPE",
+ LOG,
+ binding.getQName());
throw new WSDLRuntimeException(msg);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/9e4016bf/services/sts/sts-core/src/main/java/org/apache/cxf/sts/QNameConstants.java
----------------------------------------------------------------------
diff --git a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/QNameConstants.java b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/QNameConstants.java
index 0383500..c3105aa 100644
--- a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/QNameConstants.java
+++ b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/QNameConstants.java
@@ -28,8 +28,8 @@ public final class QNameConstants {
public static final org.apache.cxf.ws.security.sts.provider.model.ObjectFactory WS_TRUST_FACTORY
= new org.apache.cxf.ws.security.sts.provider.model.ObjectFactory();
- public static final org.apache.cxf.ws.security.sts.provider.model.wstrust14.ObjectFactory
- WS_TRUST14_FACTORY = new org.apache.cxf.ws.security.sts.provider.model.wstrust14.ObjectFactory();
+ public static final org.apache.cxf.ws.security.sts.provider.model.wstrust14.ObjectFactory WS_TRUST14_FACTORY
+ = new org.apache.cxf.ws.security.sts.provider.model.wstrust14.ObjectFactory();
public static final org.apache.cxf.ws.security.sts.provider.model.secext.ObjectFactory WSSE_FACTORY
= new org.apache.cxf.ws.security.sts.provider.model.secext.ObjectFactory();
public static final org.apache.cxf.ws.security.sts.provider.model.utility.ObjectFactory UTIL_FACTORY
http://git-wip-us.apache.org/repos/asf/cxf/blob/9e4016bf/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/AbstractOperation.java
----------------------------------------------------------------------
diff --git a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/AbstractOperation.java b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/AbstractOperation.java
index 997369f..fd89371 100644
--- a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/AbstractOperation.java
+++ b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/AbstractOperation.java
@@ -757,10 +757,8 @@ public abstract class AbstractOperation {
}
protected static org.apache.xml.security.stax.securityToken.SecurityToken
- findInboundSecurityToken(
- SecurityEventConstants.Event event,
- MessageContext messageContext
- ) throws XMLSecurityException {
+ findInboundSecurityToken(SecurityEventConstants.Event event,
+ MessageContext messageContext) throws XMLSecurityException {
@SuppressWarnings("unchecked")
final List<SecurityEvent> incomingEventList =
(List<SecurityEvent>) messageContext.get(SecurityEvent.class.getName() + ".in");
http://git-wip-us.apache.org/repos/asf/cxf/blob/9e4016bf/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/realm/CertConstraintsParser.java
----------------------------------------------------------------------
diff --git a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/realm/CertConstraintsParser.java b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/realm/CertConstraintsParser.java
index 2f93f3b..bab9047 100644
--- a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/realm/CertConstraintsParser.java
+++ b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/realm/CertConstraintsParser.java
@@ -68,8 +68,7 @@ public class CertConstraintsParser {
* subject DNConstraints; false, otherwise. The certificate subject DN only
* has to match ONE of the subject cert constraints (not all).
*/
- public boolean
- matches(
+ public boolean matches(
final java.security.cert.X509Certificate cert
) {
if (!subjectDNPatterns.isEmpty()) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/9e4016bf/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/services/JaxwsSubscription.java
----------------------------------------------------------------------
diff --git a/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/services/JaxwsSubscription.java b/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/services/JaxwsSubscription.java
index 6cac824..dc37cad 100644
--- a/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/services/JaxwsSubscription.java
+++ b/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/services/JaxwsSubscription.java
@@ -38,9 +38,9 @@ import org.oasis_open.docs.wsn.bw_2.UnrecognizedPolicyRequestFault;
import org.oasis_open.docs.wsn.bw_2.UnsupportedPolicyRequestFault;
@WebService(endpointInterface = "org.oasis_open.docs.wsn.bw_2.PausableSubscriptionManager",
-targetNamespace = "http://cxf.apache.org/wsn/jaxws",
-serviceName = "PausableSubscriptionManagerService",
-portName = "PausableSubscriptionManagerPort"
+ targetNamespace = "http://cxf.apache.org/wsn/jaxws",
+ serviceName = "PausableSubscriptionManagerService",
+ portName = "PausableSubscriptionManagerPort"
)
public class JaxwsSubscription extends JmsSubscription {
http://git-wip-us.apache.org/repos/asf/cxf/blob/9e4016bf/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSLoggingAtomPushTest.java
----------------------------------------------------------------------
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSLoggingAtomPushTest.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSLoggingAtomPushTest.java
index 19025e4..f052eba 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSLoggingAtomPushTest.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSLoggingAtomPushTest.java
@@ -206,8 +206,7 @@ public class JAXRSLoggingAtomPushTest extends Assert {
@Ignore
- private AbstractFeedBuilder<List<org.apache.cxf.management.web.logging.LogRecord>>
- createCustomFeedBuilder() {
+ private AbstractFeedBuilder<List<org.apache.cxf.management.web.logging.LogRecord>> createCustomFeedBuilder() {
AbstractFeedBuilder<List<org.apache.cxf.management.web.logging.LogRecord>> fb =
new AbstractFeedBuilder<List<org.apache.cxf.management.web.logging.LogRecord>>() {
@@ -220,8 +219,7 @@ public class JAXRSLoggingAtomPushTest extends Assert {
}
@Ignore
- private AbstractEntryBuilder<List<org.apache.cxf.management.web.logging.LogRecord>>
- createCustomEntryBuilder() {
+ private AbstractEntryBuilder<List<org.apache.cxf.management.web.logging.LogRecord>> createCustomEntryBuilder() {
AbstractEntryBuilder<List<org.apache.cxf.management.web.logging.LogRecord>> eb =
new AbstractEntryBuilder<List<org.apache.cxf.management.web.logging.LogRecord>>() {
@Override
http://git-wip-us.apache.org/repos/asf/cxf/blob/9e4016bf/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/AbstractSourcePayloadProvider.java
----------------------------------------------------------------------
diff --git a/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/AbstractSourcePayloadProvider.java b/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/AbstractSourcePayloadProvider.java
index b0e8af1..4060b69 100644
--- a/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/AbstractSourcePayloadProvider.java
+++ b/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/AbstractSourcePayloadProvider.java
@@ -49,9 +49,10 @@ import org.apache.cxf.staxutils.StaxUtils;
//The following wsdl file is used.
//wsdlLocation = "/trunk/testutils/src/main/resources/wsdl/hello_world_rpc_lit.wsdl"
-@WebServiceProvider(portName = "SoapPortProviderRPCLit3", serviceName = "SOAPServiceProviderRPCLit",
- targetNamespace = "http://apache.org/hello_world_rpclit",
- wsdlLocation = "/wsdl/hello_world_rpc_lit.wsdl")
+@WebServiceProvider(portName = "SoapPortProviderRPCLit3",
+ serviceName = "SOAPServiceProviderRPCLit",
+ targetNamespace = "http://apache.org/hello_world_rpclit",
+ wsdlLocation = "/wsdl/hello_world_rpc_lit.wsdl")
@ServiceMode (value = javax.xml.ws.Service.Mode.PAYLOAD)
@HandlerChain(file = "./handlers_invocation.xml", name = "TestHandlerChain")
public abstract class AbstractSourcePayloadProvider implements SourceProvider {
http://git-wip-us.apache.org/repos/asf/cxf/blob/9e4016bf/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/HWDOMSourceMessageProvider.java
----------------------------------------------------------------------
diff --git a/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/HWDOMSourceMessageProvider.java b/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/HWDOMSourceMessageProvider.java
index 7408116..768b16b 100644
--- a/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/HWDOMSourceMessageProvider.java
+++ b/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/HWDOMSourceMessageProvider.java
@@ -39,8 +39,8 @@ import org.w3c.dom.Node;
//The following wsdl file is used.
//wsdlLocation = "/trunk/testutils/src/main/resources/wsdl/hello_world_rpc_lit.wsdl"
@WebServiceProvider(portName = "SoapPortProviderRPCLit2", serviceName = "SOAPServiceProviderRPCLit",
- targetNamespace = "http://apache.org/hello_world_rpclit",
- wsdlLocation = "/wsdl/hello_world_rpc_lit.wsdl")
+ targetNamespace = "http://apache.org/hello_world_rpclit",
+ wsdlLocation = "/wsdl/hello_world_rpc_lit.wsdl")
@ServiceMode(value = Service.Mode.MESSAGE)
public class HWDOMSourceMessageProvider implements Provider<DOMSource> {
http://git-wip-us.apache.org/repos/asf/cxf/blob/9e4016bf/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/HWDOMSourcePayloadProvider.java
----------------------------------------------------------------------
diff --git a/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/HWDOMSourcePayloadProvider.java b/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/HWDOMSourcePayloadProvider.java
index 8361a70..ac79760 100644
--- a/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/HWDOMSourcePayloadProvider.java
+++ b/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/HWDOMSourcePayloadProvider.java
@@ -46,8 +46,8 @@ import org.apache.cxf.helpers.DOMUtils;
//The following wsdl file is used.
//wsdlLocation = "/trunk/testutils/src/main/resources/wsdl/hello_world_rpc_lit.wsdl"
@WebServiceProvider(portName = "SoapPortProviderRPCLit3", serviceName = "SOAPServiceProviderRPCLit",
- targetNamespace = "http://apache.org/hello_world_rpclit",
- wsdlLocation = "/wsdl/hello_world_rpc_lit.wsdl")
+ targetNamespace = "http://apache.org/hello_world_rpclit",
+ wsdlLocation = "/wsdl/hello_world_rpc_lit.wsdl")
public class HWDOMSourcePayloadProvider implements Provider<DOMSource> {
private static QName sayHi = new QName("http://apache.org/hello_world_rpclit", "sayHi");
private static QName greetMe = new QName("http://apache.org/hello_world_rpclit", "greetMe");
http://git-wip-us.apache.org/repos/asf/cxf/blob/9e4016bf/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/HWSAXSourceMessageProvider.java
----------------------------------------------------------------------
diff --git a/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/HWSAXSourceMessageProvider.java b/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/HWSAXSourceMessageProvider.java
index 4c7f1b2..7dbc94d 100644
--- a/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/HWSAXSourceMessageProvider.java
+++ b/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/HWSAXSourceMessageProvider.java
@@ -42,7 +42,7 @@ import org.xml.sax.InputSource;
//wsdlLocation = "/trunk/testutils/src/main/resources/wsdl/hello_world_rpc_lit.wsdl"
@WebServiceProvider(portName = "SoapPortProviderRPCLit4", serviceName = "SOAPServiceProviderRPCLit",
targetNamespace = "http://apache.org/hello_world_rpclit",
-wsdlLocation = "/wsdl/hello_world_rpc_lit.wsdl")
+ wsdlLocation = "/wsdl/hello_world_rpc_lit.wsdl")
@ServiceMode(value = Service.Mode.MESSAGE)
public class HWSAXSourceMessageProvider implements Provider<SAXSource> {
http://git-wip-us.apache.org/repos/asf/cxf/blob/9e4016bf/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/HWSAXSourcePayloadProvider.java
----------------------------------------------------------------------
diff --git a/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/HWSAXSourcePayloadProvider.java b/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/HWSAXSourcePayloadProvider.java
index 1d515e9..0f16067 100644
--- a/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/HWSAXSourcePayloadProvider.java
+++ b/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/HWSAXSourcePayloadProvider.java
@@ -50,8 +50,8 @@ import org.apache.cxf.staxutils.StaxUtils;
//The following wsdl file is used.
//wsdlLocation = "/trunk/testutils/src/main/resources/wsdl/hello_world_rpc_lit.wsdl"
@WebServiceProvider(portName = "SoapPortProviderRPCLit6", serviceName = "SOAPServiceProviderRPCLit",
- targetNamespace = "http://apache.org/hello_world_rpclit",
-wsdlLocation = "/wsdl/hello_world_rpc_lit.wsdl")
+ targetNamespace = "http://apache.org/hello_world_rpclit",
+ wsdlLocation = "/wsdl/hello_world_rpc_lit.wsdl")
@ServiceMode(value = Service.Mode.PAYLOAD)
public class HWSAXSourcePayloadProvider implements Provider<SAXSource> {
http://git-wip-us.apache.org/repos/asf/cxf/blob/9e4016bf/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/HWSoapMessageDocProvider.java
----------------------------------------------------------------------
diff --git a/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/HWSoapMessageDocProvider.java b/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/HWSoapMessageDocProvider.java
index e17e1b9..a2117c0 100644
--- a/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/HWSoapMessageDocProvider.java
+++ b/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/HWSoapMessageDocProvider.java
@@ -50,7 +50,7 @@ import org.apache.cxf.helpers.DOMUtils;
//wsdlLocation = "/trunk/testutils/src/main/resources/wsdl/hello_world.wsdl"
@WebServiceProvider(portName = "SoapProviderPort", serviceName = "SOAPProviderService",
targetNamespace = "http://apache.org/hello_world_soap_http",
- wsdlLocation = "/org/apache/cxf/systest/provider/hello_world_with_restriction.wsdl")
+ wsdlLocation = "/org/apache/cxf/systest/provider/hello_world_with_restriction.wsdl")
@ServiceMode(value = Service.Mode.MESSAGE)
public class HWSoapMessageDocProvider implements Provider<SOAPMessage> {
http://git-wip-us.apache.org/repos/asf/cxf/blob/9e4016bf/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/HWStreamSourceMessageProvider.java
----------------------------------------------------------------------
diff --git a/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/HWStreamSourceMessageProvider.java b/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/HWStreamSourceMessageProvider.java
index ecdb9e2..cef877b 100644
--- a/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/HWStreamSourceMessageProvider.java
+++ b/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/HWStreamSourceMessageProvider.java
@@ -42,7 +42,7 @@ import org.w3c.dom.Node;
//wsdlLocation = "/trunk/testutils/src/main/resources/wsdl/hello_world_rpc_lit.wsdl"
@WebServiceProvider(portName = "SoapPortProviderRPCLit5", serviceName = "SOAPServiceProviderRPCLit",
targetNamespace = "http://apache.org/hello_world_rpclit",
-wsdlLocation = "/wsdl/hello_world_rpc_lit.wsdl")
+ wsdlLocation = "/wsdl/hello_world_rpc_lit.wsdl")
@ServiceMode(value = Service.Mode.MESSAGE)
public class HWStreamSourceMessageProvider implements Provider<StreamSource> {
http://git-wip-us.apache.org/repos/asf/cxf/blob/9e4016bf/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/HWStreamSourcePayloadProvider.java
----------------------------------------------------------------------
diff --git a/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/HWStreamSourcePayloadProvider.java b/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/HWStreamSourcePayloadProvider.java
index 3429218..bebef77 100644
--- a/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/HWStreamSourcePayloadProvider.java
+++ b/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/HWStreamSourcePayloadProvider.java
@@ -51,7 +51,7 @@ import org.w3c.dom.ls.LSSerializer;
//wsdlLocation = "/trunk/testutils/src/main/resources/wsdl/hello_world_rpc_lit.wsdl"
@WebServiceProvider(portName = "SoapPortProviderRPCLit7", serviceName = "SOAPServiceProviderRPCLit",
targetNamespace = "http://apache.org/hello_world_rpclit",
-wsdlLocation = "/wsdl/hello_world_rpc_lit.wsdl")
+ wsdlLocation = "/wsdl/hello_world_rpc_lit.wsdl")
@ServiceMode(value = Service.Mode.PAYLOAD)
public class HWStreamSourcePayloadProvider implements Provider<StreamSource> {
http://git-wip-us.apache.org/repos/asf/cxf/blob/9e4016bf/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/ldap/LDAPClaimsTest.java
----------------------------------------------------------------------
diff --git a/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/ldap/LDAPClaimsTest.java b/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/ldap/LDAPClaimsTest.java
index bfc242a..5e3c198 100644
--- a/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/ldap/LDAPClaimsTest.java
+++ b/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/ldap/LDAPClaimsTest.java
@@ -58,10 +58,10 @@ import org.springframework.util.Assert;
//Define the DirectoryService
@CreateDS(name = "LDAPClaimsTest-class",
- enableAccessControl = false,
- allowAnonAccess = false,
- enableChangeLog = true,
- partitions = {
+ enableAccessControl = false,
+ allowAnonAccess = false,
+ enableChangeLog = true,
+ partitions = {
@CreatePartition(
name = "example",
suffix = "dc=example,dc=com",
@@ -71,13 +71,13 @@ import org.springframework.util.Assert;
@CreateIndex(attribute = "ou")
}
) }
-)
+ )
@CreateLdapServer(
- transports = {
+ transports = {
@CreateTransport(protocol = "LDAP")
}
-)
+ )
//Inject an file containing entries
@ApplyLdifFiles("ldap.ldif")
http://git-wip-us.apache.org/repos/asf/cxf/blob/9e4016bf/systests/uncategorized/src/test/java/org/apache/cxf/systest/schemaimport/ServiceImpl.java
----------------------------------------------------------------------
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/schemaimport/ServiceImpl.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/schemaimport/ServiceImpl.java
index ec60988..163c764 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/schemaimport/ServiceImpl.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/schemaimport/ServiceImpl.java
@@ -20,9 +20,9 @@ package org.apache.cxf.systest.schemaimport;
import javax.jws.WebService;
@WebService(targetNamespace = "http://cxf.apache.org/xsd/test/", name = "service_v1_port",
-wsdlLocation = "classpath:/wsdl_systest/service.wsdl",
-serviceName = "service_v1",
-endpointInterface = "org.apache.cxf.systest.schemaimport.ServiceV1Port")
+ wsdlLocation = "classpath:/wsdl_systest/service.wsdl",
+ serviceName = "service_v1",
+ endpointInterface = "org.apache.cxf.systest.schemaimport.ServiceV1Port")
public class ServiceImpl implements ServiceV1Port {
@Override
http://git-wip-us.apache.org/repos/asf/cxf/blob/9e4016bf/systests/uncategorized/src/test/java/org/apache/cxf/systest/schemaimport/TestEndpointImpl.java
----------------------------------------------------------------------
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/schemaimport/TestEndpointImpl.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/schemaimport/TestEndpointImpl.java
index 7009474..5fb683c 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/schemaimport/TestEndpointImpl.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/schemaimport/TestEndpointImpl.java
@@ -21,8 +21,8 @@ package org.apache.cxf.systest.schemaimport;
import javax.jws.WebService;
@WebService(name = "TestEndpoint", serviceName = "TestEndpointService",
-targetNamespace = "http://cxf.apache.org/schemaimport",
-wsdlLocation = "classpath:/wsdl_systest/import/TestService.wsdl")
+ targetNamespace = "http://cxf.apache.org/schemaimport",
+ wsdlLocation = "classpath:/wsdl_systest/import/TestService.wsdl")
public class TestEndpointImpl implements TestEndpoint {
public String echo(String message) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/9e4016bf/systests/uncategorized/src/test/java/org/apache/cxf/systest/soap/RPCEncodedSoapActionGreeterImpl.java
----------------------------------------------------------------------
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/soap/RPCEncodedSoapActionGreeterImpl.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/soap/RPCEncodedSoapActionGreeterImpl.java
index e7bec22..28934bd 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/soap/RPCEncodedSoapActionGreeterImpl.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/soap/RPCEncodedSoapActionGreeterImpl.java
@@ -25,7 +25,7 @@ import javax.jws.soap.SOAPBinding;
import org.apache.hello_world_soap_action.WrappedGreeter;
@WebService(endpointInterface = "org.apache.hello_world_soap_action.WrappedGreeter",
-serviceName = "WrappedSOAPService")
+ serviceName = "WrappedSOAPService")
@SOAPBinding(style = SOAPBinding.Style.RPC, use = SOAPBinding.Use.ENCODED)
public class RPCEncodedSoapActionGreeterImpl implements WrappedGreeter {
http://git-wip-us.apache.org/repos/asf/cxf/blob/9e4016bf/systests/uncategorized/src/test/java/org/apache/cxf/systest/soap/RPCLitSoapActionGreeterImpl.java
----------------------------------------------------------------------
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/soap/RPCLitSoapActionGreeterImpl.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/soap/RPCLitSoapActionGreeterImpl.java
index e95b13c..76b8ab8 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/soap/RPCLitSoapActionGreeterImpl.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/soap/RPCLitSoapActionGreeterImpl.java
@@ -25,7 +25,7 @@ import javax.jws.soap.SOAPBinding;
import org.apache.hello_world_soap_action.WrappedGreeter;
@WebService(endpointInterface = "org.apache.hello_world_soap_action.WrappedGreeter",
-serviceName = "WrappedSOAPService")
+ serviceName = "WrappedSOAPService")
@SOAPBinding(style = SOAPBinding.Style.RPC)
public class RPCLitSoapActionGreeterImpl implements WrappedGreeter {
http://git-wip-us.apache.org/repos/asf/cxf/blob/9e4016bf/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/JavaFirstAttachmentPolicyService.java
----------------------------------------------------------------------
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/JavaFirstAttachmentPolicyService.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/JavaFirstAttachmentPolicyService.java
index d16fb32..7c9fdd1 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/JavaFirstAttachmentPolicyService.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/JavaFirstAttachmentPolicyService.java
@@ -23,7 +23,7 @@ import javax.jws.WebMethod;
import javax.jws.WebService;
@WebService(name = "JavaFirstAttachmentPolicyService",
-targetNamespace = "http://www.example.org/contract/JavaFirstAttachmentPolicyService")
+ targetNamespace = "http://www.example.org/contract/JavaFirstAttachmentPolicyService")
public interface JavaFirstAttachmentPolicyService {
@WebMethod(operationName = "doOperationLevelPolicy")
void doOperationLevelPolicy();
http://git-wip-us.apache.org/repos/asf/cxf/blob/9e4016bf/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/JavaFirstAttachmentPolicyServiceImpl.java
----------------------------------------------------------------------
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/JavaFirstAttachmentPolicyServiceImpl.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/JavaFirstAttachmentPolicyServiceImpl.java
index e77a3bc..1e82ae3 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/JavaFirstAttachmentPolicyServiceImpl.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/JavaFirstAttachmentPolicyServiceImpl.java
@@ -22,8 +22,8 @@ package org.apache.cxf.systest.ws.policy;
import javax.jws.WebService;
@WebService(endpointInterface = "org.apache.cxf.systest.ws.policy.JavaFirstAttachmentPolicyService",
-serviceName = "JavaFirstAttachmentPolicyService",
-targetNamespace = "http://www.example.org/contract/JavaFirstAttachmentPolicyService")
+ serviceName = "JavaFirstAttachmentPolicyService",
+ targetNamespace = "http://www.example.org/contract/JavaFirstAttachmentPolicyService")
public class JavaFirstAttachmentPolicyServiceImpl implements JavaFirstAttachmentPolicyService {
public void doOperationLevelPolicy() {
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/9e4016bf/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/JavaFirstPolicyService.java
----------------------------------------------------------------------
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/JavaFirstPolicyService.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/JavaFirstPolicyService.java
index 5621943..94c2a6b 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/JavaFirstPolicyService.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/JavaFirstPolicyService.java
@@ -26,7 +26,7 @@ import org.apache.cxf.annotations.Policies;
import org.apache.cxf.annotations.Policy;
@WebService(name = "JavaFirstPolicyService",
-targetNamespace = "http://www.example.org/contract/JavaFirstPolicyService")
+ targetNamespace = "http://www.example.org/contract/JavaFirstPolicyService")
public interface JavaFirstPolicyService {
@Policies({
@Policy(uri = "#InternalTransportAndUsernamePolicy",
http://git-wip-us.apache.org/repos/asf/cxf/blob/9e4016bf/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/JavaFirstPolicyServiceImpl.java
----------------------------------------------------------------------
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/JavaFirstPolicyServiceImpl.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/JavaFirstPolicyServiceImpl.java
index 068819b..e5cc8f9 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/JavaFirstPolicyServiceImpl.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/JavaFirstPolicyServiceImpl.java
@@ -22,8 +22,8 @@ package org.apache.cxf.systest.ws.policy;
import javax.jws.WebService;
@WebService(endpointInterface = "org.apache.cxf.systest.ws.policy.JavaFirstPolicyService",
-serviceName = "JavaFirstPolicyService",
-targetNamespace = "http://www.example.org/contract/JavaFirstPolicyService")
+ serviceName = "JavaFirstPolicyService",
+ targetNamespace = "http://www.example.org/contract/JavaFirstPolicyService")
public class JavaFirstPolicyServiceImpl implements JavaFirstPolicyService {
public void doOperationOne() {
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/9e4016bf/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/SslUsernamePasswordAttachmentService.java
----------------------------------------------------------------------
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/SslUsernamePasswordAttachmentService.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/SslUsernamePasswordAttachmentService.java
index e975b06..d23dcad 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/SslUsernamePasswordAttachmentService.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/SslUsernamePasswordAttachmentService.java
@@ -23,7 +23,7 @@ import javax.jws.WebMethod;
import javax.jws.WebService;
@WebService(name = "SslUsernamePasswordAttachmentService",
-targetNamespace = "http://www.example.org/contract/SslUsernamePasswordAttachmentService")
+ targetNamespace = "http://www.example.org/contract/SslUsernamePasswordAttachmentService")
public interface SslUsernamePasswordAttachmentService {
@WebMethod(operationName = "doSslAndUsernamePasswordPolicy")
void doSslAndUsernamePasswordPolicy();
http://git-wip-us.apache.org/repos/asf/cxf/blob/9e4016bf/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/SslUsernamePasswordAttachmentServiceImpl.java
----------------------------------------------------------------------
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/SslUsernamePasswordAttachmentServiceImpl.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/SslUsernamePasswordAttachmentServiceImpl.java
index 8b90fe6..dd0139e 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/SslUsernamePasswordAttachmentServiceImpl.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/SslUsernamePasswordAttachmentServiceImpl.java
@@ -22,8 +22,8 @@ package org.apache.cxf.systest.ws.policy;
import javax.jws.WebService;
@WebService(endpointInterface = "org.apache.cxf.systest.ws.policy.SslUsernamePasswordAttachmentService",
-serviceName = "SslUsernamePasswordAttachmentService",
-targetNamespace = "http://www.example.org/contract/SslUsernamePasswordAttachmentService")
+ serviceName = "SslUsernamePasswordAttachmentService",
+ targetNamespace = "http://www.example.org/contract/SslUsernamePasswordAttachmentService")
public class SslUsernamePasswordAttachmentServiceImpl implements SslUsernamePasswordAttachmentService {
public void doSslAndUsernamePasswordPolicy() {
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/9e4016bf/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/javafirst/NoAlternativesOperationSimpleService.java
----------------------------------------------------------------------
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/javafirst/NoAlternativesOperationSimpleService.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/javafirst/NoAlternativesOperationSimpleService.java
index 4574dff..619c6e4 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/javafirst/NoAlternativesOperationSimpleService.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/javafirst/NoAlternativesOperationSimpleService.java
@@ -23,7 +23,7 @@ import javax.jws.WebMethod;
import javax.jws.WebService;
@WebService(name = "NoAlternativesOperationSimpleService",
-targetNamespace = "http://www.example.org/contract/NoAlternativesOperationSimpleService")
+ targetNamespace = "http://www.example.org/contract/NoAlternativesOperationSimpleService")
public interface NoAlternativesOperationSimpleService {
@WebMethod(operationName = "doStuff")
void doStuff();
http://git-wip-us.apache.org/repos/asf/cxf/blob/9e4016bf/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/javafirst/NoAlternativesOperationSimpleServiceImpl.java
----------------------------------------------------------------------
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/javafirst/NoAlternativesOperationSimpleServiceImpl.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/javafirst/NoAlternativesOperationSimpleServiceImpl.java
index f889f9e..ce0c927 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/javafirst/NoAlternativesOperationSimpleServiceImpl.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/javafirst/NoAlternativesOperationSimpleServiceImpl.java
@@ -25,9 +25,9 @@ import org.apache.cxf.annotations.Policy;
import org.apache.cxf.annotations.Policy.Placement;
@WebService(name = "NoAlternativesOperationSimpleService",
-endpointInterface = "org.apache.cxf.systest.ws.policy.javafirst.NoAlternativesOperationSimpleService",
-serviceName = "NoAlternativesOperationSimpleService",
-targetNamespace = "http://www.example.org/contract/NoAlternativesOperationSimpleService")
+ endpointInterface = "org.apache.cxf.systest.ws.policy.javafirst.NoAlternativesOperationSimpleService",
+ serviceName = "NoAlternativesOperationSimpleService",
+ targetNamespace = "http://www.example.org/contract/NoAlternativesOperationSimpleService")
public class NoAlternativesOperationSimpleServiceImpl implements NoAlternativesOperationSimpleService {
@Policy(uri = "classpath:/java_first_policies/UsernamePolicy.xml",
placement = Placement.BINDING_OPERATION)
http://git-wip-us.apache.org/repos/asf/cxf/blob/9e4016bf/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/javafirst/OperationSimpleService.java
----------------------------------------------------------------------
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/javafirst/OperationSimpleService.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/javafirst/OperationSimpleService.java
index 0b22a3a..5903332 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/javafirst/OperationSimpleService.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/javafirst/OperationSimpleService.java
@@ -23,7 +23,7 @@ import javax.jws.WebMethod;
import javax.jws.WebService;
@WebService(name = "OperationSimpleService",
-targetNamespace = "http://www.example.org/contract/OperationSimpleService")
+ targetNamespace = "http://www.example.org/contract/OperationSimpleService")
public interface OperationSimpleService {
@WebMethod(operationName = "doStuff")
void doStuff();
http://git-wip-us.apache.org/repos/asf/cxf/blob/9e4016bf/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/javafirst/OperationSimpleServiceImpl.java
----------------------------------------------------------------------
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/javafirst/OperationSimpleServiceImpl.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/javafirst/OperationSimpleServiceImpl.java
index ec2d5d0..a8fe166 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/javafirst/OperationSimpleServiceImpl.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/javafirst/OperationSimpleServiceImpl.java
@@ -25,8 +25,9 @@ import org.apache.cxf.annotations.Policy;
import org.apache.cxf.annotations.Policy.Placement;
@WebService(name = "OperationSimpleService",
-endpointInterface = "org.apache.cxf.systest.ws.policy.javafirst.OperationSimpleService",
-serviceName = "OperationSimpleService", targetNamespace = "http://www.example.org/contract/OperationSimpleService")
+ endpointInterface = "org.apache.cxf.systest.ws.policy.javafirst.OperationSimpleService",
+ serviceName = "OperationSimpleService",
+ targetNamespace = "http://www.example.org/contract/OperationSimpleService")
public class OperationSimpleServiceImpl implements OperationSimpleService {
@Policy(uri = "classpath:/java_first_policies/AlternativesPolicy.xml",
placement = Placement.BINDING_OPERATION_INPUT)
http://git-wip-us.apache.org/repos/asf/cxf/blob/9e4016bf/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/server/PingServiceBase.java
----------------------------------------------------------------------
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/server/PingServiceBase.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/server/PingServiceBase.java
index 5c949b9..4ee2a4a 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/server/PingServiceBase.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/server/PingServiceBase.java
@@ -32,10 +32,7 @@ public abstract class PingServiceBase implements IPingService {
}
- public java.lang.String
- echo(
- java.lang.String request
- ) {
+ public java.lang.String echo(String request) {
//System.out.println("echo(" + request + ")");
return request;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/9e4016bf/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/exception/Echo2Impl.java
----------------------------------------------------------------------
diff --git a/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/exception/Echo2Impl.java b/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/exception/Echo2Impl.java
index f95e58d..4bfd2d4 100644
--- a/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/exception/Echo2Impl.java
+++ b/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/exception/Echo2Impl.java
@@ -21,8 +21,8 @@ package org.apache.cxf.tools.fortest.exception;
import javax.jws.WebService;
@WebService(serviceName = "ListService", portName = "ListPort",
-endpointInterface = "org.apache.cxf.tools.fortest.exception.Echo2",
-targetNamespace = "http://cxf.apache.org/test/ListService")
+ endpointInterface = "org.apache.cxf.tools.fortest.exception.Echo2",
+ targetNamespace = "http://cxf.apache.org/test/ListService")
public class Echo2Impl implements Echo2 {
public String echo(String request) throws ListException {
return "Response";
http://git-wip-us.apache.org/repos/asf/cxf/blob/9e4016bf/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/holder/HolderService.java
----------------------------------------------------------------------
diff --git a/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/holder/HolderService.java b/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/holder/HolderService.java
index 2b5aa17..e5f9e4d 100644
--- a/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/holder/HolderService.java
+++ b/tools/javato/ws/src/test/java/org/apache/cxf/tools/fortest/holder/HolderService.java
@@ -27,13 +27,13 @@ import javax.xml.ws.Holder;
@WebService
public interface HolderService {
- String echo(String s1, String s2, @WebParam(mode = Mode.OUT)
- Holder<String> outS2);
+ String echo(String s1, String s2,
+ @WebParam(mode = Mode.OUT) Holder<String> outS2);
- String echo2(String s1, @WebParam(mode = Mode.OUT)
- Holder<String> outS2, String s2);
+ String echo2(String s1,
+ @WebParam(mode = Mode.OUT) Holder<String> outS2, String s2);
String echo3(@WebParam(mode = Mode.INOUT, header = true, name = "header")
- Holder<String> header, String s1);
+ Holder<String> header, String s1);
}
[6/9] cxf git commit: "setContextualProperty" doesn't make any sense
as a property has to have a context to where it's set. put the property on
the message. Add javadoc to resetContextCache.
Posted by dk...@apache.org.
"setContextualProperty" doesn't make any sense as a property has to have a context to where it's set. put the property on the message. Add javadoc to resetContextCache.
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/e251f425
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/e251f425
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/e251f425
Branch: refs/heads/3.0.x-fixes
Commit: e251f425bd0ca9ac8782ea0f95f21a3196124e66
Parents: a23a473
Author: Daniel Kulp <dk...@apache.org>
Authored: Mon Jan 26 15:24:33 2015 -0500
Committer: Daniel Kulp <dk...@apache.org>
Committed: Mon Feb 9 12:48:55 2015 -0500
----------------------------------------------------------------------
.../cxf/message/AbstractWrappedMessage.java | 9 +++++-
.../org/apache/cxf/message/ExchangeImpl.java | 29 ++++++++++++--------
.../java/org/apache/cxf/message/Message.java | 9 ++++++
.../cxf/jaxws/JAXWSMethodInvokerTest.java | 4 +--
.../ws/addressing/impl/MAPAggregatorTest.java | 4 +--
.../SecureConversationInInterceptor.java | 2 +-
.../cxf/ws/security/trust/STSLoginModule.java | 2 +-
.../wss4j/AbstractWSS4JInterceptor.java | 16 +++++------
.../wss4j/PolicyBasedWSS4JOutInterceptor.java | 2 +-
.../policyhandlers/AbstractBindingBuilder.java | 4 +--
.../AsymmetricBindingHandler.java | 2 +-
.../policyhandlers/TransportBindingHandler.java | 2 +-
.../wss4j/saml/PolicyBasedSamlTest.java | 4 +--
.../cxf/systest/jaxws/LocatorServiceImpl.java | 2 +-
.../security/saml/SamlRetrievalInterceptor.java | 2 +-
.../ws/rm/RobustServiceWithFaultTest.java | 2 +-
16 files changed, 58 insertions(+), 37 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/e251f425/core/src/main/java/org/apache/cxf/message/AbstractWrappedMessage.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/message/AbstractWrappedMessage.java b/core/src/main/java/org/apache/cxf/message/AbstractWrappedMessage.java
index 03ce0f7..6a82ce1 100644
--- a/core/src/main/java/org/apache/cxf/message/AbstractWrappedMessage.java
+++ b/core/src/main/java/org/apache/cxf/message/AbstractWrappedMessage.java
@@ -162,7 +162,14 @@ public abstract class AbstractWrappedMessage implements Message {
return message.getContextualProperty(key);
}
public void setContextualProperty(String key, Object v) {
- message.setContextualProperty(key, v);
+ if (message instanceof MessageImpl) {
+ ((MessageImpl)message).setContextualProperty(key, v);
+ } else if (message instanceof AbstractWrappedMessage) {
+ ((AbstractWrappedMessage)message).setContextualProperty(key, v);
+ } else {
+ //cannot set directly. Just invalidate the cache.
+ message.resetContextCache();
+ }
}
public Set<String> getContextualPropertyKeys() {
http://git-wip-us.apache.org/repos/asf/cxf/blob/e251f425/core/src/main/java/org/apache/cxf/message/ExchangeImpl.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/message/ExchangeImpl.java b/core/src/main/java/org/apache/cxf/message/ExchangeImpl.java
index 5ac10ca..2e53fae 100644
--- a/core/src/main/java/org/apache/cxf/message/ExchangeImpl.java
+++ b/core/src/main/java/org/apache/cxf/message/ExchangeImpl.java
@@ -113,24 +113,29 @@ public class ExchangeImpl extends ConcurrentHashMap<String, Object> implements
}
public Object put(String key, Object value) {
- if (inMessage != null) {
- inMessage.setContextualProperty(key, value);
- }
- if (outMessage != null) {
- outMessage.setContextualProperty(key, value);
- }
- if (inFaultMessage != null) {
- inFaultMessage.setContextualProperty(key, value);
- }
- if (outFaultMessage != null) {
- outFaultMessage.setContextualProperty(key, value);
- }
+ setMessageContextProperty(inMessage, key, value);
+ setMessageContextProperty(outMessage, key, value);
+ setMessageContextProperty(inFaultMessage, key, value);
+ setMessageContextProperty(outFaultMessage, key, value);
if (value == null) {
return super.remove(key);
}
return super.put(key, value);
}
+ private void setMessageContextProperty(Message m, String key, Object value) {
+ if (m == null) {
+ return;
+ }
+ if (m instanceof MessageImpl) {
+ ((MessageImpl)m).setContextualProperty(key, value);
+ } else if (m instanceof AbstractWrappedMessage) {
+ ((AbstractWrappedMessage)m).setContextualProperty(key, value);
+ } else {
+ //cannot set directly. Just invalidate the cache.
+ m.resetContextCache();
+ }
+ }
public Destination getDestination() {
return destination;
http://git-wip-us.apache.org/repos/asf/cxf/blob/e251f425/core/src/main/java/org/apache/cxf/message/Message.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/message/Message.java b/core/src/main/java/org/apache/cxf/message/Message.java
index 39d6c96..372b7dc 100644
--- a/core/src/main/java/org/apache/cxf/message/Message.java
+++ b/core/src/main/java/org/apache/cxf/message/Message.java
@@ -248,7 +248,16 @@ public interface Message extends StringMap {
*/
Object getContextualProperty(String key);
+ /**
+ * Resets the cache of contextual properties that messages may contain. Subsequent
+ * calls to getContextualProperty will likely recalculate the cache.
+ */
void resetContextCache();
+
+ /**
+ * Don't call, will be made non-public in 3.1
+ */
+ @Deprecated
void setContextualProperty(String key, Object v);
/**
http://git-wip-us.apache.org/repos/asf/cxf/blob/e251f425/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/JAXWSMethodInvokerTest.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/JAXWSMethodInvokerTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/JAXWSMethodInvokerTest.java
index 50be869..06c5be1 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/JAXWSMethodInvokerTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/JAXWSMethodInvokerTest.java
@@ -184,7 +184,7 @@ public class JAXWSMethodInvokerTest extends Assert {
// request-response with null response, interpretNullAsOneway disabled
ex.setOneWay(false);
serviceObject.setNullable(true);
- inMessage.setContextualProperty("jaxws.provider.interpretNullAsOneway", Boolean.FALSE);
+ inMessage.put("jaxws.provider.interpretNullAsOneway", Boolean.FALSE);
obj = (MessageContentsList)jaxwsMethodInvoker.invoke(
ex, new MessageContentsList(new Object[]{new StreamSource()}));
assertEquals(1, obj.size());
@@ -195,7 +195,7 @@ public class JAXWSMethodInvokerTest extends Assert {
// request-response with null response, interpretNullAsOneway explicitly enabled
ex.setOneWay(false);
serviceObject.setNullable(true);
- inMessage.setContextualProperty("jaxws.provider.interpretNullAsOneway", Boolean.TRUE);
+ inMessage.put("jaxws.provider.interpretNullAsOneway", Boolean.TRUE);
obj = (MessageContentsList)jaxwsMethodInvoker
.invoke(ex, new MessageContentsList(new Object[]{new StreamSource()}));
assertNull(obj);
http://git-wip-us.apache.org/repos/asf/cxf/blob/e251f425/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/impl/MAPAggregatorTest.java
----------------------------------------------------------------------
diff --git a/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/impl/MAPAggregatorTest.java b/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/impl/MAPAggregatorTest.java
index 95c612b..248dd4b 100644
--- a/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/impl/MAPAggregatorTest.java
+++ b/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/impl/MAPAggregatorTest.java
@@ -496,8 +496,8 @@ public class MAPAggregatorTest extends Assert {
REQUESTOR_ROLE,
Boolean.TRUE);
message.getContextualProperty(WSAContextUtils.REPLYTO_PROPERTY);
- message.setContextualProperty(WSAContextUtils.REPLYTO_PROPERTY, localReplyTo);
- message.setContextualProperty(WSAContextUtils.DECOUPLED_ENDPOINT_BASE_PROPERTY, decoupledEndpointBase);
+ message.put(WSAContextUtils.REPLYTO_PROPERTY, localReplyTo);
+ message.put(WSAContextUtils.DECOUPLED_ENDPOINT_BASE_PROPERTY, decoupledEndpointBase);
AddressingProperties maps = new AddressingProperties();
AttributedURIType id =
http://git-wip-us.apache.org/repos/asf/cxf/blob/e251f425/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/SecureConversationInInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/SecureConversationInInterceptor.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/SecureConversationInInterceptor.java
index d17bdd0..6cb52d1 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/SecureConversationInInterceptor.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/SecureConversationInInterceptor.java
@@ -513,7 +513,7 @@ class SecureConversationInInterceptor extends AbstractPhaseInterceptor<SoapMessa
client.cancelSecurityToken(tok);
NegotiationUtils.getTokenStore(m2).remove(tok.getId());
- m2.setContextualProperty(SecurityConstants.TOKEN, null);
+ m2.put(SecurityConstants.TOKEN, null);
} catch (RuntimeException e) {
throw e;
} catch (Exception e) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/e251f425/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSLoginModule.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSLoginModule.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSLoginModule.java
index e6bb31d..d141b6b 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSLoginModule.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSLoginModule.java
@@ -242,7 +242,7 @@ public class STSLoginModule implements LoginModule {
STSClient stsClient = configureSTSClient(message);
if (message != null) {
- message.setContextualProperty(SecurityConstants.STS_CLIENT, stsClient);
+ message.put(SecurityConstants.STS_CLIENT, stsClient);
data.setMsgContext(message);
} else {
TokenStore tokenStore = configureTokenStore(message);
http://git-wip-us.apache.org/repos/asf/cxf/blob/e251f425/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/AbstractWSS4JInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/AbstractWSS4JInterceptor.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/AbstractWSS4JInterceptor.java
index ed97f3f..10d731c 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/AbstractWSS4JInterceptor.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/AbstractWSS4JInterceptor.java
@@ -155,34 +155,34 @@ public abstract class AbstractWSS4JInterceptor extends WSHandler implements Soap
protected void translateProperties(SoapMessage msg) {
String bspCompliant = (String)msg.getContextualProperty(SecurityConstants.IS_BSP_COMPLIANT);
if (bspCompliant != null) {
- msg.setContextualProperty(WSHandlerConstants.IS_BSP_COMPLIANT, bspCompliant);
+ msg.put(WSHandlerConstants.IS_BSP_COMPLIANT, bspCompliant);
}
String futureTTL =
(String)msg.getContextualProperty(SecurityConstants.TIMESTAMP_FUTURE_TTL);
if (futureTTL != null) {
- msg.setContextualProperty(WSHandlerConstants.TTL_FUTURE_TIMESTAMP, futureTTL);
+ msg.put(WSHandlerConstants.TTL_FUTURE_TIMESTAMP, futureTTL);
}
String ttl =
(String)msg.getContextualProperty(SecurityConstants.TIMESTAMP_TTL);
if (ttl != null) {
- msg.setContextualProperty(WSHandlerConstants.TTL_TIMESTAMP, ttl);
+ msg.put(WSHandlerConstants.TTL_TIMESTAMP, ttl);
}
String utFutureTTL =
(String)msg.getContextualProperty(SecurityConstants.USERNAMETOKEN_FUTURE_TTL);
if (utFutureTTL != null) {
- msg.setContextualProperty(WSHandlerConstants.TTL_FUTURE_USERNAMETOKEN, utFutureTTL);
+ msg.put(WSHandlerConstants.TTL_FUTURE_USERNAMETOKEN, utFutureTTL);
}
String utTTL =
(String)msg.getContextualProperty(SecurityConstants.USERNAMETOKEN_TTL);
if (utTTL != null) {
- msg.setContextualProperty(WSHandlerConstants.TTL_USERNAMETOKEN, utTTL);
+ msg.put(WSHandlerConstants.TTL_USERNAMETOKEN, utTTL);
}
String certConstraints =
(String)msg.getContextualProperty(SecurityConstants.SUBJECT_CERT_CONSTRAINTS);
if (certConstraints != null) {
- msg.setContextualProperty(WSHandlerConstants.SIG_SUBJECT_CERT_CONSTRAINTS, certConstraints);
+ msg.put(WSHandlerConstants.SIG_SUBJECT_CERT_CONSTRAINTS, certConstraints);
}
// Now set SAML SenderVouches + Holder Of Key requirements
@@ -190,7 +190,7 @@ public abstract class AbstractWSS4JInterceptor extends WSHandler implements Soap
MessageUtils.getContextualBoolean(
msg, SecurityConstants.VALIDATE_SAML_SUBJECT_CONFIRMATION, true
);
- msg.setContextualProperty(
+ msg.put(
WSHandlerConstants.VALIDATE_SAML_SUBJECT_CONFIRMATION,
Boolean.toString(validateSAMLSubjectConf)
);
@@ -198,7 +198,7 @@ public abstract class AbstractWSS4JInterceptor extends WSHandler implements Soap
PasswordEncryptor passwordEncryptor =
(PasswordEncryptor)msg.getContextualProperty(SecurityConstants.PASSWORD_ENCRYPTOR_INSTANCE);
if (passwordEncryptor != null) {
- msg.setContextualProperty(ConfigurationConstants.PASSWORD_ENCRYPTOR_INSTANCE, passwordEncryptor);
+ msg.put(ConfigurationConstants.PASSWORD_ENCRYPTOR_INSTANCE, passwordEncryptor);
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/e251f425/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JOutInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JOutInterceptor.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JOutInterceptor.java
index 8d0a438..dfb3597 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JOutInterceptor.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JOutInterceptor.java
@@ -238,7 +238,7 @@ public class PolicyBasedWSS4JOutInterceptor extends AbstractPhaseInterceptor<Soa
private void translateProperties(SoapMessage msg) {
String bspCompliant = (String)msg.getContextualProperty(SecurityConstants.IS_BSP_COMPLIANT);
if (bspCompliant != null) {
- msg.setContextualProperty(WSHandlerConstants.IS_BSP_COMPLIANT, bspCompliant);
+ msg.put(WSHandlerConstants.IS_BSP_COMPLIANT, bspCompliant);
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/e251f425/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 fd09a0d..bb484a5 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
@@ -894,7 +894,7 @@ public abstract class AbstractBindingBuilder extends AbstractCommonBindingHandle
}
secToken.setToken(assertion.getElement());
getTokenStore().add(secToken);
- message.setContextualProperty(SecurityConstants.TOKEN_ID, secToken.getId());
+ message.put(SecurityConstants.TOKEN_ID, secToken.getId());
}
protected String findIDFromSamlToken(Element samlToken) {
@@ -944,7 +944,7 @@ public abstract class AbstractBindingBuilder extends AbstractCommonBindingHandle
try {
handler = (CallbackHandler)ClassLoaderUtils
.loadClass((String)o, this.getClass()).newInstance();
- message.setContextualProperty(SecurityConstants.CALLBACK_HANDLER, handler);
+ message.put(SecurityConstants.CALLBACK_HANDLER, handler);
} catch (Exception e) {
handler = null;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/e251f425/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AsymmetricBindingHandler.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AsymmetricBindingHandler.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AsymmetricBindingHandler.java
index 36f7aba..8329647 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AsymmetricBindingHandler.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AsymmetricBindingHandler.java
@@ -832,7 +832,7 @@ public class AsymmetricBindingHandler extends AbstractBindingBuilder {
}
getTokenStore().add(tempTok);
- message.setContextualProperty(SecurityConstants.TOKEN_ID, tempTok.getId());
+ message.put(SecurityConstants.TOKEN_ID, tempTok.getId());
return id;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/e251f425/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/TransportBindingHandler.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/TransportBindingHandler.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/TransportBindingHandler.java
index 5947969..113e507 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/TransportBindingHandler.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/TransportBindingHandler.java
@@ -339,7 +339,7 @@ public class TransportBindingHandler extends AbstractBindingBuilder {
new SecurityToken(id, usernameToken.getUsernameTokenElement(), created, expires);
tempTok.setSecret(secret);
getTokenStore().add(tempTok);
- message.setContextualProperty(SecurityConstants.TOKEN_ID, tempTok.getId());
+ message.put(SecurityConstants.TOKEN_ID, tempTok.getId());
addSig(doIssuedTokenSignature(token, wrapper));
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/e251f425/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/saml/PolicyBasedSamlTest.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/saml/PolicyBasedSamlTest.java b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/saml/PolicyBasedSamlTest.java
index 5ed6e71..34a5aaa 100644
--- a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/saml/PolicyBasedSamlTest.java
+++ b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/saml/PolicyBasedSamlTest.java
@@ -115,8 +115,8 @@ public class PolicyBasedSamlTest extends AbstractPolicySecurityTest {
// Necessary because the Bearer Assertion does not have an internal signature
SamlAssertionValidator assertionValidator = new SamlAssertionValidator();
assertionValidator.setRequireBearerSignature(false);
- inmsg.setContextualProperty(SecurityConstants.SAML2_TOKEN_VALIDATOR, assertionValidator);
- inmsg.setContextualProperty(SecurityConstants.SAML1_TOKEN_VALIDATOR, assertionValidator);
+ inmsg.put(SecurityConstants.SAML2_TOKEN_VALIDATOR, assertionValidator);
+ inmsg.put(SecurityConstants.SAML1_TOKEN_VALIDATOR, assertionValidator);
inHandler.handleMessage(inmsg);
for (CoverageType type : types) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/e251f425/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/LocatorServiceImpl.java
----------------------------------------------------------------------
diff --git a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/LocatorServiceImpl.java b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/LocatorServiceImpl.java
index 6eb98c8..bd5ce39 100644
--- a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/LocatorServiceImpl.java
+++ b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/LocatorServiceImpl.java
@@ -91,7 +91,7 @@ public class LocatorServiceImpl implements LocatorService {
// create a wsdlLocation attribute with a location only
if (serviceQname.getNamespaceURI().endsWith("2")) {
Message m = PhaseInterceptorChain.getCurrentMessage();
- m.setContextualProperty("org.apache.cxf.wsa.metadata.wsdlLocationOnly", "true");
+ m.put("org.apache.cxf.wsa.metadata.wsdlLocationOnly", "true");
}
ClassLoader cl = Thread.currentThread().getContextClassLoader();
http://git-wip-us.apache.org/repos/asf/cxf/blob/e251f425/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/saml/SamlRetrievalInterceptor.java
----------------------------------------------------------------------
diff --git a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/saml/SamlRetrievalInterceptor.java b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/saml/SamlRetrievalInterceptor.java
index dcf096e..f0f53b8 100644
--- a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/saml/SamlRetrievalInterceptor.java
+++ b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/saml/SamlRetrievalInterceptor.java
@@ -66,7 +66,7 @@ public class SamlRetrievalInterceptor extends AbstractPhaseInterceptor<Message>
SamlAssertionWrapper assertion = new SamlAssertionWrapper(samlCallback);
Document doc = DOMUtils.createDocument();
Element token = assertion.toDOM(doc);
- message.setContextualProperty(SAMLConstants.SAML_TOKEN_ELEMENT, token);
+ message.put(SAMLConstants.SAML_TOKEN_ELEMENT, token);
} catch (WSSecurityException ex) {
StringWriter sw = new StringWriter();
ex.printStackTrace(new PrintWriter(sw));
http://git-wip-us.apache.org/repos/asf/cxf/blob/e251f425/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/RobustServiceWithFaultTest.java
----------------------------------------------------------------------
diff --git a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/RobustServiceWithFaultTest.java b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/RobustServiceWithFaultTest.java
index 1dd6b28..7de20d2 100644
--- a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/RobustServiceWithFaultTest.java
+++ b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/RobustServiceWithFaultTest.java
@@ -176,7 +176,7 @@ public class RobustServiceWithFaultTest extends AbstractBusClientServerTestBase
@Override
public void handleMessage(Message message) throws Fault {
- message.setContextualProperty(Message.ROBUST_ONEWAY, robust);
+ message.put(Message.ROBUST_ONEWAY, robust);
}
}
}
[3/9] cxf git commit: Upate jibx version
Posted by dk...@apache.org.
Upate jibx version
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/0ee29500
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/0ee29500
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/0ee29500
Branch: refs/heads/3.0.x-fixes
Commit: 0ee29500ca1d031490bbc245908cf3a44b42730e
Parents: e251f42
Author: Daniel Kulp <dk...@apache.org>
Authored: Mon Feb 2 10:01:06 2015 -0500
Committer: Daniel Kulp <dk...@apache.org>
Committed: Mon Feb 9 12:48:55 2015 -0500
----------------------------------------------------------------------
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/0ee29500/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 6009be5..206bfaf 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -127,7 +127,7 @@
<cxf.jettison.version>1.3.7</cxf.jettison.version>
<cxf.jetty.version>8.1.15.v20140411</cxf.jetty.version>
<cxf.jetty.osgi.version>[7.6,8.2)</cxf.jetty.osgi.version>
- <cxf.jibx.version>1.2.5</cxf.jibx.version>
+ <cxf.jibx.version>1.2.6</cxf.jibx.version>
<cxf.junit.version>4.12</cxf.junit.version>
<cxf.maven.core.version>2.2.1</cxf.maven.core.version>
<cxf.msv.version>2011.1</cxf.msv.version>