Spring/spring-ws-samples
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update MTOM to use Jakarta.

Browse Source
This commit is contained in:
Greg L. Turnquist
2022-11-29 16:25:34 -06:00
parent 0200346f5d
commit 47df184a86
6 changed files with 78 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
mtom/client/spring-ws/pom.xml
View File

@@ -17,8 +17,7 @@
<description>Demo project for Spring Web Services</description>
<properties>
<java.version>1.8</java.version>
<log4j2.version>2.15.0</log4j2.version>
<wsdl>${project.basedir}/../../server/src/main/resources/contentStore.wsdl</wsdl>
</properties>
<dependencies>
@@ -49,25 +48,48 @@
<artifactId>spring-boot-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>jaxb2-maven-plugin</artifactId>
<version>2.5.0</version>
<executions>
<execution>
<id>xjc</id>
<goals>
<goal>xjc</goal>
</goals>
</execution>
</executions>
<configuration>
<sourceType>WSDL</sourceType>
<sources>${project.basedir}/../../server/src/main/resources/contentStore.wsdl</sources>
<packageName>org.springframework.ws.samples.mtom.client.sws</packageName>
<target>2.1</target>
</configuration>
</plugin>
<plugin>
<groupId>com.evolvedbinary.maven.jvnet</groupId>
<artifactId>jaxb30-maven-plugin</artifactId>
<version>0.15.0</version>
<executions>
<execution>
<goals>
<goal>generate</goal>
</goals>
</execution>
</executions>
<configuration>
<schemaLanguage>WSDL</schemaLanguage>
<generatePackage>org.springframework.ws.samples.mtom.client.sws</generatePackage>
<schemas>
<schema>
<url>${wsdl}</url>
</schema>
</schemas>
<addCompileSourceRoot>true</addCompileSourceRoot>
</configuration>
</plugin>
<!-- <plugin>-->
<!-- <groupId>org.codehaus.mojo</groupId>-->
<!-- <artifactId>jaxb2-maven-plugin</artifactId>-->
<!-- <version>3.1.0</version>-->
<!-- <executions>-->
<!-- <execution>-->
<!-- <id>xjc</id>-->
<!-- <goals>-->
<!-- <goal>xjc</goal>-->
<!-- </goals>-->
<!-- </execution>-->
<!-- </executions>-->
<!-- <configuration>-->
<!-- <sourceType>WSDL</sourceType>-->
<!-- <sources>${project.basedir}/../../server/src/main/resources/contentStore.wsdl</sources>-->
<!-- <packageName>org.springframework.ws.samples.mtom.client.sws</packageName>-->
<!-- <target>3.0</target>-->
<!-- </configuration>-->
<!-- </plugin>-->
<!-- <plugin>-->
@@ -105,7 +127,7 @@
</goals>
<configuration>
<sources>
<source>${project.basedir}/target/generated-sources/jaxb</source>
<source>${project.basedir}/target/generated-sources/xjc</source>
</sources>
</configuration>
</execution>

3
mtom/client/spring-ws/src/main/java/org/springframework/ws/samples/mtom/client/sws/SaajMtomClient.java
View File

@@ -22,8 +22,7 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import javax.activation.DataHandler;
import jakarta.activation.DataHandler;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.boot.CommandLineRunner;

56
mtom/server/pom.xml
View File

@@ -10,17 +10,14 @@
<relativePath>../../</relativePath> <!-- lookup parent from repository -->
</parent>
<groupId>org.springframework.ws</groupId>
<artifactId>mtom-server</artifactId>
<version>0.0.1-SNAPSHOT</version>
<name>Spring Web Services Samples - MTOM - Server</name>
<description>Demo project for Spring Web Services</description>
<properties>
<java.version>1.8</java.version>
<joda-time.version>2.10.6</joda-time.version>
<log4j2.version>2.15.0</log4j2.version>
<xmlschema.version>2.0.2</xmlschema.version>
<xmlschema.version>2.0.2</xmlschema.version>
<wsdl>${project.basedir}/src/main/resources/contentStore.wsdl</wsdl>
</properties>
<dependencies>
@@ -52,12 +49,6 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>org.junit.vintage</groupId>
<artifactId>junit-vintage-engine</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependencies>
@@ -71,25 +62,28 @@
<artifactId>spring-boot-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>jaxb2-maven-plugin</artifactId>
<version>2.5.0</version>
<executions>
<execution>
<id>xjc</id>
<goals>
<goal>xjc</goal>
</goals>
</execution>
</executions>
<configuration>
<sourceType>WSDL</sourceType>
<sources>${project.basedir}/src/main/resources/contentStore.wsdl</sources>
<packageName>org.springframework.ws.samples.mtom.schema</packageName>
<target>2.1</target>
</configuration>
</plugin>
<plugin>
<groupId>com.evolvedbinary.maven.jvnet</groupId>
<artifactId>jaxb30-maven-plugin</artifactId>
<version>0.15.0</version>
<executions>
<execution>
<goals>
<goal>generate</goal>
</goals>
</execution>
</executions>
<configuration>
<schemaLanguage>WSDL</schemaLanguage>
<generatePackage>org.springframework.ws.samples.mtom.schema</generatePackage>
<schemas>
<schema>
<url>${wsdl}</url>
</schema>
</schemas>
<addCompileSourceRoot>true</addCompileSourceRoot>
</configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
@@ -104,7 +98,7 @@
</goals>
<configuration>
<sources>
<source>target/generated-sources/jaxb</source>
<source>target/generated-sources/xjc</source>
</sources>
</configuration>
</execution>

4
mtom/server/src/main/java/org/springframework/ws/samples/mtom/service/ContentRepository.java
View File

@@ -16,11 +16,11 @@
package org.springframework.ws.samples.mtom.service;
import jakarta.activation.DataHandler;
import java.io.File;
import java.io.IOException;
import javax.activation.DataHandler;
/** @author Arjen Poutsma */
public interface ContentRepository {

8
mtom/server/src/main/java/org/springframework/ws/samples/mtom/service/ContentRepositoryImpl.java
View File

@@ -16,13 +16,9 @@
package org.springframework.ws.samples.mtom.service;
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import jakarta.activation.DataHandler;
import javax.activation.DataHandler;
import java.io.*;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

12
mtom/server/src/main/java/org/springframework/ws/samples/mtom/ws/ContentRepositoryEndpoint.java
View File

@@ -16,18 +16,14 @@
package org.springframework.ws.samples.mtom.ws;
import jakarta.activation.DataHandler;
import jakarta.activation.FileDataSource;
import java.io.File;
import java.io.IOException;
import javax.activation.DataHandler;
import javax.activation.FileDataSource;
import org.springframework.util.Assert;
import org.springframework.ws.samples.mtom.schema.LoadContentRequest;
import org.springframework.ws.samples.mtom.schema.LoadContentResponse;
import org.springframework.ws.samples.mtom.schema.ObjectFactory;
import org.springframework.ws.samples.mtom.schema.StoreContentRequest;
import org.springframework.ws.samples.mtom.schema.StoreContentResponse;
import org.springframework.ws.samples.mtom.schema.*;
import org.springframework.ws.samples.mtom.service.ContentRepository;
import org.springframework.ws.server.endpoint.annotation.Endpoint;
import org.springframework.ws.server.endpoint.annotation.PayloadRoot;