Return-Path: 
 <commits-return-23538-apmail-cxf-commits-archive=cxf.apache.org@cxf.apache.org>
X-Original-To: apmail-cxf-commits-archive@www.apache.org
Delivered-To: apmail-cxf-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 801D1E81F
	for <apmail-cxf-commits-archive@www.apache.org>;
 Wed, 28 Nov 2012 16:29:48 +0000 (UTC)
Received: (qmail 19853 invoked by uid 500); 28 Nov 2012 16:29:48 -0000
Delivered-To: apmail-cxf-commits-archive@cxf.apache.org
Received: (qmail 19734 invoked by uid 500); 28 Nov 2012 16:29:47 -0000
Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@cxf.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@cxf.apache.org>
List-Post: <mailto:commits@cxf.apache.org>
List-Id: <commits.cxf.apache.org>
Reply-To: dev@cxf.apache.org
Delivered-To: mailing list commits@cxf.apache.org
Received: (qmail 19722 invoked by uid 99); 28 Nov 2012 16:29:47 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 28 Nov 2012 16:29:47 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 28 Nov 2012 16:29:46 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id 38D08238896F;
	Wed, 28 Nov 2012 16:29:26 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1414792 - in
 /cxf/trunk/distribution/src/main/release/samples/mtom: pom.xml
 src/main/java/demo/mtom/client/Client.java
 src/main/java/demo/mtom/client/me.bmp src/main/resources/
 src/main/resources/me.bmp src/main/resources/mtom_xop.wsdl wsdl/
Date: Wed, 28 Nov 2012 16:29:25 -0000
To: commits@cxf.apache.org
From: gmazza@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20121128162926.38D08238896F@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: gmazza
Date: Wed Nov 28 16:29:22 2012
New Revision: 1414792

URL: http://svn.apache.org/viewvc?rev=1414792&view=rev
Log:
Better Mavenized mtom sample

Added:
    cxf/trunk/distribution/src/main/release/samples/mtom/src/main/resources/
    cxf/trunk/distribution/src/main/release/samples/mtom/src/main/resources/me.bmp
      - copied unchanged from r1414763, cxf/trunk/distribution/src/main/release/samples/mtom/src/main/java/demo/mtom/client/me.bmp
    cxf/trunk/distribution/src/main/release/samples/mtom/src/main/resources/mtom_xop.wsdl
      - copied unchanged from r1414763, cxf/trunk/distribution/src/main/release/samples/mtom/wsdl/mtom_xop.wsdl
Removed:
    cxf/trunk/distribution/src/main/release/samples/mtom/src/main/java/demo/mtom/client/me.bmp
    cxf/trunk/distribution/src/main/release/samples/mtom/wsdl/
Modified:
    cxf/trunk/distribution/src/main/release/samples/mtom/pom.xml
    cxf/trunk/distribution/src/main/release/samples/mtom/src/main/java/demo/mtom/client/Client.java

Modified: cxf/trunk/distribution/src/main/release/samples/mtom/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/mtom/pom.xml?rev=1414792&r1=1414791&r2=1414792&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/mtom/pom.xml (original)
+++ cxf/trunk/distribution/src/main/release/samples/mtom/pom.xml Wed Nov 28 16:29:22 2012
@@ -32,18 +32,10 @@
 
     <properties>
         <cxf.version>${project.version}</cxf.version>
+        <wsdl.location>${basedir}/src/main/resources/mtom_xop.wsdl</wsdl.location>
     </properties>
 
     <build>
-        <resources>
-            <resource>
-                <directory>src/main/java</directory>
-                <excludes>
-                    <exclude>**/*.java</exclude>
-                    <exclude>**/package.html</exclude>
-                </excludes>
-            </resource>
-        </resources>    
         <plugins>
             <plugin>
                 <artifactId>maven-compiler-plugin</artifactId>
@@ -63,7 +55,7 @@
                         <configuration>
                             <wsdlOptions>
                                 <wsdlOption>
-                                    <wsdl>${basedir}/wsdl/mtom_xop.wsdl</wsdl>
+                                    <wsdl>${wsdl.location}</wsdl>
                                     <frontEnd>jaxws21</frontEnd>
                                     <faultSerialVersionUID>1</faultSerialVersionUID>
                                 </wsdlOption>
@@ -95,7 +87,7 @@
                                 <configuration>
                                     <mainClass>demo.mtom.server.Server</mainClass>
                                     <arguments>
-                                        <argument>${basedir}/wsdl/mtom_xop.wsdl</argument>
+                                        <argument>${wsdl.location}</argument>
                                     </arguments>
                                 </configuration>
                             </execution>
@@ -121,7 +113,7 @@
                                 <configuration>
                                     <mainClass>demo.mtom.client.Client</mainClass>
                                     <arguments>
-                                        <argument>${basedir}/wsdl/mtom_xop.wsdl</argument>
+                                        <argument>${wsdl.location}</argument>
                                     </arguments>
                                 </configuration>
                             </execution>

Modified: cxf/trunk/distribution/src/main/release/samples/mtom/src/main/java/demo/mtom/client/Client.java
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/mtom/src/main/java/demo/mtom/client/Client.java?rev=1414792&r1=1414791&r2=1414792&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/mtom/src/main/java/demo/mtom/client/Client.java (original)
+++ cxf/trunk/distribution/src/main/release/samples/mtom/src/main/java/demo/mtom/client/Client.java Wed Nov 28 16:29:22 2012
@@ -69,7 +69,7 @@ public final class Client {
         Binding binding = ((BindingProvider)port).getBinding();
         ((SOAPBinding)binding).setMTOMEnabled(true);
 
-        URL fileURL = Client.class.getResource("me.bmp");
+        URL fileURL = Client.class.getResource("/me.bmp");
         File aFile = new File(new URI(fileURL.toString()));
         long fileSize = aFile.length();
         System.out.println("Filesize of me.bmp image is: " + fileSize);