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/05/12 20:00:16 UTC

svn commit: r405812 [1/2] - in /incubator/tuscany/java: ./ das/ docs/ sampleapps/ sampleapps/bigbank/ sampleapps/bigbank/account/ sampleapps/bigbank/account/src/main/resources/wsdl/ sampleapps/bigbank/webclient/ sampleapps/bigbank/webclient/src/main/re...

Author: rineholt
Date: Fri May 12 11:00:12 2006
New Revision: 405812

URL: http://svn.apache.org/viewcvs?rev=405812&view=rev
Log:
sample move

Added:
    incubator/tuscany/java/docs/
    incubator/tuscany/java/docs/sampleSetup.htm
      - copied, changed from r405731, incubator/tuscany/java/sampleSetup.htm
    incubator/tuscany/java/sampleapps/
    incubator/tuscany/java/sampleapps/bigbank/
      - copied from r405731, incubator/tuscany/java/samples/bigbank/
    incubator/tuscany/java/sampleapps/bigbank/account/
      - copied from r405805, incubator/tuscany/java/samples/bigbank/account/
    incubator/tuscany/java/sampleapps/bigbank/pom.xml
      - copied, changed from r405805, incubator/tuscany/java/samples/bigbank/pom.xml
    incubator/tuscany/java/sampleapps/bigbank/readme.htm
      - copied, changed from r405805, incubator/tuscany/java/samples/bigbank/readme.htm
    incubator/tuscany/java/sampleapps/bigbank/webclient/
      - copied from r405805, incubator/tuscany/java/samples/bigbank/webclient/
    incubator/tuscany/java/sampleapps/pom.xml
      - copied, changed from r405731, incubator/tuscany/java/samples/pom.xml
    incubator/tuscany/java/sampleapps/readme.htm
      - copied, changed from r405731, incubator/tuscany/java/samples/readme.htm
    incubator/tuscany/java/samples/das/
      - copied from r405731, incubator/tuscany/java/das/samples/
    incubator/tuscany/java/samples/das/companyweb/
      - copied from r405805, incubator/tuscany/java/das/samples/companyweb/
    incubator/tuscany/java/samples/das/pom.xml
      - copied, changed from r405805, incubator/tuscany/java/das/samples/pom.xml
    incubator/tuscany/java/samples/sca/
      - copied from r405731, incubator/tuscany/java/sca/samples/
    incubator/tuscany/java/samples/sca/JavaScript/
      - copied from r405731, incubator/tuscany/java/samples/JavaScript/
    incubator/tuscany/java/samples/sca/JavaScript/pom.xml
      - copied, changed from r405805, incubator/tuscany/java/samples/JavaScript/pom.xml
    incubator/tuscany/java/samples/sca/JavaScript/readme.txt
      - copied unchanged from r405805, incubator/tuscany/java/samples/JavaScript/readme.txt
    incubator/tuscany/java/samples/sca/JavaScript/sample1/
      - copied from r405805, incubator/tuscany/java/samples/JavaScript/sample1/
    incubator/tuscany/java/samples/sca/JavaScript/sample2/
      - copied from r405805, incubator/tuscany/java/samples/JavaScript/sample2/
    incubator/tuscany/java/samples/sca/JavaScript/sample3/
      - copied from r405805, incubator/tuscany/java/samples/JavaScript/sample3/
    incubator/tuscany/java/samples/sca/JavaScript/sample4/
      - copied from r405805, incubator/tuscany/java/samples/JavaScript/sample4/
    incubator/tuscany/java/samples/sca/JavaScript/sample5/
      - copied from r405805, incubator/tuscany/java/samples/JavaScript/sample5/
    incubator/tuscany/java/samples/sca/JavaScript/sample7/
      - copied from r405805, incubator/tuscany/java/samples/JavaScript/sample7/
    incubator/tuscany/java/samples/sca/calculator/
      - copied from r405805, incubator/tuscany/java/sca/samples/calculator/
    incubator/tuscany/java/samples/sca/customerinfo/
      - copied from r405805, incubator/tuscany/java/sca/samples/customerinfo/
    incubator/tuscany/java/samples/sca/helloworld/
      - copied from r405805, incubator/tuscany/java/sca/samples/helloworld/
    incubator/tuscany/java/samples/sca/helloworldjsonrpc/
      - copied from r405805, incubator/tuscany/java/sca/samples/helloworldjsonrpc/
    incubator/tuscany/java/samples/sca/helloworldweb/
      - copied from r405805, incubator/tuscany/java/sca/samples/helloworldweb/
    incubator/tuscany/java/samples/sca/helloworldws/
      - copied from r405805, incubator/tuscany/java/sca/samples/helloworldws/
    incubator/tuscany/java/samples/sca/helloworldws-celtix/
      - copied from r405805, incubator/tuscany/java/sca/samples/helloworldws-celtix/
    incubator/tuscany/java/samples/sca/helloworldwsclient/
      - copied from r405805, incubator/tuscany/java/sca/samples/helloworldwsclient/
    incubator/tuscany/java/samples/sca/pom.xml
      - copied, changed from r405805, incubator/tuscany/java/sca/samples/pom.xml
    incubator/tuscany/java/samples/sca/readme.htm
      - copied, changed from r405805, incubator/tuscany/java/sca/samples/readme.htm
    incubator/tuscany/java/samples/sca/supplychain/
      - copied from r405805, incubator/tuscany/java/sca/samples/supplychain/
Removed:
    incubator/tuscany/java/sampleSetup.htm
    incubator/tuscany/java/samples/JavaScript/
    incubator/tuscany/java/samples/bigbank/
    incubator/tuscany/java/samples/pom.xml
    incubator/tuscany/java/samples/readme.htm
    incubator/tuscany/java/sca/samples/
Modified:
    incubator/tuscany/java/das/pom.xml
    incubator/tuscany/java/pom.xml
    incubator/tuscany/java/sampleapps/bigbank/account/pom.xml
    incubator/tuscany/java/sampleapps/bigbank/account/src/main/resources/wsdl/AccountService.wsdl
    incubator/tuscany/java/sampleapps/bigbank/webclient/pom.xml
    incubator/tuscany/java/sampleapps/bigbank/webclient/src/main/resources/wsdl/AccountService.wsdl
    incubator/tuscany/java/samples/das/companyweb/pom.xml
    incubator/tuscany/java/samples/sca/JavaScript/sample1/pom.xml
    incubator/tuscany/java/samples/sca/JavaScript/sample2/pom.xml
    incubator/tuscany/java/samples/sca/JavaScript/sample3/pom.xml
    incubator/tuscany/java/samples/sca/JavaScript/sample4/pom.xml
    incubator/tuscany/java/samples/sca/JavaScript/sample5/pom.xml
    incubator/tuscany/java/samples/sca/calculator/pom.xml
    incubator/tuscany/java/samples/sca/customerinfo/pom.xml
    incubator/tuscany/java/samples/sca/customerinfo/src/main/resources/wsdl/customerinfo.wsdl
    incubator/tuscany/java/samples/sca/helloworld/pom.xml
    incubator/tuscany/java/samples/sca/helloworld/readme.htm
    incubator/tuscany/java/samples/sca/helloworldjsonrpc/pom.xml
    incubator/tuscany/java/samples/sca/helloworldweb/pom.xml
    incubator/tuscany/java/samples/sca/helloworldweb/readme.htm
    incubator/tuscany/java/samples/sca/helloworldws-celtix/pom.xml
    incubator/tuscany/java/samples/sca/helloworldws-celtix/readme.htm
    incubator/tuscany/java/samples/sca/helloworldws-celtix/src/main/resources/wsdl/helloworld.wsdl
    incubator/tuscany/java/samples/sca/helloworldws/pom.xml
    incubator/tuscany/java/samples/sca/helloworldws/readme.htm
    incubator/tuscany/java/samples/sca/helloworldws/src/main/resources/wsdl/helloworld.wsdl
    incubator/tuscany/java/samples/sca/helloworldwsclient/pom.xml
    incubator/tuscany/java/samples/sca/helloworldwsclient/readme.htm
    incubator/tuscany/java/samples/sca/helloworldwsclient/src/main/resources/wsdl/helloworld.wsdl
    incubator/tuscany/java/samples/sca/supplychain/pom.xml
    incubator/tuscany/java/sca/bindings/binding.axis2/src/test/resources/org/apache/tuscany/binding/axis2/builder/helloworld.wsdl
    incubator/tuscany/java/sca/bindings/binding.axis2/src/test/resources/org/apache/tuscany/binding/axis2/handler/helloworld.wsdl
    incubator/tuscany/java/sca/bindings/binding.axis2/src/test/resources/org/apache/tuscany/binding/axis2/util/helloworld.wsdl
    incubator/tuscany/java/sca/containers/container.rhino/src/test/resources/org/apache/tuscany/container/rhino/rhino/helloworld.wsdl
    incubator/tuscany/java/sca/pom.xml
    incubator/tuscany/java/sca/tomcat/src/test/resources/app1/WEB-INF/classes/wsdl/helloworld.wsdl
    incubator/tuscany/java/sca/tomcat/src/test/resources/app2/WEB-INF/classes/wsdl/helloworld.wsdl
    incubator/tuscany/java/sca/tools/src/test/resources/AccountService.wsdl
    incubator/tuscany/java/testing/tomcat/build.xml

Modified: incubator/tuscany/java/das/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/das/pom.xml?rev=405812&r1=405811&r2=405812&view=diff
==============================================================================
--- incubator/tuscany/java/das/pom.xml (original)
+++ incubator/tuscany/java/das/pom.xml Fri May 12 11:00:12 2006
@@ -29,7 +29,6 @@
 
     <modules>
         <module>rdb</module>
-        <module>samples</module>
     </modules>
 
 </project>

Copied: incubator/tuscany/java/docs/sampleSetup.htm (from r405731, incubator/tuscany/java/sampleSetup.htm)
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/docs/sampleSetup.htm?p2=incubator/tuscany/java/docs/sampleSetup.htm&p1=incubator/tuscany/java/sampleSetup.htm&r1=405731&r2=405812&rev=405812&view=diff
==============================================================================
--- incubator/tuscany/java/sampleSetup.htm (original)
+++ incubator/tuscany/java/docs/sampleSetup.htm Fri May 12 11:00:12 2006
@@ -1,182 +1,83 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<!-- Copyright (c) 2005 The Apache Software Foundation or its licensors,
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html><head><!-- Copyright (c) 2005 The Apache Software Foundation or its licensors,
 as applicable. Licensed 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. -->
 
+<meta content="text/html; charset=iso-8859-1" http-equiv="Content-Type">
+<meta content="text/css" http-equiv="Content-Style-Type"><title>Tuscany Sample Setup</title><!-- LINK rel="stylesheet" href="ait.css" type="text/css" -->
 
-  
-  <meta content="text/html; charset=iso-8859-1" http-equiv="Content-Type">
 
-
-  
-  <meta content="text/css" http-equiv="Content-Style-Type">
-
-  
-
-
-
-  
-  <title>Tuscany Sample Setup</title>
-<!-- LINK rel="stylesheet" href="ait.css" type="text/css" -->
-  <style type="text/css" media="all">
+<style type="text/css" media="all">
 @import url("../../css/maven-base.css");
 @import url("../../css/maven-theme.css");
 @import url("../../css/site.css");
