From 404fc0f34b6643ea1f8fe8f6749a56c2c5f7a29e Mon Sep 17 00:00:00 2001
From: "Greg L. Turnquist" <gturnquist@vmware.com>
Date: Tue, 29 Nov 2022 12:48:50 -0600
Subject: [PATCH] Tweak Airline Spring-WS client.

---
 airline/client/spring-ws/pom.xml              | 35 -------------------
 .../airline/client/sws/SpringWsMain.java      |  3 --
 .../airline/client/sws/WsConfiguration.java   | 16 +--------
 .../airline/client/sws/securityPolicy.xml     |  3 --
 .../airline/security/securityPolicy.xml       |  3 --
 5 files changed, 1 insertion(+), 59 deletions(-)
 delete mode 100644 airline/client/spring-ws/src/main/resources/org/springframework/ws/samples/airline/client/sws/securityPolicy.xml
 delete mode 100644 airline/server/src/main/resources/org/springframework/ws/samples/airline/security/securityPolicy.xml

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 @@
 	<description>Demo project for Spring Web Services</description>
 
 	<properties>
-		<java.version>1.8</java.version>
 		<jax-ws.version>2.1.7</jax-ws.version>
-		<log4j2.version>2.15.0</log4j2.version>
 		<xmlbeans.version>2.4.0</xmlbeans.version>
-		<xws.version>3.0</xws.version>
 		<sourcesDir>${project.basedir}/target/generated-sources/xjc</sourcesDir>
 		<classesDir>${project.basedir}/target/classes</classesDir>
 		<schema>${project.basedir}/../../server/src/main/resources</schema>
@@ -35,38 +32,6 @@
 			<artifactId>spring-ws-core</artifactId>
 		</dependency>
 
-		<dependency>
-			<groupId>org.springframework.ws</groupId>
-			<artifactId>spring-ws-security</artifactId>
-			<exclusions>
-				<exclusion>
-					<groupId>com.sun.xml.wsit</groupId>
-					<artifactId>wsit-rt</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>com.sun.xml.wsit</groupId>
-					<artifactId>xws-security</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-
-		<dependency>
-			<groupId>com.sun.xml.wss</groupId>
-			<artifactId>xws-security</artifactId>
-			<version>${xws.version}</version>
-			<scope>runtime</scope>
-			<exclusions>
-				<exclusion>
-					<groupId>javax.xml.crypto</groupId>
-					<artifactId>xmldsig</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>javax.activation</groupId>
-					<artifactId>activation</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-
 		<dependency>
 			<groupId>org.springframework.ws</groupId>
 			<artifactId>spring-ws-test</artifactId>
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 @@
-<xwss:SecurityConfiguration dumpMessages="false" xmlns:xwss="https://java.sun.com/xml/ns/xwss/config">
-    <xwss:UsernameToken digestPassword="true" useNonce="true"/>
-</xwss:SecurityConfiguration>
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 @@
-<xwss:SecurityConfiguration dumpMessages="false" xmlns:xwss="http://java.sun.com/xml/ns/xwss/config">
-    <xwss:RequireUsernameToken passwordDigestRequired="true" nonceRequired="true"/>
-</xwss:SecurityConfiguration>