You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by js...@apache.org on 2006/05/17 08:21:39 UTC

svn commit: r407174 - in /incubator/tuscany: ./ java/ java/distribution/ java/distribution/tomcat-overlay/ java/distribution/tuscany-polish/ java/sampleapps/bigbank/ java/sampleapps/bigbank/account/src/main/resources/wsdl/ java/sampleapps/bigbank/webcl...

Author: jsdelfino
Date: Tue May 16 23:21:37 2006
New Revision: 407174

URL: http://svn.apache.org/viewcvs?rev=407174&view=rev
Log:
Minor changes to the distribution, removed incubating-M1 from the deployed webapps, adjusted readmes and wsdls, added notice and proposal.txt

Added:
    incubator/tuscany/PROPOSAL.txt   (with props)
    incubator/tuscany/java/distribution/NOTICE
    incubator/tuscany/java/samples/sca/supplychain/readme.htm
Removed:
    incubator/tuscany/java/samples/sca/supplychain/README.htm
Modified:
    incubator/tuscany/java/README.txt
    incubator/tuscany/java/distribution/tomcat-overlay/configureTomcat.xml
    incubator/tuscany/java/distribution/tuscany-polish/fixupJars.xml
    incubator/tuscany/java/sampleapps/bigbank/account/src/main/resources/wsdl/AccountService.wsdl
    incubator/tuscany/java/sampleapps/bigbank/readme.htm
    incubator/tuscany/java/sampleapps/bigbank/webclient/src/main/resources/wsdl/AccountService.wsdl
    incubator/tuscany/java/samples/das/companyweb/readme.htm
    incubator/tuscany/java/samples/sca/customerinfo/src/main/resources/wsdl/customerinfo.wsdl
    incubator/tuscany/java/samples/sca/helloworld-jms/server/src/main/resources/wsdl/helloworld.wsdl
    incubator/tuscany/java/samples/sca/helloworlde4xws/src/main/resources/wsdl/helloworld.wsdl
    incubator/tuscany/java/samples/sca/helloworldjsclient/readme.htm
    incubator/tuscany/java/samples/sca/helloworldjsclient/src/main/resources/wsdl/helloworld.wsdl
    incubator/tuscany/java/samples/sca/helloworldjsonrpc/readme.htm
    incubator/tuscany/java/samples/sca/helloworldweb/readme.htm
    incubator/tuscany/java/samples/sca/helloworldws-celtix/src/main/resources/wsdl/helloworld.wsdl
    incubator/tuscany/java/samples/sca/helloworldws/src/main/resources/wsdl/helloworld.wsdl
    incubator/tuscany/java/samples/sca/helloworldwsclient/src/main/resources/wsdl/helloworld.wsdl
    incubator/tuscany/java/sca/bindings/binding.axis2/src/test/resources/org/apache/tuscany/binding/axis2/assembly/tests/bigbank/account/services/account/AccountService.wsdl
    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.java/src/test/java/org/apache/tuscany/container/java/assembly/tests/bigbank/account/services/account/AccountService.wsdl
    incubator/tuscany/java/sca/containers/container.rhino/src/test/resources/org/apache/tuscany/container/rhino/rhino/helloworld.wsdl
    incubator/tuscany/java/sca/containers/container.rhino/src/test/resources/wsdl/helloworld.wsdl
    incubator/tuscany/java/sca/databinding/sdo/src/test/resources/org/apache/tuscany/databinding/sdo/helloworld.wsdl
    incubator/tuscany/java/sca/model/src/test/java/org/apache/tuscany/model/assembly/tests/bigbank/account/services/account/AccountService.wsdl
    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/bigbank/src/test/java/org/apache/tuscany/test/bigbank/BigBankTestCase.java
    incubator/tuscany/java/testing/tomcat/helloworldweb/src/test/java/org/apache/tuscany/test/helloworldweb/HelloWorldWebTestCase.java