-  </style>
-  
-  <link rel="stylesheet" href="./css/print.css" type="text/css" media="print">
-</head>
-
-
+</style>
+<link rel="stylesheet" href="./css/print.css" type="text/css" media="print"></head>
 <body>
-
-
 <h2>Tuscany&nbsp;Sample Setup</h2>
-
-
 <br>
-
-
 <br>
-
-
 <h3>Getting
 Tuscany</h3>
-
-
 Obtain Subversion <a target="_blank" href="http://subversion.tigris.org/">Subversion</a><br>
-
-
 <ul>
-
-
-  <li>md
+<li>md
 tuscany</li>
-
-
-  <li>cd tuscany</li>
-
-
-  <li>svn co
+<li>cd tuscany</li>
+<li>svn co
 http://svn.apache.org/repos/asf/incubator/tuscany/java</li>
-
-
 </ul>
-
-
 <h3>&nbsp;Build
 Tuscany&nbsp;</h3>
-
-
 Obtain <a target="_blank" href="http://maven.apache.org/">Maven
 2.0.2</a><br>
-
-
 <ul>
-
-
-  <li>cd
+<li>cd
 java</li>
-
-
-  <li>mvn</li>
-
-
+<li>mvn</li>
 </ul>
-
-
 <h3>Setup</h3>
-
-
 <h4><a name="J2SE_setup"></a>J2SE
 setup</h4>
-
-
 Tuscany applications can be run in a J2SE 5.0
 environment. Before you
 can run Tuscany applications in that environment, the Tuscany runtime
 JAR files and the JAR files they depend on must be added to your J2SE
 classpath.<br>
-
-
 Samples&nbsp;not requiring invoking web
 services
 need at least the following jars in their classpath<br>
-
-
 <a name="#J2SEJARSNWS"></a><br>
-
-
 <table style="text-align: left; width: 100%;" border="1" cellpadding="2" cellspacing="2">
-
-
-  <tbody>
-
-
-    <tr>
-
-
-      <td>
-      
-      <pre style="margin-left: 40px;">axis-wsdl4j-1.2.jar<br>common-2.2.0-SNAPSHOT.jar<br>ecore-2.2.0-SNAPSHOT.jar<br>ecore-change-2.2.0-SNAPSHOT.jar<br>ecore-xmi-2.2.0-SNAPSHOT.jar<br>sca-api-SNAPSHOT.jar<br>sdo-api-SNAPSHOT.jar<br>stax-api-1.0.jar<br>tuscany-common-SNAPSHOT.jar<br>tuscany-container-java-SNAPSHOT.jar<br>tuscany-core-SNAPSHOT.jar<br>tuscany-model-SNAPSHOT.jar<br>tuscany-sdo-impl-SNAPSHOT.jar<br>xsd-2.2.0-SNAPSHOT.jar</pre>
-
-
-      </td>
-
-
-    </tr>
-
-
-  
-  </tbody>
+<tbody>
+<tr>
+<td>
+<pre style="margin-left: 40px;">axis-wsdl4j-1.2.jar<br>common-2.2.0-SNAPSHOT.jar<br>ecore-2.2.0-SNAPSHOT.jar<br>ecore-change-2.2.0-SNAPSHOT.jar<br>ecore-xmi-2.2.0-SNAPSHOT.jar<br>sca-api-SNAPSHOT.jar<br>sdo-api-SNAPSHOT.jar<br>stax-api-1.0.jar<br>tuscany-common-SNAPSHOT.jar<br>tuscany-container-java-SNAPSHOT.jar<br>tuscany-core-SNAPSHOT.jar<br>tuscany-model-SNAPSHOT.jar<br>tuscany-sdo-impl-SNAPSHOT.jar<br>xsd-2.2.0-SNAPSHOT.jar</pre>
+</td>
+</tr>
+</tbody>
 </table>
-
-
 <span style="font-style: italic;">There is an <a href="http://ant.apache.org/bindownload.cgi" target="_blank">ant</a>
 script in java\testing\tomcat\build.xml that will produce in
 tuscany\java\testing\tomcat\target\j2se all the jars above once you
 have completed the full maven build at the root. Run "<span style="font-weight: bold;">ant j2se</span>"
 &nbsp;Use in java -Djava.ext.dirs to point to this directory to
 include all these jars.</span><br>
-
-
 <br>
-
-
 If
 you're planning to use SCA Web Service bindings from your Tuscany
 application, add the following JAR files to your classpath:<br>
-
-
 <table style="text-align: left; width: 100%;" border="1" cellpadding="2" cellspacing="2">
-
-
-  <tbody>
-
-
-    <tr>
-
-
-      <td>
-      
-      <pre style="margin-left: 40px;">asm-2.2.jar<br>axiom-api-0.95.jar<br>axiom-impl-0.95.jar<br>axis-wsdl4j-1.2.jar<br>axis2-kernel-0.95.jar<br>common-2.2.0-SNAPSHOT.jar<br>commons-codec-1.3.jar<br>commons-httpclient-3.0.jar<br>commons-logging-1.0.4.jar<br>ecore-2.2.0-SNAPSHOT.jar<br>ecore-change-2.2.0-SNAPSHOT.jar<br>ecore-xmi-2.2.0-SNAPSHOT.jar<br>log4j-1.2.12.jar<br>policy-1.0.jar<br>sca-api-SNAPSHOT.jar<br>sdo-api-SNAPSHOT.jar<br>stax-api-1.0.jar<br>tuscany-binding-axis2-SNAPSHOT.jar<br>tuscany-common-SNAPSHOT.jar<br>tuscany-container-java-SNAPSHOT.jar<br>tuscany-core-SNAPSHOT.jar<br>tuscany-model-SNAPSHOT.jar<br>tuscany-sdo-impl-SNAPSHOT.jar<br>wstx-asl-2.8.2.jar<br>XmlSchema-1.0.jar<br>xsd-2.2.0-SNAPSHOT.jar</pre>
-
-
-      </td>
-
-
-    </tr>
-
-
-  
-  </tbody>
+<tbody>
+<tr>
+<td>
+<pre style="margin-left: 40px;">asm-2.2.jar<br>axiom-api-0.95.jar<br>axiom-impl-0.95.jar<br>axis-wsdl4j-1.2.jar<br>axis2-kernel-0.95.jar<br>common-2.2.0-SNAPSHOT.jar<br>commons-codec-1.3.jar<br>commons-httpclient-3.0.jar<br>commons-logging-1.0.4.jar<br>ecore-2.2.0-SNAPSHOT.jar<br>ecore-change-2.2.0-SNAPSHOT.jar<br>ecore-xmi-2.2.0-SNAPSHOT.jar<br>log4j-1.2.12.jar<br>policy-1.0.jar<br>sca-api-SNAPSHOT.jar<br>sdo-api-SNAPSHOT.jar<br>stax-api-1.0.jar<br>tuscany-binding-axis2-SNAPSHOT.jar<br>tuscany-common-SNAPSHOT.jar<br>tuscany-container-java-SNAPSHOT.jar<br>tuscany-core-SNAPSHOT.jar<br>tuscany-model-SNAPSHOT.jar<br>tuscany-sdo-impl-SNAPSHOT.jar<br>wstx-asl-2.8.2.jar<br>XmlSchema-1.0.jar<br>xsd-2.2.0-SNAPSHOT.jar</pre>
+</td>
+</tr>
+</tbody>
 </table>
-
-
 <span style="font-style: italic;">There is an <a href="http://ant.apache.org/bindownload.cgi" target="_blank">ant</a>
 script in java\testing\tomcat\build.xml that will produce in
 tuscany\java\testing\tomcat\target\j2sews all the jars above once you
@@ -185,213 +86,94 @@
 include all these jars.</span>
 <h4><a name="Tomcat_Setup"></a>Tomcat
 Setup</h4>
-
-
 <p>The setup and configuration of &nbsp;the
 Tomcat web server is a little more complex. &nbsp;If you are not
 interested in the details the easiest means of &nbsp;configuring
 this environment is by running "ant" in &nbsp;<span style="font-style: italic;">java\testing\tomcat </span>that
 will configure a server that is
 ready to run the samples and deploy your own SCA applications..</p>
-
-
 <p>For
 any other&nbsp;SCA application that is run in a Tomcat environment,
 package it&nbsp;as a standard J2EE war file and deploy it as
 usual. For
 Tomcat this is simply done by copying them to its webapps
 directory.&nbsp; </p>
-
-
 <p>The
 details:</p>
-
-
 <ul compact="compact">
-
-
-  <li>Unzip
+<li>Unzip
 Tomcat to acceptance\target\apache-tomcat-5.5.15 </li>
-
-
-  <li>Add
+<li>Add
 org.apache.Tuscany.tomcat.lifecycle.listener.TomcatServerLifecycleListener
 to conf\server.xml<br>
-
-
-    
-    <table style="width: 100%; text-align: left; margin-left: auto; margin-right: auto;" border="1" cellpadding="2" cellspacing="2">
-
-
-      <tbody>
-
-
-        <tr>
-
-
-          <td style="background-color: rgb(204, 204, 204);"><code>Change
+<table style="width: 100%; text-align: left; margin-left: auto; margin-right: auto;" border="1" cellpadding="2" cellspacing="2">
+<tbody>
+<tr>
+<td style="background-color: rgb(204, 204, 204);"><code>Change
 the Host element to add </code><span style="font-weight: bold;">className="org.apache.tuscany.tomcat.TuscanyHost"</span>
 attribute like this<code>:<br>
-
-
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 &lt;Host <span style="color: rgb(255, 0, 0);">className="org.apache.tuscany.tomcat.TuscanyHost"
-          </span>name="localhost" appBase="webapps"
+</span>name="localhost" appBase="webapps"
 unpackWARs="true"
 autoDeploy="true" xmlValidation="false"
 xmlNamespaceAware="false"&gt;<br>
-
-
-          <br>
-
-
-          </code></td>
-
-
-        </tr>
-
-
-      
-      </tbody>
-    
-    </table>
-
-
-    
-    <p>The following jars need to be placed in tomcats
+<br>
+</code></td>
+</tr>
+</tbody>
+</table>
+<p>The following jars need to be placed in tomcats
 common/lib directory</p>
-
-
-    
-    <table style="text-align: left; width: 100%;" border="1" cellpadding="2" cellspacing="2">
-
-
-      <tbody>
-
-
-        <tr>
-
-
-          <td>
-          
-          <pre>common-2.2.0-snapshot.jar<br>ecore-2.2.0-snapshot.jar<br>ecore-change-2.2.0-snapshot.jar<br>ecore-xmi-2.2.0-snapshot.jar<br>sca-api-snapshot.jar<br>sdo-api-snapshot.jar<br>tuscany-das-rdb-snapshot.jar<br>tuscany-sdo-impl-snapshot.jar<br>xsd-2.2.0-snapshot.jar<br>jsonrpc-snapshot.jar <span style="font-style: italic;"><span style="font-weight: bold;">Optional if you want javascript components</span></span><br>derby-10.1.2.1.jar <span style="font-style: italic;"><span style="font-weight: bold;">Optional if you want database support</span></span></pre>
-
-
-          </td>
-
-
-        </tr>
-
-
-      
-      </tbody>
-    
-    </table>
-
-
-  </li>
-
-
-  <li>
-    
-    <p>The
+<table style="text-align: left; width: 100%;" border="1" cellpadding="2" cellspacing="2">
+<tbody>
+<tr>
+<td>
+<pre>common-2.2.0-snapshot.jar<br>ecore-2.2.0-snapshot.jar<br>ecore-change-2.2.0-snapshot.jar<br>ecore-xmi-2.2.0-snapshot.jar<br>sca-api-snapshot.jar<br>sdo-api-snapshot.jar<br>tuscany-das-rdb-snapshot.jar<br>tuscany-sdo-impl-snapshot.jar<br>xsd-2.2.0-snapshot.jar<br>jsonrpc-snapshot.jar <span style="font-style: italic;"><span style="font-weight: bold;">Optional if you want javascript components</span></span><br>derby-10.1.2.1.jar <span style="font-style: italic;"><span style="font-weight: bold;">Optional if you want database support</span></span></pre>
+</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li>
+<p>The
 following jars need to go into the server/lib</p>
