You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by na...@apache.org on 2010/05/15 17:13:16 UTC

svn commit: r944662 - in /tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/distribution/src/main/release: BUILDING LICENSE NOTICE README RELEASE_NOTES

Author: nash
Date: Sat May 15 15:13:16 2010
New Revision: 944662

URL: http://svn.apache.org/viewvc?rev=944662&view=rev
Log:
Merge revision r938166 from trunk

Modified:
    tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/distribution/src/main/release/BUILDING
    tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/distribution/src/main/release/LICENSE
    tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/distribution/src/main/release/NOTICE
    tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/distribution/src/main/release/README
    tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/distribution/src/main/release/RELEASE_NOTES

Modified: tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/distribution/src/main/release/BUILDING
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/distribution/src/main/release/BUILDING?rev=944662&r1=944661&r2=944662&view=diff
==============================================================================
--- tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/distribution/src/main/release/BUILDING (original)
+++ tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/distribution/src/main/release/BUILDING Sat May 15 15:13:16 2010
@@ -31,33 +31,6 @@ Initial Setup
    from http://tuscany.apache.org/sca-java-travel-sample-1x-releases.html and
    unpack it into a local directory.
 
-The following steps are only needed if you will be using Maven to build the
-travel sample: 
-
- 7) Check the setting of the <tuscany.version> property in the
-    travelsample/pom.xml file.  If you want to build the travel sample using
-    a different Tuscany version, change this property as necessary.  The
-    travel sample has been tested and runs correctly with Tuscany SCA Java 1.6. 
-
-The following steps are only needed if you will be using Ant to build the
-travel sample: 
-
- 8) Download the Apache OpenEJB 3.1.2 (or later) binary distribution from
-    http://openejb.apache.org/download.html and unpack it into a local
-    directory. Set your OPENEJB_HOME environment variable to the base directory
-    containing the unpacked binary distribution.
-
- 9) If you are using JDK 5, download the JAX-WS reference implementation
-    version 2.1.7 from https://jax-ws.dev.java.net/2.1.7/ and unpack it into
-    a local directory. Set your JAXWS_HOME environment variable to the base
-    directory containing the unpacked download.
-
-10) Download the JUnit 4.5 (or later) binary distribution from
-    http://github.com/KentBeck/junit/downloads and unpack it into a local
-    directory. Set your the JUNIT_JAR environment variable to the full path
-    to the junit-x.y.z.jar in the unpacked binary distribution taking care
-    to replace x.y.z with the JUnit version number.
-
 
 Building using Ant
 ------------------
@@ -109,3 +82,58 @@ Running the Travel Sample
 
 Full details of how to run the travel sample can be found in the README
 file in the "travelsample" directory of the unpacked distribution.
+
+
+Changing the Tuscany SCA Java version used for the build
+--------------------------------------------------------
+
+If you are using Maven to build the travel sample, the maven build files
+are set up to use the 1.6 version of Tuscany SCA Java. You can build
+the travel sample using some other version of Tuscany SCA Java (for example,
+a development snapshot) by changing the <tuscany.version> property in the
+travelsample/pom.xml file.
+
+If you are using Ant to build the travel sample, you can change the
+version of Tuscany SCA Java used by the build by changing the setting of
+the TUSCANY_HOME environment variable before running the build.
+
+
+Building a development snaphost of the travel sample code
+---------------------------------------------------------
+   
+You can build the latest development snapshot of the travel sample by
+following these steps:
+
+1) Install Apache Subversion 1.4.0 or later, which can be downloaded from 
+http://subversion.apache.org/packages.html. Make sure that your PATH
+includes the "bin" subdirectory of the installation base directory. 
+
+2) Check out the travel sample code from svn using the following command:
+svn co http://svn.apache.org/repos/asf/tuscany/sca-java-1.x/trunk/tutorials/travelsample   
+
+3) Change to the travelsample directory of your local travel sample checkout
+and run the command "mvn". This will use Maven to compile the complete
+travel sample and run all of the travel sample unit tests.
+
+4) If you want to build the travel sample using Ant instead of Maven,
+you need to peform the following additional steps:
+
+  4a) Download the JUnit 4.5 (or later) binary distribution from
+  http://github.com/KentBeck/junit/downloads and unpack it into a local
+  directory. Set your the JUNIT_JAR environment variable to the full path
+  to the junit-x.y.z.jar in the unpacked binary distribution taking care
+  to replace x.y.z with the JUnit version number.
+
+  4b) Download the Apache OpenEJB 3.1.2 (or later) binary distribution
+  from http://openejb.apache.org/download.html and unpack it into a local
+  directory. Set your OPENEJB_HOME environment variable to the base directory
+  containing the unpacked binary distribution.
+
+  4c) If you are using JDK 5, download the JAX-WS reference implementation
+  version 2.1.7 from https://jax-ws.dev.java.net/2.1.7/ and unpack it into
+  a local directory. Set your JAXWS_HOME environment variable to the base
+  directory containing the unpacked download.
+
+  4d) Change to the travelsample directory of your local travel sample
+  checkout and run the command "ant". This will use Ant to compile the
+  complete travel sample and run all of the travel sample unit tests.

Modified: tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/distribution/src/main/release/LICENSE
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/distribution/src/main/release/LICENSE?rev=944662&r1=944661&r2=944662&view=diff
==============================================================================
--- tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/distribution/src/main/release/LICENSE (original)
+++ tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/distribution/src/main/release/LICENSE Sat May 15 15:13:16 2010
@@ -200,3 +200,520 @@
    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.
