Author: dkulp
Date: Wed Jun 6 17:57:19 2012
New Revision: 1347008
URL: http://svn.apache.org/viewvc?rev=1347008&view=rev
Log:
Merged revisions 1346575 via git cherry-pick from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1346575 | dkulp | 2012-06-05 16:35:34 -0400 (Tue, 05 Jun 2012) | 2 lines
Fix some checkstyle issues
........
Modified:
cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/sts/src/main/java/demo/wssec/client/ClientCallbackHandler.java
cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/sts/src/main/java/demo/wssec/sts/STSCallbackHandler.java
Modified:
cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/sts/src/main/java/demo/wssec/client/ClientCallbackHandler.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/sts/src/main/java/demo/wssec/client/ClientCallbackHandler.java?rev=1347008&r1=1347007&r2=1347008&view=diff
==============================================================================
---
cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/sts/src/main/java/demo/wssec/client/ClientCallbackHandler.java
(original)
+++
cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/sts/src/main/java/demo/wssec/client/ClientCallbackHandler.java
Wed Jun 6 17:57:19 2012
@@ -31,8 +31,8 @@ public class ClientCallbackHandler imple
for (int i = 0; i < callbacks.length; i++) {
if (callbacks[i] instanceof WSPasswordCallback) {
WSPasswordCallback pc = (WSPasswordCallback) callbacks[i];
- if (pc.getUsage() == WSPasswordCallback.DECRYPT ||
- pc.getUsage() == WSPasswordCallback.SIGNATURE) {
+ if (pc.getUsage() == WSPasswordCallback.DECRYPT
+ || pc.getUsage() == WSPasswordCallback.SIGNATURE) {
if ("myclientkey".equals(pc.getIdentifier())) {
pc.setPassword("ckpass");
}
Modified:
cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/sts/src/main/java/demo/wssec/sts/STSCallbackHandler.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/sts/src/main/java/demo/wssec/sts/STSCallbackHandler.java?rev=1347008&r1=1347007&r2=1347008&view=diff
==============================================================================
---
cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/sts/src/main/java/demo/wssec/sts/STSCallbackHandler.java
(original)
+++
cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/sts/src/main/java/demo/wssec/sts/STSCallbackHandler.java
Wed Jun 6 17:57:19 2012
@@ -31,8 +31,8 @@ public class STSCallbackHandler implemen
for (int i = 0; i < callbacks.length; i++) {
if (callbacks[i] instanceof WSPasswordCallback) {
WSPasswordCallback pc = (WSPasswordCallback) callbacks[i];
- if (pc.getUsage() == WSPasswordCallback.DECRYPT ||
- pc.getUsage() == WSPasswordCallback.SIGNATURE) {
+ if (pc.getUsage() == WSPasswordCallback.DECRYPT
+ || pc.getUsage() == WSPasswordCallback.SIGNATURE) {
if ("mystskey".equals(pc.getIdentifier())) {
pc.setPassword("stskpass");
}
