Author: jsdelfino
Date: Fri Aug 31 16:54:45 2007
New Revision: 571650
URL: http://svn.apache.org/viewvc?rev=571650&view=rev
Log:
Changed sample to not require a WSDL, removed incorrect dependency on Jetty,
adjusted web.xml to use the Tuscany servlet filter.
Removed:
incubator/tuscany/java/sca/samples/calculator-webapp-ws/src/main/resources/wsdl/
Modified:
incubator/tuscany/java/sca/samples/calculator-webapp-ws/pom.xml
incubator/tuscany/java/sca/samples/calculator-webapp-ws/src/main/resources/Calculator.composite
incubator/tuscany/java/sca/samples/calculator-webapp-ws/src/main/webapp/WEB-INF/web.xml
Modified: incubator/tuscany/java/sca/samples/calculator-webapp-ws/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/calculator-webapp-ws/pom.xml?rev=571650&r1=571649&r2=571650&view=diff
==============================================================================
--- incubator/tuscany/java/sca/samples/calculator-webapp-ws/pom.xml (original)
+++ incubator/tuscany/java/sca/samples/calculator-webapp-ws/pom.xml Fri Aug 31
16:54:45 2007
@@ -38,12 +38,6 @@
<dependencies>
- <!--dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tools-registry-inspector</artifactId>
- <version>1.0-incubating-SNAPSHOT</version>
- </dependency-->
-
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-host-webapp</artifactId>
@@ -63,13 +57,6 @@
<scope>runtime</scope>
</dependency>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-http-jetty</artifactId>
- <version>1.0-incubating-SNAPSHOT</version>
- <scope>test</scope>
- </dependency>
-
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
Modified:
incubator/tuscany/java/sca/samples/calculator-webapp-ws/src/main/resources/Calculator.composite
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/calculator-webapp-ws/src/main/resources/Calculator.composite?rev=571650&r1=571649&r2=571650&view=diff
==============================================================================
---
incubator/tuscany/java/sca/samples/calculator-webapp-ws/src/main/resources/Calculator.composite
(original)
+++
incubator/tuscany/java/sca/samples/calculator-webapp-ws/src/main/resources/Calculator.composite
Fri Aug 31 16:54:45 2007
@@ -26,7 +26,7 @@
<implementation.java class="calculator.CalculatorServiceImpl"/>
<reference name="addService" >
<interface.java interface="calculator.AddService" />
- <binding.ws
wsdlElement="http://calculator#wsdl.port(AddService/AddSoapPort)"/>
+ <binding.ws
uri="http://localhost:8080/sample-calculator-webapp-ws/AddServiceComponent"/>
</reference>
<reference name="subtractService"
target="SubtractServiceComponent"></reference>
<reference name="multiplyService"
target="MultiplyServiceComponent"></reference>
@@ -37,9 +37,8 @@
<implementation.java class="calculator.AddServiceImpl"/>
<service name="AddService">
<interface.java interface="calculator.AddService" />
- <!--interface.wsdl
interface="http://calculator#wsdl.interface(Add)" /-->
- <binding.ws
wsdlElement="http://calculator#wsdl.port(AddService/AddSoapPort)"/>
- </service>
+ <binding.ws/>
+ </service>
</component>
<component name="SubtractServiceComponent">
@@ -54,8 +53,4 @@
<implementation.java class="calculator.DivideServiceImpl"/>
</component>
- <!--component name="ExtensionPointRegistryInspectorComponent">
- <implementation.java
class="org.apache.tuscany.sca.tools.registryinspector.inspector.ExtensionPointRegistryInspectorImpl"/>
- </component-->
-
</composite>
Modified:
incubator/tuscany/java/sca/samples/calculator-webapp-ws/src/main/webapp/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/calculator-webapp-ws/src/main/webapp/WEB-INF/web.xml?rev=571650&r1=571649&r2=571650&view=diff
==============================================================================
---
incubator/tuscany/java/sca/samples/calculator-webapp-ws/src/main/webapp/WEB-INF/web.xml
(original)
+++
incubator/tuscany/java/sca/samples/calculator-webapp-ws/src/main/webapp/WEB-INF/web.xml
Fri Aug 31 16:54:45 2007
@@ -24,19 +24,15 @@
<display-name>Tuscany Calculator Web Service Sample</display-name>
- <listener>
-
<listener-class>org.apache.tuscany.sca.host.webapp.TuscanyContextListener</listener-class>
- </listener>
+ <filter>
+ <filter-name>tuscany</filter-name>
+
<filter-class>org.apache.tuscany.sca.host.webapp.TuscanyServletFilter</filter-class>
+ </filter>
- <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>
<welcome-file-list id="WelcomeFileList">
<welcome-file>calc.jsp</welcome-file>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