+
+===============================================================================
+
+APACHE TUSCANY SCA TRAVEL SAMPLE SUBCOMPONENTS: 
+
+The Apache Tuscany SCA Travel Sample distribution includes a number of
+subcomponents with separate copyright notices and license terms. Your use
+of the code for the these subcomponents is subject to the terms and
+conditions of the following licenses.                             
+
+===============================================================================
+
+The following components come under Apache Software License 2.0
+
+commons-cli-1.1.jar
+commons-dbcp-all-1.3-r699049.jar
+ejb31-api-experimental-3.1.2.jar
+geronimo-transaction-2.1.jar
+javaee-api-5.0-2.jar
+openejb-api-3.1.2.jar
+openejb-client-3.1.2.jar
+openejb-core-3.1.2.jar
+openejb-ejbd-3.1.2.jar
+openejb-javaagent-3.1.2.jar
+openejb-jee-3.1.2.jar
+openejb-loader-3.1.2.jar
+openejb-server-3.1.2.jar
+xbean-asm-shaded-3.6.jar
+xbean-finder-shaded-3.6.jar
+xbean-reflect-3.6.jar
+
+===============================================================================
+
+The jars; 
+http-20070405.jar, 
+jaxws-rt-2.1.7.jar, 
+jaxws-tools-2.1.7.jar, 
+saaj-api-1.3.jar, 
+saaj-impl-1.3.3.jar, 
+stax-ex-1.2.jar,
+streambuffer-0.9.jar
+
+COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0
+
+
+      1. Definitions.
+
+            1.1. "Contributor" means each individual or entity that
+            creates or contributes to the creation of Modifications.
+
+            1.2. "Contributor Version" means the combination of the
+            Original Software, prior Modifications used by a
+            Contributor (if any), and the Modifications made by that
+            particular Contributor.
+
+            1.3. "Covered Software" means (a) the Original Software, or
+            (b) Modifications, or (c) the combination of files
+            containing Original Software with files containing
+            Modifications, in each case including portions thereof.
+
+            1.4. "Executable" means the Covered Software in any form
+            other than Source Code. 
+
+            1.5. "Initial Developer" means the individual or entity
+            that first makes Original Software available under this
+            License. 
+            
+            1.6. "Larger Work" means a work which combines Covered
+            Software or portions thereof with code not governed by the
+            terms of this License.
+
+            1.7. "License" means this document.
+
+            1.8. "Licensable" means having the right to grant, to the
+            maximum extent possible, whether at the time of the initial
+            grant or subsequently acquired, any and all of the rights
+            conveyed herein.
+            
+            1.9. "Modifications" means the Source Code and Executable
+            form of any of the following: 
+
+                  A. Any file that results from an addition to,
+                  deletion from or modification of the contents of a
+                  file containing Original Software or previous
+                  Modifications; 
+
+                  B. Any new file that contains any part of the
+                  Original Software or previous Modification; or 
+
+                  C. Any new file that is contributed or otherwise made
+                  available under the terms of this License.
+
+            1.10. "Original Software" means the Source Code and
+            Executable form of computer software code that is
+            originally released under this License. 
+
+            1.11. "Patent Claims" means any patent claim(s), now owned
+            or hereafter acquired, including without limitation,
+            method, process, and apparatus claims, in any patent
+            Licensable by grantor. 
+
+            1.12. "Source Code" means (a) the common form of computer
+            software code in which modifications are made and (b)
+            associated documentation included in or with such code.
+
+            1.13. "You" (or "Your") means an individual or a legal
+            entity exercising rights under, and complying with all of
+            the terms of, this License. For legal entities, "You"
+            includes any entity which controls, is controlled by, or is
+            under common control with You. For purposes of this
+            definition, "control" means (a) the power, direct or
+            indirect, to cause the direction or management of such
+            entity, whether by contract or otherwise, or (b) ownership
+            of more than fifty percent (50%) of the outstanding shares
+            or beneficial ownership of such entity.
+
+      2. License Grants. 
+
+            2.1. The Initial Developer Grant.
+
+            Conditioned upon Your compliance with Section 3.1 below and
+            subject to third party intellectual property claims, the
+            Initial Developer hereby grants You a world-wide,
+            royalty-free, non-exclusive license: 
+
+                  (a) under intellectual property rights (other than
+                  patent or trademark) Licensable by Initial Developer,
+                  to use, reproduce, modify, display, perform,
+                  sublicense and distribute the Original Software (or
+                  portions thereof), with or without Modifications,
+                  and/or as part of a Larger Work; and 
+
+                  (b) under Patent Claims infringed by the making,
+                  using or selling of Original Software, to make, have
+                  made, use, practice, sell, and offer for sale, and/or
+                  otherwise dispose of the Original Software (or
+                  portions thereof). 
+
+                  (c) The licenses granted in Sections 2.1(a) and (b)
+                  are effective on the date Initial Developer first
+                  distributes or otherwise makes the Original Software
+                  available to a third party under the terms of this
+                  License. 
+
+                  (d) Notwithstanding Section 2.1(b) above, no patent
+                  license is granted: (1) for code that You delete from
+                  the Original Software, or (2) for infringements
+                  caused by: (i) the modification of the Original
+                  Software, or (ii) the combination of the Original
+                  Software with other software or devices. 
+
+            2.2. Contributor Grant.
+
+            Conditioned upon Your compliance with Section 3.1 below and
+            subject to third party intellectual property claims, each
+            Contributor hereby grants You a world-wide, royalty-free,
+            non-exclusive license:
+
+                  (a) under intellectual property rights (other than
+                  patent or trademark) Licensable by Contributor to
+                  use, reproduce, modify, display, perform, sublicense
+                  and distribute the Modifications created by such
+                  Contributor (or portions thereof), either on an
+                  unmodified basis, with other Modifications, as
+                  Covered Software and/or as part of a Larger Work; and
+                  
+
+                  (b) under Patent Claims infringed by the making,
+                  using, or selling of Modifications made by that
+                  Contributor either alone and/or in combination with
+                  its Contributor Version (or portions of such
+                  combination), to make, use, sell, offer for sale,
+                  have made, and/or otherwise dispose of: (1)
+                  Modifications made by that Contributor (or portions
+                  thereof); and (2) the combination of Modifications
+                  made by that Contributor with its Contributor Version
+                  (or portions of such combination). 
+
+                  (c) The licenses granted in Sections 2.2(a) and
+                  2.2(b) are effective on the date Contributor first
+                  distributes or otherwise makes the Modifications
+                  available to a third party. 
+
+                  (d) Notwithstanding Section 2.2(b) above, no patent
+                  license is granted: (1) for any code that Contributor
+                  has deleted from the Contributor Version; (2) for
+                  infringements caused by: (i) third party
+                  modifications of Contributor Version, or (ii) the
+                  combination of Modifications made by that Contributor
+                  with other software (except as part of the
+                  Contributor Version) or other devices; or (3) under
+                  Patent Claims infringed by Covered Software in the
+                  absence of Modifications made by that Contributor. 
+
+      3. Distribution Obligations.
+
+            3.1. Availability of Source Code.
+
+            Any Covered Software that You distribute or otherwise make
+            available in Executable form must also be made available in
+            Source Code form and that Source Code form must be
+            distributed only under the terms of this License. You must
+            include a copy of this License with every copy of the
+            Source Code form of the Covered Software You distribute or
+            otherwise make available. You must inform recipients of any
+            such Covered Software in Executable form as to how they can
+            obtain such Covered Software in Source Code form in a
+            reasonable manner on or through a medium customarily used
+            for software exchange.
+
+            3.2. Modifications.
+
+            The Modifications that You create or to which You
+            contribute are governed by the terms of this License. You
+            represent that You believe Your Modifications are Your
+            original creation(s) and/or You have sufficient rights to
+            grant the rights conveyed by this License.
+
+            3.3. Required Notices.
+
+            You must include a notice in each of Your Modifications
+            that identifies You as the Contributor of the Modification.
+            You may not remove or alter any copyright, patent or
+            trademark notices contained within the Covered Software, or
+            any notices of licensing or any descriptive text giving
+            attribution to any Contributor or the Initial Developer.
+
+            3.4. Application of Additional Terms.
+
+            You may not offer or impose any terms on any Covered
+            Software in Source Code form that alters or restricts the
+            applicable version of this License or the recipients'
+            rights hereunder. You may choose to offer, and to charge a
+            fee for, warranty, support, indemnity or liability
+            obligations to one or more recipients of Covered Software.
+            However, you may do so only on Your own behalf, and not on
+            behalf of the Initial Developer or any Contributor. You
+            must make it absolutely clear that any such warranty,
+            support, indemnity or liability obligation is offered by
+            You alone, and You hereby agree to indemnify the Initial
+            Developer and every Contributor for any liability incurred
+            by the Initial Developer or such Contributor as a result of
+            warranty, support, indemnity or liability terms You offer.
+          
+
+            3.5. Distribution of Executable Versions.
+
+            You may distribute the Executable form of the Covered
+            Software under the terms of this License or under the terms
+            of a license of Your choice, which may contain terms
+            different from this License, provided that You are in
+            compliance with the terms of this License and that the
+            license for the Executable form does not attempt to limit
+            or alter the recipient's rights in the Source Code form
+            from the rights set forth in this License. If You
+            distribute the Covered Software in Executable form under a
+            different license, You must make it absolutely clear that
+            any terms which differ from this License are offered by You
+            alone, not by the Initial Developer or Contributor. You
+            hereby agree to indemnify the Initial Developer and every
+            Contributor for any liability incurred by the Initial
+            Developer or such Contributor as a result of any such terms
+            You offer.
+
+            3.6. Larger Works.
+
+            You may create a Larger Work by combining Covered Software
+            with other code not governed by the terms of this License
+            and distribute the Larger Work as a single product. In such
+            a case, You must make sure the requirements of this License
+            are fulfilled for the Covered Software. 
+            
+      4. Versions of the License. 
+
+            4.1. New Versions.
+
+            Sun Microsystems, Inc. is the initial license steward and
+            may publish revised and/or new versions of this License
+            from time to time. Each version will be given a
+            distinguishing version number. Except as provided in
+            Section 4.3, no one other than the license steward has the
+            right to modify this License. 
+
+            4.2. Effect of New Versions.
+
+            You may always continue to use, distribute or otherwise
+            make the Covered Software available under the terms of the
+            version of the License under which You originally received
+            the Covered Software. If the Initial Developer includes a
+            notice in the Original Software prohibiting it from being
+            distributed or otherwise made available under any
+            subsequent version of the License, You must distribute and
+            make the Covered Software available under the terms of the
+            version of the License under which You originally received
+            the Covered Software. Otherwise, You may also choose to
+            use, distribute or otherwise make the Covered Software
+            available under the terms of any subsequent version of the
+            License published by the license steward. 
+
+            4.3. Modified Versions.
+
+            When You are an Initial Developer and You want to create a
+            new license for Your Original Software, You may create and
+            use a modified version of this License if You: (a) rename
+            the license and remove any references to the name of the
+            license steward (except to note that the license differs
+            from this License); and (b) otherwise make it clear that
+            the license contains terms which differ from this License.
+            
+
+      5. DISCLAIMER OF WARRANTY.
+
+      COVERED SOFTWARE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS"
+      BASIS, WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED,
+      INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT THE COVERED
+      SOFTWARE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR
+      PURPOSE OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND
+      PERFORMANCE OF THE COVERED SOFTWARE IS WITH YOU. SHOULD ANY
+      COVERED SOFTWARE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE
+      INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF
+      ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF
+      WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF
+      ANY COVERED SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS
+      DISCLAIMER. 
+
+      6. TERMINATION. 
+
+            6.1. This License and the rights granted hereunder will
+            terminate automatically if You fail to comply with terms
+            herein and fail to cure such breach within 30 days of
+            becoming aware of the breach. Provisions which, by their
+            nature, must remain in effect beyond the termination of
+            this License shall survive.
+
+            6.2. If You assert a patent infringement claim (excluding
+            declaratory judgment actions) against Initial Developer or
+            a Contributor (the Initial Developer or Contributor against
+            whom You assert such claim is referred to as "Participant")
+            alleging that the Participant Software (meaning the
+            Contributor Version where the Participant is a Contributor
+            or the Original Software where the Participant is the
+            Initial Developer) directly or indirectly infringes any
+            patent, then any and all rights granted directly or
+            indirectly to You by such Participant, the Initial
+            Developer (if the Initial Developer is not the Participant)
+            and all Contributors under Sections 2.1 and/or 2.2 of this
+            License shall, upon 60 days notice from Participant
+            terminate prospectively and automatically at the expiration
+            of such 60 day notice period, unless if within such 60 day
+            period You withdraw Your claim with respect to the
+            Participant Software against such Participant either
+            unilaterally or pursuant to a written agreement with
+            Participant.
+
+            6.3. In the event of termination under Sections 6.1 or 6.2
+            above, all end user licenses that have been validly granted
+            by You or any distributor hereunder prior to termination
+            (excluding licenses granted to You by any distributor)
+            shall survive termination.
+
+      7. LIMITATION OF LIABILITY.
+
+      UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT
+      (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE
+      INITIAL DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF
+      COVERED SOFTWARE, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE
+      LIABLE TO ANY PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL, OR
+      CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT
+      LIMITATION, DAMAGES FOR LOST PROFITS, LOSS OF GOODWILL, WORK
+      STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER
+      COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN
+      INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF
+      LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL
+      INJURY RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT
+      APPLICABLE LAW PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO
+      NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL OR
+      CONSEQUENTIAL DAMAGES, SO THIS EXCLUSION AND LIMITATION MAY NOT
+      APPLY TO YOU.
+
+      8. U.S. GOVERNMENT END USERS.
+
+      The Covered Software is a "commercial item," as that term is
+      defined in 48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial
+      computer software" (as that term is defined at 48 C.F.R. 
+      252.227-7014(a)(1)) and "commercial computer software
+      documentation" as such terms are used in 48 C.F.R. 12.212 (Sept.
+      1995). Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1
+      through 227.7202-4 (June 1995), all U.S. Government End Users
+      acquire Covered Software with only those rights set forth herein.
+      This U.S. Government Rights clause is in lieu of, and supersedes,
+      any other FAR, DFAR, or other clause or provision that addresses
+      Government rights in computer software under this License.
+
+      9. MISCELLANEOUS.
+
+      This License represents the complete agreement concerning subject
+      matter hereof. If any provision of this License is held to be
+      unenforceable, such provision shall be reformed only to the
+      extent necessary to make it enforceable. This License shall be
+      governed by the law of the jurisdiction specified in a notice
+      contained within the Original Software (except to the extent
+      applicable law, if any, provides otherwise), excluding such
+      jurisdiction's conflict-of-law provisions. Any litigation
+      relating to this License shall be subject to the jurisdiction of
+      the courts located in the jurisdiction and venue specified in a
+      notice contained within the Original Software, with the losing
+      party responsible for costs, including, without limitation, court
+      costs and reasonable attorneys' fees and expenses. The
+      application of the United Nations Convention on Contracts for the
+      International Sale of Goods is expressly excluded. Any law or
+      regulation which provides that the language of a contract shall
+      be construed against the drafter shall not apply to this License.
+      You agree that You alone are responsible for compliance with the
+      United States export administration regulations (and the export
+      control laws and regulation of any other countries) when You use,
+      distribute or otherwise make available any Covered Software.
+
+      10. RESPONSIBILITY FOR CLAIMS.
+
+      As between Initial Developer and the Contributors, each party is
+      responsible for claims and damages arising, directly or
+      indirectly, out of its utilization of rights under this License
+      and You agree to work with Initial Developer and Contributors to
+      distribute such responsibility on an equitable basis. Nothing
+      herein is intended or shall be deemed to constitute any admission
+      of liability.
+
+===============================================================================
+
+JUnit (junit-4.5.jar):
+
+Common Public License - v 1.0
+
+THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS COMMON PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
+
+1. DEFINITIONS
+
+"Contribution" means:
+
+      a) in the case of the initial Contributor, the initial code and documentation distributed under this Agreement, and
+      b) in the case of each subsequent Contributor:
+
+      i) changes to the Program, and
+
+      ii) additions to the Program;
+
+      where such changes and/or additions to the Program originate from and are distributed by that particular Contributor. A Contribution 'originates' from a Contributor if it was added to the Program by such Contributor itself or anyone acting on such Contributor's behalf. Contributions do not include additions to the Program which: (i) are separate modules of software distributed in conjunction with the Program under their own license agreement, and (ii) are not derivative works of the Program. 
+
+"Contributor" means any person or entity that distributes the Program.
+
+"Licensed Patents " mean patent claims licensable by a Contributor which are necessarily infringed by the use or sale of its Contribution alone or when combined with the Program.
+
+"Program" means the Contributions distributed in accordance with this Agreement.
+
+"Recipient" means anyone who receives the Program under this Agreement, including all Contributors.
+
+2. GRANT OF RIGHTS
+
+      a) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free copyright license to reproduce, prepare derivative works of, publicly display, publicly perform, distribute and sublicense the Contribution of such Contributor, if any, and such derivative works, in source code and object code form.
+
+      b) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free patent license under Licensed Patents to make, use, sell, offer to sell, import and otherwise transfer the Contribution of such Contributor, if any, in source code and object code form. This patent license shall apply to the combination of the Contribution and the Program if, at the time the Contribution is added by the Contributor, such addition of the Contribution causes such combination to be covered by the Licensed Patents. The patent license shall not apply to any other combinations which include the Contribution. No hardware per se is licensed hereunder. 
+
+      c) Recipient understands that although each Contributor grants the licenses to its Contributions set forth herein, no assurances are provided by any Contributor that the Program does not infringe the patent or other intellectual property rights of any other entity. Each Contributor disclaims any liability to Recipient for claims brought by any other entity based on infringement of intellectual property rights or otherwise. As a condition to exercising the rights and licenses granted hereunder, each Recipient hereby assumes sole responsibility to secure any other intellectual property rights needed, if any. For example, if a third party patent license is required to allow Recipient to distribute the Program, it is Recipient's responsibility to acquire that license before distributing the Program.
+
+      d) Each Contributor represents that to its knowledge it has sufficient copyright rights in its Contribution, if any, to grant the copyright license set forth in this Agreement. 
+
+3. REQUIREMENTS
+
+A Contributor may choose to distribute the Program in object code form under its own license agreement, provided that:
+
+      a) it complies with the terms and conditions of this Agreement; and
+
+      b) its license agreement:
+
+      i) effectively disclaims on behalf of all Contributors all warranties and conditions, express and implied, including warranties or conditions of title and non-infringement, and implied warranties or conditions of merchantability and fitness for a particular purpose; 
+
+      ii) effectively excludes on behalf of all Contributors all liability for damages, including direct, indirect, special, incidental and consequential damages, such as lost profits; 
+
+      iii) states that any provisions which differ from this Agreement are offered by that Contributor alone and not by any other party; and
+
+      iv) states that source code for the Program is available from such Contributor, and informs licensees how to obtain it in a reasonable manner on or through a medium customarily used for software exchange. 
+
+When the Program is made available in source code form:
+
+      a) it must be made available under this Agreement; and 
+
+      b) a copy of this Agreement must be included with each copy of the Program. 
+
+Contributors may not remove or alter any copyright notices contained within the Program.
+
+Each Contributor must identify itself as the originator of its Contribution, if any, in a manner that reasonably allows subsequent Recipients to identify the originator of the Contribution.
+
+4. COMMERCIAL DISTRIBUTION
+
+Commercial distributors of software may accept certain responsibilities with respect to end users, business partners and the like. While this license is intended to facilitate the commercial use of the Program, the Contributor who includes the Program in a commercial product offering should do so in a manner which does not create potential liability for other Contributors. Therefore, if a Contributor includes the Program in a commercial product offering, such Contributor ("Commercial Contributor") hereby agrees to defend and indemnify every other Contributor ("Indemnified Contributor") against any losses, damages and costs (collectively "Losses") arising from claims, lawsuits and other legal actions brought by a third party against the Indemnified Contributor to the extent caused by the acts or omissions of such Commercial Contributor in connection with its distribution of the Program in a commercial product offering. The obligations in this section do not apply to any claim
 s or Losses relating to any actual or alleged intellectual property infringement. In order to qualify, an Indemnified Contributor must: a) promptly notify the Commercial Contributor in writing of such claim, and b) allow the Commercial Contributor to control, and cooperate with the Commercial Contributor in, the defense and any related settlement negotiations. The Indemnified Contributor may participate in any such claim at its own expense.