-
-
-    
-    <table style="text-align: left; width: 100%;" border="1" cellpadding="2" cellspacing="2">
-
-
-      <tbody>
-
-
-        <tr>
-
-
-          <td>
-          
-          <pre>asm-2.2.jar<br>axiom-api-0.95.jar<br>axiom-impl-0.95.jar<br>axis-wsdl4j-1.2.jar<br>axis2-kernel-0.95.jar<br>commons-codec-1.3.jar<br>commons-httpclient-3.0.jar<br>log4j-1.2.12.jar<br>policy-1.0.jar<br>stax-api-1.0.jar<br>tuscany-binding-axis2-snapshot.jar<br>tuscany-binding-jsonrpc-snapshot.jar<br>tuscany-common-snapshot.jar<br>tuscany-container-java-snapshot.jar<br>tuscany-core-snapshot.jar<br>tuscany-model-snapshot.jar<br>tuscany-tomcat-snapshot.jar<br>wstx-asl-2.8.2.jar<br>xmlschema-1.0.jar</pre>
-
-
-          </td>
-
-
-        </tr>
-
-
-      
-      </tbody>
-    
-    </table>
-
-
-    <br>
-
-
-  </li>
-
-
-  <li>For
+<table style="text-align: left; width: 100%;" border="1" cellpadding="2" cellspacing="2">
+<tbody>
+<tr>
+<td>
+<pre>asm-2.2.jar<br>axiom-api-0.95.jar<br>axiom-impl-0.95.jar<br>axis-wsdl4j-1.2.jar<br>axis2-kernel-0.95.jar<br>commons-codec-1.3.jar<br>commons-httpclient-3.0.jar<br>log4j-1.2.12.jar<br>policy-1.0.jar<br>stax-api-1.0.jar<br>tuscany-binding-axis2-snapshot.jar<br>tuscany-binding-jsonrpc-snapshot.jar<br>tuscany-common-snapshot.jar<br>tuscany-container-java-snapshot.jar<br>tuscany-core-snapshot.jar<br>tuscany-model-snapshot.jar<br>tuscany-tomcat-snapshot.jar<br>wstx-asl-2.8.2.jar<br>xmlschema-1.0.jar</pre>
+</td>
+</tr>
+</tbody>
+</table>
+<br>
+</li>
+<li>For
 the samples copy their war files to Tomcat's webapps
 directory.</li>
-
-
 </ul>
-
-
 <h3>Samples&nbsp;</h3>
-
-
 <table style="text-align: left; width: 100%;" border="0" cellpadding="2" cellspacing="2">
-
-
-  <caption style="text-decoration: underline;">Tuscany
+<caption style="text-decoration: underline;">Tuscany
 samples and applications</caption><tbody>
-
-
-    <tr>
-
-
-      <td style="vertical-align: top; white-space: nowrap;"><a href="sca/samples/readme.htm"><span style="text-decoration: underline;"></span></a><a href="sca/samples/readme.htm">SCA technology samples</a> </td>
-
-
-      <td>Shows
+<tr>
+<td style="vertical-align: top; white-space: nowrap;"><span style="text-decoration: underline;"></span><a href="samples/sca/readme.htm">Technology samples</a>
+</td>
+<td>Shows
 simple samples that emphasizes &nbsp;how to to use SCA technology.<br>
-
-
-      </td>
-
-
-    </tr>
-
-
-    <tr>
-
-
-      <td style="vertical-align: top; white-space: nowrap;"><a href="samples/readme.htm">Sample
+</td>
+</tr>
+<tr>
+<td style="vertical-align: top; white-space: nowrap;">
+<a href="sampleapps/readme.htm">Sample
 applications</a></td>
-
-
-      <td>Sample business applications that show the value of SCA
+<td>Sample business applications that show&nbsp; SCA
 and SDO.<br>
-
-
-      <br>
-
-
-      </td>
-
-
-    </tr>
-
-
-  
-  </tbody>
+<br>
+</td>
+</tr>
+</tbody>
 </table>
-
-
 <br>
-
-
-</body>
-</html>
+</body></html>
\ No newline at end of file

Modified: incubator/tuscany/java/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/pom.xml?rev=405812&r1=405811&r2=405812&view=diff
==============================================================================
--- incubator/tuscany/java/pom.xml (original)
+++ incubator/tuscany/java/pom.xml Fri May 12 11:00:12 2006
@@ -62,6 +62,7 @@
         <module>das</module>
         <module>sca</module>
         <module>samples</module>
+        <module>sampleapps</module>
     </modules>
 
     <distributionManagement>

Modified: incubator/tuscany/java/sampleapps/bigbank/account/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sampleapps/bigbank/account/pom.xml?rev=405812&r1=405805&r2=405812&view=diff
==============================================================================
--- incubator/tuscany/java/sampleapps/bigbank/account/pom.xml (original)
+++ incubator/tuscany/java/sampleapps/bigbank/account/pom.xml Fri May 12 11:00:12 2006
@@ -21,7 +21,7 @@
         <version>SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>bigbank-account</artifactId>
+    <artifactId>sample-bigbank-account</artifactId>
     <packaging>war</packaging>
     <name>Tuscany BigBank Account Module</name>
     <description>BigBank Scenario - Account Management Module</description>

Modified: incubator/tuscany/java/sampleapps/bigbank/account/src/main/resources/wsdl/AccountService.wsdl
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sampleapps/bigbank/account/src/main/resources/wsdl/AccountService.wsdl?rev=405812&r1=405805&r2=405812&view=diff
==============================================================================
--- incubator/tuscany/java/sampleapps/bigbank/account/src/main/resources/wsdl/AccountService.wsdl (original)
+++ incubator/tuscany/java/sampleapps/bigbank/account/src/main/resources/wsdl/AccountService.wsdl Fri May 12 11:00:12 2006
@@ -386,7 +386,7 @@
 		<wsdl:port binding="account:AccountServiceSOAP"
 			name="AccountServiceSOAP">
 			<soap:address
-				location="http://localhost:8080/bigbank-account-SNAPSHOT/services/AccountService" />
+				location="http://localhost:8080/sample-bigbank-account-SNAPSHOT/services/AccountService" />
 		</wsdl:port>
 	</wsdl:service>
 </wsdl:definitions>

Copied: incubator/tuscany/java/sampleapps/bigbank/pom.xml (from r405805, incubator/tuscany/java/samples/bigbank/pom.xml)
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sampleapps/bigbank/pom.xml?p2=incubator/tuscany/java/sampleapps/bigbank/pom.xml&p1=incubator/tuscany/java/samples/bigbank/pom.xml&r1=405805&r2=405812&rev=405812&view=diff
==============================================================================
--- incubator/tuscany/java/samples/bigbank/pom.xml (original)
+++ incubator/tuscany/java/sampleapps/bigbank/pom.xml Fri May 12 11:00:12 2006
@@ -16,8 +16,8 @@
  -->
 <project>
     <parent>
-        <groupId>org.apache.tuscany.samples</groupId>
-        <artifactId>tuscany-samples</artifactId>
+        <groupId>org.apache.tuscany.samplesapps</groupId>
+        <artifactId>tuscany-sampleapps</artifactId>
         <version>SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>

Copied: incubator/tuscany/java/sampleapps/bigbank/readme.htm (from r405805, incubator/tuscany/java/samples/bigbank/readme.htm)
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sampleapps/bigbank/readme.htm?p2=incubator/tuscany/java/sampleapps/bigbank/readme.htm&p1=incubator/tuscany/java/samples/bigbank/readme.htm&r1=405805&r2=405812&rev=405812&view=diff
==============================================================================
--- incubator/tuscany/java/samples/bigbank/readme.htm (original)
+++ incubator/tuscany/java/sampleapps/bigbank/readme.htm Fri May 12 11:00:12 2006
@@ -33,7 +33,7 @@
 
 <h3>Setup</h3>
 
-Set up your server as described in the <a href="../../sampleSetup.htm" target="_blank">Tomcat
+Set up your server as described in the <a href="../../docs/sampleSetup.htm" target="_blank">Tomcat
 Setup</a>. &nbsp;If you are not configuring with the
 acceptance test the server, you will need to add<br>
 

Modified: incubator/tuscany/java/sampleapps/bigbank/webclient/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sampleapps/bigbank/webclient/pom.xml?rev=405812&r1=405805&r2=405812&view=diff
==============================================================================
--- incubator/tuscany/java/sampleapps/bigbank/webclient/pom.xml (original)
+++ incubator/tuscany/java/sampleapps/bigbank/webclient/pom.xml Fri May 12 11:00:12 2006
@@ -21,7 +21,7 @@
         <version>SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>bigbank-webclient</artifactId>
+    <artifactId>sample-bigbank-webclient</artifactId>
     <packaging>war</packaging>
     <name>Tuscany BigBank Web Client Module</name>
     <description>BigBank Scenario Sample - Web Front-End Module</description>

Modified: incubator/tuscany/java/sampleapps/bigbank/webclient/src/main/resources/wsdl/AccountService.wsdl
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sampleapps/bigbank/webclient/src/main/resources/wsdl/AccountService.wsdl?rev=405812&r1=405805&r2=405812&view=diff
==============================================================================
--- incubator/tuscany/java/sampleapps/bigbank/webclient/src/main/resources/wsdl/AccountService.wsdl (original)
+++ incubator/tuscany/java/sampleapps/bigbank/webclient/src/main/resources/wsdl/AccountService.wsdl Fri May 12 11:00:12 2006
@@ -386,7 +386,7 @@
 		<wsdl:port binding="account:AccountServiceSOAP"
 			name="AccountServiceSOAP">
 			<soap:address
-				location="http://localhost:8080/bigbank-account-SNAPSHOT/services/AccountService" />
+				location="http://localhost:8080/sample-bigbank-account-SNAPSHOT/services/AccountService" />
 		</wsdl:port>
 	</wsdl:service>
 </wsdl:definitions>

Copied: incubator/tuscany/java/sampleapps/pom.xml (from r405731, incubator/tuscany/java/samples/pom.xml)
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sampleapps/pom.xml?p2=incubator/tuscany/java/sampleapps/pom.xml&p1=incubator/tuscany/java/samples/pom.xml&r1=405731&r2=405812&rev=405812&view=diff
==============================================================================
--- incubator/tuscany/java/samples/pom.xml (original)
+++ incubator/tuscany/java/sampleapps/pom.xml Fri May 12 11:00:12 2006
@@ -20,15 +20,15 @@
         <artifactId>tuscany-project</artifactId>
         <version>SNAPSHOT</version>
     </parent>