Added: incubator/tuscany/PROPOSAL.txt
URL: http://svn.apache.org/viewcvs/incubator/tuscany/PROPOSAL.txt?rev=407174&view=auto
==============================================================================
--- incubator/tuscany/PROPOSAL.txt (added)
+++ incubator/tuscany/PROPOSAL.txt Tue May 16 23:21:37 2006
@@ -0,0 +1,229 @@
+RATIONALE
+
+Tuscany provides multiple language implementations of the Service Component
+Architecture (SCA) specifications and related technologies such as SDO (links
+to these specifications are in the "Initial Source" section of this proposal).
+
+Its overall goal is to simplify the implementation of services and the
+composition of heterogeneous service networks by building infrastructure
+bridging the gaps between language-specific application component
+implementation technologies (e.g. Java EE, BPEL, Spring, etc) using SOA
+concepts/design approaches (e.g. web services, loosely coupled asynchronous
+messaging, ESBs, etc).
+
+The seed code for the project will consist of in-progress C++ and Java
+implementations of several SCA specifications that we intend to continue
+development on in conjuction with other Apache communities. More information on
+the scope of the seed code can be found in subsequent sections of this
+proposal.
+
+CRITERIA
+
+Meritocracy:
+
+The Tuscany committers recognize the desirability of running the project as a
+meritocracy; indeed, the scope of the project is so broad that we find it hard
+to envision success any other way. One of the lessons taken from the historic
+development of middleware is that specifications developed in isolation from
+real usable code or amongst a narrowly restricted list of contributors often do
+not see widespread adoption. We are eager to engage other members of the
+community and operate to the standard of meritocracy that Apache emphasizes.
+
+Community:
+
+Tuscany is not based on an existing open source community, but the contributors
+involved have experience participating in and building other open source
+communities. A primary objective of the project is to build a vibrant community
+of users and active contributors.
+
+Core Developers:
+
+Most of the initial committers are members of BEA and IBM development teams. 4
+are committers on other Apache projects.
+
+Alignment:
+
+An initial implementation has been written in Java and has already been
+integrated with Apache Tomcat as a deployment platform; it is expected that
+this implementation will soon be integrated with other Java middleware
+environments including Apache Geronimo and ObjectWeb Celtix. This
+implementation makes extensive use of projects from the Apache Web Services
+community, including Axis and associated tools; future implementation of
+policies will increase the collaboration with other web service projects.
+
+Another implementation has also been written in C++ and has been integrated
+with Apache HTTPD and the Axis C++ project.
+
+The scope of the project is broader than just Java and C++, and some
+development has started on component containers for other programming languages
+including BPEL and PHP.
+
+As a broad goal is to present a SOA development model that mediates over a
+variety of middleware technologies, there is potential synergy with many other
+Apache projects including:
+
+    * Customized component/application packaging and deployment on Geronimo
+    * Data access integration with Beehive controls
+    * XML model representation and parsing using XMLBeans
+    * Language/platform neutral messaging infrastructure using Synapse
+    * OSGi packaging and deployment on Felix
+
+AVOIDING THE WARNING SIGNS
+
+Orphaned products:
+
+The initial code submission is based on active code developed collaboratively
+by BEA and IBM who believe that its continued evolution in an open community
+will lead to a stronger, more widely accepted foundation for development of
+SOA-based applications.
+
+Inexperience with open source:
+
+Several of the committers have experience working on open source projects and
+are committers on other Apache projects. The seed materials have been
+co-developed in an environment that is structurally similar to open source
+communities (for example, design decisions made over mailing lists based on
+technical merit).
+
+Homogenous developers:
+
+The current list of committers includes developers from several different
+companies who are geographically distributed across the U.S., Europe, and Asia.
+They are experienced with working in a distributed environment, and with
+resolving technical differences outside the scope of a common employer.
+
+Reliance on salaried developers:
+
+Most of the initial developers are paid by their employers to contribute to
+this project; however, this includes three independent employers with track
+records for ongoing investment in open source communities (including Apache
+and Eclipse).
+
+No ties to other Apache products:
+
+As described in the Alignment section, this framework already has ties to many
+Apache products. The initial codebase is already licensed under the Apache
+License 2.0.
+
+A fascination with the Apache brand:
+
+The committers are intent on developing a strong open source community around
+frameworks that treat SOA-centric design in a first-class manner. We believe
+that the Apache Software Foundation's emphasis on community development makes
+it the most suitable choice for such a project.
+
+SCOPE OF SUBPROJECTS
+
+The initial contributors envision an active community of related projects
+sharing a common model for SOA applications but targeting specific technical
+areas of that model.
+
+Tuscany will be seeded with several projects based on donated material (see
+the next section):
+
+    * an assembly model defining a mechanism for composing SOA applications
+    * a Java implementation running on top of Tomcat and Axis
+    * a Java implementation of SDO2 and a data access subsystem
+    * a C++ implementation running on top of Apache HTTPD and Axis C++
+    * a C++ implementation of SDO2
+
+To assist in community building the committers have identified several key
+technology areas that will allow new contributors to actively engage in the
+project. These include:
+
+    * transition web service integration to Axis2
+    * integration with Axis2 policy implementations for security, transactions,
+      reliable messaging
+    * support heterogeneous components written in C/C++, BPEL, PHP and other
+      languages
+    * support callbacks, allowing a component to call back to the service that
+      invoked it
+    * support asynchronous calls using JMS
+    * support typesafe SDOs in the C++ implementation of SDO2
+
+These initial projects are intended merely as starting points and should not
+be taken as bounding the scope of the Tuscany project as a whole. Some other
+potential projects may include:
+
+    * Integration with existing development frameworks (such as JEE5/EJB3 or
+      Spring).
+    * Integration with rich middleware frameworks (such as Celtix or
+      ServiceMix).
+    * Frameworks for providing service-oriented data access to a variety of
+      existing resources.
+    * Richer tooling support for SOA-based applications, especially in the
+      areas of services composition, monitoring and policy administration.
+
+INITIAL SOURCE
+
+A group of vendors are developing a set of specifications relating to the
+design and composition of systems using SOA, collectively called Service
+Component Architecture (SCA). In progress versions are available at:
+
+    * http://dev2dev.bea.com/pub/a/2005/11/sca.html
+    * http://www.ibm.com/developerworks/library/specification/ws-sca/
+    * http://www.iona.com/devcenter/sca/
+    * http://oracle.com/technology/webservices/sca
+    * https://www.sdn.sap.com/
+    * http://www.sybase.com/sca
+
+The initial contributors have been developing Java and C++ code bases (already
+licensed under the Apache License 2.0) which implement aspects of these
+specifications, and intend to donate it to Apache. A snapshot of this code has
+been uploaded to JIRA and is is available at:
+
+    * http://issues.apache.org/jira/browse/INCUBATOR-8
+
+Although the Tuscany project expects to bootstrap using these materials and in
+the case of specifications, to provide feedback that will be incorporated into
+their ongoing development, we expect and encourage the open source community to
+take the project in new directions not envisioned by them.
+
+ASF resources to be created
+mailing list(s)
+
+    * tuscany-dev@ws.apache.org
+    * tuscany-commits@ws.apache.org
+
+Subversion repository
+
+    * https://svn.apache.org/repos/asf/incubator/tuscany
+
+Jira
+
+    * Tuscany (TUSCANY)
+
+INITIAL COMMITTERS
+
+    * Jeremy Boynes
+    * Frank Budinsky
+    * Don Cai
+    * Jean-Sebastien Delfino
+    * Mike Edwards
+    * Padmapriya Illindala
+    * Jim Marino
+    * Geir Magnusson Jr.
+    * Eddie O'Neil
+    * Radu Preotiuc-Pietro
+    * Rick Rineholt
+    * Pete Robbins
+    * Michael Rowley
+    * Edward Slattery
+    * Ken Tam
+    * Alexandre Vasseur
+    * Kevin Williams
+
+APACHE SPONSOR
+
+The WS PMC has voted to accept this project into the WS project upon successful
+incubation.
+
+Champion
+
+    * Geir Magnusson Jr.
+
+Mentors:
+
+    * Sam Ruby
+    * Davanum Srinivas (Dims)
+

Propchange: incubator/tuscany/PROPOSAL.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/tuscany/java/README.txt
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/README.txt?rev=407174&r1=407173&r2=407174&view=diff
==============================================================================
--- incubator/tuscany/java/README.txt (original)
+++ incubator/tuscany/java/README.txt Tue May 16 23:21:37 2006
@@ -1,7 +1,7 @@
 Apache Tuscany M1 build (May, 2006)
 ===================================
 