+
+For example, a Contributor might include the Program in a commercial product offering, Product X. That Contributor is then a Commercial Contributor. If that Commercial Contributor then makes performance claims, or offers warranties related to Product X, those performance claims and warranties are such Commercial Contributor's responsibility alone. Under this section, the Commercial Contributor would have to defend claims against the other Contributors related to those performance claims and warranties, and if a court requires any other Contributor to pay any damages as a result, the Commercial Contributor must pay those damages.
+
+5. NO WARRANTY
+
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely responsible for determining the appropriateness of using and distributing the Program and assumes all risks associated with its exercise of rights under this Agreement, including but not limited to the risks and costs of program errors, compliance with applicable laws, damage to or loss of data, programs or equipment, and unavailability or interruption of operations.
+
+6. DISCLAIMER OF LIABILITY
+
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+7. GENERAL
+
+If any provision of this Agreement is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this Agreement, and without further action by the parties hereto, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable.
+
+If Recipient institutes patent litigation against a Contributor with respect to a patent applicable to software (including a cross-claim or counterclaim in a lawsuit), then any patent licenses granted by that Contributor to such Recipient under this Agreement shall terminate as of the date such litigation is filed. In addition, if Recipient institutes patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Program itself (excluding combinations of the Program with other software or hardware) infringes such Recipient's patent(s), then such Recipient's rights granted under Section 2(b) shall terminate as of the date such litigation is filed.
+
+All Recipient's rights under this Agreement shall terminate if it fails to comply with any of the material terms or conditions of this Agreement and does not cure such failure in a reasonable period of time after becoming aware of such noncompliance. If all Recipient's rights under this Agreement terminate, Recipient agrees to cease use and distribution of the Program as soon as reasonably practicable. However, Recipient's obligations under this Agreement and any licenses granted by Recipient relating to the Program shall continue and survive.
+
+Everyone is permitted to copy and distribute copies of this Agreement, but in order to avoid inconsistency the Agreement is copyrighted and may only be modified in the following manner. The Agreement Steward reserves the right to publish new versions (including revisions) of this Agreement from time to time. No one other than the Agreement Steward has the right to modify this Agreement. IBM is the initial Agreement Steward. IBM may assign the responsibility to serve as the Agreement Steward to a suitable separate entity. Each new version of the Agreement will be given a distinguishing version number. The Program (including Contributions) may always be distributed subject to the version of the Agreement under which it was received. In addition, after a new version of the Agreement is published, Contributor may elect to distribute the Program (including its Contributions) under the new version. Except as expressly stated in Sections 2(a) and 2(b) above, Recipient receives no r
 ights or licenses to the intellectual property of any Contributor under this Agreement, whether expressly, by implication, estoppel or otherwise. All rights in the Program not expressly granted under this Agreement are reserved.
