You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by ri...@apache.org on 2006/08/15 23:07:37 UTC
svn commit: r431702 - in /incubator/tuscany/java/samples/sca/helloworldws:
./ src/main/java/helloworld/ src/main/java/helloworldOM/
src/main/resources/wsdl/ src/main/webapp/META-INF/sca/
Author: rineholt
Date: Tue Aug 15 14:07:37 2006
New Revision: 431702
URL: http://svn.apache.org/viewvc?rev=431702&view=rev
Log:
reverse a bad commit
Added:
incubator/tuscany/java/samples/sca/helloworldws/src/main/java/helloworld/
- copied from r431697, incubator/tuscany/java/samples/sca/helloworldws/src/main/java/helloworldOM/
incubator/tuscany/java/samples/sca/helloworldws/src/main/resources/wsdl/helloworld.wsdl
Removed:
incubator/tuscany/java/samples/sca/helloworldws/src/main/java/helloworldOM/
Modified:
incubator/tuscany/java/samples/sca/helloworldws/pom.xml
incubator/tuscany/java/samples/sca/helloworldws/readme.htm
incubator/tuscany/java/samples/sca/helloworldws/src/main/java/helloworld/HelloWorldImpl.java
incubator/tuscany/java/samples/sca/helloworldws/src/main/java/helloworld/HelloWorldService.java
incubator/tuscany/java/samples/sca/helloworldws/src/main/webapp/META-INF/sca/default.scdl
Modified: incubator/tuscany/java/samples/sca/helloworldws/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/samples/sca/helloworldws/pom.xml?rev=431702&r1=431701&r2=431702&view=diff
==============================================================================
--- incubator/tuscany/java/samples/sca/helloworldws/pom.xml (original)
+++ incubator/tuscany/java/samples/sca/helloworldws/pom.xml Tue Aug 15 14:07:37 2006
@@ -24,10 +24,10 @@
<version>1.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>sample-helloworldwsOM</artifactId>
+ <artifactId>sample-helloworldws</artifactId>
<packaging>war</packaging>
- <name>Tuscany HelloWorld Web Service Sample OM</name>
- <description>A sample HelloWorld Web Service OM.</description>
+ <name>Tuscany HelloWorld Web Service Sample</name>
+ <description>A sample HelloWorld Web Service.</description>
<properties>
<ws.type>axis2</ws.type>
@@ -43,6 +43,7 @@
<scope>provided</scope>
-->
</dependency>
+
<dependency>
<groupId>org.apache.tuscany</groupId>
<artifactId>core</artifactId>
@@ -63,6 +64,8 @@
<scope>provided</scope>
-->
</dependency>
+
+
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
@@ -71,4 +74,4 @@
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
Modified: incubator/tuscany/java/samples/sca/helloworldws/readme.htm
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/samples/sca/helloworldws/readme.htm?rev=431702&r1=431701&r2=431702&view=diff
==============================================================================
--- incubator/tuscany/java/samples/sca/helloworldws/readme.htm (original)
+++ incubator/tuscany/java/samples/sca/helloworldws/readme.htm Tue Aug 15 14:07:37 2006
@@ -27,7 +27,7 @@
<h3>Code Overview</h3>
The source files are physically organized as shown below:<br>
<table style="text-align: left; width: 100%;" border="1" cellpadding="2" cellspacing="2"><tbody><tr><td>
-<pre>+---main<br> +---resources<br> ¦ ¦ sca.module<br> ¦ ¦<br> ¦ +---wsdl<br> ¦ helloworldOM.wsdl<br> ¦<br> +---webapp<br> +---WEB-INF<br> web.xml<br></pre></td></tr></tbody></table>
+<pre>+---main<br> +---resources<br> ¦ ¦ sca.module<br> ¦ ¦<br> ¦ +---wsdl<br> ¦ helloworld.wsdl<br> ¦<br> +---webapp<br> +---WEB-INF<br> web.xml<br></pre></td></tr></tbody></table>
<br><br><table style="text-align: left; width: 100%; height: 154px;" border="0" cellpadding="2" cellspacing="2"><tbody>
<tr><td style="vertical-align: top; height: 62px;">sca.module</td>
<td style="height: 62px;">Defines the SCA module,
@@ -37,12 +37,12 @@
by the service, and wires the service to
the HelloWorldServiceComponent</td>
</tr><tr>
-<td>helloworldOM.wsdl</td>
+<td>helloworld.wsdl</td>
<td>WSDL for the service.</td>
</tr><tr><td>web.xml</td>
<td>Standard J2EE web application's web.xml</td>
</tr></tbody></table>
<p>You may have noticed that there is no Java source for this
components implementation. There reason is this sample reuses
-the code from the helloworldOM sample to implement the service.
+the code from the helloworld sample to implement the service.
</p></body></html>
Modified: incubator/tuscany/java/samples/sca/helloworldws/src/main/java/helloworld/HelloWorldImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/samples/sca/helloworldws/src/main/java/helloworld/HelloWorldImpl.java?rev=431702&r1=431697&r2=431702&view=diff
==============================================================================
--- incubator/tuscany/java/samples/sca/helloworldws/src/main/java/helloworld/HelloWorldImpl.java (original)
+++ incubator/tuscany/java/samples/sca/helloworldws/src/main/java/helloworld/HelloWorldImpl.java Tue Aug 15 14:07:37 2006
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package helloworldOM;
+package helloworld;
import org.osoa.sca.annotations.Service;
Modified: incubator/tuscany/java/samples/sca/helloworldws/src/main/java/helloworld/HelloWorldService.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/samples/sca/helloworldws/src/main/java/helloworld/HelloWorldService.java?rev=431702&r1=431697&r2=431702&view=diff
==============================================================================
--- incubator/tuscany/java/samples/sca/helloworldws/src/main/java/helloworld/HelloWorldService.java (original)
+++ incubator/tuscany/java/samples/sca/helloworldws/src/main/java/helloworld/HelloWorldService.java Tue Aug 15 14:07:37 2006
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package helloworldOM;
+package helloworld;
/**
* This is the business interface of the HelloWorld greetings service.
Added: incubator/tuscany/java/samples/sca/helloworldws/src/main/resources/wsdl/helloworld.wsdl
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/samples/sca/helloworldws/src/main/resources/wsdl/helloworld.wsdl?rev=431702&view=auto
==============================================================================
--- incubator/tuscany/java/samples/sca/helloworldws/src/main/resources/wsdl/helloworld.wsdl (added)
+++ incubator/tuscany/java/samples/sca/helloworldws/src/main/resources/wsdl/helloworld.wsdl Tue Aug 15 14:07:37 2006
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+-->
+<wsdl:definitions targetNamespace="http://helloworld" xmlns:tns="http://helloworld" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ name="helloworld">
+
+ <wsdl:types>
+ <schema elementFormDefault="qualified" targetNamespace="http://helloworld" xmlns="http://www.w3.org/2001/XMLSchema">
+
+ <element name="getGreetings">
+ <complexType>
+ <sequence>
+ <element name="name" type="xsd:string"/>
+ </sequence>
+ </complexType>
+ </element>
+
+ <element name="getGreetingsResponse">
+ <complexType>
+ <sequence>
+ <element name="getGreetingsReturn" type="xsd:string"/>
+ </sequence>
+ </complexType>
+ </element>
+ </schema>
+ </wsdl:types>
+
+ <wsdl:message name="getGreetingsRequest">
+ <wsdl:part element="tns:getGreetings" name="parameters"/>
+ </wsdl:message>
+
+ <wsdl:message name="getGreetingsResponse">
+ <wsdl:part element="tns:getGreetingsResponse" name="parameters"/>
+ </wsdl:message>
+
+ <wsdl:portType name="HelloWorld">
+ <wsdl:operation name="getGreetings">
+ <wsdl:input message="tns:getGreetingsRequest" name="getGreetingsRequest"/>
+ <wsdl:output message="tns:getGreetingsResponse" name="getGreetingsResponse"/>
+ </wsdl:operation>
+ </wsdl:portType>
+
+ <wsdl:binding name="HelloWorldSoapBinding" type="tns:HelloWorld">
+ <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
+ <wsdl:operation name="getGreetings">
+ <wsdlsoap:operation soapAction=""/>
+ <wsdl:input name="getGreetingsRequest">
+ <wsdlsoap:body use="literal"/>
+ </wsdl:input>
+ <wsdl:output name="getGreetingsResponse">
+ <wsdlsoap:body use="literal"/>
+ </wsdl:output>
+ </wsdl:operation>
+ </wsdl:binding>
+
+ <wsdl:service name="HelloWorldService">
+ <wsdl:port binding="tns:HelloWorldSoapBinding" name="HelloWorldSoapPort">
+ <wsdlsoap:address location="http://localhost:8080/sample-helloworldws/services/HelloWorldWebService"/>
+ </wsdl:port>
+ </wsdl:service>
+
+</wsdl:definitions>
Modified: incubator/tuscany/java/samples/sca/helloworldws/src/main/webapp/META-INF/sca/default.scdl
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/samples/sca/helloworldws/src/main/webapp/META-INF/sca/default.scdl?rev=431702&r1=431701&r2=431702&view=diff
==============================================================================
--- incubator/tuscany/java/samples/sca/helloworldws/src/main/webapp/META-INF/sca/default.scdl (original)
+++ incubator/tuscany/java/samples/sca/helloworldws/src/main/webapp/META-INF/sca/default.scdl Tue Aug 15 14:07:37 2006
@@ -20,22 +20,22 @@
<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" name="helloworldws">
<service name="HelloWorldWebService" target="http:///foo">
- <!-- interface.wsdl interface="http://helloworldOM#wsdl.interface(HelloWorld)"/ -->
- <interface.java interface="helloworldOM.HelloWorldService"/>
+ <!-- interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)"/ -->
+ <interface.java interface="helloworld.HelloWorldService"/>
<!--FIXME the location attribute is a really bad hack here! does not follow to spec at all
-->
- <binding.ws endpoint="http://helloworldOM#wsdl.endpoint(HelloWorldService/HelloWorldSoapPort)"
+ <binding.ws endpoint="http://helloworld#wsdl.endpoint(HelloWorldService/HelloWorldSoapPort)"
conformanceURIs="http://ws-i.org/profiles/basic/1.1"
- location="wsdl/helloworldOM.wsdl"
+ location="wsdl/helloworld.wsdl"
/>
<reference>HelloWorldServiceComponent</reference>
</service>
<component name="HelloWorldServiceComponent">
- <implementation.java class="helloworldOM.HelloWorldImpl"/>
+ <implementation.java class="helloworld.HelloWorldImpl"/>
</component>
</composite>
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org