+
     <modelVersion>4.0.0</modelVersion>
-    <groupId>org.apache.tuscany.samples</groupId>
-    <artifactId>tuscany-samples</artifactId>
+    <groupId>org.apache.tuscany.samplesapps</groupId>
+    <artifactId>tuscany-sampleapps</artifactId>
     <packaging>pom</packaging>
     <name>Tuscany Scenario Samples</name>
     <version>SNAPSHOT</version>
 
     <modules>
         <module>bigbank</module>
-        <module>JavaScript</module>
     </modules>
 </project>

Copied: incubator/tuscany/java/sampleapps/readme.htm (from r405731, incubator/tuscany/java/samples/readme.htm)
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sampleapps/readme.htm?p2=incubator/tuscany/java/sampleapps/readme.htm&p1=incubator/tuscany/java/samples/readme.htm&r1=405731&r2=405812&rev=405812&view=diff
==============================================================================
--- incubator/tuscany/java/samples/readme.htm (original)
+++ incubator/tuscany/java/sampleapps/readme.htm Fri May 12 11:00:12 2006
@@ -21,7 +21,7 @@
 
 <body>
 <h2>Tuscany&nbsp;Sample Applications</h2>
-To set up for &nbsp;the sample read the <a href="../sampleSetup.htm">Sample setup</a><br>
+To set up for &nbsp;the sample read the <a href="../docs/sampleSetup.htm">Sample setup</a><br>
 <br>
 <h3>Sample Summary</h3>
 

Modified: incubator/tuscany/java/samples/das/companyweb/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/samples/das/companyweb/pom.xml?rev=405812&r1=405805&r2=405812&view=diff
==============================================================================
--- incubator/tuscany/java/samples/das/companyweb/pom.xml (original)
+++ incubator/tuscany/java/samples/das/companyweb/pom.xml Fri May 12 11:00:12 2006
@@ -23,7 +23,7 @@
     </parent>
 	
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>companyWeb</artifactId>
+    <artifactId>sample-companyWeb</artifactId>
     <packaging>war</packaging>
     <name>Tuscany DAS sample Company WEB</name>
     <description>Sample use of RDB DAS with JSP</description>

Copied: incubator/tuscany/java/samples/das/pom.xml (from r405805, incubator/tuscany/java/das/samples/pom.xml)
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/samples/das/pom.xml?p2=incubator/tuscany/java/samples/das/pom.xml&p1=incubator/tuscany/java/das/samples/pom.xml&r1=405805&r2=405812&rev=405812&view=diff
==============================================================================
--- incubator/tuscany/java/das/samples/pom.xml (original)
+++ incubator/tuscany/java/samples/das/pom.xml Fri May 12 11:00:12 2006
@@ -16,13 +16,13 @@
  -->
 <project>
     <parent>
-        <groupId>org.apache.tuscany.das</groupId>
-        <artifactId>tuscany-das</artifactId>
+        <groupId>org.apache.tuscany.samples</groupId>
+        <artifactId>tuscany-samples</artifactId>
         <version>SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.apache.tuscany.samples.das</groupId>
-    <artifactId>das-samples</artifactId>
+    <artifactId>das</artifactId>
     <packaging>pom</packaging>
     <name>Tuscany DAS Samples</name>
     <version>SNAPSHOT</version>

Copied: incubator/tuscany/java/samples/sca/JavaScript/pom.xml (from r405805, incubator/tuscany/java/samples/JavaScript/pom.xml)
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/samples/sca/JavaScript/pom.xml?p2=incubator/tuscany/java/samples/sca/JavaScript/pom.xml&p1=incubator/tuscany/java/samples/JavaScript/pom.xml&r1=405805&r2=405812&rev=405812&view=diff
==============================================================================
--- incubator/tuscany/java/samples/JavaScript/pom.xml (original)
+++ incubator/tuscany/java/samples/sca/JavaScript/pom.xml Fri May 12 11:00:12 2006
@@ -17,14 +17,14 @@
 <project>
 
     <parent>
-        <groupId>org.apache.tuscany.samples</groupId>
-        <artifactId>tuscany-samples</artifactId>
+        <groupId>org.apache.tuscany.samples.sca</groupId>
+        <artifactId>tuscany-samples-sca</artifactId>
         <version>SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <groupId>org.apache.tuscany.samples.javascript</groupId>
-    <artifactId>tuscany-samples-javascript</artifactId>
+    <groupId>org.apache.tuscany.samples.sca.javascript</groupId>
+    <artifactId>samples-javascript</artifactId>
     <packaging>pom</packaging>
     <name>Tuscany Samples JavaScript</name>
     <version>SNAPSHOT</version>

Modified: incubator/tuscany/java/samples/sca/JavaScript/sample1/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/samples/sca/JavaScript/sample1/pom.xml?rev=405812&r1=405805&r2=405812&view=diff
==============================================================================
--- incubator/tuscany/java/samples/sca/JavaScript/sample1/pom.xml (original)
+++ incubator/tuscany/java/samples/sca/JavaScript/sample1/pom.xml Fri May 12 11:00:12 2006
@@ -17,13 +17,13 @@
 <project>
 
     <parent>
-        <groupId>org.apache.tuscany.samples.javascript</groupId>
-        <artifactId>tuscany-samples-javascript</artifactId>
+        <groupId>org.apache.tuscany.samples.sca.javascript</groupId>
+        <artifactId>samples-javascript</artifactId>
         <version>SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>javascript-sample1</artifactId>
+    <artifactId>sample-javascript1</artifactId>
     <packaging>jar</packaging>
     <name>Tuscany Samples - JavaScript - Sample 1 - HelloWorld</name>
     <description>The clasic HelloWorld as a SCA JavaScript component</description>

Modified: incubator/tuscany/java/samples/sca/JavaScript/sample2/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/samples/sca/JavaScript/sample2/pom.xml?rev=405812&r1=405805&r2=405812&view=diff
==============================================================================
--- incubator/tuscany/java/samples/sca/JavaScript/sample2/pom.xml (original)
+++ incubator/tuscany/java/samples/sca/JavaScript/sample2/pom.xml Fri May 12 11:00:12 2006
@@ -17,13 +17,13 @@
 <project>
 
     <parent>
-        <groupId>org.apache.tuscany.samples.javascript</groupId>
-        <artifactId>tuscany-samples-javascript</artifactId>
+        <groupId>org.apache.tuscany.samples.sca.javascript</groupId>
+        <artifactId>samples-javascript</artifactId>
         <version>SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>javascript-sample2</artifactId>
+    <artifactId>sample-javascript2</artifactId>
     <packaging>jar</packaging>
     <name>Tuscany Samples - JavaScript - Sample 2 - Properties</name>
     <description>Shows how to use SCA component properties in a SCA JavaScript component</description>

Modified: incubator/tuscany/java/samples/sca/JavaScript/sample3/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/samples/sca/JavaScript/sample3/pom.xml?rev=405812&r1=405805&r2=405812&view=diff
==============================================================================
--- incubator/tuscany/java/samples/sca/JavaScript/sample3/pom.xml (original)
+++ incubator/tuscany/java/samples/sca/JavaScript/sample3/pom.xml Fri May 12 11:00:12 2006
@@ -17,13 +17,13 @@
 <project>
 
     <parent>
-        <groupId>org.apache.tuscany.samples.javascript</groupId>
-        <artifactId>tuscany-samples-javascript</artifactId>
+        <groupId>org.apache.tuscany.samples.sca.javascript</groupId>
+        <artifactId>samples-javascript</artifactId>
         <version>SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>javascript-sample3</artifactId>
+    <artifactId>sample-javascript3</artifactId>
     <packaging>jar</packaging>
     <name>Tuscany Samples - JavaScript - Sample 3 - References</name>
     <description>Shows how to use SCA component service references with a SCA JavaScript comonent</description>

Modified: incubator/tuscany/java/samples/sca/JavaScript/sample4/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/samples/sca/JavaScript/sample4/pom.xml?rev=405812&r1=405805&r2=405812&view=diff
==============================================================================
--- incubator/tuscany/java/samples/sca/JavaScript/sample4/pom.xml (original)
+++ incubator/tuscany/java/samples/sca/JavaScript/sample4/pom.xml Fri May 12 11:00:12 2006
@@ -17,13 +17,13 @@
 <project>
 
     <parent>
-        <groupId>org.apache.tuscany.samples.javascript</groupId>
-        <artifactId>tuscany-samples-javascript</artifactId>
+        <groupId>org.apache.tuscany.samples.sca.javascript</groupId>
+        <artifactId>samples-javascript</artifactId>
         <version>SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>javascript-sample4</artifactId>
+    <artifactId>sample-javascript4</artifactId>
     <packaging>jar</packaging>
     <name>Tuscany Samples - JavaScript - Sample 4 - Initialization</name>
     <description>Shows the various ways SCA JavaScript components can be initialized</description>

Modified: incubator/tuscany/java/samples/sca/JavaScript/sample5/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/samples/sca/JavaScript/sample5/pom.xml?rev=405812&r1=405805&r2=405812&view=diff
==============================================================================
--- incubator/tuscany/java/samples/sca/JavaScript/sample5/pom.xml (original)
+++ incubator/tuscany/java/samples/sca/JavaScript/sample5/pom.xml Fri May 12 11:00:12 2006
@@ -17,13 +17,13 @@
 <project>
 
     <parent>
-        <groupId>org.apache.tuscany.samples.javascript</groupId>
-        <artifactId>tuscany-samples-javascript</artifactId>
+        <groupId>org.apache.tuscany.samples.sca.javascript</groupId>
+        <artifactId>samples-javascript</artifactId>
         <version>SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>javascript-sample5</artifactId>
+    <artifactId>sample-javascript5</artifactId>
     <packaging>jar</packaging>
     <name>Tuscany Samples - JavaScript - Sample 5 - Importing Java classes</name>
     <description>shows how to access user written Java classes from within an SCA JavaScript component</description>

Modified: incubator/tuscany/java/samples/sca/calculator/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/samples/sca/calculator/pom.xml?rev=405812&r1=405805&r2=405812&view=diff
==============================================================================
--- incubator/tuscany/java/samples/sca/calculator/pom.xml (original)
+++ incubator/tuscany/java/samples/sca/calculator/pom.xml Fri May 12 11:00:12 2006
@@ -16,12 +16,12 @@
  -->
 <project>
     <parent>
-        <groupId>org.apache.tuscany.sca.samples</groupId>
-        <artifactId>tuscany-sca-samples</artifactId>
+        <groupId>org.apache.tuscany.samples.sca</groupId>
+        <artifactId>tuscany-samples-sca</artifactId>
         <version>SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>calculator</artifactId>
+    <artifactId>sample-calculator</artifactId>
     <packaging>jar</packaging>
     <name>Tuscany Calculator Sample</name>
     <description>A sample Calculator made of several SCA components wired together.</description>

Modified: incubator/tuscany/java/samples/sca/customerinfo/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/samples/sca/customerinfo/pom.xml?rev=405812&r1=405805&r2=405812&view=diff
==============================================================================
--- incubator/tuscany/java/samples/sca/customerinfo/pom.xml (original)
+++ incubator/tuscany/java/samples/sca/customerinfo/pom.xml Fri May 12 11:00:12 2006
@@ -16,12 +16,13 @@
  -->
 <project>
     <parent>