+
+This Agreement is governed by the laws of the State of New York and the intellectual property laws of the United States of America. No party to this Agreement will bring a legal action under this Agreement more than one year after the cause of action arose. Each party waives its rights to a jury trial in any resulting litigation. 

Modified: tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/distribution/src/main/release/NOTICE
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/distribution/src/main/release/NOTICE?rev=944662&r1=944661&r2=944662&view=diff
==============================================================================
--- tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/distribution/src/main/release/NOTICE (original)
+++ tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/distribution/src/main/release/NOTICE Sat May 15 15:13:16 2010
@@ -81,3 +81,5 @@ Software AG., Sun Microsystems, Sybase I
 
 This product includes/uses software under the OASIS license
 Copyright (C) OASIS(R) 2005, 2010. All Rights Reserved.
+
+This product includes/uses JUnit (http://www.junit.org/)

Modified: tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/distribution/src/main/release/README
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/distribution/src/main/release/README?rev=944662&r1=944661&r2=944662&view=diff
==============================================================================
--- tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/distribution/src/main/release/README (original)
+++ tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/distribution/src/main/release/README Sat May 15 15:13:16 2010
@@ -21,13 +21,13 @@ travelsample     top-level directory for
   testdomain     scratch directory for trying out the domain manager
   util           utility code used by other parts of the travel sample
 
-Note1: The travel sample depends on the Apache Tuscany SCA Java 1.x binary
+Note 1: The travel sample depends on the Apache Tuscany SCA Java 1.x binary
 distribution, which is downloaded separately from the travel sample.
 To avoid needless duplication, the "lib" directory of the travel sample
 only contains dependencies that aren't provided in the current release
 of the Tuscany SCA Java 1.x binary distribution.
 
-Note2: Before attempting to build or run the travel sample, you will need to
+Note 2: Before attempting to build or run the travel sample, you will need to
 download the Apache Tuscany SCA Java 1.6 (or later) binary distribution and
 set your TUSCANY_HOME environment variable to a local directory containing
 the unpacked binary distribution. 
@@ -36,7 +36,7 @@ the unpacked binary distribution. 
 Overview of the travel sample
 -----------------------------
 
-The travel sample consists of a number of related scenarios.  For each
+The travel sample consists of a number of related scenarios. For each
 scenario, this section lists the following:
  Description: A description of the scenario.
  Contributions: SCA contributions used in the scenario. Each contribution
@@ -45,7 +45,7 @@ scenario, this section lists the followi
    of the travelsample/launchers directory.
  Services: Non-SCA services used in the scenario, if any. Each non-SCA 
    service is a subdirectory of the travelsample/services directory.
- Clients: Non-SCA clients used in the scenario, if any.  Each non-SCA
+ Clients: Non-SCA clients used in the scenario, if any. Each non-SCA
    client is a subdirectory of the travelsample/clients directory.
  Webapp: Web application (.war) file used to run the scenario, for those
    scenarios that use contributions packaged as web applications and
@@ -150,135 +150,159 @@ Description: *** to be added ***
 Contributions: creditcard-payment-jaxb-policy, payment-java-policy, policy-client
 Launchers: policy
 
-13) Payment service with different implementation types
+13) Using - Using SCA Components
 
 Description: *** to be added ***