-http://incubator.apache.org/tuscany/
+http://incubator.apache.org/tuscany
 
 Tuscany is an effort undergoing incubation at the Apache Software Foundation
 (ASF), sponsored by the Web Services PMC.
@@ -17,13 +17,15 @@
 
 Documentation
 -------------
-Documentation can be found TBD...
+Documentation can be found at http://incubator.apache.org/tuscany/documentation
 
 
 Getting Started
 ---------------
 
-TBD...
+To get started with Tuscany, try the SCA and DAS technology samples in the
+samples/ directory. More complete sample scenarios can be found in the
+sampleapps directory.
 
 
 Support
@@ -35,7 +37,7 @@
 Mailing list subscription:
     tuscany-dev-subscribe@ws.apache.org
 
-Jira:
+JIRA:
     http://issues.apache.org/jira/browse/Tuscany
 
 

Added: incubator/tuscany/java/distribution/NOTICE
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/distribution/NOTICE?rev=407174&view=auto
==============================================================================
    (empty)

Modified: incubator/tuscany/java/distribution/tomcat-overlay/configureTomcat.xml
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/distribution/tomcat-overlay/configureTomcat.xml?rev=407174&r1=407173&r2=407174&view=diff
==============================================================================
--- incubator/tuscany/java/distribution/tomcat-overlay/configureTomcat.xml (original)
+++ incubator/tuscany/java/distribution/tomcat-overlay/configureTomcat.xml Tue May 16 23:21:37 2006
@@ -201,7 +201,7 @@
 		<!-- just use unix for now -->
 	</target>
 
-	<target name="prepareTomcat" depends='tuscany.tomcat.unzipWindows,tuscany.tomcat.unzipUnix,tuscany.tomcat.unzipMac,tuscany.tomcat.fixup,tuscany.deploy.samples,tuscany.deploy.interop,tuscany.deploy.das.standalone' description='Unzip tomcat, fix it up, and deploy samples'>
+	<target name="prepareTomcat" depends='tuscany.tomcat.unzipWindows,tuscany.tomcat.unzipUnix,tuscany.tomcat.unzipMac,tuscany.tomcat.fixup,tuscany.deploy.samples,tuscany.deploy.das.standalone' description='Unzip tomcat, fix it up, and deploy samples'>
 		<dirname property='tuscany.acceptance.tc.dir.full' file="${tuscany.acceptance.tc.dir}/bin" />
 		<echo level="info" message="Tomcat fixed up here:  ${tuscany.acceptance.tc.dir.full}" />
 
@@ -273,18 +273,14 @@
 			<fileset dir="${tuscany.acceptance.samples.dir}">
 				<include name="**/*.war" />
 			</fileset>
+                        <chainedmapper>
+                                <flattenmapper/>
+                                <globmapper from="*-incubating-M1.war" to="*.war"/>
+                        </chainedmapper>
 		</copy>
 	</target>
 
 
-	<target name="tuscany.deploy.interop" description='Deploy tuscany interop test wars to tomcat webapps.'>
-		<copy todir="${tuscany.acceptance.tc.dir}/webapps" flatten='true'>
-			<fileset dir="${tuscany.acceptance.interop.dir}">
-				<include name="**/*.war" />
-			</fileset>
-		</copy>
-	</target>
-	
     <!-- DAS standalone target -->
     <target name="tuscany.deploy.das.standalone" description='Deploy DAS stand alone sample to tomcat.'>
 

Modified: incubator/tuscany/java/distribution/tuscany-polish/fixupJars.xml
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/distribution/tuscany-polish/fixupJars.xml?rev=407174&r1=407173&r2=407174&view=diff
==============================================================================
--- incubator/tuscany/java/distribution/tuscany-polish/fixupJars.xml (original)
+++ incubator/tuscany/java/distribution/tuscany-polish/fixupJars.xml Tue May 16 23:21:37 2006
@@ -41,6 +41,10 @@
 			</fileset>
 			<fileset dir="../../..">
 				<include name="STATUS" />
+				<include name="PROPOSAL.txt" />
+			</fileset>
+			<fileset dir="..">
+				<include name="NOTICE" />
 			</fileset>
 		</copy>		
 		<zip destfile="${target.dir}/../tuscany-incubating-M1.zip">

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=407174&r1=407173&r2=407174&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 Tue May 16 23:21:37 2006
@@ -386,7 +386,7 @@
 		<wsdl:port binding="account:AccountServiceSOAP"
 			name="AccountServiceSOAP">
 			<soap:address
-				location="http://localhost:8080/sample-bigbank-account-incubating-M1/services/AccountService" />
+				location="http://localhost:8080/sample-bigbank-account/services/AccountService" />
 		</wsdl:port>
 	</wsdl:service>
 </wsdl:definitions>

Modified: incubator/tuscany/java/sampleapps/bigbank/readme.htm
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sampleapps/bigbank/readme.htm?rev=407174&r1=407173&r2=407174&view=diff
==============================================================================
--- incubator/tuscany/java/sampleapps/bigbank/readme.htm (original)
+++ incubator/tuscany/java/sampleapps/bigbank/readme.htm Tue May 16 23:21:37 2006
@@ -28,7 +28,7 @@
 your webapp directory.<br>
 <h3>Running</h3>
 Once you've started your web server, use your web browser to view the