-        <groupId>org.apache.tuscany.sca.samples</groupId>
-        <artifactId>tuscany-sca-samples</artifactId>
+        <groupId>org.apache.tuscany.samples.sca</groupId>
+        <artifactId>tuscany-samples-sca</artifactId>
         <version>SNAPSHOT</version>
     </parent>
+    
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>customerinfo</artifactId>
+    <artifactId>sample-customerinfo</artifactId>
     <packaging>jar</packaging>
     <name>Tuscany Customer Info Sample</name>
     <description>A component that exposes a WSDL portType interface and uses the dynamic SDO API.</description>

Modified: incubator/tuscany/java/samples/sca/customerinfo/src/main/resources/wsdl/customerinfo.wsdl
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/samples/sca/customerinfo/src/main/resources/wsdl/customerinfo.wsdl?rev=405812&r1=405805&r2=405812&view=diff
==============================================================================
--- incubator/tuscany/java/samples/sca/customerinfo/src/main/resources/wsdl/customerinfo.wsdl (original)
+++ incubator/tuscany/java/samples/sca/customerinfo/src/main/resources/wsdl/customerinfo.wsdl Fri May 12 11:00:12 2006
@@ -69,7 +69,7 @@
 
     <wsdl:service name="CustomerInfoService">
         <wsdl:port binding="tns:CustomerInfoSoapBinding" name="CustomerInfoSoapPort">
-            <wsdlsoap:address location="http://localhost:8080/helloworldws-SNAPSHOT/services/CustomerInfoService"/>
+            <wsdlsoap:address location="http://localhost:8080/sample-helloworldws-SNAPSHOT/services/CustomerInfoService"/>
         </wsdl:port>
     </wsdl:service>
 

Modified: incubator/tuscany/java/samples/sca/helloworld/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/samples/sca/helloworld/pom.xml?rev=405812&r1=405805&r2=405812&view=diff
==============================================================================
--- incubator/tuscany/java/samples/sca/helloworld/pom.xml (original)
+++ incubator/tuscany/java/samples/sca/helloworld/pom.xml Fri May 12 11:00:12 2006
@@ -16,12 +16,12 @@
  -->
 <project>
     <parent>
-        <groupId>org.apache.tuscany.sca.samples</groupId>
-        <artifactId>tuscany-sca-samples</artifactId>
+        <groupId>org.apache.tuscany.samples.sca</groupId>
+        <artifactId>tuscany-samples-sca</artifactId>
         <version>SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>helloworld</artifactId>
+    <artifactId>sample-helloworld</artifactId>
     <packaging>jar</packaging>
     <name>Tuscany HelloWorld Sample</name>
     <description>A sample implementation of HelloWorld using an SCA component.</description>

Modified: incubator/tuscany/java/samples/sca/helloworld/readme.htm
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/samples/sca/helloworld/readme.htm?rev=405812&r1=405805&r2=405812&view=diff
==============================================================================
--- incubator/tuscany/java/samples/sca/helloworld/readme.htm (original)
+++ incubator/tuscany/java/samples/sca/helloworld/readme.htm Fri May 12 11:00:12 2006
@@ -1,164 +1,47 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<!--
-  Copyright (c) 2005 The Apache Software Foundation or its licensors, as applicable.
-
-  Licensed 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.
- -->
-
-    
-  <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-
-
-    
-  <meta http-equiv="Content-Style-Type" content="text/css">
-
-    
-  <title>Tuscany HelloWorld</title>
-<!-- LINK rel="stylesheet" href="ait.css" type="text/css" -->
-  <style type="text/css" media="all">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html><head><!-- Copyright (c) 2005 The Apache Software Foundation or its licensors, as applicable. Licensed 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. -->
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> <meta http-equiv="Content-Style-Type" content="text/css"><title>Tuscany
+HelloWorld</title> <!-- LINK rel="stylesheet" href="ait.css" type="text/css" --><style type="text/css" media="all">
 @import url("../../../../css/maven-base.css");
 @import url("../../../../css/maven-theme.css");
 @import url("../../../../css/site.css");
-  </style>
-  <link rel="stylesheet" href="./css/print.css" type="text/css" media="print">
-</head>
-
-
-<body>
-
-
-<h2>Tuscany Hello World Sample</h2>
-
+</style>
+<link rel="stylesheet" href="./css/print.css" type="text/css" media="print"></head>
 
+<body><h2>Tuscany Hello World Sample</h2>
 <h3>Overview</h3>
-
-
 <p>The Tuscany helloworld sample shows using the Tuscany SCA
-    runtime in a J2SE environment &nbsp;loading a component that
-    implements the classic introductory hello world example. </p>
-
-
-
-<h3>Setup</h3>
-The jars for a <a href="../../../sampleSetup.htm" target="_blank">J2SE setup</a> &nbsp;not requiring web
+runtime in a J2SE environment &nbsp;loading a component that
+implements the classic introductory hello world example.</p><h3>Location</h3>This
+sample is located &nbsp;in the samples\sca\helloworld directory.<br><span style="font-weight: bold;"><br></span>
+<h3>Setup</h3>&nbsp;The
+jars for a <a href="../../../docs/sampleSetup.htm" target="_blank">J2SE
+setup</a> &nbsp;not requiring web
 services are required including the sample's own jar <span style="font-weight: bold;">helloworld-SNAPSHOT.jar</span>.
-
-
 <ol>
-
-</ol>
-
-
-<h3>Running</h3>
-
-
-Using JDK 1.5 java command with the previous jars run the class org.apache.tuscany.samples.helloworld.HelloWorldClient
-<br>
-
-
-<h3>Results</h3>
-
-
+</ol><h3>Running</h3>
+Using JDK 1.5 java command with the previous jars run the class
+org.apache.tuscany.samples.helloworld.HelloWorldClient
+<br><h3>Results</h3>
 <p>The sample when run should simply display to the standard
-    output:<br>
-
-
-    <code>Hello World</code></p>
-
-
-
+output:<br> <code>Hello World</code></p>
 <h3>Code Overview</h3>
-
-
 The source files are physically organized as shown below:
-<pre>sca.module<br>org<br>+-apache<br> +-tuscany<br> +-samples<br> +-helloworld<br> HelloWorldClient.java<br>
-    HelloWorldService.java<br> HelloWorldServiceComponentImpl.java<br><br><br></pre>
-
-
-<p>&nbsp;</p>
-
-
-<table style="text-align: left; width: 879px; height: 154px;" border="0" cellpadding="2" cellspacing="2">
-
-
-    <tbody>
-
-
-        <tr>
-
-
-            <td style="vertical-align: top;">sca.module</td>
-
-
-            <td>Defines the SCA module and component. Defines for the
-                HelloWorldServiceComponent component&nbsp; the Java class that
-                implements that component</td>
-
-
-        </tr>
-
-
-        <tr>
-
-
-            <td style="vertical-align: top;">HelloWorldService.java</td>
-
-
-            <td>Defines the Java interface implemented by the component.</td>
-
-
-        </tr>
-
-
-        <tr>
-
-
-            <td style="vertical-align: top;">HelloWorldServiceComponentImpl.java</td>
-
-
-            <td>Implements the SCA component. Uses the SCA service
-                annotation tag on the class to show what SCA interface is being
-                implemented.</td>
-
-
-        </tr>
-
-
-        <tr>
-
-
-            <td style="vertical-align: top;">HelloWorldClient.java</td>
-
-
-            <td>Creates a Tuscany runtime and starts it.
-                &nbsp;Obtains the module context which was defined by the
-                sca.module file. From the module context locates the
-                HelloWorldServiceComponent and then calls&nbsp; the getGreetings
-                method to invoke the component.</td>
-
-
-        </tr>
-
-
-    
-  </tbody>
-</table>
-
-
-<br>
-
-
-</body>
-</html>
+<pre>sca.module<br>org<br>+-apache<br> +-tuscany<br> +-samples<br> +-helloworld<br> HelloWorldClient.java<br><br>HelloWorldService.java<br> HelloWorldServiceComponentImpl.java<br><br><br></pre><p>&nbsp;</p>
+<table style="text-align: left; width: 879px; height: 154px;" border="0" cellpadding="2" cellspacing="2"> <tbody>
+<tr> <td style="vertical-align: top;">sca.module</td>
+<td>Defines the SCA module and component. Defines for the
+HelloWorldServiceComponent component&nbsp; the Java class that
+implements that component</td> </tr> <tr> <td style="vertical-align: top;">HelloWorldService.java</td>
+<td>Defines the Java interface implemented by the component.</td>
+</tr> <tr> <td style="vertical-align: top;">HelloWorldServiceComponentImpl.java</td>
+<td>Implements the SCA component. Uses the SCA service annotation
+tag on the class to show what SCA interface is being implemented.</td>
+</tr> <tr> <td style="vertical-align: top;">HelloWorldClient.java</td>
+<td>Creates a Tuscany runtime and starts it. &nbsp;Obtains
+the module context which was defined by the sca.module file. From the
+module context locates the HelloWorldServiceComponent and then
+calls&nbsp; the getGreetings method to invoke the component.</td>
+</tr> </tbody>
+</table><br>
+</body></html>

Modified: incubator/tuscany/java/samples/sca/helloworldjsonrpc/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/samples/sca/helloworldjsonrpc/pom.xml?rev=405812&r1=405805&r2=405812&view=diff
==============================================================================
--- incubator/tuscany/java/samples/sca/helloworldjsonrpc/pom.xml (original)
+++ incubator/tuscany/java/samples/sca/helloworldjsonrpc/pom.xml Fri May 12 11:00:12 2006
@@ -16,12 +16,12 @@
  -->
 <project>
     <parent>
-        <groupId>org.apache.tuscany.sca.samples</groupId>
-        <artifactId>tuscany-sca-samples</artifactId>
+        <groupId>org.apache.tuscany.samples.sca</groupId>
+        <artifactId>tuscany-samples-sca</artifactId>
         <version>SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>helloworldjsonrpc</artifactId>
+    <artifactId>sample-helloworldjsonrpc</artifactId>
     <packaging>war</packaging>
     <name>Tuscany HelloWorld JSON-RPC Sample</name>
     <description>A sample HelloWorld Web application using JSON-RPC</description>

Modified: incubator/tuscany/java/samples/sca/helloworldweb/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/samples/sca/helloworldweb/pom.xml?rev=405812&r1=405805&r2=405812&view=diff
==============================================================================
--- incubator/tuscany/java/samples/sca/helloworldweb/pom.xml (original)
+++ incubator/tuscany/java/samples/sca/helloworldweb/pom.xml Fri May 12 11:00:12 2006
@@ -16,12 +16,12 @@
  -->
 <project>
     <parent>
-        <groupId>org.apache.tuscany.sca.samples</groupId>
-        <artifactId>tuscany-sca-samples</artifactId>
+        <groupId>org.apache.tuscany.samples.sca</groupId>
+        <artifactId>tuscany-samples-sca</artifactId>
         <version>SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>helloworldweb</artifactId>
+    <artifactId>sample-helloworldweb</artifactId>
     <packaging>war</packaging>
     <name>Tuscany HelloWorld Web Application Sample</name>
     <description>A sample JSP that invokes a HelloWorld component.</description>