+Contributions: using
+Launchers: using
 
-13a) implementation.bpel
+14) SCA credit card payment service packaged as a web application
+
+Description: *** to be added ***
+Contributions: creditcard-payment-jaxb, creditcard-payment-webapp
+Webapp: creditcard-payment-webapp
+
+15) Payment service with different implementation types
+
+Description: *** to be added ***
+
+15a) implementation.bpel
 
 Description: *** to be added ***
 Contributions: creditcard-payment-jaxb, emailgateway, payment-bpel, payment-bpel-process 
 Launchers: payment-bpel
 
-13b) implementation.script written in Groovy
+15b) implementation.script written in Groovy
 
 Description: *** to be added ***
 Contributions: creditcard-payment-jaxb, emailgateway, payment-groovy
 Launchers: payment-groovy
 
-13c) implementation.java
+15c) implementation.java
 
 Description: *** to be added ***
 Contributions: creditcard-payment-jaxb, payment-java 
 Launchers: payment-java
 
-13d) implementation.java with policy
+15d) implementation.java with callback
+
+Description: *** to be added ***
+Contributions: payment-java-callback 
+Launchers: payment-java-callback
+
+15e) implementation.java with policy
 
 Description: *** to be added ***
 Contributions: creditcard-payment-jaxb-policy, payment-java-policy 
 Launchers: payment-java-policy
 
-13e) implementation.spring
+15f) implementation.java with reference passing
+
+Description: *** to be added ***
+Contributions: payment-java-reference-pass 
+Launchers: payment-java-reference-pass
+
+15g) implementation.script written in Python
+
+Description: *** to be added ***
+Contributions: creditcard-payment-jaxb, emailgateway, payment-python
+Launchers: payment-python
+
+15h) implementation.spring
 
 Description: *** to be added ***
 Contributions: creditcard-payment-jaxb, payment-spring
 Launchers: payment-spring
 
-13f) implementation.spring with SCA tags
+15i) implementation.spring with SCA tags
 
 Description: *** to be added ***
 Contributions: creditcard-payment-jaxb, payment-spring-scatag
 Launchers: payment-spring-scatag
 
-14) SCA credit card payment service packaged as a web application
-
-Description: *** to be added ***
-Contributions: creditcard-payment-jaxb, creditcard-payment-webapp
-Webapp: creditcard-payment-webapp
-
-15) SCA currency converter service interoperating with SCA or non-SCA client
+16) SCA currency converter service interoperating with SCA or non-SCA client
 
 Description: *** to be added ***
 
-15a) SCA client
+16a) SCA client
 
 Description: *** to be added ***
 Contributions: currency
 Launchers: currency-converter
 
-15b) CORBA client
+16b) CORBA client
 
 Description: *** to be added ***
 Contributions: currency, currency-corba
 Launchers: currency-converter-corba
 Clients: currency-converter-corba
 
-15c) JMS client
+16c) JMS client
 
 Description: *** to be added ***
 Contributions: currency, currency-jms
 Launchers: currency-converter-jms
 Clients: currency-converter-jms
 
-15d) RMI client
+16d) RMI client
 
 Description: *** to be added ***
 Contributions: currency, currency-rmi
 Launchers: currency-converter-rmi
 Clients: currency-converter-rmi
 
-15e) JAX-WS client
+16e) JAX-WS client
 
 Description: *** to be added ***
 Contributions: currency, currency-ws
 Launchers: currency-converter-ws
 Clients: currency-converter-ws-jaxws
 
-15f) Web application JSP client
+16f) Web application JSP client
 
 Description: *** to be added ***
 Contributions: currency, currency-jsp
 Webapp: scatours-contribution-currency-jsp.war
 
-15g) Web application servlet client
+16g) Web application servlet client
 
 Description: *** to be added ***
 Contributions: currency, currency-servlet
 Webapp: scatours-contribution-currency-servlet.war
 
-16) SCA notification service interoperating with non-SCA SMS gateway service
+17) SCA notification service interoperating with non-SCA SMS gateway service
 
 Description: *** to be added ***
 
-16a) SMS gateway CORBA service
+17a) SMS gateway CORBA service
 
 Description: *** to be added ***
 Contributions: notification, notification-corba
 Services: smsgateway-corba
 Launchers: notification-corba
 
-16b) SMS gateway EJB service
+17b) SMS gateway EJB service
 
 Description: *** to be added ***
 Contributions: notification, notification-ejb
 Services: smsgateway-ejb
 Launchers: notification-ejb
 
-16c) SMS gateway JMS service
+17c) SMS gateway JMS service
 
 Description: *** to be added ***
 Contributions: notification, notification-jms
 Services: smsgateway-jms
 Launchers: notification-jms
 
-16d) SMS gateway RMI service
+17d) SMS gateway RMI service
 
 Description: *** to be added ***
 Contributions: notification, notification-rmi
 Services: smsgateway-rmi
 Launchers: notification-rmi
 
-16e) SMS gateway JAX-WS service
+17e) SMS gateway JAX-WS service
 
 Description: *** to be added ***
 Contributions: notification, notification-ws
@@ -298,7 +322,7 @@ Running travel sample scenarios from lau
 
 After building the travel sample using either Maven or Ant, you can run
 all the scenarios that have launchers by using ant scripts in the
-subdirectories of the travelsample/launchers directory.  For scenarios
+subdirectories of the travelsample/launchers directory. For scenarios
 that are packaged as web applications and don't have launchers, the next
 section describes how you can run these.
 
@@ -307,19 +331,19 @@ You can run the launcher ant scripts as 
  2. Change directory to travelsample/launchers/<launcher-dir> where
     <launcher-dir> is the launcher directory for the scenario that you
     want to run.
- 3. Enter the command shown in Table 1 below.  This command is usually
-    "ant run".  This runs an ant script that sets the necessary
+ 3. Enter the command shown in Table 1 below. This command is usually
+    "ant run". This runs an ant script that sets the necessary
     classpath and invokes the launcher class.
  4. Some scenarios require the above steps to be repeated multiple times
-    with different commands.  These cases are indicated by entries in
-    Table 1 with more than one command listed.  For these scenarios, all
+    with different commands. These cases are indicated by entries in
+    Table 1 with more than one command listed. For these scenarios, all
     the listed commands should be entered in separate command prompts
     from the same current directory and in the same order as shown.
  5. Some scenarios have a browser-based user interface which is started
     by entering the URL shown in Table 1 in a browser after running the
-    launcher or launchers for the scenario.  The recommended browser is
+    launcher or launchers for the scenario. The recommended browser is
     Firefox as some scenarios don't work with Internet Explorer.
-    
+
 Table 1. Running scenarios packaged as launchers and contributions
 -----------------------------------------------------------------------------------------------------
 |    Scenario           Launcher directory   Commands         URLs                                  |
@@ -355,57 +379,66 @@ Table 1. Running scenarios packaged as l
 -----------------------------------------------------------------------------------------------------
 | 12) Policy          | policy             | ant run        |                                       |
 -----------------------------------------------------------------------------------------------------
-| 13) Payment service implementation types                                                          |
+| 13) Using           | using              | ant run        |                                       |
+-----------------------------------------------------------------------------------------------------
+| 15) Payment service implementation types                                                          |
 |                                                                                                   |
