Author: antelder
Date: Mon Oct 16 12:01:18 2006
New Revision: 464625
URL: http://svn.apache.org/viewvc?view=rev&rev=464625
Log:
Cleanup helloworldws sample to match M2 branch
Added:
incubator/tuscany/java/samples/sca/helloworldws/src/main/webapp/WEB-INF/default.scdl
Removed:
incubator/tuscany/java/samples/sca/helloworldws/.ruleset
incubator/tuscany/java/samples/sca/helloworldws/readme.htm
incubator/tuscany/java/samples/sca/helloworldws/setup.bat
incubator/tuscany/java/samples/sca/helloworldws/src/main/webapp/META-INF/sca/default.scdl
Modified:
incubator/tuscany/java/samples/sca/helloworldws/pom.xml
incubator/tuscany/java/samples/sca/helloworldws/src/main/webapp/WEB-INF/web.xml
Modified: incubator/tuscany/java/samples/sca/helloworldws/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/samples/sca/helloworldws/pom.xml?view=diff&rev=464625&r1=464624&r2=464625
==============================================================================
--- incubator/tuscany/java/samples/sca/helloworldws/pom.xml (original)
+++ incubator/tuscany/java/samples/sca/helloworldws/pom.xml Mon Oct 16 12:01:18
2006
@@ -29,10 +29,6 @@
<name>Tuscany HelloWorld Web Service Sample</name>
<description>A sample HelloWorld Web Service.</description>
- <properties>
- <ws.type>axis2</ws.type>
- </properties>
-
<dependencies>
<!-- SCA API dependencies -->
@@ -101,7 +97,8 @@
</dependencies>
<build>
- <finalName>sample-helloworldws-1.0-incubator-M2-SNAPSHOT</finalName>
+ <defaultGoal>install</defaultGoal>
+ <finalName>sample-helloworldws</finalName>
<plugins>
<plugin>
<groupId>org.apache.tuscany.sca.plugins</groupId>
@@ -124,20 +121,6 @@
<artifactId>axis2</artifactId>
<version>${tuscanyVersion}</version>
</dependency>
- <!-- HACK: comment out wsdl and databinding-axiom
extensions to work around the inter-extension
- dependency issue -->
- <!--
- <dependency>
-
<groupId>org.apache.tuscany.sca.services.idl</groupId>
- <artifactId>wsdl</artifactId>
- <version>${tuscanyVersion}</version>
- </dependency>
- <dependency>
-
<groupId>org.apache.tuscany.sca.services.databinding</groupId>
- <artifactId>databinding-axiom</artifactId>
- <version>${tuscanyVersion}</version>
- </dependency>
- -->
<dependency>
<groupId>org.apache.tuscany.sca.services.databinding</groupId>
<artifactId>databinding-sdo</artifactId>
Added:
incubator/tuscany/java/samples/sca/helloworldws/src/main/webapp/WEB-INF/default.scdl
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/samples/sca/helloworldws/src/main/webapp/WEB-INF/default.scdl?view=auto&rev=464625
==============================================================================
---
incubator/tuscany/java/samples/sca/helloworldws/src/main/webapp/WEB-INF/default.scdl
(added)
+++
incubator/tuscany/java/samples/sca/helloworldws/src/main/webapp/WEB-INF/default.scdl
Mon Oct 16 12:01:18 2006
@@ -0,0 +1,35 @@
+<?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.
+-->
+<composite xmlns="http://www.osoa.org/xmlns/sca/1.0";
xmlns:wsdli="http://www.w3.org/2006/01/wsdl-instance";
+ name="helloworldws">
+
+ <dbsdo:import.sdo
xmlns:dbsdo="http://tuscany.apache.org/xmlns/sca/databinding/sdo/1.0";
location="wsdl/helloworld.wsdl" />
+
+ <service name="HelloWorldWebService">
+ <interface.wsdl
interface="http://helloworld#wsdl.interface(HelloWorld)"
wsdli:wsdlLocation="http://helloworld wsdl/helloworld.wsdl" />
+ <binding.ws
endpoint="http://helloworld#wsdl.endpoint(HelloWorldService/HelloWorldSoapPort)"
location="wsdl/helloworld.wsdl" />
+ <reference>HelloWorldServiceComponent</reference>
+ </service>
+
+ <component name="HelloWorldServiceComponent">
+ <implementation.java class="helloworld.HelloWorldImpl" />
+ </component>
+
+</composite>
Modified:
incubator/tuscany/java/samples/sca/helloworldws/src/main/webapp/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/samples/sca/helloworldws/src/main/webapp/WEB-INF/web.xml?view=diff&rev=464625&r1=464624&r2=464625
==============================================================================
---
incubator/tuscany/java/samples/sca/helloworldws/src/main/webapp/WEB-INF/web.xml
(original)
+++
incubator/tuscany/java/samples/sca/helloworldws/src/main/webapp/WEB-INF/web.xml
Mon Oct 16 12:01:18 2006
@@ -23,16 +23,6 @@
<web-app>
<display-name>Tuscany HelloWorld Web Service Sample</display-name>
- <context-param>
- <param-name>tuscany.systemScdlPath</param-name>
- <param-value>/META-INF/tuscany/webapp.scdl</param-value>
- </context-param>
-
- <context-param>
- <param-name>tuscany.applicationScdlPath</param-name>
- <param-value>/META-INF/sca/default.scdl</param-value>
- </context-param>
-
<listener>
<listener-class>org.apache.tuscany.runtime.webapp.TuscanyContextListener</listener-class>
</listener>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