Modified: incubator/tuscany/java/samples/sca/helloworldweb/readme.htm
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/samples/sca/helloworldweb/readme.htm?rev=405812&r1=405805&r2=405812&view=diff
==============================================================================
--- incubator/tuscany/java/samples/sca/helloworldweb/readme.htm (original)
+++ incubator/tuscany/java/samples/sca/helloworldweb/readme.htm Fri May 12 11:00:12 2006
@@ -17,15 +17,23 @@
   limitations under the License.
  -->
 
+
     
+  
   <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
 
 
+
     
+  
   <meta http-equiv="Content-Style-Type" content="text/css">
 
+
     
 
+  
+
+  
   <title>Tuscany Hello World Web Sample</title>
 <!-- LINK rel="stylesheet" href="ait.css" type="text/css" --><!-- maven -->
   <style type="text/css" media="all">
@@ -33,6 +41,7 @@
 @import url("../../../../css/maven-theme.css");
 @import url("../../../../css/site.css");
   </style>
+  
   <link rel="stylesheet" href="./css/print.css" type="text/css" media="print">
 <!-- end maven -->
 </head>
@@ -41,32 +50,41 @@
 <body>
 
 
+
 <h2>Tuscany Hello World Web Sample</h2>
 
 
+
 <h3>Overview</h3>
 
 
+
 <p>The Tuscany hello world web sample shows using the Tuscany SCA
     runtime in a Tomcat environment being accessed from a JSP
     page&nbsp;that
-    implements the classic introductory hello world example. </p>
+    implements the classic introductory hello world example.</p>
+<h3>Location</h3>
+This sample is located &nbsp;in the samples\sca\helloworldweb directory.
 
 
 
 <h3>Setup</h3>
-Set up your server as described in the <a href="../../../sampleSetup.htm" target="_blank">Tomcat
+
+Set up your server as described in the <a href="../../../docs/sampleSetup.htm" target="_blank">Tomcat
     Setup</a>. &nbsp;If you are not configuring with the acceptance test the server, you will need to add <span style="font-weight: bold;">helloworldWeb-SNAPSHOT.war</span> to your tomcat's webapp directory.<br>
 
 
+
 <h3>Running</h3>
 
 
+
 Once you've started your web server, use your browse to view the
 following URL: <a href="http://localhost:8080/helloworldWeb-SNAPSHOT/" target="_blank">http://localhost:8080/helloworldWeb-SNAPSHOT/</a>
 <br>
 
 
+
 You should see a form you can supply your name and a submit button.
 &nbsp;Once you submit the form the JSP page calls a Java class that
 gets the CurrentModuleContext and locates the SCA component to execute
@@ -75,117 +93,159 @@
 <h3>Results</h3>
 
 
+
 <p>The page should be updated with the greeting displayed below
     the form.<br>
 
 
+
 </p>
 
 
+
 <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>&brvbar;   +---java<br>&brvbar;       &brvbar;   sca.module<br>&brvbar;       &brvbar;<br>                    <br>&brvbar;       +---org<br>&brvbar;           +---apache<br>&brvbar;               +---tuscany<br>                    <br>&brvbar;                   +---samples<br>&brvbar;                       +---helloworldweb<br>                    <br>&brvbar;                               HelloWorldService.java<br>&brvbar;<br>                    HelloWorldServiceComponentImpl.java<br>&brvbar;<br>+---webapp<br>    &brvbar;   HelloWorldWeb.jsp<br>                    <br>    &brvbar;<br> +---WEB-INF<br> web.xml<br></pre>
 
+
             </td>
 
+
         </tr>
 
+
     
+  
   </tbody>
 </table>
 
+
 <br>
 
+
 <br>
 
 
+
 <p>&nbsp;</p>
 
 
+
 <table style="text-align: left; width: 100%; height: 154px;" border="0" cellpadding="2" cellspacing="2">
 
 
+
     <tbody>
 
 
+
         <tr>
 
 
+
             <td style="vertical-align: top;">sca.module</td>
 
 
+
             <td>Defines the SCA module and component. Defines for the
                 HelloWorldServiceComponent component and the Java class that
                 implements that component</td>
 
 
+
         </tr>
 
 
+
         <tr>
 
 
+
             <td style="vertical-align: top;">HelloWorldService.java</td>
 
 
+
             <td>Defines the Java interface implemented by the component.</td>
 
 
+
         </tr>
 
 
+
         <tr>
 
 
+
             <td style="vertical-align: top;">HelloWorldServiceComponentImpl.java</td>
 
 
+
             <td>Implements the SCA component. Uses the SCA service
                 annotation tag on the class to show what SCA interface is being
                 implemented.</td>
 
 
+
         </tr>
 
 
 
+
         <tr>
 
+
             <td>HelloWorldWeb.jsp</td>
 
+
             <td>Handles Web form input.. Obtains the module context which was defined by the
                 sca.module file. From the module context locates the
                 HelloWorldServiceComponent and then calls&nbsp; the getGreetings
                 method to invoke the component.&nbsp;and formats &nbsp;returned&nbsp;results.</td>
 
+
         </tr>
 
+
         <tr>
 
+
             <td>web.xml</td>
 
+
             <td>Standard J2EE web application's web.xml</td>
 
+
         </tr>
 
 
+
     
+  
   </tbody>
 </table>
 
 
+
 <br>
+
 
 
 </body>

Modified: incubator/tuscany/java/samples/sca/helloworldws-celtix/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/samples/sca/helloworldws-celtix/pom.xml?rev=405812&r1=405805&r2=405812&view=diff
==============================================================================
--- incubator/tuscany/java/samples/sca/helloworldws-celtix/pom.xml (original)
+++ incubator/tuscany/java/samples/sca/helloworldws-celtix/pom.xml Fri May 12 11:00:12 2006
@@ -16,12 +16,13 @@
  -->
 <project>
     <parent>
-        <groupId>org.apache.tuscany.sca.samples</groupId>
-        <artifactId>tuscany-sca-samples</artifactId>
+        <groupId>org.apache.tuscany.samples.sca</groupId>
+        <artifactId>tuscany-samples-sca</artifactId>
         <version>SNAPSHOT</version>
     </parent>
+
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>helloworldws-celtix</artifactId>
+    <artifactId>sample-helloworldws-celtix</artifactId>
     <packaging>jar</packaging>
     <name>Tuscany HelloWorld Celtix Web Service Sample</name>
     <description>A sample HelloWorld Web Service.</description>

Modified: incubator/tuscany/java/samples/sca/helloworldws-celtix/readme.htm
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/samples/sca/helloworldws-celtix/readme.htm?rev=405812&r1=405805&r2=405812&view=diff
==============================================================================
--- incubator/tuscany/java/samples/sca/helloworldws-celtix/readme.htm (original)
+++ incubator/tuscany/java/samples/sca/helloworldws-celtix/readme.htm Fri May 12 11:00:12 2006
@@ -1,7 +1,4 @@
-
-
-
-DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
 <head>
 <!--
@@ -52,7 +49,7 @@
 <h3>Setup</h3>
 
 
-The jars for a <a href="../../../sampleSetup.htm" target="_blank">J2SE setup</a> &nbsp;including those necessary&nbsp;
+The jars for a <a href="../../../docs/sampleSetup.htm" target="_blank">J2SE setup</a> &nbsp;including those necessary&nbsp;
 for web services are required including the sample's own jar <span style="font-weight: bold;">helloworldws-celtix-SNAPSHOT.jar</span>.
 
 <h3>Running</h3>

Modified: incubator/tuscany/java/samples/sca/helloworldws-celtix/src/main/resources/wsdl/helloworld.wsdl
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/samples/sca/helloworldws-celtix/src/main/resources/wsdl/helloworld.wsdl?rev=405812&r1=405805&r2=405812&view=diff
==============================================================================
--- incubator/tuscany/java/samples/sca/helloworldws-celtix/src/main/resources/wsdl/helloworld.wsdl (original)
+++ incubator/tuscany/java/samples/sca/helloworldws-celtix/src/main/resources/wsdl/helloworld.wsdl Fri May 12 11:00:12 2006
@@ -68,7 +68,7 @@
 
     <wsdl:service name="HelloWorldService">
         <wsdl:port binding="tns:HelloWorldSoapBinding" name="HelloWorldSoapPort">
-            <wsdlsoap:address location="http://localhost:8080/helloworldws-SNAPSHOT/services/HelloWorldService"/>
+            <wsdlsoap:address location="http://localhost:8080/sample-helloworldws-SNAPSHOT/services/HelloWorldService"/>
         </wsdl:port>
     </wsdl:service>
 

Modified: incubator/tuscany/java/samples/sca/helloworldws/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/samples/sca/helloworldws/pom.xml?rev=405812&r1=405805&r2=405812&view=diff
==============================================================================
--- incubator/tuscany/java/samples/sca/helloworldws/pom.xml (original)
+++ incubator/tuscany/java/samples/sca/helloworldws/pom.xml Fri May 12 11:00:12 2006
@@ -16,12 +16,12 @@
  -->
 <project>
     <parent>
-        <groupId>org.apache.tuscany.sca.samples</groupId>
-        <artifactId>tuscany-sca-samples</artifactId>
+        <groupId>org.apache.tuscany.samples.sca</groupId>
+        <artifactId>tuscany-samples-sca</artifactId>
         <version>SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>helloworldws</artifactId>
+    <artifactId>sample-helloworldws</artifactId>
     <packaging>war</packaging>
     <name>Tuscany HelloWorld Web Service Sample</name>
     <description>A sample HelloWorld Web Service.</description>
@@ -30,8 +30,8 @@
     <dependencies>
     
           <dependency>
-            <groupId>org.apache.tuscany.sca.samples</groupId>
-            <artifactId>helloworld</artifactId>
+            <groupId>org.apache.tuscany.samples.sca</groupId>
+            <artifactId>sample-helloworld</artifactId>
             <version>${pom.version}</version>
             <scope>compile</scope> 
         </dependency>

Modified: incubator/tuscany/java/samples/sca/helloworldws/readme.htm
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/samples/sca/helloworldws/readme.htm?rev=405812&r1=405805&r2=405812&view=diff
==============================================================================
--- incubator/tuscany/java/samples/sca/helloworldws/readme.htm (original)
+++ incubator/tuscany/java/samples/sca/helloworldws/readme.htm Fri May 12 11:00:12 2006
@@ -1,111 +1,53 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<!--
-  Copyright (c) 2005 The Apache Software Foundation or its licensors, as applicable.
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html><head><!-- Copyright (c) 2005 The Apache Software Foundation or its licensors, as applicable. Licensed 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. -->
 
-  Licensed 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
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+<meta http-equiv="Content-Style-Type" content="text/css"><title>Tuscany Hello World Web Service Sample</title><!-- LINK rel="stylesheet" href="ait.css" type="text/css" --><!-- maven -->
 
-     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.
- -->
-
-
-    
-  <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-
-
-
-    
-  <meta http-equiv="Content-Style-Type" content="text/css">
-
-
-
-    
-
-  <title>Tuscany Hello World Web Sample</title>
-<!-- LINK rel="stylesheet" href="ait.css" type="text/css" --><!-- maven -->
-  <style type="text/css" media="all">
+<style type="text/css" media="all">
 @import url("../../../../css/maven-base.css");
 @import url("../../../../css/maven-theme.css");
 @import url("../../../../css/site.css");
