Author: slaws
Date: Mon Jan  7 16:14:01 2008
New Revision: 609816

URL: http://svn.apache.org/viewvc?rev=609816&view=rev
Log:
Move ws-sdo-webapp to tomcat filter approach

Modified:
    
incubator/tuscany/branches/sca-java-1.1/samples/helloworld-ws-sdo-webapp/pom.xml
    
incubator/tuscany/branches/sca-java-1.1/samples/helloworld-ws-sdo-webapp/src/main/resources/wsdl/helloworld.wsdl
    
incubator/tuscany/branches/sca-java-1.1/samples/helloworld-ws-sdo-webapp/src/main/webapp/WEB-INF/web.xml

Modified: 
incubator/tuscany/branches/sca-java-1.1/samples/helloworld-ws-sdo-webapp/pom.xml
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.1/samples/helloworld-ws-sdo-webapp/pom.xml?rev=609816&r1=609815&r2=609816&view=diff
==============================================================================
--- 
incubator/tuscany/branches/sca-java-1.1/samples/helloworld-ws-sdo-webapp/pom.xml
 (original)
+++ 
incubator/tuscany/branches/sca-java-1.1/samples/helloworld-ws-sdo-webapp/pom.xml
 Mon Jan  7 16:14:01 2008
@@ -65,6 +65,11 @@
     
         <dependency>
             <groupId>org.apache.tuscany.sdo</groupId>
+            <artifactId>tuscany-sdo-api-r2.1</artifactId>
+            <version>1.0-incubating</version>
+        </dependency>    
+        <dependency>
+            <groupId>org.apache.tuscany.sdo</groupId>
             <artifactId>tuscany-sdo-lib</artifactId>
             <version>1.0-incubating</version>
         </dependency>
@@ -102,6 +107,13 @@
             <version>4.2</version>
             <scope>test</scope>
         </dependency>
+        
+        <dependency>
+            <groupId>org.codehaus.woodstox</groupId>
+            <artifactId>wstx-asl</artifactId>
+            <version>3.2.1</version>
+            <scope>runtime</scope>
+        </dependency>        
 
     </dependencies>
 

Modified: 
incubator/tuscany/branches/sca-java-1.1/samples/helloworld-ws-sdo-webapp/src/main/resources/wsdl/helloworld.wsdl
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.1/samples/helloworld-ws-sdo-webapp/src/main/resources/wsdl/helloworld.wsdl?rev=609816&r1=609815&r2=609816&view=diff
==============================================================================
--- 
incubator/tuscany/branches/sca-java-1.1/samples/helloworld-ws-sdo-webapp/src/main/resources/wsdl/helloworld.wsdl
 (original)
+++ 
incubator/tuscany/branches/sca-java-1.1/samples/helloworld-ws-sdo-webapp/src/main/resources/wsdl/helloworld.wsdl
 Mon Jan  7 16:14:01 2008
@@ -104,7 +104,7 @@
         <wsdl:port binding="tns:HelloWorldSoapBinding"
             name="HelloWorldSoapPort">
             <wsdlsoap:address
-                
location="http://localhost:8080/sample-helloworld-ws-sdo-webapp/services/HelloWorld";
 />
+                
location="http://localhost:8080/sample-helloworld-ws-sdo-webapp/HelloWorld"; />
         </wsdl:port>
     </wsdl:service>
 

Modified: 
incubator/tuscany/branches/sca-java-1.1/samples/helloworld-ws-sdo-webapp/src/main/webapp/WEB-INF/web.xml
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.1/samples/helloworld-ws-sdo-webapp/src/main/webapp/WEB-INF/web.xml?rev=609816&r1=609815&r2=609816&view=diff
==============================================================================
--- 
incubator/tuscany/branches/sca-java-1.1/samples/helloworld-ws-sdo-webapp/src/main/webapp/WEB-INF/web.xml
 (original)
+++ 
incubator/tuscany/branches/sca-java-1.1/samples/helloworld-ws-sdo-webapp/src/main/webapp/WEB-INF/web.xml
 Mon Jan  7 16:14:01 2008
@@ -23,20 +23,21 @@
 <web-app>
 
     <display-name>Apache Tuscany Hello World Web Service SDO 
Sample</display-name>
+    
+  <filter>
+    <filter-name>tuscany</filter-name> 
+    
<filter-class>org.apache.tuscany.sca.host.webapp.TuscanyServletFilter</filter-class>
 
+  </filter>
 
-    <listener>
-        
<listener-class>org.apache.tuscany.sca.host.webapp.TuscanyContextListener</listener-class>
-    </listener>
-
-    <servlet>
-        <servlet-name>TuscanyServlet</servlet-name>
-        
<servlet-class>org.apache.tuscany.sca.host.webapp.TuscanyServlet</servlet-class>
-    </servlet>
-
-    <servlet-mapping>
-        <servlet-name>TuscanyServlet</servlet-name>
-        <url-pattern>/services/*</url-pattern>
-    </servlet-mapping>
+  <filter-mapping>
+    <filter-name>tuscany</filter-name> 
+    <url-pattern>/*</url-pattern> 
+  </filter-mapping>
+  
+  <filter-mapping>
+    <filter-name>tuscany</filter-name> 
+    <url-pattern>/services/*</url-pattern> 
+  </filter-mapping>
 
   <welcome-file-list id="WelcomeFileList">
     <welcome-file>HelloWorld.jsp</welcome-file>



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to