-|      Impl type         Launcher directory      Commands     URLs                                  |
+|      Impl type          Launcher directory            Commands  URLs                              |
+-----------------------------------------------------------------------------------------------------
+| 15a) BPEL             | payment-bpel                | ant run |                                   |
+-----------------------------------------------------------------------------------------------------
+| 15b) Groovy           | payment-groovy              | ant run |                                   |
+-----------------------------------------------------------------------------------------------------
+| 15c) Java             | payment-java                | ant run |                                   |
 -----------------------------------------------------------------------------------------------------
-| 13a) BPEL            | payment-bpel          | ant run    |                                       |
+| 15d) Java + callback  | payment-java-callback       | ant run |                                   |
 -----------------------------------------------------------------------------------------------------
-| 13b) Groovy          | payment-groovy        | ant run    |                                       |
+| 15e) Java + policy    | payment-java-policy         | ant run |                                   |
 -----------------------------------------------------------------------------------------------------
-| 13c) Java            | payment-java          | ant run    |                                       |
+| 15f) Java + reference | payment-java-reference-pass | ant run |                                   |
+|      passing          |                             |         |                                   |
 -----------------------------------------------------------------------------------------------------
-| 13d) Java + policy   | payment-java-policy   | ant run    |                                       |
+| 15g) Python           | payment-python              | ant run |                                   |
 -----------------------------------------------------------------------------------------------------
-| 13e) Spring          | payment-spring        | ant run    |                                       |
+| 15h) Spring           | payment-spring              | ant run |                                   |
 -----------------------------------------------------------------------------------------------------
-| 13f) Spring SCA tags | payment-spring-scatag | ant run    |                                       |
+| 15i) Spring SCA tags  | payment-spring-scatag       | ant run |                                   |
 -----------------------------------------------------------------------------------------------------
-| 15) Currency converter service binding types                                                      |
+| 16) Currency converter service binding types                                                      |
 |                                                                                                   |
 |      Binding type  Launcher directory         Commands         URLs                               |
 -----------------------------------------------------------------------------------------------------
-| 15a) SCA         | currency-converter       | ant run        |                                    |
+| 16a) SCA         | currency-converter       | ant run        |                                    |
 -----------------------------------------------------------------------------------------------------
-| 15b) CORBA       | currency-converter-corba | ant run        |                                    |
+| 16b) CORBA       | currency-converter-corba | ant run        |                                    |
 |                  |                          | ant run-client |                                    |
 -----------------------------------------------------------------------------------------------------
-| 15c) JMS         | currency-converter-jms   | ant run        |                                    |
+| 16c) JMS         | currency-converter-jms   | ant run        |                                    |
 |                  |                          | ant run-client |                                    |
 -----------------------------------------------------------------------------------------------------
-| 15d) RMI         | currency-converter-rmi   | ant run        |                                    |
+| 16d) RMI         | currency-converter-rmi   | ant run        |                                    |
 |                  |                          | ant run-client |                                    |
 -----------------------------------------------------------------------------------------------------
-| 15e) WS          | currency-converter-ws    | ant run        |                                    |
+| 16e) WS          | currency-converter-ws    | ant run        |                                    |
 |                  |                          | ant run-client |                                    |
 -----------------------------------------------------------------------------------------------------
-| 16) Notification reference binding types                                                          |
+| 17) Notification reference binding types                                                          |
 |                                                                                                   |
 |      Binding type  Launcher directory     Commands             URLs                               |
 -----------------------------------------------------------------------------------------------------
-| 16a) CORBA       | notification-corba   | ant run-smsgateway |                                    |
+| 17a) CORBA       | notification-corba   | ant run-smsgateway |                                    |
 |                  |                      | ant run            |                                    |
 -----------------------------------------------------------------------------------------------------
-| 16b) EJB         | notification-ejb     | ant run-smsgateway |                                    |
+| 17b) EJB         | notification-ejb     | ant run-smsgateway |                                    |
 |                  |                      | ant run            |                                    |
 -----------------------------------------------------------------------------------------------------
-| 16c) JMS         | notification-jms     | ant run-smsgateway |                                    |
+| 17c) JMS         | notification-jms     | ant run-smsgateway |                                    |
 |                  |                      | ant run            |                                    |
 -----------------------------------------------------------------------------------------------------
-| 16d) RMI         | notification-rmi     | ant run-smsgateway |                                    |
+| 17d) RMI         | notification-rmi     | ant run-smsgateway |                                    |
 |                  |                      | ant run            |                                    |
 -----------------------------------------------------------------------------------------------------
-| 16e) WS          | notification-ws      | ant run-smsgateway |                                    |
+| 17e) WS          | notification-ws      | ant run-smsgateway |                                    |
 |                  |                      | ant run            |                                    |
 -----------------------------------------------------------------------------------------------------
 
@@ -414,20 +447,22 @@ Running travel sample scenarios in a Web
 -----------------------------------------------------------
 
 Some scenarios are packaged as web applications (.war files) and don't
-have launchers.  After building the travel sample using either Maven or Ant,
+have launchers. After building the travel sample using either Maven or Ant,
 you can use a Web application server to run these scenarios.
 
 You can run these web applications as follows:
  1. Deploy the web application (.war) file to a Web application server
-    such as Tomcat.  The .war file can be found in the directory
+    such as Tomcat. The .war file can be found in the directory
     travelsample/contributions/<contrib-dir>/target where <contrib-dir>
-    is the contribution directory listed in Table 2 below.  The name of
+    is the contribution directory listed in Table 2 below. The name of
     the .war file is scatours-contribution-<contrib-dir>.war.
  2. Start the browser-based user interface for the scenario by entering
-    its URL in a browser.  The URL for each scenario is shown in Table 2.
-    The recommended browser is Firefox because some scenarios don't work
-    with Internet Explorer.
-    
+    its URL in a browser. The URL for each scenario is shown in Table 2.
+    The host and port in the URL may need to be changed depending on the
+    configuration of the Web application server in which the web application
+    is deployed. The recommended browser is Firefox because some scenarios
+    don't work with Internet Explorer.
+
 Table 2. Running scenarios packaged as web applications
 --------------------------------------------------------------------------------------------------------------------------
 |    Scenario        | Contribution directory    | URL                                                                   |
@@ -435,17 +470,41 @@ Table 2. Running scenarios packaged as w
 | 14) Credit card    | creditcard-payment-webapp | http://localhost:8080/scatours-contribution-creditcard-payment-webapp |
 |     webapp service |                           |                                                                       |                                     |
 --------------------------------------------------------------------------------------------------------------------------
-| 15f) Currency      | currency-jsp              | http://localhost:8080/scatours-contribution-currency-jsp              |                        |
+| 16f) Currency      | currency-jsp              | http://localhost:8080/scatours-contribution-currency-jsp              |                        |
 |      converter JSP |                           |                                                                       |
 --------------------------------------------------------------------------------------------------------------------------
-| 15g) Currency      | currency-servlet          | http://localhost:8080/scatours-contribution-currency-servlet          |                        |
+| 16g) Currency      | currency-servlet          | http://localhost:8080/scatours-contribution-currency-servlet          |                        |
 |      converter     |                           |                                                                       |
 |      servlet       |                           |                                                                       |
 --------------------------------------------------------------------------------------------------------------------------
 
-Note: The host name and port number in the above URLs may differ depending
-on the configuration of the Web application server in which the web application
-was deployed.
+
+Running the domain manager
+--------------------------
+
+The travelsample/testdomain directory is provided for the purpose
+of running the domain manager and creating your own configuration.
+You can do this as follows:
+
+1) Open a command prompt and make travelsample/testdomain your
+   current directory.
+
+2) Enter "ant run" to start the domain manager.
+
+3) In a browser, start the domain manager GUI by entering the URL
+   "http://localhost:9990/ui/home". The recommended browser is Firefox
+   because the domain manager GUI doesn't work with Internet Explorer.
+
+4) In the browser window, create or update your domain manager
+   configuration using the domain manager GUI.
+
+5) To exit the domain manager, enter "q" in the command prompt window.
+   The domain configuration is saved automatically and will be
+   restored the next time you start the domain manager.
+
+6) If you want to remove your saved configuration and start again from
+   a clean slate, enter either "ant clean" or "mvn clean" from the
+   command prompt window.
 
 
 Running travel sample scenarios from the "binaries" directory