-following URL <a href="http://localhost:8080/sample-bigbank-webclient-incubating-M1/" target="_blank">http://localhost:8080/sample-bigbank-webclient-incubating-M1/</a><br>You can either use an already supplied account with <span style="font-weight: bold;">Login</span> as <span style="color: rgb(204, 0, 0); font-weight: bold;">test</span><span style="font-weight: bold;"> </span>and <span style="font-weight: bold;">Password</span> as <span style="color: rgb(204, 0, 0); font-weight: bold;">password, </span>or you can &nbsp;create a new account.<br>The
+following URL <a href="http://localhost:8080/sample-bigbank-webclient/" target="_blank">http://localhost:8080/sample-bigbank-webclient/</a><br>You can either use an already supplied account with <span style="font-weight: bold;">Login</span> as <span style="color: rgb(204, 0, 0); font-weight: bold;">test</span><span style="font-weight: bold;"> </span>and <span style="font-weight: bold;">Password</span> as <span style="color: rgb(204, 0, 0); font-weight: bold;">password, </span>or you can &nbsp;create a new account.<br>The
 demo is first configured to use a local mock stock quote service that
 returns random stock data. &nbsp;If you want to use an actual stock
 quote provider follow these steps:<br><ul><li>Stop your server by issuing in the <span style="font-weight: bold;">apache-tomcat-5.5.17\bin</span> directory</li><li>Issue <span style="font-weight: bold;">shutdown </span>command to stop your web application server<span style="font-weight: bold;">.</span></li><li><span style="font-weight: bold;">Change the directory to <span style="font-weight: bold;">apache-tomcat-5.5.17\webapps\sample-bigbank-account-incubating-M1\WEB-INF\classes</span></span></li><li>Copy the file<span style="font-weight: bold;"><span style="font-weight: bold;"> WebservicexService_stockquote.fragment </span></span>to<span style="font-weight: bold;"><span style="font-weight: bold;"> sca.fragment</span></span></li><li>Change to the directory &nbsp;<span style="font-weight: bold;">apache-tomcat-5.5.17\bin&nbsp;</span></li><li><span style="font-weight: bold;"></span> issue<span style="font-weight: bold;"> startup &nbsp;</span>command to start up the server<span 
 style="font-weight: bold;">.</span></li></ul>The

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=407174&r1=407173&r2=407174&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 Tue May 16 23:21:37 2006
@@ -386,7 +386,7 @@
 		<wsdl:port binding="account:AccountServiceSOAP"
 			name="AccountServiceSOAP">
 			<soap:address
-				location="http://localhost:8080/sample-bigbank-account-incubating-M1/services/AccountService" />
+				location="http://localhost:8080/sample-bigbank-account/services/AccountService" />
 		</wsdl:port>
 	</wsdl:service>
 </wsdl:definitions>

Modified: incubator/tuscany/java/samples/das/companyweb/readme.htm
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/samples/das/companyweb/readme.htm?rev=407174&r1=407173&r2=407174&view=diff
==============================================================================
--- incubator/tuscany/java/samples/das/companyweb/readme.htm (original)
+++ incubator/tuscany/java/samples/das/companyweb/readme.htm Tue May 16 23:21:37 2006
@@ -541,7 +541,7 @@
 <p class=MsoNormal style='margin-left:1.0in'>NOTE: for the M1 version of <st1:State><st1:place>Tuscany</st1:place></st1:State>
 sample the <span class=SpellE><span class=GramE>url</span></span> is:</p>
 
-<p class=MsoNormal style='margin-left:1.5in'>http://localhost:8080/sample-companyweb-incubating-M1/<o:p></o:p></p>
+<p class=MsoNormal style='margin-left:1.5in'>http://localhost:8080/sample-companyweb/<o:p></o:p></p>
 
 <p class=MsoNormal><sub><o:p>&nbsp;</o:p></sub></p>
 

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=407174&r1=407173&r2=407174&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 Tue May 16 23:21:37 2006
@@ -69,7 +69,7 @@
 
     <wsdl:service name="CustomerInfoService">
         <wsdl:port binding="tns:CustomerInfoSoapBinding" name="CustomerInfoSoapPort">
-            <wsdlsoap:address location="http://localhost:8080/sample-helloworldws-incubating-M1/services/CustomerInfoService"/>
+            <wsdlsoap:address location="http://localhost:8080/sample-helloworldws/services/CustomerInfoService"/>
         </wsdl:port>
     </wsdl:service>
 

Modified: incubator/tuscany/java/samples/sca/helloworld-jms/server/src/main/resources/wsdl/helloworld.wsdl
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/samples/sca/helloworld-jms/server/src/main/resources/wsdl/helloworld.wsdl?rev=407174&r1=407173&r2=407174&view=diff
==============================================================================
--- incubator/tuscany/java/samples/sca/helloworld-jms/server/src/main/resources/wsdl/helloworld.wsdl (original)
+++ incubator/tuscany/java/samples/sca/helloworld-jms/server/src/main/resources/wsdl/helloworld.wsdl Tue May 16 23:21:37 2006
@@ -92,7 +92,7 @@
     </wsdl:service>
     <wsdl:service name="HelloWorldService">
         <wsdl:port binding="tns:HelloWorldSoapBinding" name="HelloWorldSoapPort">
-            <wsdlsoap:address location="http://localhost:8080/sample-helloworldws-incubating-M1/services/HelloWorldWebService"/>
+            <wsdlsoap:address location="http://localhost:8080/sample-helloworldws/services/HelloWorldWebService"/>
         </wsdl:port>
     </wsdl:service>
 

Modified: incubator/tuscany/java/samples/sca/helloworlde4xws/src/main/resources/wsdl/helloworld.wsdl
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/samples/sca/helloworlde4xws/src/main/resources/wsdl/helloworld.wsdl?rev=407174&r1=407173&r2=407174&view=diff
==============================================================================
--- incubator/tuscany/java/samples/sca/helloworlde4xws/src/main/resources/wsdl/helloworld.wsdl (original)
+++ incubator/tuscany/java/samples/sca/helloworlde4xws/src/main/resources/wsdl/helloworld.wsdl Tue May 16 23:21:37 2006
@@ -68,7 +68,7 @@
 
     <wsdl:service name="HelloWorldService">
         <wsdl:port binding="tns:HelloWorldSoapBinding" name="HelloWorldSoapPort">
-            <wsdlsoap:address location="http://localhost:8080/sample-helloworldws-incubating-M1/services/HelloWorldWebService"/>
+            <wsdlsoap:address location="http://localhost:8080/sample-helloworldws/services/HelloWorldWebService"/>
         </wsdl:port>
     </wsdl:service>
 

