Repository: cxf Updated Branches: refs/heads/master 7fa0e3a2f -> 559e8b4d0
Fixing some checkstyle issues in the samples Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/559e8b4d Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/559e8b4d Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/559e8b4d Branch: refs/heads/master Commit: 559e8b4d0f1e580e8dc56d34e7d387aeb4399990 Parents: 7fa0e3a Author: Colm O hEigeartaigh <[email protected]> Authored: Fri Mar 21 09:54:24 2014 +0000 Committer: Colm O hEigeartaigh <[email protected]> Committed: Fri Mar 21 09:54:24 2014 +0000 ---------------------------------------------------------------------- .../samples/sts/src/main/java/demo/wssec/client/Client.java | 1 - .../samples/sts/src/main/java/demo/wssec/server/Server.java | 1 - .../samples/sts/src/main/java/demo/wssec/sts/Server.java | 1 - .../sign_enc/src/main/java/demo/wssec/client/StaxClient.java | 7 ++++--- .../sign_enc/src/main/java/demo/wssec/server/StaxServer.java | 1 - .../ut/src/main/java/demo/wssec/client/StaxClient.java | 8 -------- .../ut/src/main/java/demo/wssec/server/StaxServer.java | 7 +------ 7 files changed, 5 insertions(+), 21 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/559e8b4d/distribution/src/main/release/samples/sts/src/main/java/demo/wssec/client/Client.java ---------------------------------------------------------------------- diff --git a/distribution/src/main/release/samples/sts/src/main/java/demo/wssec/client/Client.java b/distribution/src/main/release/samples/sts/src/main/java/demo/wssec/client/Client.java index 5abdac3..94e2788 100644 --- a/distribution/src/main/release/samples/sts/src/main/java/demo/wssec/client/Client.java +++ b/distribution/src/main/release/samples/sts/src/main/java/demo/wssec/client/Client.java @@ -28,7 +28,6 @@ import javax.xml.ws.Service; import org.apache.cxf.Bus; import org.apache.cxf.bus.spring.SpringBusFactory; import org.apache.hello_world_soap_http.Greeter; -import org.springframework.core.io.ClassPathResource; public final class Client { http://git-wip-us.apache.org/repos/asf/cxf/blob/559e8b4d/distribution/src/main/release/samples/sts/src/main/java/demo/wssec/server/Server.java ---------------------------------------------------------------------- diff --git a/distribution/src/main/release/samples/sts/src/main/java/demo/wssec/server/Server.java b/distribution/src/main/release/samples/sts/src/main/java/demo/wssec/server/Server.java index a928b82..5a5aea0 100644 --- a/distribution/src/main/release/samples/sts/src/main/java/demo/wssec/server/Server.java +++ b/distribution/src/main/release/samples/sts/src/main/java/demo/wssec/server/Server.java @@ -25,7 +25,6 @@ import java.net.URL; import org.apache.cxf.Bus; import org.apache.cxf.BusFactory; import org.apache.cxf.bus.spring.SpringBusFactory; -import org.springframework.core.io.ClassPathResource; public class Server { http://git-wip-us.apache.org/repos/asf/cxf/blob/559e8b4d/distribution/src/main/release/samples/sts/src/main/java/demo/wssec/sts/Server.java ---------------------------------------------------------------------- diff --git a/distribution/src/main/release/samples/sts/src/main/java/demo/wssec/sts/Server.java b/distribution/src/main/release/samples/sts/src/main/java/demo/wssec/sts/Server.java index c85b6d0..7bba1a3 100644 --- a/distribution/src/main/release/samples/sts/src/main/java/demo/wssec/sts/Server.java +++ b/distribution/src/main/release/samples/sts/src/main/java/demo/wssec/sts/Server.java @@ -25,7 +25,6 @@ import java.net.URL; import org.apache.cxf.Bus; import org.apache.cxf.BusFactory; import org.apache.cxf.bus.spring.SpringBusFactory; -import org.springframework.core.io.ClassPathResource; public class Server { http://git-wip-us.apache.org/repos/asf/cxf/blob/559e8b4d/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/client/StaxClient.java ---------------------------------------------------------------------- diff --git a/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/client/StaxClient.java b/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/client/StaxClient.java index 19557d6..9a96359 100644 --- a/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/client/StaxClient.java +++ b/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/client/StaxClient.java @@ -39,7 +39,6 @@ import org.apache.wss4j.stax.ext.WSSConstants; import org.apache.wss4j.stax.ext.WSSSecurityProperties; import org.apache.wss4j.stax.securityToken.WSSecurityTokenConstants; import org.apache.xml.security.stax.ext.SecurePart; -import org.apache.xml.security.stax.ext.XMLSecurityConstants; import demo.wssec.server.UTPasswordCallback; @@ -60,7 +59,8 @@ public final class StaxClient { BusFactory.setDefaultBus(bus); Properties encCryptoProperties = - CryptoFactory.getProperties("etc/Client_Encrypt.properties", StaxClient.class.getClassLoader()); + CryptoFactory.getProperties("etc/Client_Encrypt.properties", + StaxClient.class.getClassLoader()); Properties sigCryptoProperties = CryptoFactory.getProperties("etc/Client_Sign.properties", StaxClient.class.getClassLoader()); @@ -83,7 +83,8 @@ public final class StaxClient { "http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"; ); properties.addEncryptionPart( - new SecurePart(new QName(WSSConstants.NS_WSSE10, "UsernameToken"), SecurePart.Modifier.Element) + new SecurePart(new QName(WSSConstants.NS_WSSE10, + "UsernameToken"), SecurePart.Modifier.Element) ); properties.addEncryptionPart( new SecurePart(new QName(WSSConstants.NS_SOAP11, "Body"), SecurePart.Modifier.Content) http://git-wip-us.apache.org/repos/asf/cxf/blob/559e8b4d/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/server/StaxServer.java ---------------------------------------------------------------------- diff --git a/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/server/StaxServer.java b/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/server/StaxServer.java index 5534e10..7559434 100644 --- a/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/server/StaxServer.java +++ b/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/server/StaxServer.java @@ -36,7 +36,6 @@ import org.apache.wss4j.stax.ext.WSSConstants; import org.apache.wss4j.stax.ext.WSSSecurityProperties; import org.apache.wss4j.stax.securityToken.WSSecurityTokenConstants; import org.apache.xml.security.stax.ext.SecurePart; -import org.apache.xml.security.stax.ext.XMLSecurityConstants; /** * A StAX-based server http://git-wip-us.apache.org/repos/asf/cxf/blob/559e8b4d/distribution/src/main/release/samples/ws_security/ut/src/main/java/demo/wssec/client/StaxClient.java ---------------------------------------------------------------------- diff --git a/distribution/src/main/release/samples/ws_security/ut/src/main/java/demo/wssec/client/StaxClient.java b/distribution/src/main/release/samples/ws_security/ut/src/main/java/demo/wssec/client/StaxClient.java index e494028..8be503e 100644 --- a/distribution/src/main/release/samples/ws_security/ut/src/main/java/demo/wssec/client/StaxClient.java +++ b/distribution/src/main/release/samples/ws_security/ut/src/main/java/demo/wssec/client/StaxClient.java @@ -22,9 +22,6 @@ package demo.wssec.client; import java.io.Closeable; import java.lang.reflect.UndeclaredThrowableException; import java.net.URL; -import java.util.Properties; - -import javax.xml.namespace.QName; import org.apache.cxf.Bus; import org.apache.cxf.BusFactory; @@ -32,15 +29,10 @@ import org.apache.cxf.bus.spring.SpringBusFactory; import org.apache.cxf.frontend.ClientProxy; import org.apache.cxf.hello_world_soap_http.Greeter; import org.apache.cxf.hello_world_soap_http.GreeterService; -import org.apache.cxf.ws.security.wss4j.StaxCryptoCoverageChecker; import org.apache.cxf.ws.security.wss4j.WSS4JStaxInInterceptor; import org.apache.cxf.ws.security.wss4j.WSS4JStaxOutInterceptor; -import org.apache.wss4j.common.crypto.CryptoFactory; import org.apache.wss4j.stax.ext.WSSConstants; import org.apache.wss4j.stax.ext.WSSSecurityProperties; -import org.apache.wss4j.stax.securityToken.WSSecurityTokenConstants; -import org.apache.xml.security.stax.ext.SecurePart; -import org.apache.xml.security.stax.ext.XMLSecurityConstants; import demo.wssec.server.UTPasswordCallback; http://git-wip-us.apache.org/repos/asf/cxf/blob/559e8b4d/distribution/src/main/release/samples/ws_security/ut/src/main/java/demo/wssec/server/StaxServer.java ---------------------------------------------------------------------- diff --git a/distribution/src/main/release/samples/ws_security/ut/src/main/java/demo/wssec/server/StaxServer.java b/distribution/src/main/release/samples/ws_security/ut/src/main/java/demo/wssec/server/StaxServer.java index 83c41e9..5324dbc 100644 --- a/distribution/src/main/release/samples/ws_security/ut/src/main/java/demo/wssec/server/StaxServer.java +++ b/distribution/src/main/release/samples/ws_security/ut/src/main/java/demo/wssec/server/StaxServer.java @@ -20,9 +20,7 @@ package demo.wssec.server; import java.net.URL; -import java.util.Properties; -import javax.xml.namespace.QName; import javax.xml.ws.Endpoint; import org.apache.cxf.Bus; @@ -31,18 +29,15 @@ import org.apache.cxf.bus.spring.SpringBusFactory; import org.apache.cxf.jaxws.EndpointImpl; import org.apache.cxf.ws.security.wss4j.WSS4JStaxInInterceptor; import org.apache.cxf.ws.security.wss4j.WSS4JStaxOutInterceptor; -import org.apache.wss4j.common.crypto.CryptoFactory; import org.apache.wss4j.stax.ext.WSSConstants; import org.apache.wss4j.stax.ext.WSSSecurityProperties; -import org.apache.wss4j.stax.securityToken.WSSecurityTokenConstants; -import org.apache.xml.security.stax.ext.XMLSecurityConstants; /** * A StAX-based server */ public class StaxServer { - protected StaxServer() throws Exception { + protected StaxServer() throws Exception { System.out.println("Starting StaxServer"); Object implementor = new GreeterImpl();