@@ -453,7 +512,7 @@ Running travel sample scenarios from the
 
 If the travel sample was built using Maven, a binaries/target directory
 will be created with subdirectories containing all the built jar and war
-files and runtime dependencies for these files.  This enables you to see
+files and runtime dependencies for these files. This enables you to see
 how a Tuscany application can be packaged in binary form by an application
 developer for distribution to users of the application.
 
@@ -471,7 +530,7 @@ for the above files:
   domainconfig - domain configuration files
   jaxws - JAX-WS runtime jars neeed when running the travel sample on JDK 5
   lib - Tuscany runtime jars and their dependencies needed by the travel sample
-     (only present if the travel sample was  built using "mvn -Pselfcontained")
+     (only present if the travel sample was built using "mvn -Pselfcontained")
   ode - JPA Derby database needed by the ODE runtime
   openejb - OpenEJB 3.1.2 runtime jars needed by the travel sample
 
@@ -480,16 +539,16 @@ the following:
  1. Open a command prompt. 
  2. Change directory to travelsample/binaries/target/<runtime-dir> where
     <runtime-dir> is the directory for the scenario shown in Table 3 below.
- 3. Enter the command for the scenario shown in Table 3.  This runs an
+ 3. Enter the command for the scenario shown in Table 3. This runs an
     ant script that sets the necessary classpath and invokes the launcher class.
  4. Some scenarios require the above steps to be repeated multiple times
-    with different commands.  These cases are indicated by entries in
-    Table 3 with more than one directory and command listed.  For these
+    with different commands. These cases are indicated by entries in
+    Table 3 with more than one directory and command listed. For these
     scenarios, all the listed commands should be entered in separate command
     prompts from the listed current directories in the same order as shown.
  5. Some scenarios have a browser-based user interface which is started
     by entering the URL shown in Table 3 in a browser after running the
-    launcher or launchers for the scenario.  The recommended browser is
+    launcher or launchers for the scenario. The recommended browser is
     Firefox as some scenarios don't work with Internet Explorer.
 
 Table 3. Running scenarios with launchers from the binaries directory
@@ -527,71 +586,82 @@ Table 3. Running scenarios with launcher
 --------------------------------------------------------------------------------------------------------
 | 12) Policy          | launchers | ant run-policy             |                                       |
 --------------------------------------------------------------------------------------------------------
-| 13) Payment service implementation types                                                             |
+| 13) Using           | launchers | ant run-using              |                                       |
+--------------------------------------------------------------------------------------------------------
+| 15) Payment service implementation types                                                             |
 |                                                                                                      |
-|      Impl type         Directory   Commands                        URLs                              |
+|      Impl type          Directory   Commands                              URLs                       |
+--------------------------------------------------------------------------------------------------------
+| 15a) BPEL             | launchers | ant run-payment-bpel                |                            |
 --------------------------------------------------------------------------------------------------------
-| 13a) BPEL            | launchers | ant run-payment-bpel          |                                   |
+| 15b) Groovy           | launchers | ant run-payment-groovy              |                            |
 --------------------------------------------------------------------------------------------------------
-| 13b) Groovy          | launchers | ant run-payment-groovy        |                                   |
+| 15c) Java             | launchers | ant run-payment-java                |                            |
 --------------------------------------------------------------------------------------------------------
-| 13c) Java            | launchers | ant run-payment-java          |                                   |
+| 15d) Java + callback  | launchers | ant run-payment-java-callback       |                            |
 --------------------------------------------------------------------------------------------------------
-| 13d) Java + policy   | launchers | ant run-payment-java-policy   |                                   |
+| 15e) Java + policy    | launchers | ant run-payment-java-policy         |                            |
 --------------------------------------------------------------------------------------------------------
-| 13e) Spring          | launchers | ant run-payment-spring        |                                   |
+| 15f) Java + reference | launchers | ant run-payment-java-reference-pass |                            |
+|      passing          |           |                                     |                            |
 --------------------------------------------------------------------------------------------------------
-| 13f) Spring SCA tags | launchers | ant run-payment-spring-scatag |                                   |
+| 15g) Python           | launchers | ant run-payment-python              |                            |
 --------------------------------------------------------------------------------------------------------
-| 15) Currency converter service binding types                                                         |
+| 15h) Spring           | launchers | ant run-payment-spring              |                            |
+--------------------------------------------------------------------------------------------------------
+| 15i) Spring SCA tags  | launchers | ant run-payment-spring-scatag       |                            |
+--------------------------------------------------------------------------------------------------------
+| 16) Currency converter service binding types                                                         |
 |                                                                                                      |
 |      Binding type  Directories  Commands                              URLs                           |
 --------------------------------------------------------------------------------------------------------
-| 15a) SCA         | launchers  | ant run-currency-converter          |                                |
+| 16a) SCA         | launchers  | ant run-currency-converter          |                                |
 --------------------------------------------------------------------------------------------------------
-| 15b) CORBA       | launchers  | ant run-currency-converter-corba    |                                |
+| 16b) CORBA       | launchers  | ant run-currency-converter-corba    |                                |
 |                  | clients    | ant run-currency-converter-corba    |                                |
 --------------------------------------------------------------------------------------------------------
-| 15c) JMS         | launchers  | ant run-currency-converter-jms      |                                |
+| 16c) JMS         | launchers  | ant run-currency-converter-jms      |                                |
 |                  | clients    | ant run-currency-converter-jms      |                                |
 --------------------------------------------------------------------------------------------------------
-| 15d) RMI         | launchers  | ant run-currency-converter-rmi      |                                |
+| 16d) RMI         | launchers  | ant run-currency-converter-rmi      |                                |
 |                  | clients    | ant run-currency-converter-rmi      |                                |
 --------------------------------------------------------------------------------------------------------
-| 15e) WS          | launchers  | ant run-currency-converter-ws       |                                |
+| 16e) WS          | launchers  | ant run-currency-converter-ws       |                                |
 |                  | clients    | ant run-currency-converter-ws-jaxws |                                |
 --------------------------------------------------------------------------------------------------------
-| 16) Notification reference binding types                                                             |
+| 17) Notification reference binding types                                                             |
 |                                                                                                      |
 |      Binding type  Directories  Commands                     URLs                                    |
 --------------------------------------------------------------------------------------------------------
-| 16a) CORBA       | services   | ant run-smsgateway-corba   |                                         |
+| 17a) CORBA       | services   | ant run-smsgateway-corba   |                                         |
 |                  | launchers  | ant run-notification-corba |                                         |
 --------------------------------------------------------------------------------------------------------
-| 16b) EJB         | services   | ant run-smsgateway-ejb     |                                         |
+| 17b) EJB         | services   | ant run-smsgateway-ejb     |                                         |
 |                  | launchers  | ant run-notification-ejb   |                                         |
 --------------------------------------------------------------------------------------------------------
-| 16c) JMS         | services   | ant run-smsgateway-jms     |                                         |
+| 17c) JMS         | services   | ant run-smsgateway-jms     |                                         |
 |                  | launchers  | ant run-notification-jms   |                                         |
 --------------------------------------------------------------------------------------------------------
-| 16d) RMI         | services   | ant run-smsgateway-rmi     |                                         |
+| 17d) RMI         | services   | ant run-smsgateway-rmi     |                                         |
 |                  | launchers  | ant run-notification-rmi   |                                         |
 --------------------------------------------------------------------------------------------------------
-| 16e) WS          | services   | ant run-smsgateway-jaxws   |                                         |
+| 17e) WS          | services   | ant run-smsgateway-jaxws   |                                         |
 |                  | launchers  | ant run-notification-ws    |                                         |
 --------------------------------------------------------------------------------------------------------
 
 The scenarios packaged as web applications can be run using .war files
 from the binaries/target/webapps directory as follows:
  1. Deploy the web application (.war) file to a Web application server