Modified: incubator/tuscany/java/samples/sca/helloworldjsclient/readme.htm
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/samples/sca/helloworldjsclient/readme.htm?rev=407174&r1=407173&r2=407174&view=diff
==============================================================================
--- incubator/tuscany/java/samples/sca/helloworldjsclient/readme.htm (original)
+++ incubator/tuscany/java/samples/sca/helloworldjsclient/readme.htm Tue May 16 23:21:37 2006
@@ -73,7 +73,7 @@
 <h3>Running</h3>
 
 Once you've started your web server, use your browse to view the
-following URL: <a href="http://localhost:8080/sample-helloworldjsclient-incubating-M1/" target="_blank">http://localhost:8080/sample-helloworldjsclient-incubating-M1/</a>
+following URL: <a href="http://localhost:8080/sample-helloworldjsclient/" target="_blank">http://localhost:8080/sample-helloworldjsclient/</a>
 <br>
 
 <h3>Code Overview</h3>

Modified: incubator/tuscany/java/samples/sca/helloworldjsclient/src/main/resources/wsdl/helloworld.wsdl
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/samples/sca/helloworldjsclient/src/main/resources/wsdl/helloworld.wsdl?rev=407174&r1=407173&r2=407174&view=diff
==============================================================================
--- incubator/tuscany/java/samples/sca/helloworldjsclient/src/main/resources/wsdl/helloworld.wsdl (original)
+++ incubator/tuscany/java/samples/sca/helloworldjsclient/src/main/resources/wsdl/helloworld.wsdl Tue May 16 23:21:37 2006
@@ -68,7 +68,7 @@
 
     <wsdl:service name="HelloWorldService">
         <wsdl:port binding="tns:HelloWorldSoapBinding" name="HelloWorldSoapPort">
-            <wsdlsoap:address location="http://localhost:8080/sample-helloworldws-incubating-M1/services/HelloWorldWebService"/>
+            <wsdlsoap:address location="http://localhost:8080/sample-helloworldws/services/HelloWorldWebService"/>
         </wsdl:port>
     </wsdl:service>
 

Modified: incubator/tuscany/java/samples/sca/helloworldjsonrpc/readme.htm
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/samples/sca/helloworldjsonrpc/readme.htm?rev=407174&r1=407173&r2=407174&view=diff
==============================================================================
--- incubator/tuscany/java/samples/sca/helloworldjsonrpc/readme.htm (original)
+++ incubator/tuscany/java/samples/sca/helloworldjsonrpc/readme.htm Tue May 16 23:21:37 2006
@@ -39,7 +39,7 @@
 <h3>Running</h3>
 
 Once you've started your web server, use your browse to view the
-following URL: <a href="http://localhost:8080/sample-helloworldjsonrpc-incubating-M1/" target="_blank">http://localhost:8080/sample-helloworldjsonrpc-incubating-M1/</a>
+following URL: <a href="http://localhost:8080/sample-helloworldjsonrpc/" target="_blank">http://localhost:8080/sample-helloworldjsonrpc/</a>
 <br>
 
 You should see a form you can supply your name and a button.

Modified: incubator/tuscany/java/samples/sca/helloworldweb/readme.htm
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/samples/sca/helloworldweb/readme.htm?rev=407174&r1=407173&r2=407174&view=diff
==============================================================================
--- incubator/tuscany/java/samples/sca/helloworldweb/readme.htm (original)
+++ incubator/tuscany/java/samples/sca/helloworldweb/readme.htm Tue May 16 23:21:37 2006
@@ -77,7 +77,7 @@
 
 
 Once you've started your web server, use your browse to view the
-following URL: <a href="http://localhost:8080/sample-helloworldweb-incubating-M1/" target="_blank">http://localhost:8080/sample-helloworldweb-incubating-M1/</a>
+following URL: <a href="http://localhost:8080/sample-helloworldweb/" target="_blank">http://localhost:8080/sample-helloworldweb/</a>
 <br>
 
 

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=407174&r1=407173&r2=407174&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 Tue May 16 23:21:37 2006
@@ -68,7 +68,7 @@
 
     <wsdl:service name="HelloWorldService">
         <wsdl:port binding="tns:HelloWorldSoapBinding" name="HelloWorldSoapPort">
-            <wsdlsoap:address location="http://localhost:8080/sample-helloworldws-incubating-M1/services/HelloWorldWebService"/>
+            <wsdlsoap:address location="http://localhost:8080/sample-helloworldws/services/HelloWorldWebService"/>
         </wsdl:port>
     </wsdl:service>
 

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=407174&r1=407173&r2=407174&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 Tue May 16 23:21:37 2006
@@ -68,7 +68,7 @@
 
     <wsdl:service name="HelloWorldService">
         <wsdl:port binding="tns:HelloWorldSoapBinding" name="HelloWorldSoapPort">
-            <wsdlsoap:address location="http://localhost:8080/sample-helloworldws-incubating-M1/services/HelloWorldWebService"/>
+            <wsdlsoap:address location="http://localhost:8080/sample-helloworldws/services/HelloWorldWebService"/>
         </wsdl:port>
     </wsdl:service>
 

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=407174&r1=407173&r2=407174&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 Tue May 16 23:21:37 2006
@@ -68,7 +68,7 @@
 
     <wsdl:service name="HelloWorldService">
         <wsdl:port binding="tns:HelloWorldSoapBinding" name="HelloWorldSoapPort">
-            <wsdlsoap:address location="http://localhost:8080/sample-helloworldws-incubating-M1/services/HelloWorldWebService"/>
+            <wsdlsoap:address location="http://localhost:8080/sample-helloworldws/services/HelloWorldWebService"/>
         </wsdl:port>
     </wsdl:service>
 

