diff --git a/airline/client/spring-ws/pom.xml b/airline/client/spring-ws/pom.xml
index 44ebbc8..5aab356 100644
--- a/airline/client/spring-ws/pom.xml
+++ b/airline/client/spring-ws/pom.xml
@@ -17,11 +17,8 @@
Demo project for Spring Web Services
- 1.8
2.1.7
- 2.15.0
2.4.0
- 3.0
${project.basedir}/target/generated-sources/xjc
${project.basedir}/target/classes
${project.basedir}/../../server/src/main/resources
@@ -35,38 +32,6 @@
spring-ws-core
-
- org.springframework.ws
- spring-ws-security
-
-
- com.sun.xml.wsit
- wsit-rt
-
-
- com.sun.xml.wsit
- xws-security
-
-
-
-
-
- com.sun.xml.wss
- xws-security
- ${xws.version}
- runtime
-
-
- javax.xml.crypto
- xmldsig
-
-
- javax.activation
- activation
-
-
-
-
org.springframework.ws
spring-ws-test
diff --git a/airline/client/spring-ws/src/main/java/org/springframework/ws/samples/airline/client/sws/SpringWsMain.java b/airline/client/spring-ws/src/main/java/org/springframework/ws/samples/airline/client/sws/SpringWsMain.java
index 6e91a54..62c0e48 100644
--- a/airline/client/spring-ws/src/main/java/org/springframework/ws/samples/airline/client/sws/SpringWsMain.java
+++ b/airline/client/spring-ws/src/main/java/org/springframework/ws/samples/airline/client/sws/SpringWsMain.java
@@ -29,8 +29,5 @@ public class SpringWsMain {
GetFlights getFlights = ctx.getBean(GetFlights.class);
getFlights.getFlights();
-
- GetFrequentFlyerMileage getFrequentFlyerMileage = ctx.getBean(GetFrequentFlyerMileage.class);
- getFrequentFlyerMileage.getFrequentFlyerMileage();
}
}
diff --git a/airline/client/spring-ws/src/main/java/org/springframework/ws/samples/airline/client/sws/WsConfiguration.java b/airline/client/spring-ws/src/main/java/org/springframework/ws/samples/airline/client/sws/WsConfiguration.java
index de35db2..4860a70 100644
--- a/airline/client/spring-ws/src/main/java/org/springframework/ws/samples/airline/client/sws/WsConfiguration.java
+++ b/airline/client/spring-ws/src/main/java/org/springframework/ws/samples/airline/client/sws/WsConfiguration.java
@@ -5,7 +5,6 @@ import org.springframework.context.annotation.Configuration;
import org.springframework.oxm.jaxb.Jaxb2Marshaller;
import org.springframework.ws.soap.SoapMessageFactory;
import org.springframework.ws.soap.saaj.SaajSoapMessageFactory;
-import org.springframework.ws.soap.security.wss4j2.Wss4jSecurityInterceptor;
@Configuration(proxyBeanMethods = false)
public class WsConfiguration {
@@ -34,23 +33,10 @@ public class WsConfiguration {
}
@Bean
- GetFrequentFlyerMileage getFrequentFlyerMileage(SoapMessageFactory messageFactory,
- Wss4jSecurityInterceptor securityInterceptor) {
+ GetFrequentFlyerMileage getFrequentFlyerMileage(SoapMessageFactory messageFactory) {
GetFrequentFlyerMileage getFrequentFlyerMileage = new GetFrequentFlyerMileage(messageFactory);
getFrequentFlyerMileage.setDefaultUri("http://localhost:8080/airline-server/services");
- getFrequentFlyerMileage.setInterceptors(new Wss4jSecurityInterceptor[] { securityInterceptor });
return getFrequentFlyerMileage;
}
-
- @Bean
- Wss4jSecurityInterceptor securityInterceptor() {
-
- Wss4jSecurityInterceptor interceptor = new Wss4jSecurityInterceptor();
- interceptor.setSecurementActions("UsernameToken");
- interceptor.setSecurementUsername("john");
- interceptor.setSecurementPassword("changeme");
- return interceptor;
- }
-
}
diff --git a/airline/client/spring-ws/src/main/resources/org/springframework/ws/samples/airline/client/sws/securityPolicy.xml b/airline/client/spring-ws/src/main/resources/org/springframework/ws/samples/airline/client/sws/securityPolicy.xml
deleted file mode 100644
index 195eb98..0000000
--- a/airline/client/spring-ws/src/main/resources/org/springframework/ws/samples/airline/client/sws/securityPolicy.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
-
diff --git a/airline/server/src/main/resources/org/springframework/ws/samples/airline/security/securityPolicy.xml b/airline/server/src/main/resources/org/springframework/ws/samples/airline/security/securityPolicy.xml
deleted file mode 100644
index b6d644b..0000000
--- a/airline/server/src/main/resources/org/springframework/ws/samples/airline/security/securityPolicy.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
-