Return-Path: 
 <scm-return-20974-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org>
Delivered-To: apmail-geronimo-scm-archive@www.apache.org
Received: (qmail 221 invoked from network); 2 Aug 2007 17:15:49 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 2 Aug 2007 17:15:49 -0000
Received: (qmail 21875 invoked by uid 500); 2 Aug 2007 17:15:43 -0000
Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org
Received: (qmail 21822 invoked by uid 500); 2 Aug 2007 17:15:43 -0000
Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:scm-help@geronimo.apache.org>
list-unsubscribe: <mailto:scm-unsubscribe@geronimo.apache.org>
List-Post: <mailto:scm@geronimo.apache.org>
Reply-To: dev@geronimo.apache.org
List-Id: <scm.geronimo.apache.org>
Delivered-To: mailing list scm@geronimo.apache.org
Received: (qmail 21811 invoked by uid 99); 2 Aug 2007 17:15:43 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 02 Aug 2007 10:15:43 -0700
X-ASF-Spam-Status: No, hits=-100.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 02 Aug 2007 17:15:43 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id D6EB71A981A; Thu,  2 Aug 2007 10:15:22 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r562185 - in
 /geronimo/samples/trunk/samples/jaxws-calculator/jaxws-calculator-war: ./
 src/main/webapp/ src/main/webapp/WEB-INF/ src/main/webapp/WEB-INF/wsdl/
Date: Thu, 02 Aug 2007 17:15:22 -0000
To: scm@geronimo.apache.org
From: gawor@apache.org
X-Mailer: svnmailer-1.1.0
Message-Id: <20070802171522.D6EB71A981A@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: gawor
Date: Thu Aug  2 10:15:21 2007
New Revision: 562185

URL: http://svn.apache.org/viewvc?view=rev&rev=562185
Log:
minor calculator sample updates

Added:
    geronimo/samples/trunk/samples/jaxws-calculator/jaxws-calculator-war/src/main/webapp/WEB-INF/wsdl/
    geronimo/samples/trunk/samples/jaxws-calculator/jaxws-calculator-war/src/main/webapp/WEB-INF/wsdl/CalculatorService.wsdl
      - copied unchanged from r562182, geronimo/samples/trunk/samples/jaxws-calculator/jaxws-calculator-war/src/main/webapp/CalculatorService.wsdl
Removed:
    geronimo/samples/trunk/samples/jaxws-calculator/jaxws-calculator-war/src/main/webapp/CalculatorService.wsdl
Modified:
    geronimo/samples/trunk/samples/jaxws-calculator/jaxws-calculator-war/pom.xml
    geronimo/samples/trunk/samples/jaxws-calculator/jaxws-calculator-war/src/main/webapp/WEB-INF/web.xml
    geronimo/samples/trunk/samples/jaxws-calculator/jaxws-calculator-war/src/main/webapp/WEB-INF/webservices.xml

Modified: geronimo/samples/trunk/samples/jaxws-calculator/jaxws-calculator-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/jaxws-calculator/jaxws-calculator-war/pom.xml?view=diff&rev=562185&r1=562184&r2=562185
==============================================================================
--- geronimo/samples/trunk/samples/jaxws-calculator/jaxws-calculator-war/pom.xml (original)
+++ geronimo/samples/trunk/samples/jaxws-calculator/jaxws-calculator-war/pom.xml Thu Aug  2 10:15:21 2007
@@ -69,16 +69,19 @@
             <groupId>org.apache.axis2</groupId>
             <artifactId>axis2-jaxws-api</artifactId>
             <version>SNAPSHOT</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-annotation_1.0_spec</artifactId>
             <version>1.1</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
-            <version>1.1.1-SNAPSHOT</version>
+            <version>1.1.1</version>
+            <scope>provided</scope>
         </dependency>
         <!--<dependency>
             <groupId>org.apache.geronimo.modules</groupId>

Modified: geronimo/samples/trunk/samples/jaxws-calculator/jaxws-calculator-war/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/jaxws-calculator/jaxws-calculator-war/src/main/webapp/WEB-INF/web.xml?view=diff&rev=562185&r1=562184&r2=562185
==============================================================================
--- geronimo/samples/trunk/samples/jaxws-calculator/jaxws-calculator-war/src/main/webapp/WEB-INF/web.xml (original)
+++ geronimo/samples/trunk/samples/jaxws-calculator/jaxws-calculator-war/src/main/webapp/WEB-INF/web.xml Thu Aug  2 10:15:21 2007
@@ -42,7 +42,7 @@
     <service-ref>
         <service-ref-name>services/Calculator</service-ref-name>
         <service-interface>javax.xml.ws.Service</service-interface>
-        <wsdl-file>CalculatorService.wsdl</wsdl-file>
+        <wsdl-file>WEB-INF/wsdl/CalculatorService.wsdl</wsdl-file>
     </service-ref>
 	
 </web-app>

Modified: geronimo/samples/trunk/samples/jaxws-calculator/jaxws-calculator-war/src/main/webapp/WEB-INF/webservices.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/jaxws-calculator/jaxws-calculator-war/src/main/webapp/WEB-INF/webservices.xml?view=diff&rev=562185&r1=562184&r2=562185
==============================================================================
--- geronimo/samples/trunk/samples/jaxws-calculator/jaxws-calculator-war/src/main/webapp/WEB-INF/webservices.xml (original)
+++ geronimo/samples/trunk/samples/jaxws-calculator/jaxws-calculator-war/src/main/webapp/WEB-INF/webservices.xml Thu Aug  2 10:15:21 2007
@@ -25,7 +25,7 @@
              version="1.2">
   <webservice-description>
     <webservice-description-name>CalculatorService</webservice-description-name>
-    <wsdl-file>CalculatorService.wsdl</wsdl-file>
+    <wsdl-file>WEB-INF/wsdl/CalculatorService.wsdl</wsdl-file>
     <port-component>
       <port-component-name>CalculatorServicePort</port-component-name>
       <wsdl-service>calculator:Calculator</wsdl-service>