Added: incubator/tuscany/java/samples/sca/supplychain/readme.htm
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/samples/sca/supplychain/readme.htm?rev=407174&view=auto
==============================================================================
--- incubator/tuscany/java/samples/sca/supplychain/readme.htm (added)
+++ incubator/tuscany/java/samples/sca/supplychain/readme.htm Tue May 16 23:21:37 2006
@@ -0,0 +1,71 @@
+<!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
+Supply Chain</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
+Supply Chain Sample</h2>
+<h3>Overview</h3>
+<p>The Tuscany supply chain sample shows using the Tuscany SCA
+runtime in a J2SE environment&nbsp;executing the SCA asynchronous API.</p>
+<h3>Location</h3>This
+sample is located &nbsp;in the samples\sca\supplychain directory.<br>
+<h3>Setup</h3>This sample depends on the Tuscany runtime
+and the sample jar,&nbsp;<span style="font-weight: bold;">sample-supplychain-incubating-M1.jar</span>
+, both of these must be available on the classpath to run the sample.
+<h3>Running</h3> In the directory&nbsp;samples\sca\supplychain
+use the JDK 1.5 java command to run the class <span style="font-weight: bold;">supplychain.SupplyChainClient</span> <pre>Linux: java -cp ../../../lib/tuscany-runtime-incubating-M1.jar:target\sample-supplychain-incubating-M1.jar supplychain.SupplyChainClient</pre>
+<pre>Windows: java -cp ../../../lib/tuscany-runtime-incubating-M1.jar;target\sample-supplychain-incubating-M1.jar supplychain.SupplyChainClient</pre><h3>Results</h3>
+<p>The sample when run should simply display to the standard
+output: <code></code></p><p>May 16, 2006
+3:12:13 PM org.apache.tuscany.core.client.TuscanyRuntime$Monitor
+moduleStarted<br>INFO: Started application module [supplychain]<br>Main
+thread Thread[main,5,main]<br>Work thread Thread[Thread-1,5,main]
+- <span style="font-weight: bold;">Order, submitted, fulfilled, shipped</span><code></code></p>
+<h3>Code Overview</h3>
+The source files are physically organized as shown below:
+<table style="text-align: left; width: 100%;" border="1" cellpadding="2" cellspacing="2"> <tbody> <tr><td>src<br>+---main<br>&nbsp;&nbsp;&nbsp;
++---java<br>&nbsp;&nbsp;&nbsp;
+&brvbar;&nbsp;&nbsp; +---supplychain<br>&nbsp;&nbsp;&nbsp;
+&brvbar;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+Customer.java<br>&nbsp;&nbsp;&nbsp;
+&brvbar;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+CustomerComponentImpl.java<br>&nbsp;&nbsp;&nbsp;
+&brvbar;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+Retailer.java<br>&nbsp;&nbsp;&nbsp;
+&brvbar;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+RetailerComponentImpl.java<br>&nbsp;&nbsp;&nbsp;
+&brvbar;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+Shipper.java<br>&nbsp;&nbsp;&nbsp;
+&brvbar;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+ShipperComponentImpl.java<br>&nbsp;&nbsp;&nbsp;
+&brvbar;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+SupplyChainClient.java<br>&nbsp;&nbsp;&nbsp;
+&brvbar;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+Warehouse.java<br>&nbsp;&nbsp;&nbsp;
+&brvbar;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+WarehouseComponentImpl.java<br>&nbsp;&nbsp;&nbsp;
+&brvbar;<br>&nbsp;&nbsp;&nbsp; +---resources<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+logging.properties<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+sca.module<br></td></tr></tbody></table>
+<br><table style="text-align: left; width: 879px; height: 154px;" border="0" cellpadding="2" cellspacing="2"> <tbody> <tr> <td style="vertical-align: top;">Customer.java</td>
+<td>Defines the Java interface implemented by the Customer
+component.</td>
+</tr> <tr> <td style="vertical-align: top;">CustomerComponentImpl.java</td>
+<td>Implements the SCA Customer component.</td>
+</tr> <tr> <td style="vertical-align: top;">Retailer.java</td>
+<td>Defines the Java interface implemented by the Retailer
+component.</td>
+</tr><tr><td>RetailerComponentImpl.java</td><td>Implements
+the SCA&nbsp;RetailerComponent component.</td></tr><tr><td>Shipper.java</td><td>Defines
+the Java interface implemented by the&nbsp;Shipper component</td></tr><tr><td>ShipperComponentImpl.java</td><td>Implements
+the SCA&nbsp;ShipperComponent component.</td></tr><tr><td>SupplyChainClient.java</td><td>SupplyChainClient.java
+loads SCA runtime</td></tr><tr><td>Warehouse.java</td><td>Defines
+the Java interface implemented by the&nbsp;Warehouse component.</td></tr><tr><td>WarehouseComponentImpl.java</td><td>Implements
+the SCA&nbsp;WarehouseComponent component.</td></tr><tr><td>logging.properties</td><td>Configures
+Tuscany logging. Provides the output of this demo.</td></tr><tr><td>sca.module</td><td>Defines
+and assembles the SCA components</td></tr> </tbody></table><br></body></html>
\ No newline at end of file

Modified: incubator/tuscany/java/sca/bindings/binding.axis2/src/test/resources/org/apache/tuscany/binding/axis2/assembly/tests/bigbank/account/services/account/AccountService.wsdl
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/bindings/binding.axis2/src/test/resources/org/apache/tuscany/binding/axis2/assembly/tests/bigbank/account/services/account/AccountService.wsdl?rev=407174&r1=407173&r2=407174&view=diff
==============================================================================
--- incubator/tuscany/java/sca/bindings/binding.axis2/src/test/resources/org/apache/tuscany/binding/axis2/assembly/tests/bigbank/account/services/account/AccountService.wsdl (original)
+++ incubator/tuscany/java/sca/bindings/binding.axis2/src/test/resources/org/apache/tuscany/binding/axis2/assembly/tests/bigbank/account/services/account/AccountService.wsdl Tue May 16 23:21:37 2006
@@ -72,7 +72,7 @@
     <wsdl:service name="AccountService">
         <wsdl:port binding="tns:AccountServiceSOAP"
                    name="AccountServiceSOAP">
-            <soap:address location="http://localhost:8080/tuscany-binding-axis2-incubating-M1/services/AccountService"/>
+            <soap:address location="http://localhost:8080/tuscany-binding-axis2/services/AccountService"/>
         </wsdl:port>
     </wsdl:service>
 </wsdl:definitions>

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=407174&r1=407173&r2=407174&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 Tue May 16 23:21:37 2006
@@ -89,11 +89,11 @@
         <wsdl:port binding="impl:helloworldSoapBinding" name="helloworld">
 
             <!-- Tuscany SCA Service -->