-    such as Tomcat.  The .war file can be found in the directory
+    such as Tomcat. The .war file can be found in the directory
     travelsample/binaries/target/webapps and has the name listed in
     Table 4 below.
  2. Start the browser-based user interface for the scenario by entering
-    its URL in a browser.  The URL for each scenario is shown in Table 4.
-    The recommended browser is Firefox because some scenarios don't work
-    with Internet Explorer.
-    
+    its URL in a browser. The URL for each scenario is shown in Table 4.
+    The host and port in the URL may need to be changed depending on the
+    configuration of the Web application server in which the web application
+    is deployed. The recommended browser is Firefox because some scenarios
+    don't work with Internet Explorer.
+
 Table 4. Running scenarios packaged as web applications
 ----------------------------------------------------------------------------------------------------------------------------------------------------
 |    Scenario        | Web application file                                | URL                                                                   |
@@ -599,30 +669,26 @@ Table 4. Running scenarios packaged as w
 | 14) Credit card    | scatours-contribution-creditcard-payment-webapp.war | http://localhost:8080/scatours-contribution-creditcard-payment-webapp |
 |     webapp service |                                                     |                                                                       |                                     |
 ----------------------------------------------------------------------------------------------------------------------------------------------------
-| 15f) Currency      | scatours-contribution-currency-jsp.war              | http://localhost:8080/scatours-contribution-currency-jsp              |                        |
+| 16f) Currency      | scatours-contribution-currency-jsp.war              | http://localhost:8080/scatours-contribution-currency-jsp              |                        |
 |      converter JSP |                                                     |                                                                       |
 ----------------------------------------------------------------------------------------------------------------------------------------------------
-| 15g) Currency      | scatours-contribution-currency-servlet.war          | http://localhost:8080/scatours-contribution-currency-servlet          |                        |
+| 16g) Currency      | scatours-contribution-currency-servlet.war          | http://localhost:8080/scatours-contribution-currency-servlet          |                        |
 |      converter     |                                                     |                                                                       |
 |      servlet       |                                                     |                                                                       |
 ----------------------------------------------------------------------------------------------------------------------------------------------------
 
-Note: The host name and port number in the above URLs may differ depending
-on the configuration of the Web application server in which the web application
-was deployed.
-
 
 Building and running the self-contained travel sample
 -----------------------------------------------------
 
-The travel sample can be built using the "mvn -Pselfcontained" command.  This
+The travel sample can be built using the "mvn -Pselfcontained" command. This
 puts all of its runtime dependencies under the binaries/target directory and
 doesn't use any files from the Tuscany SCA Java binary distribution.
 
 If the travel sample has been built in this way, you can run it as described
-in the previous section using the same ant scripts.  Alternatively you can
+in the previous section using the same ant scripts. Alternatively you can
 use the "java -jar" command to run the travel sample executable jars directly
-using the manifest dependencies in the jar files.  For example, the commands
+using the manifest dependencies in the jar files. For example, the commands
   ant run-currency-converter-ws
   ant run-currency-converter-ws-jaxws
   ant run-smsgateway-corba
@@ -630,7 +696,7 @@ could be replaced by the commands
   java -jar scatours-launcher-currency-converter-ws.jar
   java -jar scatours-client-currency-converter-ws-jaxws.jar
   java -jar scatours-service-smsgateway-corba.jar
-    
+
 
 Cross-reference of contributions to scenarios
 ---------------------------------------------
@@ -642,20 +708,20 @@ contributions/buildingblocks  7
 contributions/buildingblocks-client  7
 contributions/calendar  4
 contributions/car  5, 6
-contributions/common  4, 5, 6
-contributions/creditcard-payment-jaxb  13a, 13b, 13c, 13e, 13f, 14
-contributions/creditcard-payment-jaxb-policy  5, 6, 12, 13d
+contributions/common  4, 5, 6, 12
+contributions/creditcard-payment-jaxb  15a, 15b, 15c, 15g, 15h, 15i, 14
+contributions/creditcard-payment-jaxb-policy  5, 6, 12, 15e
 contributions/creditcard-payment-sdo  9
 contributions/creditcard-payment-webapp  14
-contributions/currency  4, 5, 6, 15a, 15b, 15c, 15d, 15e, 15f, 15g
-contributions/currency-corba  15b
-contributions/currency-jms  15c
-contributions/currency-jsp  15f
-contributions/currency-rmi  15d
-contributions/currency-servlet  15g
-contributions/currency-ws  15e
+contributions/currency  4, 5, 6, 16a, 16b, 16c, 16d, 16e, 16f, 16g
+contributions/currency-corba  16b
+contributions/currency-jms  16c
+contributions/currency-jsp  16f
+contributions/currency-rmi  16d
+contributions/currency-servlet  16g
+contributions/currency-ws  16e
 contributions/databinding-client  9
-contributions/emailgateway  13a, 13b
+contributions/emailgateway  15a, 15b, 15g
 contributions/feed-logger  10
 contributions/flight  4, 5, 6
 contributions/fullapp-bespoketrip  5, 6
@@ -671,22 +737,28 @@ contributions/interaction-service-remote
 contributions/introducing-client  2, 3
 contributions/introducing-tours  2, 3
 contributions/introducing-trips  1, 2, 3, 7
-contributions/notification  16a, 16b, 16c, 16d
-contributions/notification-corba  16a
-contributions/notification-ejb  16b
-contributions/notification-jms  16c
-contributions/notification-rmi  16d
-contributions/payment-bpel  13a
-contributions/payment-bpel-process  13a
-contributions/payment-groovy  13b
-contributions/payment-java  9, 13c
-contributions/payment-java-policy  12, 13d
-contributions/payment-spring  13e
+contributions/notification  17a, 17b, 17c, 17d, 17e
+contributions/notification-corba  17a
+contributions/notification-ejb  17b
+contributions/notification-jms  17c
+contributions/notification-rmi  17d
+contributions/notification-ws  17e
+contributions/payment-bpel  15a
+contributions/payment-bpel-process  15a
+contributions/payment-groovy  15b
+contributions/payment-java  9, 15c
+contributions/payment-java-callback  15d
+contributions/payment-java-policy  12, 15e
+contributions/payment-java-reference-pass  15f
+contributions/payment-python  15g
+contributions/payment-spring  15h
 contributions/payment-spring-policy  5, 6
-contributions/payment-spring-scatag  13f
+contributions/payment-spring-scatag  15i
 contributions/policy-client  12
 contributions/scatours  5, 6
 contributions/shoppingcart  4, 5, 6
 contributions/travelcatalog  5, 6
 contributions/trip  5, 6
 contributions/tripbooking  5, 6
+contributions/trip-policy  12
+contributions/using  13

Modified: tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/distribution/src/main/release/RELEASE_NOTES
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/distribution/src/main/release/RELEASE_NOTES?rev=944662&r1=944661&r2=944662&view=diff
==============================================================================
--- tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/distribution/src/main/release/RELEASE_NOTES (original)
+++ tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/distribution/src/main/release/RELEASE_NOTES Sat May 15 15:13:16 2010
@@ -18,11 +18,13 @@ separate package. This matches how user 
 and makes it easier for Apache Tuscany users to use the travel sample
 as a template for developing and packaging their own applications.
 
-The travel sample distribution contains source code and build files.
-It doesn't contain binaries because one of the major purposes of this
-sample is to show users how to build and run an Apache Tuscany
-application from source code. The travel sample BUILDING file gives
-details of the steps needed to do this.
+The travel sample distribution contains source code and build files for
+the travel sample, together with binary dependencies of the travel sample
+that aren't included in the Apache Tuscany SCA Java binary distribution.
+The distribution doesn't include binaries for the travel sample because
+one of the major purposes of this sample is to show users how to build
+and run an Apache Tuscany application from source code. See the BUILDING
+and README files for details of the steps needed to do this.
 
 See the travel sample CHANGES file for a detailed list of new features
 and bug fixes in this release.