-  </style>
-  <link rel="stylesheet" href="./css/print.css" type="text/css" media="print">
-<!-- end maven -->
-</head>
-
-
+</style>
+<link rel="stylesheet" href="./css/print.css" type="text/css" media="print"><!-- end maven --></head>
 <body>
-
-
-
 <h2>Tuscany Hello World WS Sample</h2>
-
-
-
 <h3>Overview</h3>
-
-
-
 <p>The Tuscany hello world ws sample shows using the Tuscany SCA
-    runtime in a Tomcat environment&nbsp;providing&nbsp;a web service.. </p>
-
-
-
+runtime in a Tomcat environment&nbsp;providing&nbsp;a web
+service.</p>
+<h3>Location</h3>
+This sample is located &nbsp;in the samples\sca\helloworldws
+directory.<br>
 <h3>Setup</h3>
-
-
-
-Set up your server as described in the <a href="../../../sampleSetup.htm" target="_blank">Tomcat Setup</a>. &nbsp;If
-you are not configuring with the acceptance test the server, you will need to add <span style="font-weight: bold;">helloworldws-SNAPSHOT.war</span>
+Set up your server as described in the <a href="../../../docs/sampleSetup.htm" target="_blank">Tomcat
+Setup</a>. &nbsp;If
+you are not configuring with the acceptance test the server, you will
+need to add <span style="font-weight: bold;">helloworldws-SNAPSHOT.war</span>
 to your Tomcat's webapp directory.
-
-
 <h3>Running</h3>
-
-
-This service can be invoked by either the Tuscany SCA <a target="_blank" href="../helloworldwsclient/readme.htm">helloworldwsclient</a>
-sample or <a href="../helloworldaxis/readme.htm" target="_blank">hello
-    world Axis sample's</a> client &nbsp;sample.<br>
-
-
+This service can be invoked by&nbsp;the Tuscany SCA <a target="_blank" href="../helloworldwsclient/readme.htm">helloworldwsclient</a>
+sample.<br>
 <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>+---main<br>
-
-                &brvbar;&nbsp;&nbsp; +---java<br>
-
-                &brvbar;&nbsp;&nbsp; &brvbar;&nbsp;&nbsp; &brvbar;&nbsp;&nbsp; sca.module<br>
-
-                &brvbar;&nbsp;&nbsp; &brvbar;&nbsp;&nbsp; &brvbar;<br>
-
-                &brvbar;&nbsp;&nbsp; &brvbar;&nbsp;&nbsp; +---org<br>
-
-                &brvbar;&nbsp;&nbsp; &brvbar;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; +---apache<br>
-
-                &brvbar;&nbsp;&nbsp; &brvbar;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; +---tuscany
-                <br>
+<tbody>
+<tr>
+<td>+---main<br>
+&brvbar;&nbsp;&nbsp; +---java<br>
+&brvbar;&nbsp;&nbsp; &brvbar;&nbsp;&nbsp;
+&brvbar;&nbsp;&nbsp; sca.module<br>
+&brvbar;&nbsp;&nbsp; &brvbar;&nbsp;&nbsp;
+&brvbar;<br>
+&brvbar;&nbsp;&nbsp; &brvbar;&nbsp;&nbsp;
++---org<br>
+&brvbar;&nbsp;&nbsp;
+&brvbar;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
++---apache<br>
+&brvbar;&nbsp;&nbsp;
+&brvbar;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
++---tuscany <br>
 &brvbar;&nbsp;&nbsp;
 &brvbar;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 +---samples<br>
@@ -118,152 +60,65 @@
 &brvbar;&nbsp;&nbsp;
 &brvbar;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 HelloWorldServiceComponentImpl.java<br>
-
-                &brvbar;&nbsp;&nbsp; &brvbar;<br>
-
-                &brvbar;&nbsp;&nbsp; +---resources<br>
-
-                &brvbar;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &brvbar;&nbsp;&nbsp; tuscany-model.config<br>
-
-                &brvbar;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &brvbar;<br>
-
-                &brvbar;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; +---wsdl<br>
-
-                &brvbar;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-                helloworld.wsdl<br>
-
-                &brvbar;<br>
-
-                &brvbar;<br>
-
-                +---webapp<br>
-
-                &nbsp;&nbsp;&nbsp; +---WEB-INF<br>
-
-                &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; web.xml<br>
-
-            </td>
-
-
-        </tr>
-
-
-
-    
-  </tbody>
+&brvbar;&nbsp;&nbsp; &brvbar;<br>
+&brvbar;&nbsp;&nbsp; +---resources<br>
+&brvbar;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+&brvbar;&nbsp;&nbsp; tuscany-model.config<br>
+&brvbar;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+&brvbar;<br>
+&brvbar;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
++---wsdl<br>
+&brvbar;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+helloworld.wsdl<br>
+&brvbar;<br>
+&brvbar;<br>
++---webapp<br>
+&nbsp;&nbsp;&nbsp; +---WEB-INF<br>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+web.xml<br>
+</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, entryPoint
-                and component. Defines for the
-                HelloWorldServiceComponent component and the Java class that
-                implements the component For the entryPoint it defines WSDL for the
-                service, the Java interface provided by the service, and wires the
-                service to the&nbsp;HelloWorldServiceComponent</td>
-
-
-
-        </tr>
-
-
-
-        <tr>
-
-
-
-            <td style="vertical-align: top; height: 26px;">HelloWorldService.java</td>
-
-
-
-            <td style="height: 26px;">Defines the Java interface implemented by the component.</td>
-
-
-
-        </tr>
-
-
-
-        <tr>
-
-
-
-            <td style="vertical-align: top;">HelloWorldServiceComponentImpl.java</td>
-
-
-
-            <td>Implements the SCA component. Uses the SCA service
-                annotation tag on the class to show what SCA interface is being
-                implemented. &nbsp;Also uses the SCA Java annotation "Remotable" to
-                indicate that a component implemented by this class can be
-                referenced&nbsp;out side of the SCA module it resides in.</td>
-
-
-
-        </tr>
-
-
-
-        <tr>
-
-
-            <td>tuscany-model.config</td>
-
-
-            <td>Maps the SCA Entry point WSDL to the physical WSDL file location.</td>
-
-
-        </tr>
-
-
-        <tr>
-
-            <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>
+<tbody>
+<tr>
+<td style="vertical-align: top; height: 62px;">sca.module</td>
+<td style="height: 62px;">Defines the SCA module,
+entryPoint and component. Defines for the HelloWorldServiceComponent
+component and the Java class that implements the component For the
+entryPoint it defines WSDL for the service, the Java interface provided
+by the service, and wires the service to
+the&nbsp;HelloWorldServiceComponent</td>
+</tr>
+<tr>
+<td style="vertical-align: top; height: 26px;">HelloWorldService.java</td>
+<td style="height: 26px;">Defines the Java interface
+implemented by the component.</td>
+</tr>
+<tr>
+<td style="vertical-align: top;">HelloWorldServiceComponentImpl.java</td>
+<td>Implements the SCA component. Uses the SCA service
+annotation tag on the class to show what SCA interface is being
+implemented. &nbsp;Also uses the SCA Java annotation "Remotable" to
+indicate that a component implemented by this class can be
+referenced&nbsp;out side of the SCA module it resides in.</td>
+</tr>
+<tr>
+<td>tuscany-model.config</td>
+<td>Maps the SCA Entry point WSDL to the physical WSDL file
+location.</td>
+</tr>
+<tr>
+<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>
-
-
-
-</body>
-</html>
+</body></html>

Modified: incubator/tuscany/java/samples/sca/helloworldws/src/main/resources/wsdl/helloworld.wsdl
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/samples/sca/helloworldws/src/main/resources/wsdl/helloworld.wsdl?rev=405812&r1=405805&r2=405812&view=diff
==============================================================================
--- incubator/tuscany/java/samples/sca/helloworldws/src/main/resources/wsdl/helloworld.wsdl (original)
+++ incubator/tuscany/java/samples/sca/helloworldws/src/main/resources/wsdl/helloworld.wsdl Fri May 12 11:00:12 2006
@@ -68,7 +68,7 @@
 
     <wsdl:service name="HelloWorldService">
         <wsdl:port binding="tns:HelloWorldSoapBinding" name="HelloWorldSoapPort">
-            <wsdlsoap:address location="http://localhost:8080/helloworldws-SNAPSHOT/services/HelloWorldWebService"/>
+            <wsdlsoap:address location="http://localhost:8080/sample-helloworldws-SNAPSHOT/services/HelloWorldWebService"/>
         </wsdl:port>
     </wsdl:service>
 

Modified: incubator/tuscany/java/samples/sca/helloworldwsclient/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/samples/sca/helloworldwsclient/pom.xml?rev=405812&r1=405805&r2=405812&view=diff
==============================================================================
--- incubator/tuscany/java/samples/sca/helloworldwsclient/pom.xml (original)
+++ incubator/tuscany/java/samples/sca/helloworldwsclient/pom.xml Fri May 12 11:00:12 2006
@@ -16,12 +16,12 @@
  -->
 <project>
     <parent>
-        <groupId>org.apache.tuscany.sca.samples</groupId>
-        <artifactId>tuscany-sca-samples</artifactId>
+        <groupId>org.apache.tuscany.samples.sca</groupId>
+        <artifactId>tuscany-samples-sca</artifactId>
         <version>SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>helloworldwsclient</artifactId>
+    <artifactId>sample-helloworldwsclient</artifactId>
     <packaging>jar</packaging>
     <name>Tuscany HelloWorld Web Service Client Sample</name>
     <description>A sample client for a HelloWorld Web Service.</description>

Modified: incubator/tuscany/java/samples/sca/helloworldwsclient/readme.htm
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/samples/sca/helloworldwsclient/readme.htm?rev=405812&r1=405805&r2=405812&view=diff
==============================================================================
--- incubator/tuscany/java/samples/sca/helloworldwsclient/readme.htm (original)
+++ incubator/tuscany/java/samples/sca/helloworldwsclient/readme.htm Fri May 12 11:00:12 2006
@@ -1,7 +1,5 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<!--
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html><head><!--
   Copyright (c) 2005 The Apache Software Foundation or its licensors, as applicable.
 
   Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,6 +15,7 @@
   limitations under the License.
  -->
 
+
     
   <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
 
@@ -26,18 +25,14 @@
 
     
 
-  <title>Tuscany Hello World Web Sample</title>
-<!-- LINK rel="stylesheet" href="ait.css" type="text/css" --><!-- maven -->
-  <style type="text/css" media="all">
+  
+
+  <title>Tuscany Hello World Web Sample</title><!-- LINK rel="stylesheet" href="ait.css" type="text/css" --><!-- maven --><style type="text/css" media="all">
 @import url("../../../../css/maven-base.css");
 @import url("../../../../css/maven-theme.css");
 @import url("../../../../css/site.css");
   </style>
-  <link rel="stylesheet" href="./css/print.css" type="text/css" media="print">
-<!-- end maven -->
-</head>
-
-
+  <link rel="stylesheet" href="./css/print.css" type="text/css" media="print"><!-- end maven --></head>
 <body>
 
 
@@ -51,16 +46,18 @@
     runtime in a J2SE environment invoking a web service. </p>
 
 