-            <wsdlsoap:address location="http://localhost:8080/sample-helloworldws-incubating-M1/services/HelloWorldService"/>
+            <wsdlsoap:address location="http://localhost:8080/sample-helloworldws/services/HelloWorldService"/>
 
             <!-- Axis Web Service -->
             <!--
-            <wsdlsoap:address location="http://localhost:8081/helloworldaxissvc-incubating-M1/services/helloworld"/>
+            <wsdlsoap:address location="http://localhost:8081/helloworldaxissvc/services/helloworld"/>
             -->
 
         </wsdl:port>

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=407174&r1=407173&r2=407174&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 Tue May 16 23:21:37 2006
@@ -89,11 +89,11 @@
         <wsdl:port binding="impl:helloworldSoapBinding" name="helloworld">
 
             <!-- Tuscany SCA Service -->
-            <wsdlsoap:address location="http://localhost:8080/sample-helloworldws-incubating-M1/services/HelloWorldService"/>
+            <wsdlsoap:address location="http://localhost:8080/sample-helloworldws/services/HelloWorldService"/>
 
             <!-- Axis Web Service -->
             <!--
-            <wsdlsoap:address location="http://localhost:8081/helloworldaxissvc-incubating-M1/services/helloworld"/>
+            <wsdlsoap:address location="http://localhost:8081/helloworldaxissvc/services/helloworld"/>
             -->
 
         </wsdl:port>

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=407174&r1=407173&r2=407174&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 Tue May 16 23:21:37 2006
@@ -96,7 +96,7 @@
 
             <!-- Axis Web Service -->
             <!--
-            <wsdlsoap:address location="http://localhost:8081/sample-helloworldaxissvc-incubating-M1/services/helloworld"/>
+            <wsdlsoap:address location="http://localhost:8081/sample-helloworldaxissvc/services/helloworld"/>
             -->
 
         </wsdl:port>

Modified: incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/assembly/tests/bigbank/account/services/account/AccountService.wsdl
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/assembly/tests/bigbank/account/services/account/AccountService.wsdl?rev=407174&r1=407173&r2=407174&view=diff
==============================================================================
--- incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/assembly/tests/bigbank/account/services/account/AccountService.wsdl (original)
+++ incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/assembly/tests/bigbank/account/services/account/AccountService.wsdl Tue May 16 23:21:37 2006
@@ -72,7 +72,7 @@
     <wsdl:service name="AccountService">
         <wsdl:port binding="tns:AccountServiceSOAP"
                    name="AccountServiceSOAP">
-            <soap:address location="http://localhost:8080/tuscany-container-java-incubating-M1/services/AccountService"/>
+            <soap:address location="http://localhost:8080/tuscany-container-java/services/AccountService"/>
         </wsdl:port>
     </wsdl:service>
 </wsdl:definitions>

Modified: incubator/tuscany/java/sca/containers/container.rhino/src/test/resources/org/apache/tuscany/container/rhino/rhino/helloworld.wsdl
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/containers/container.rhino/src/test/resources/org/apache/tuscany/container/rhino/rhino/helloworld.wsdl?rev=407174&r1=407173&r2=407174&view=diff
==============================================================================
--- incubator/tuscany/java/sca/containers/container.rhino/src/test/resources/org/apache/tuscany/container/rhino/rhino/helloworld.wsdl (original)
+++ incubator/tuscany/java/sca/containers/container.rhino/src/test/resources/org/apache/tuscany/container/rhino/rhino/helloworld.wsdl Tue May 16 23:21:37 2006
@@ -88,7 +88,7 @@
 
         <wsdl:port binding="impl:helloworldSoapBinding" name="helloworld">
 
-            <wsdlsoap:address location="http://localhost:8080/sample-helloworldws-incubating-M1/services/HelloWorldService"/>
+            <wsdlsoap:address location="http://localhost:8080/sample-helloworldws/services/HelloWorldService"/>
 
         </wsdl:port>
 

Modified: incubator/tuscany/java/sca/containers/container.rhino/src/test/resources/wsdl/helloworld.wsdl
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/containers/container.rhino/src/test/resources/wsdl/helloworld.wsdl?rev=407174&r1=407173&r2=407174&view=diff
==============================================================================
--- incubator/tuscany/java/sca/containers/container.rhino/src/test/resources/wsdl/helloworld.wsdl (original)
+++ incubator/tuscany/java/sca/containers/container.rhino/src/test/resources/wsdl/helloworld.wsdl Tue May 16 23:21:37 2006
@@ -88,7 +88,7 @@
 
         <wsdl:port binding="impl:helloworldSoapBinding" name="helloworld">
 
-            <wsdlsoap:address location="http://localhost:8080/helloworldws-incubating-M1/services/HelloWorldService"/>
+            <wsdlsoap:address location="http://localhost:8080/helloworldws/services/HelloWorldService"/>
 
         </wsdl:port>
 

Modified: incubator/tuscany/java/sca/databinding/sdo/src/test/resources/org/apache/tuscany/databinding/sdo/helloworld.wsdl
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/databinding/sdo/src/test/resources/org/apache/tuscany/databinding/sdo/helloworld.wsdl?rev=407174&r1=407173&r2=407174&view=diff
==============================================================================
--- incubator/tuscany/java/sca/databinding/sdo/src/test/resources/org/apache/tuscany/databinding/sdo/helloworld.wsdl (original)
+++ incubator/tuscany/java/sca/databinding/sdo/src/test/resources/org/apache/tuscany/databinding/sdo/helloworld.wsdl Tue May 16 23:21:37 2006
@@ -96,7 +96,7 @@
 
             <!-- Axis Web Service -->
             <!--
-            <wsdlsoap:address location="http://localhost:8081/helloworldaxissvc-incubating-M1/services/helloworld"/>
+            <wsdlsoap:address location="http://localhost:8081/helloworldaxissvc/services/helloworld"/>
             -->
 
         </wsdl:port>

