diff --git a/samples/mtom/client/jaxws/build.xml b/samples/mtom/client/jax-ws/build.xml similarity index 100% rename from samples/mtom/client/jaxws/build.xml rename to samples/mtom/client/jax-ws/build.xml diff --git a/samples/mtom/client/jax-ws/pom.xml b/samples/mtom/client/jax-ws/pom.xml new file mode 100644 index 00000000..55a280a8 --- /dev/null +++ b/samples/mtom/client/jax-ws/pom.xml @@ -0,0 +1,63 @@ + + + + mtom-client + org.springframework.ws + 2.0.0-M1-SNAPSHOT + ../pom.xml + + 4.0.0 + mtom-jax-ws-client + jar + Spring WS MTOM Sample - JAX-WS Client + + + jdk15 + + !1.6 + + + + javax.xml.soap + saaj-api + compile + + + + + + + + org.codehaus.mojo + jaxws-maven-plugin + + + + wsimport + + + + http://localhost:8080/mtom-server/mtom.wsdl + + org.springframework.ws.samples.mtom.client.jaxws + + + + + + org.codehaus.mojo + exec-maven-plugin + + + + java + + + + + org.springframework.ws.samples.mtom.client.jaxws.Main + + + + + diff --git a/samples/mtom/client/jaxws/readme.txt b/samples/mtom/client/jax-ws/readme.txt similarity index 100% rename from samples/mtom/client/jaxws/readme.txt rename to samples/mtom/client/jax-ws/readme.txt diff --git a/samples/mtom/client/jaxws/src/org/springframework/ws/samples/mtom/client/jaxws/Main.java b/samples/mtom/client/jax-ws/src/main/java/org/springframework/ws/samples/mtom/client/jaxws/Main.java similarity index 86% rename from samples/mtom/client/jaxws/src/org/springframework/ws/samples/mtom/client/jaxws/Main.java rename to samples/mtom/client/jax-ws/src/main/java/org/springframework/ws/samples/mtom/client/jaxws/Main.java index f835bc1a..85ebca15 100644 --- a/samples/mtom/client/jaxws/src/org/springframework/ws/samples/mtom/client/jaxws/Main.java +++ b/samples/mtom/client/jax-ws/src/main/java/org/springframework/ws/samples/mtom/client/jaxws/Main.java @@ -37,15 +37,24 @@ public class Main { public static void main(String[] args) throws IOException { try { + String fileName = "../spring-ws-logo.png"; + if (args.length > 0) { + fileName = args[0]; + } + ImageRepositoryService service = new ImageRepositoryService(); ImageRepository imageRepository = service.getImageRepositorySoap11(); SOAPBinding binding = (SOAPBinding) ((BindingProvider) imageRepository).getBinding(); binding.setMTOMEnabled(true); Image request = new Image(); - File file = new File(args[0]); + File file = new File(fileName); + if (!file.exists()) { + System.err.println("File [" + fileName + "] does not exist"); + System.exit(-1); + } request.setName(file.getName()); - request.setImage(Toolkit.getDefaultToolkit().getImage(args[0])); + request.setImage(Toolkit.getDefaultToolkit().getImage(file.getAbsolutePath())); StopWatch stopWatch = new StopWatch(); stopWatch.start("store"); imageRepository.storeImage(request); diff --git a/samples/mtom/client/pom.xml b/samples/mtom/client/pom.xml new file mode 100644 index 00000000..b233e7df --- /dev/null +++ b/samples/mtom/client/pom.xml @@ -0,0 +1,17 @@ + + + + mtom + org.springframework.ws + 2.0.0-M1-SNAPSHOT + ../pom.xml + + 4.0.0 + mtom-client + pom + Spring WS MTOM Sample - Clients + + jax-ws + spring-ws + + diff --git a/samples/mtom/client/spring-ws/pom.xml b/samples/mtom/client/spring-ws/pom.xml new file mode 100644 index 00000000..c2b7f350 --- /dev/null +++ b/samples/mtom/client/spring-ws/pom.xml @@ -0,0 +1,79 @@ + + + + mtom-client + org.springframework.ws + 2.0.0-M1-SNAPSHOT + ../pom.xml + + 4.0.0 + mtom-spring-ws-client + jar + Spring WS MTOM Sample - Spring-WS Client + + + jdk15 + + !1.6 + + + + javax.xml.soap + saaj-api + runtime + + + + + + + + org.codehaus.mojo + jaxb2-maven-plugin + + + + xjc + + + + + ${project.basedir}/../../server/src/main/webapp/WEB-INF/ + org.springframework.ws.samples.mtom.client.sws + + + + org.codehaus.mojo + exec-maven-plugin + + + + java + + + + + org.springframework.ws.samples.mtom.client.sws.Driver + + + + + + + org.springframework + spring-context + + + org.springframework.ws + spring-ws-core + + + org.apache.ws.commons.axiom + axiom-api + + + org.apache.ws.commons.axiom + axiom-impl + + + diff --git a/samples/mtom/client/spring-ws/src/org/springframework/ws/samples/mtom/client/sws/AxiomMtomClient.java b/samples/mtom/client/spring-ws/src/main/java/org/springframework/ws/samples/mtom/client/sws/AxiomMtomClient.java similarity index 100% rename from samples/mtom/client/spring-ws/src/org/springframework/ws/samples/mtom/client/sws/AxiomMtomClient.java rename to samples/mtom/client/spring-ws/src/main/java/org/springframework/ws/samples/mtom/client/sws/AxiomMtomClient.java diff --git a/samples/mtom/client/spring-ws/src/org/springframework/ws/samples/mtom/client/sws/Driver.java b/samples/mtom/client/spring-ws/src/main/java/org/springframework/ws/samples/mtom/client/sws/Driver.java similarity index 67% rename from samples/mtom/client/spring-ws/src/org/springframework/ws/samples/mtom/client/sws/Driver.java rename to samples/mtom/client/spring-ws/src/main/java/org/springframework/ws/samples/mtom/client/sws/Driver.java index dff609b6..2f7c5565 100644 --- a/samples/mtom/client/spring-ws/src/org/springframework/ws/samples/mtom/client/sws/Driver.java +++ b/samples/mtom/client/spring-ws/src/main/java/org/springframework/ws/samples/mtom/client/sws/Driver.java @@ -22,20 +22,18 @@ import org.springframework.context.support.ClassPathXmlApplicationContext; public class Driver { public static void main(String[] args) { - if (args.length != 1) { - System.out.println("Usage: java " + Driver.class.getName() + " filePath"); - System.exit(-1); + String fileName = "../spring-ws-logo.png"; + if (args.length > 0) { + fileName = args[0]; } - String filePath = args[0]; ApplicationContext applicationContext = new ClassPathXmlApplicationContext("applicationContext.xml", Driver.class); - SaajMtomClient saajClient = (SaajMtomClient) applicationContext.getBean("saajClient", SaajMtomClient.class); - saajClient.doIt(filePath); + SaajMtomClient saajClient = applicationContext.getBean("saajClient", SaajMtomClient.class); + saajClient.doIt(fileName); - AxiomMtomClient axiomClient = - (AxiomMtomClient) applicationContext.getBean("axiomClient", AxiomMtomClient.class); - axiomClient.doIt(filePath); + AxiomMtomClient axiomClient = applicationContext.getBean("axiomClient", AxiomMtomClient.class); + axiomClient.doIt(fileName); } } diff --git a/samples/mtom/client/spring-ws/src/org/springframework/ws/samples/mtom/client/sws/SaajMtomClient.java b/samples/mtom/client/spring-ws/src/main/java/org/springframework/ws/samples/mtom/client/sws/SaajMtomClient.java similarity index 100% rename from samples/mtom/client/spring-ws/src/org/springframework/ws/samples/mtom/client/sws/SaajMtomClient.java rename to samples/mtom/client/spring-ws/src/main/java/org/springframework/ws/samples/mtom/client/sws/SaajMtomClient.java diff --git a/samples/mtom/client/spring-ws/src/org/springframework/ws/samples/mtom/client/sws/applicationContext.xml b/samples/mtom/client/spring-ws/src/main/resources/org/springframework/ws/samples/mtom/client/sws/applicationContext.xml similarity index 98% rename from samples/mtom/client/spring-ws/src/org/springframework/ws/samples/mtom/client/sws/applicationContext.xml rename to samples/mtom/client/spring-ws/src/main/resources/org/springframework/ws/samples/mtom/client/sws/applicationContext.xml index 093d9d58..52d63951 100644 --- a/samples/mtom/client/spring-ws/src/org/springframework/ws/samples/mtom/client/sws/applicationContext.xml +++ b/samples/mtom/client/spring-ws/src/main/resources/org/springframework/ws/samples/mtom/client/sws/applicationContext.xml @@ -3,7 +3,7 @@ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd"> - + diff --git a/samples/mtom/client/wcf/bin/image.exe b/samples/mtom/client/wcf/bin/image.exe deleted file mode 100644 index da970cb2..00000000 Binary files a/samples/mtom/client/wcf/bin/image.exe and /dev/null differ diff --git a/samples/mtom/client/wcf/bin/image.exe.config b/samples/mtom/client/wcf/bin/image.exe.config deleted file mode 100644 index bc2a9bec..00000000 --- a/samples/mtom/client/wcf/bin/image.exe.config +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/samples/mtom/client/wcf/build.bat b/samples/mtom/client/wcf/build.bat deleted file mode 100644 index ed32706b..00000000 --- a/samples/mtom/client/wcf/build.bat +++ /dev/null @@ -1,5 +0,0 @@ -@echo off -set WCF_PATH="%WINDIR%\Microsoft.NET\Framework\v3.0\Windows Communication Foundation" -svcutil /noLogo /out:src\ImageRepositoryService.cs -namespace:http://www.springframework.org/spring-ws/samples/mtom,Spring.Ws.Samples.Mtom.Client.Wcf /noConfig http://localhost:8080/mtom/mtom.wsdl -csc /noLogo /out:bin\image.exe /reference:%WCF_PATH%\System.ServiceModel.dll src\Main.cs src\ImageRepositoryService.cs -copy src\*.config bin\ \ No newline at end of file diff --git a/samples/mtom/client/wcf/readme.txt b/samples/mtom/client/wcf/readme.txt deleted file mode 100644 index 25dd4a2d..00000000 --- a/samples/mtom/client/wcf/readme.txt +++ /dev/null @@ -1,13 +0,0 @@ -SPRING WEB SERVICES - -This directory contains a .NET 3.0 client for the MTOM Sample that uses -Windows Communication Foundation (WCF). The client can be run with the -given run.bat batch file, or rebuilt by calling build.bat. - -Client Sample table of contents ---------------------------------------------------- -* bin - The executable files for the client: image.exe -* src - The source files for the client -* build.bat - .NET build batch file -* run.bat - runs image.exe - diff --git a/samples/mtom/client/wcf/run.bat b/samples/mtom/client/wcf/run.bat deleted file mode 100644 index e1463098..00000000 --- a/samples/mtom/client/wcf/run.bat +++ /dev/null @@ -1,2 +0,0 @@ -@echo off -bin\image ..\spring-ws-logo.png diff --git a/samples/mtom/client/wcf/spring-ws-logo.png b/samples/mtom/client/wcf/spring-ws-logo.png deleted file mode 100644 index 2bdbd1a6..00000000 Binary files a/samples/mtom/client/wcf/spring-ws-logo.png and /dev/null differ diff --git a/samples/mtom/client/wcf/src/ImageRepositoryService.cs b/samples/mtom/client/wcf/src/ImageRepositoryService.cs deleted file mode 100644 index 75c8f38b..00000000 --- a/samples/mtom/client/wcf/src/ImageRepositoryService.cs +++ /dev/null @@ -1,192 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// Runtime Version:2.0.50727.1433 -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - - - -/// -[System.CodeDom.Compiler.GeneratedCodeAttribute("svcutil", "3.0.4506.30")] -[System.SerializableAttribute()] -[System.Diagnostics.DebuggerStepThroughAttribute()] -[System.ComponentModel.DesignerCategoryAttribute("code")] -[System.Xml.Serialization.XmlTypeAttribute(Namespace="http://www.springframework.org/spring-ws/samples/mtom")] -public partial class Image -{ - - private string nameField; - - private byte[] imageField; - - /// - [System.Xml.Serialization.XmlElementAttribute(Order=0)] - public string name - { - get - { - return this.nameField; - } - set - { - this.nameField = value; - } - } - - /// - [System.Xml.Serialization.XmlElementAttribute(DataType="base64Binary", Order=1)] - public byte[] image - { - get - { - return this.imageField; - } - set - { - this.imageField = value; - } - } -} -namespace Spring.Ws.Samples.Mtom.Client.Wcf -{ - - - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "3.0.0.0")] - [System.ServiceModel.ServiceContractAttribute(Namespace="http://www.springframework.org/spring-ws/samples/mtom", ConfigurationName="Spring.Ws.Samples.Mtom.Client.Wcf.ImageRepository")] - public interface ImageRepository - { - - // CODEGEN: Generating message contract since the operation LoadImage is neither RPC nor document wrapped. - [System.ServiceModel.OperationContractAttribute(Action="", ReplyAction="*")] - [System.ServiceModel.XmlSerializerFormatAttribute()] - Spring.Ws.Samples.Mtom.Client.Wcf.LoadImageResponse LoadImage(Spring.Ws.Samples.Mtom.Client.Wcf.LoadImageRequest request); - - // CODEGEN: Generating message contract since the operation StoreImage is neither RPC nor document wrapped. - [System.ServiceModel.OperationContractAttribute(IsOneWay=true, Action="")] - [System.ServiceModel.XmlSerializerFormatAttribute()] - void StoreImage(Spring.Ws.Samples.Mtom.Client.Wcf.StoreImageRequest request); - } - - [System.Diagnostics.DebuggerStepThroughAttribute()] - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "3.0.0.0")] - [System.ServiceModel.MessageContractAttribute(IsWrapped=false)] - public partial class LoadImageRequest - { - - [System.ServiceModel.MessageBodyMemberAttribute(Name="LoadImageRequest", Namespace="http://www.springframework.org/spring-ws/samples/mtom", Order=0)] - public string LoadImageRequest1; - - public LoadImageRequest() - { - } - - public LoadImageRequest(string LoadImageRequest1) - { - this.LoadImageRequest1 = LoadImageRequest1; - } - } - - [System.Diagnostics.DebuggerStepThroughAttribute()] - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "3.0.0.0")] - [System.ServiceModel.MessageContractAttribute(IsWrapped=false)] - public partial class LoadImageResponse - { - - [System.ServiceModel.MessageBodyMemberAttribute(Name="LoadImageResponse", Namespace="http://www.springframework.org/spring-ws/samples/mtom", Order=0)] - public Image LoadImageResponse1; - - public LoadImageResponse() - { - } - - public LoadImageResponse(Image LoadImageResponse1) - { - this.LoadImageResponse1 = LoadImageResponse1; - } - } - - [System.Diagnostics.DebuggerStepThroughAttribute()] - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "3.0.0.0")] - [System.ServiceModel.MessageContractAttribute(IsWrapped=false)] - public partial class StoreImageRequest - { - - [System.ServiceModel.MessageBodyMemberAttribute(Name="StoreImageRequest", Namespace="http://www.springframework.org/spring-ws/samples/mtom", Order=0)] - public Image StoreImageRequest1; - - public StoreImageRequest() - { - } - - public StoreImageRequest(Image StoreImageRequest1) - { - this.StoreImageRequest1 = StoreImageRequest1; - } - } - - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "3.0.0.0")] - public interface ImageRepositoryChannel : Spring.Ws.Samples.Mtom.Client.Wcf.ImageRepository, System.ServiceModel.IClientChannel - { - } - - [System.Diagnostics.DebuggerStepThroughAttribute()] - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "3.0.0.0")] - public partial class ImageRepositoryClient : System.ServiceModel.ClientBase, Spring.Ws.Samples.Mtom.Client.Wcf.ImageRepository - { - - public ImageRepositoryClient() - { - } - - public ImageRepositoryClient(string endpointConfigurationName) : - base(endpointConfigurationName) - { - } - - public ImageRepositoryClient(string endpointConfigurationName, string remoteAddress) : - base(endpointConfigurationName, remoteAddress) - { - } - - public ImageRepositoryClient(string endpointConfigurationName, System.ServiceModel.EndpointAddress remoteAddress) : - base(endpointConfigurationName, remoteAddress) - { - } - - public ImageRepositoryClient(System.ServiceModel.Channels.Binding binding, System.ServiceModel.EndpointAddress remoteAddress) : - base(binding, remoteAddress) - { - } - - [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)] - Spring.Ws.Samples.Mtom.Client.Wcf.LoadImageResponse Spring.Ws.Samples.Mtom.Client.Wcf.ImageRepository.LoadImage(Spring.Ws.Samples.Mtom.Client.Wcf.LoadImageRequest request) - { - return base.Channel.LoadImage(request); - } - - public Image LoadImage(string LoadImageRequest1) - { - Spring.Ws.Samples.Mtom.Client.Wcf.LoadImageRequest inValue = new Spring.Ws.Samples.Mtom.Client.Wcf.LoadImageRequest(); - inValue.LoadImageRequest1 = LoadImageRequest1; - Spring.Ws.Samples.Mtom.Client.Wcf.LoadImageResponse retVal = ((Spring.Ws.Samples.Mtom.Client.Wcf.ImageRepository)(this)).LoadImage(inValue); - return retVal.LoadImageResponse1; - } - - [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)] - void Spring.Ws.Samples.Mtom.Client.Wcf.ImageRepository.StoreImage(Spring.Ws.Samples.Mtom.Client.Wcf.StoreImageRequest request) - { - base.Channel.StoreImage(request); - } - - public void StoreImage(Image StoreImageRequest1) - { - Spring.Ws.Samples.Mtom.Client.Wcf.StoreImageRequest inValue = new Spring.Ws.Samples.Mtom.Client.Wcf.StoreImageRequest(); - inValue.StoreImageRequest1 = StoreImageRequest1; - ((Spring.Ws.Samples.Mtom.Client.Wcf.ImageRepository)(this)).StoreImage(inValue); - } - } -} diff --git a/samples/mtom/client/wcf/src/Main.cs b/samples/mtom/client/wcf/src/Main.cs deleted file mode 100644 index f79971c7..00000000 --- a/samples/mtom/client/wcf/src/Main.cs +++ /dev/null @@ -1,55 +0,0 @@ -using System; -using System.IO; -using System.ServiceModel; - -namespace Spring.Ws.Samples.Mtom.Client.Wcf { - - public class Client { - public static void Main(string[] args) { - if (args.Length == 0) { - Console.Error.WriteLine("Usage: image.exe [filename]"); - return; - } - ImageRepositoryClient wcfClient = new ImageRepositoryClient(); - try { - Image image = new Image(); - FileInfo file = new FileInfo(args[0]); - image.name = file.Name; - byte[] buf = new byte[file.Length]; - using (FileStream stream = file.OpenRead()) - { - stream.Read(buf, 0, buf.Length); - } - image.image = buf; - DateTime start = DateTime.Now; - wcfClient.StoreImage(image); - TimeSpan interval = DateTime.Now - start; - Console.WriteLine("StoreImage took: {0,4:N0} ms.", interval.TotalMilliseconds); - - start = DateTime.Now; - image = wcfClient.LoadImage(file.Name); - interval = DateTime.Now - start; - Console.WriteLine("LoadImage took: {0,4:N0} ms.", interval.TotalMilliseconds); - - wcfClient.Close(); - - } catch (TimeoutException ex) { - Console.Error.WriteLine("The service operation timed out. " + ex.Message); - wcfClient.Abort(); - } catch (FaultException ex) { - Console.Error.WriteLine("SOAP Fault Code {0}", ex.Code); - Console.Error.WriteLine("SOAP Fault Reason: {0}", ex.Reason); - wcfClient.Abort(); - } catch (CommunicationException ex) { - Console.WriteLine(ex.GetType()); - Console.Error.WriteLine("There was a communication problem. " + ex.Message); - Console.Error.WriteLine(ex.StackTrace); - wcfClient.Abort(); - } catch (Exception ex) { - Console.Error.WriteLine("Unknown exception. " + ex.Message); - Console.Error.WriteLine(ex.StackTrace); - wcfClient.Abort(); - } - } - } -} diff --git a/samples/mtom/client/wcf/src/image.exe.config b/samples/mtom/client/wcf/src/image.exe.config deleted file mode 100644 index bc2a9bec..00000000 --- a/samples/mtom/client/wcf/src/image.exe.config +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/samples/mtom/pom.xml b/samples/mtom/server/pom.xml similarity index 78% rename from samples/mtom/pom.xml rename to samples/mtom/server/pom.xml index c08c1048..50614f95 100644 --- a/samples/mtom/pom.xml +++ b/samples/mtom/server/pom.xml @@ -2,15 +2,15 @@ - spring-ws-samples + mtom org.springframework.ws 2.0.0-M1-SNAPSHOT - ../samples/pom.xml + ../pom.xml 4.0.0 - mtom + mtom-server war - Spring WS MTOM Example + Spring WS MTOM Sample - Server This sample shows how to use MTOM and JAXB2. @@ -20,16 +20,6 @@ legacy - - - - maven-javadoc-plugin - - ${basedir}/../../src/main/javadoc/javadoc.css - - - - jdk15 @@ -42,7 +32,6 @@ jaxb-api provided true - 2.1 javax.xml.stream @@ -57,7 +46,6 @@ com.sun.xml.bind jaxb-impl - 2.1.5 provided @@ -69,14 +57,6 @@ - - org.apache.maven.plugins - maven-compiler-plugin - - 1.5 - 1.5 - - com.sun.tools.xjc.maven2 maven-jaxb-plugin diff --git a/samples/mtom/src/main/java/org/springframework/ws/samples/mtom/service/ImageRepository.java b/samples/mtom/server/src/main/java/org/springframework/ws/samples/mtom/service/ImageRepository.java similarity index 100% rename from samples/mtom/src/main/java/org/springframework/ws/samples/mtom/service/ImageRepository.java rename to samples/mtom/server/src/main/java/org/springframework/ws/samples/mtom/service/ImageRepository.java diff --git a/samples/mtom/src/main/java/org/springframework/ws/samples/mtom/service/StubImageRepository.java b/samples/mtom/server/src/main/java/org/springframework/ws/samples/mtom/service/StubImageRepository.java similarity index 100% rename from samples/mtom/src/main/java/org/springframework/ws/samples/mtom/service/StubImageRepository.java rename to samples/mtom/server/src/main/java/org/springframework/ws/samples/mtom/service/StubImageRepository.java diff --git a/samples/mtom/src/main/java/org/springframework/ws/samples/mtom/ws/ImageRepositoryEndpoint.java b/samples/mtom/server/src/main/java/org/springframework/ws/samples/mtom/ws/ImageRepositoryEndpoint.java similarity index 100% rename from samples/mtom/src/main/java/org/springframework/ws/samples/mtom/ws/ImageRepositoryEndpoint.java rename to samples/mtom/server/src/main/java/org/springframework/ws/samples/mtom/ws/ImageRepositoryEndpoint.java diff --git a/samples/mtom/src/main/resources/log4j.properties b/samples/mtom/server/src/main/resources/log4j.properties similarity index 75% rename from samples/mtom/src/main/resources/log4j.properties rename to samples/mtom/server/src/main/resources/log4j.properties index ecbc6e2b..5bb7c900 100644 --- a/samples/mtom/src/main/resources/log4j.properties +++ b/samples/mtom/server/src/main/resources/log4j.properties @@ -1,4 +1,6 @@ log4j.rootLogger=WARN, stdout +log4j.logger.org.springframework.ws=DEBUG +log4j.logger.org.springframework.xml=DEBUG log4j.logger.org.springframework.ws.samples=INFO log4j.appender.stdout=org.apache.log4j.ConsoleAppender diff --git a/samples/mtom/src/main/webapp/WEB-INF/schema.xsd b/samples/mtom/server/src/main/webapp/WEB-INF/schema.xsd similarity index 100% rename from samples/mtom/src/main/webapp/WEB-INF/schema.xsd rename to samples/mtom/server/src/main/webapp/WEB-INF/schema.xsd diff --git a/samples/mtom/src/main/webapp/WEB-INF/spring-ws-servlet.xml b/samples/mtom/server/src/main/webapp/WEB-INF/spring-ws-servlet.xml similarity index 98% rename from samples/mtom/src/main/webapp/WEB-INF/spring-ws-servlet.xml rename to samples/mtom/server/src/main/webapp/WEB-INF/spring-ws-servlet.xml index 044d031c..a43b304c 100644 --- a/samples/mtom/src/main/webapp/WEB-INF/spring-ws-servlet.xml +++ b/samples/mtom/server/src/main/webapp/WEB-INF/spring-ws-servlet.xml @@ -22,7 +22,7 @@ - + diff --git a/samples/mtom/src/main/webapp/WEB-INF/web.xml b/samples/mtom/server/src/main/webapp/WEB-INF/web.xml similarity index 100% rename from samples/mtom/src/main/webapp/WEB-INF/web.xml rename to samples/mtom/server/src/main/webapp/WEB-INF/web.xml