-<h3>Setup</h3>
+<h3>Location</h3>
+This sample is located &nbsp;in the samples\sca\helloworldwsclient
+directory.<br><h3>Setup</h3>
 
 
-The jars for a <a href="../../../sampleSetup.htm" target="_blank">J2SE setup</a> &nbsp;including those necessary&nbsp;
+The jars for a <a href="../../../docs/sampleSetup.htm" target="_blank">J2SE setup</a> &nbsp;including those necessary&nbsp;
 for web services are required including the sample's own jar <span style="font-weight: bold;">helloworldwsclient-SNAPSHOT.jar</span>.
 
 <h3>Running</h3>
 
 Using JDK 1.5 java command with the previous mentioned jars run the
-class org.apache.tuscany.samples.helloworldwsclient.HelloWorldClient
+class&nbsp;elloworldwsclient.HelloWorldClient
 
 <h3>Results</h3>
 
@@ -265,5 +262,4 @@
 </table>
 
 
-</body>
-</html>
+</body></html>

Modified: incubator/tuscany/java/samples/sca/helloworldwsclient/src/main/resources/wsdl/helloworld.wsdl
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/samples/sca/helloworldwsclient/src/main/resources/wsdl/helloworld.wsdl?rev=405812&r1=405805&r2=405812&view=diff
==============================================================================
--- incubator/tuscany/java/samples/sca/helloworldwsclient/src/main/resources/wsdl/helloworld.wsdl (original)
+++ incubator/tuscany/java/samples/sca/helloworldwsclient/src/main/resources/wsdl/helloworld.wsdl Fri May 12 11:00:12 2006
@@ -68,7 +68,7 @@
 
     <wsdl:service name="HelloWorldService">
         <wsdl:port binding="tns:HelloWorldSoapBinding" name="HelloWorldSoapPort">
-            <wsdlsoap:address location="http://localhost:8080/helloworldws-SNAPSHOT/services/HelloWorldWebService"/>
+            <wsdlsoap:address location="http://localhost:8080/sample-helloworldws-SNAPSHOT/services/HelloWorldWebService"/>
         </wsdl:port>
     </wsdl:service>
 

Copied: incubator/tuscany/java/samples/sca/pom.xml (from r405805, incubator/tuscany/java/sca/samples/pom.xml)
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/samples/sca/pom.xml?p2=incubator/tuscany/java/samples/sca/pom.xml&p1=incubator/tuscany/java/sca/samples/pom.xml&r1=405805&r2=405812&rev=405812&view=diff
==============================================================================
--- incubator/tuscany/java/sca/samples/pom.xml (original)
+++ incubator/tuscany/java/samples/sca/pom.xml Fri May 12 11:00:12 2006
@@ -16,13 +16,14 @@
  -->
 <project>
     <parent>
-        <groupId>org.apache.tuscany</groupId>
-        <artifactId>tuscany-sca</artifactId>
+        <groupId>org.apache.tuscany.samples</groupId>
+        <artifactId>tuscany-samples</artifactId>
         <version>SNAPSHOT</version>
     </parent>
+
     <modelVersion>4.0.0</modelVersion>
-    <groupId>org.apache.tuscany.sca.samples</groupId>
-    <artifactId>tuscany-sca-samples</artifactId>
+    <groupId>org.apache.tuscany.samples.sca</groupId>
+    <artifactId>tuscany-samples-sca</artifactId>
     <packaging>pom</packaging>
     <name>Tuscany SCA Samples</name>
     <version>SNAPSHOT</version>
@@ -37,5 +38,6 @@
         <module>helloworldwsclient</module>
         <module>supplychain</module>
         <module>helloworldjsonrpc</module>
+        <module>JavaScript</module>
     </modules>
 </project>

Copied: incubator/tuscany/java/samples/sca/readme.htm (from r405805, incubator/tuscany/java/sca/samples/readme.htm)
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/samples/sca/readme.htm?p2=incubator/tuscany/java/samples/sca/readme.htm&p1=incubator/tuscany/java/sca/samples/readme.htm&r1=405805&r2=405812&rev=405812&view=diff
==============================================================================
--- incubator/tuscany/java/sca/samples/readme.htm (original)
+++ incubator/tuscany/java/samples/sca/readme.htm Fri May 12 11:00:12 2006
@@ -1,33 +1,29 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-
-<!-- Copyright (c) 2005 The Apache Software Foundation or its licensors,
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html><head><!-- Copyright (c) 2005 The Apache Software Foundation or its licensors,
 as applicable. Licensed 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. -->
+
+
   <meta content="text/html; charset=iso-8859-1" http-equiv="Content-Type">
 
   <meta content="text/css" http-equiv="Content-Style-Type">
-  <title>Tuscany SCA Samples</title>
+  
+
 
 
-<!-- LINK rel="stylesheet" href="ait.css" type="text/css" -->
-  <style type="text/css" media="all">
+  <title>Tuscany SCA Samples</title><!-- LINK rel="stylesheet" href="ait.css" type="text/css" --><style type="text/css" media="all">
 @import url("../../css/maven-base.css");
 @import url("../../css/maven-theme.css");
 @import url("../../css/site.css");
   </style>
-  <link rel="stylesheet" href="./css/print.css" type="text/css" media="print">
-
-</head>
-
+  <link rel="stylesheet" href="./css/print.css" type="text/css" media="print"></head>
 <body>
 
-<h2>Tuscany SCA Samples</h2>
+<h2>Tuscany Techonology Samples</h2>
 
-To configure&nbsp; see <a href="../../sampleSetup.htm">Sample
+To configure and build&nbsp; see <a href="../../docs/sampleSetup.htm">Sample
 setup</a><br>
 
 <br>
@@ -43,7 +39,7 @@
 
       <td style="vertical-align: top; white-space: nowrap;"><a href="helloworld/readme.htm" target="_blank">helloworld</a></td>
 
-      <td>Shows
+      <td>Sample shows
 using the Tuscany SCA runtime in a J2SE environment &nbsp;loading a
 component.<br>
 
@@ -68,8 +64,7 @@
 
       <td style="vertical-align: top; white-space: nowrap;"><a href="helloworldweb/readme.htm" target="_blank">helloworldweb</a>&nbsp;</td>
 
-      <td>This
-sample shows in a J2EE environment using SCA components to handle HTML
+      <td>Sample shows in a J2EE environment using SCA components to handle HTML
 forms.<br>
 
       <br>
@@ -105,12 +100,11 @@
 
       </td>
 
-    </tr>
+    </tr><tr><td>calculator</td><td>Sample showing &nbsp;Tuscany SCA runtime using mutliple components.</td></tr><tr><td>customerinfo</td><td>Sample showing &nbsp;a component &nbsp;exposing a WSDL &nbsp;portType interface and using the dynamic SDO API</td></tr><tr><td>supplychain</td><td>Sample showing the use of Tuscany SCA asynchronous API</td></tr><tr><td>helloworldjsonrpc</td><td>Sample HelloWorld Web application using JSON-RPC</td></tr>
 
   </tbody>
 </table>
 
 <br>
 
-</body>
-</html>
+</body></html>

Modified: incubator/tuscany/java/samples/sca/supplychain/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/samples/sca/supplychain/pom.xml?rev=405812&r1=405805&r2=405812&view=diff
==============================================================================
--- incubator/tuscany/java/samples/sca/supplychain/pom.xml (original)
+++ incubator/tuscany/java/samples/sca/supplychain/pom.xml Fri May 12 11:00:12 2006
@@ -16,12 +16,13 @@
  -->
 <project>
     <parent>
-        <groupId>org.apache.tuscany.sca.samples</groupId>
-        <artifactId>tuscany-sca-samples</artifactId>
+        <groupId>org.apache.tuscany.samples.sca</groupId>
+        <artifactId>tuscany-samples-sca</artifactId>
         <version>SNAPSHOT</version>
     </parent>
+
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>supplychain</artifactId>
+    <artifactId>sample-supplychain</artifactId>
     <packaging>jar</packaging>
     <name>Tuscany Supply Chain Sample</name>
     <description>A sample implementation of an asynchronous supply chain application.</description>

Modified: incubator/tuscany/java/sca/bindings/binding.axis2/src/test/resources/org/apache/tuscany/binding/axis2/builder/helloworld.wsdl
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/bindings/binding.axis2/src/test/resources/org/apache/tuscany/binding/axis2/builder/helloworld.wsdl?rev=405812&r1=405811&r2=405812&view=diff
==============================================================================
--- incubator/tuscany/java/sca/bindings/binding.axis2/src/test/resources/org/apache/tuscany/binding/axis2/builder/helloworld.wsdl (original)
+++ incubator/tuscany/java/sca/bindings/binding.axis2/src/test/resources/org/apache/tuscany/binding/axis2/builder/helloworld.wsdl Fri May 12 11:00:12 2006
@@ -89,7 +89,7 @@
         <wsdl:port binding="impl:helloworldSoapBinding" name="helloworld">
 
             <!-- Tuscany SCA Service -->
-            <wsdlsoap:address location="http://localhost:8080/helloworldws-SNAPSHOT/services/HelloWorldService"/>
+            <wsdlsoap:address location="http://localhost:8080/sample-helloworldws-SNAPSHOT/services/HelloWorldService"/>
 
             <!-- Axis Web Service -->
             <!--

Modified: incubator/tuscany/java/sca/bindings/binding.axis2/src/test/resources/org/apache/tuscany/binding/axis2/handler/helloworld.wsdl
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/bindings/binding.axis2/src/test/resources/org/apache/tuscany/binding/axis2/handler/helloworld.wsdl?rev=405812&r1=405811&r2=405812&view=diff
==============================================================================
--- incubator/tuscany/java/sca/bindings/binding.axis2/src/test/resources/org/apache/tuscany/binding/axis2/handler/helloworld.wsdl (original)
+++ incubator/tuscany/java/sca/bindings/binding.axis2/src/test/resources/org/apache/tuscany/binding/axis2/handler/helloworld.wsdl Fri May 12 11:00:12 2006
@@ -89,7 +89,7 @@
         <wsdl:port binding="impl:helloworldSoapBinding" name="helloworld">
 
             <!-- Tuscany SCA Service -->
-            <wsdlsoap:address location="http://localhost:8080/helloworldws-SNAPSHOT/services/HelloWorldService"/>
+            <wsdlsoap:address location="http://localhost:8080/sample-helloworldws-SNAPSHOT/services/HelloWorldService"/>
 
             <!-- Axis Web Service -->
             <!--

Modified: incubator/tuscany/java/sca/bindings/binding.axis2/src/test/resources/org/apache/tuscany/binding/axis2/util/helloworld.wsdl
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/bindings/binding.axis2/src/test/resources/org/apache/tuscany/binding/axis2/util/helloworld.wsdl?rev=405812&r1=405811&r2=405812&view=diff
==============================================================================
--- incubator/tuscany/java/sca/bindings/binding.axis2/src/test/resources/org/apache/tuscany/binding/axis2/util/helloworld.wsdl (original)
+++ incubator/tuscany/java/sca/bindings/binding.axis2/src/test/resources/org/apache/tuscany/binding/axis2/util/helloworld.wsdl Fri May 12 11:00:12 2006
@@ -96,7 +96,7 @@
 
             <!-- Axis Web Service -->
             <!--
-            <wsdlsoap:address location="http://localhost:8081/helloworldaxissvc-SNAPSHOT/services/helloworld"/>
+            <wsdlsoap:address location="http://localhost:8081/sample-helloworldaxissvc-SNAPSHOT/services/helloworld"/>
             -->
 
         </wsdl:port>