Modified: incubator/tuscany/java/sca/model/src/test/java/org/apache/tuscany/model/assembly/tests/bigbank/account/services/account/AccountService.wsdl
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/model/src/test/java/org/apache/tuscany/model/assembly/tests/bigbank/account/services/account/AccountService.wsdl?rev=407174&r1=407173&r2=407174&view=diff
==============================================================================
--- incubator/tuscany/java/sca/model/src/test/java/org/apache/tuscany/model/assembly/tests/bigbank/account/services/account/AccountService.wsdl (original)
+++ incubator/tuscany/java/sca/model/src/test/java/org/apache/tuscany/model/assembly/tests/bigbank/account/services/account/AccountService.wsdl Tue May 16 23:21:37 2006
@@ -72,7 +72,7 @@
     <wsdl:service name="AccountService">
         <wsdl:port binding="tns:AccountServiceSOAP"
                    name="AccountServiceSOAP">
-            <soap:address location="http://localhost:8080/tuscany-model-incubating-M1/services/AccountService"/>
+            <soap:address location="http://localhost:8080/tuscany-model/services/AccountService"/>
         </wsdl:port>
     </wsdl:service>
 </wsdl:definitions>

Modified: incubator/tuscany/java/sca/tomcat/src/test/resources/app1/WEB-INF/classes/wsdl/helloworld.wsdl
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/tomcat/src/test/resources/app1/WEB-INF/classes/wsdl/helloworld.wsdl?rev=407174&r1=407173&r2=407174&view=diff
==============================================================================
--- incubator/tuscany/java/sca/tomcat/src/test/resources/app1/WEB-INF/classes/wsdl/helloworld.wsdl (original)
+++ incubator/tuscany/java/sca/tomcat/src/test/resources/app1/WEB-INF/classes/wsdl/helloworld.wsdl Tue May 16 23:21:37 2006
@@ -88,7 +88,7 @@
 
         <wsdl:port binding="impl:helloworldSoapBinding" name="helloworld">
 
-            <wsdlsoap:address location="http://localhost:8080/sample-helloworldws-incubating-M1/services/HelloWorldService"/>
+            <wsdlsoap:address location="http://localhost:8080/sample-helloworldws/services/HelloWorldService"/>
 
         </wsdl:port>
 

Modified: incubator/tuscany/java/sca/tomcat/src/test/resources/app2/WEB-INF/classes/wsdl/helloworld.wsdl
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/tomcat/src/test/resources/app2/WEB-INF/classes/wsdl/helloworld.wsdl?rev=407174&r1=407173&r2=407174&view=diff
==============================================================================
--- incubator/tuscany/java/sca/tomcat/src/test/resources/app2/WEB-INF/classes/wsdl/helloworld.wsdl (original)
+++ incubator/tuscany/java/sca/tomcat/src/test/resources/app2/WEB-INF/classes/wsdl/helloworld.wsdl Tue May 16 23:21:37 2006
@@ -88,7 +88,7 @@
 
         <wsdl:port binding="impl:helloworldSoapBinding" name="helloworld">
 
-            <wsdlsoap:address location="http://localhost:8080/sample-helloworldws-incubating-M1/services/HelloWorldService"/>
+            <wsdlsoap:address location="http://localhost:8080/sample-helloworldws/services/HelloWorldService"/>
 
         </wsdl:port>
 

Modified: incubator/tuscany/java/sca/tools/src/test/resources/AccountService.wsdl
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/tools/src/test/resources/AccountService.wsdl?rev=407174&r1=407173&r2=407174&view=diff
==============================================================================
--- incubator/tuscany/java/sca/tools/src/test/resources/AccountService.wsdl (original)
+++ incubator/tuscany/java/sca/tools/src/test/resources/AccountService.wsdl Tue May 16 23:21:37 2006
@@ -233,7 +233,7 @@
     <wsdl:service name="AccountService">
         <wsdl:port binding="tns:AccountServiceSOAP"
                    name="AccountServiceSOAP">
-            <soap:address location="http://localhost:8080/sample-account-incubating-M1/services/AccountService"/>
+            <soap:address location="http://localhost:8080/sample-account/services/AccountService"/>
         </wsdl:port>
     </wsdl:service>
 </wsdl:definitions>

Modified: incubator/tuscany/java/testing/tomcat/bigbank/src/test/java/org/apache/tuscany/test/bigbank/BigBankTestCase.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/testing/tomcat/bigbank/src/test/java/org/apache/tuscany/test/bigbank/BigBankTestCase.java?rev=407174&r1=407173&r2=407174&view=diff
==============================================================================
--- incubator/tuscany/java/testing/tomcat/bigbank/src/test/java/org/apache/tuscany/test/bigbank/BigBankTestCase.java (original)
+++ incubator/tuscany/java/testing/tomcat/bigbank/src/test/java/org/apache/tuscany/test/bigbank/BigBankTestCase.java Tue May 16 23:21:37 2006
@@ -32,7 +32,7 @@
 
 public class BigBankTestCase extends TestCase {
     // public static final String testUrl = "http://localhost:8080/tuscany-samples-bigbank-webclient";
-    public static final String testUrl = "http://localhost:8080/sample-bigbank-webclient-incubating-M1/";
+    public static final String testUrl = "http://localhost:8080/sample-bigbank-webclient/";
 
     public void testBigBankDefault() throws Exception {
         System.err.println("Running: testcase:");

Modified: incubator/tuscany/java/testing/tomcat/helloworldweb/src/test/java/org/apache/tuscany/test/helloworldweb/HelloWorldWebTestCase.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/testing/tomcat/helloworldweb/src/test/java/org/apache/tuscany/test/helloworldweb/HelloWorldWebTestCase.java?rev=407174&r1=407173&r2=407174&view=diff
==============================================================================
--- incubator/tuscany/java/testing/tomcat/helloworldweb/src/test/java/org/apache/tuscany/test/helloworldweb/HelloWorldWebTestCase.java (original)
+++ incubator/tuscany/java/testing/tomcat/helloworldweb/src/test/java/org/apache/tuscany/test/helloworldweb/HelloWorldWebTestCase.java Tue May 16 23:21:37 2006
@@ -33,7 +33,7 @@
 
 
 public class HelloWorldWebTestCase extends TestCase {
-	public static final String testUrl = "http://localhost:8080/sample-helloworldweb-incubating-M1/";
+	public static final String testUrl = "http://localhost:8080/sample-helloworldweb/";
 
 	public void testHelloWorldDefault() throws Exception
 	{