Copy trunk to beta2 release branch. (I've not yet changed the version so that would need to be done first before the branch is used)

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1069272 13f79535-47bb-0310-9956-ffa450edef68

5 files changed, 766 insertions, 0 deletions

diff --git a/sca-java-2.x/branches/2.0-Beta2/distribution/tomcat/tomcat-war/src/main/assembly/war.xml b/sca-java-2.x/branches/2.0-Beta2/distribution/tomcat/tomcat-war/src/main/assembly/war.xml
new file mode 100644
index 0000000000..5c6dff5915
--- /dev/null
+++ b/sca-java-2.x/branches/2.0-Beta2/distribution/tomcat/tomcat-war/src/main/assembly/war.xml
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<assembly>
+  <id>war</id>
+  <formats>
+    <format>war</format>
+    <format>dir</format>
+  </formats>
+  <includeBaseDirectory>false</includeBaseDirectory>
+  <fileSets>
+    <fileSet>
+      <directory>${basedir}</directory>
+      <includes>
+        <include>README.txt</include>
+      </includes>
+    </fileSet>
+    <fileSet>
+      <directory>${basedir}/target/classes</directory>
+      <outputDirectory>/</outputDirectory>
+      <includes>
+        <include>README.txt</include>
+        <include>NOTICE.txt</include>
+        <include>LICENSE.txt</include>
+      </includes>
+    </fileSet>
+    <fileSet>
+      <directory>${basedir}/src/main/webapp</directory>
+      <outputDirectory>/</outputDirectory>
+    </fileSet>
+    <fileSet>
+      <directory>${basedir}/target/classes</directory>
+      <outputDirectory>/</outputDirectory>
+      <excludes>
+          <exclude>org/**</exclude>
+          <exclude>META-INF/LICENSE</exclude>
+          <exclude>META-INF/NOTICE</exclude>
+      </excludes>
+    </fileSet>
+    <fileSet>
+      <directory>${basedir}/target/classes</directory>
+      <outputDirectory>WEB-INF/classes</outputDirectory>
+    </fileSet>
+    <fileSet>
+      <directory>${basedir}/target</directory>
+      <outputDirectory>lib</outputDirectory>
+      <includes>
+        <include>tuscany-host*.jar</include>
+      </includes>
+    </fileSet>
+  </fileSets>
+  <dependencySets>
+    <dependencySet>
+      <outputDirectory>tuscany-lib</outputDirectory>
+      <scope>runtime</scope>
+      <excludes>
+          <exclude>org.apache.tomcat:catalina</exclude>
+          <exclude>org.apache.tomcat:annotations-api</exclude>
+          <exclude>org.apache.tomcat:juli</exclude>
+          <exclude>org.apache.tomcat:servlet-api</exclude>
+          <exclude>org.apache.tuscany.sca:tuscany-tomcat-hook</exclude>
+          <exclude>org.apache.tuscany.sca:tuscany-tomcat-servlet</exclude>
+          <exclude>org.codehaus.swizzle:swizzle-stream</exclude>
+      </excludes>
+    </dependencySet>
+    <dependencySet>
+      <outputDirectory>tomcat-lib</outputDirectory>
+      <scope>runtime</scope>
+      <includes>
+          <include>org.apache.tuscany.sca:tuscany-tomcat-hook</include>
+      </includes>
+    </dependencySet>
+    <dependencySet>
+      <outputDirectory>WEB-INF/lib</outputDirectory>
+      <scope>runtime</scope>
+      <includes>
+          <include>org.apache.tuscany.sca:tuscany-tomcat-servlet</include>
+          <include>org.codehaus.swizzle:swizzle-stream</include>
+      </includes>
+    </dependencySet>
+  </dependencySets>
+</assembly>
+
diff --git a/sca-java-2.x/branches/2.0-Beta2/distribution/tomcat/tomcat-war/src/main/webapp/LICENSE b/sca-java-2.x/branches/2.0-Beta2/distribution/tomcat/tomcat-war/src/main/webapp/LICENSE
new file mode 100644
index 0000000000..9b6255b8e1
--- /dev/null
+++ b/sca-java-2.x/branches/2.0-Beta2/distribution/tomcat/tomcat-war/src/main/webapp/LICENSE
@@ -0,0 +1,443 @@
+

+                                 Apache License

+                           Version 2.0, January 2004

+                        http://www.apache.org/licenses/

+

+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION

+

+   1. Definitions.

+

+      "License" shall mean the terms and conditions for use, reproduction,

+      and distribution as defined by Sections 1 through 9 of this document.

+

+      "Licensor" shall mean the copyright owner or entity authorized by

+      the copyright owner that is granting the License.

+

+      "Legal Entity" shall mean the union of the acting entity and all

+      other entities that control, are controlled by, or are under common

+      control with that entity. For the purposes of this definition,

+      "control" means (i) the power, direct or indirect, to cause the

+      direction or management of such entity, whether by contract or

+      otherwise, or (ii) ownership of fifty percent (50%) or more of the

+      outstanding shares, or (iii) beneficial ownership of such entity.

+

+      "You" (or "Your") shall mean an individual or Legal Entity

+      exercising permissions granted by this License.

+

+      "Source" form shall mean the preferred form for making modifications,

+      including but not limited to software source code, documentation

+      source, and configuration files.

+

+      "Object" form shall mean any form resulting from mechanical

+      transformation or translation of a Source form, including but

+      not limited to compiled object code, generated documentation,

+      and conversions to other media types.

+

+      "Work" shall mean the work of authorship, whether in Source or

+      Object form, made available under the License, as indicated by a

+      copyright notice that is included in or attached to the work

+      (an example is provided in the Appendix below).

+

+      "Derivative Works" shall mean any work, whether in Source or Object

+      form, that is based on (or derived from) the Work and for which the

+      editorial revisions, annotations, elaborations, or other modifications

+      represent, as a whole, an original work of authorship. For the purposes

+      of this License, Derivative Works shall not include works that remain

+      separable from, or merely link (or bind by name) to the interfaces of,

+      the Work and Derivative Works thereof.

+

+      "Contribution" shall mean any work of authorship, including

+      the original version of the Work and any modifications or additions

+      to that Work or Derivative Works thereof, that is intentionally

+      submitted to Licensor for inclusion in the Work by the copyright owner

+      or by an individual or Legal Entity authorized to submit on behalf of

+      the copyright owner. For the purposes of this definition, "submitted"

+      means any form of electronic, verbal, or written communication sent

+      to the Licensor or its representatives, including but not limited to

+      communication on electronic mailing lists, source code control systems,

+      and issue tracking systems that are managed by, or on behalf of, the

+      Licensor for the purpose of discussing and improving the Work, but

+      excluding communication that is conspicuously marked or otherwise

+      designated in writing by the copyright owner as "Not a Contribution."

+

+      "Contributor" shall mean Licensor and any individual or Legal Entity

+      on behalf of whom a Contribution has been received by Licensor and

+      subsequently incorporated within the Work.

+

+   2. Grant of Copyright License. Subject to the terms and conditions of

+      this License, each Contributor hereby grants to You a perpetual,

+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable

+      copyright license to reproduce, prepare Derivative Works of,

+      publicly display, publicly perform, sublicense, and distribute the

+      Work and such Derivative Works in Source or Object form.

+

+   3. Grant of Patent License. Subject to the terms and conditions of

+      this License, each Contributor hereby grants to You a perpetual,

+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable

+      (except as stated in this section) patent license to make, have made,

+      use, offer to sell, sell, import, and otherwise transfer the Work,

+      where such license applies only to those patent claims licensable

+      by such Contributor that are necessarily infringed by their

+      Contribution(s) alone or by combination of their Contribution(s)

+      with the Work to which such Contribution(s) was submitted. If You

+      institute patent litigation against any entity (including a

+      cross-claim or counterclaim in a lawsuit) alleging that the Work

+      or a Contribution incorporated within the Work constitutes direct

+      or contributory patent infringement, then any patent licenses

+      granted to You under this License for that Work shall terminate

+      as of the date such litigation is filed.

+

+   4. Redistribution. You may reproduce and distribute copies of the

+      Work or Derivative Works thereof in any medium, with or without

+      modifications, and in Source or Object form, provided that You

+      meet the following conditions:

+

+      (a) You must give any other recipients of the Work or

+          Derivative Works a copy of this License; and

+

+      (b) You must cause any modified files to carry prominent notices

+          stating that You changed the files; and

+

+      (c) You must retain, in the Source form of any Derivative Works

+          that You distribute, all copyright, patent, trademark, and

+          attribution notices from the Source form of the Work,

+          excluding those notices that do not pertain to any part of

+          the Derivative Works; and

+

+      (d) If the Work includes a "NOTICE" text file as part of its

+          distribution, then any Derivative Works that You distribute must

+          include a readable copy of the attribution notices contained

+          within such NOTICE file, excluding those notices that do not

+          pertain to any part of the Derivative Works, in at least one

+          of the following places: within a NOTICE text file distributed

+          as part of the Derivative Works; within the Source form or

+          documentation, if provided along with the Derivative Works; or,

+          within a display generated by the Derivative Works, if and

+          wherever such third-party notices normally appear. The contents

+          of the NOTICE file are for informational purposes only and

+          do not modify the License. You may add Your own attribution

+          notices within Derivative Works that You distribute, alongside

+          or as an addendum to the NOTICE text from the Work, provided

+          that such additional attribution notices cannot be construed

+          as modifying the License.

+

+      You may add Your own copyright statement to Your modifications and

+      may provide additional or different license terms and conditions

+      for use, reproduction, or distribution of Your modifications, or

+      for any such Derivative Works as a whole, provided Your use,

+      reproduction, and distribution of the Work otherwise complies with

+      the conditions stated in this License.

+

+   5. Submission of Contributions. Unless You explicitly state otherwise,

+      any Contribution intentionally submitted for inclusion in the Work

+      by You to the Licensor shall be under the terms and conditions of

+      this License, without any additional terms or conditions.

+      Notwithstanding the above, nothing herein shall supersede or modify

+      the terms of any separate license agreement you may have executed

+      with Licensor regarding such Contributions.

+

+   6. Trademarks. This License does not grant permission to use the trade

+      names, trademarks, service marks, or product names of the Licensor,

+      except as required for reasonable and customary use in describing the

+      origin of the Work and reproducing the content of the NOTICE file.

+

+   7. Disclaimer of Warranty. Unless required by applicable law or

+      agreed to in writing, Licensor provides the Work (and each

+      Contributor provides its Contributions) 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. You are solely responsible for determining the

+      appropriateness of using or redistributing the Work and assume any

+      risks associated with Your exercise of permissions under this License.

+

+   8. Limitation of Liability. In no event and under no legal theory,

+      whether in tort (including negligence), contract, or otherwise,

+      unless required by applicable law (such as deliberate and grossly

+      negligent acts) or agreed to in writing, shall any Contributor be

+      liable to You for damages, including any direct, indirect, special,

+      incidental, or consequential damages of any character arising as a

+      result of this License or out of the use or inability to use the

+      Work (including but not limited to damages for loss of goodwill,

+      work stoppage, computer failure or malfunction, or any and all

+      other commercial damages or losses), even if such Contributor

+      has been advised of the possibility of such damages.

+

+   9. Accepting Warranty or Additional Liability. While redistributing

+      the Work or Derivative Works thereof, You may choose to offer,

+      and charge a fee for, acceptance of support, warranty, indemnity,

+      or other liability obligations and/or rights consistent with this

+      License. However, in accepting such obligations, You may act only

+      on Your own behalf and on Your sole responsibility, not on behalf

+      of any other Contributor, and only if You agree to indemnify,

+      defend, and hold each Contributor harmless for any liability

+      incurred by, or claims asserted against, such Contributor by reason

+      of your accepting any such warranty or additional liability.

+

+   END OF TERMS AND CONDITIONS

+

+   APPENDIX: How to apply the Apache License to your work.

+

+      To apply the Apache License to your work, attach the following

+      boilerplate notice, with the fields enclosed by brackets "[]"

+      replaced with your own identifying information. (Don't include

+      the brackets!)  The text should be enclosed in the appropriate

+      comment syntax for the file format. We also recommend that a

+      file or class name and description of purpose be included on the

+      same "printed page" as the copyright notice for easier

+      identification within third-party archives.

+

+   Copyright [yyyy] [name of copyright owner]

+

+   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.

+

+

+===============================================================================

+

+APACHE TUSCANY SUBCOMPONENTS: 

+

+The Apache Tuscany binary 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

+

+ cglib-2.2.jar

+ swizzle-stream-1.0.2.jar

+ XmlSchema-1.4.3.jar

+

+===============================================================================

+

+WSDL4j (wsdl4j-1.6.2.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 claims 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 rights 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. 

+

+

+===============================================================================

+

+The asm-3.1.jar are distributed under the license:

+

+Copyright (c) 2000-2005 INRIA, France Telecom

+All rights reserved.

+

+Redistribution and use in source and binary forms, with or without

+modification, are permitted provided that the following conditions

+are met:

+

+1. Redistributions of source code must retain the above copyright

+   notice, this list of conditions and the following disclaimer.

+

+2. Redistributions in binary form must reproduce the above copyright

+   notice, this list of conditions and the following disclaimer in the

+   documentation and/or other materials provided with the distribution.

+

+3. Neither the name of the copyright holders nor the names of its

+   contributors may be used to endorse or promote products derived from

+   this software without specific prior written permission.

+

+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"

+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE

+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE

+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE

+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR

+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF

+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS

+INTERRUPTION) 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 OF THIS SOFTWARE, EVEN IF ADVISED OF

+THE POSSIBILITY OF SUCH DAMAGE.

+

+================================================================================

+

+The tuscany-base jar includes XSD files under the following SCA Collaboration license:

+

+License for the Service Component Architecture JavaDoc, Interface 

+Definition files and XSD files.

+

+The Service Component Architecture JavaDoc, Interface Definition files, 

+and XSD files are being provided by the copyright holders under the 

+following license. By using and/or copying this work, you agree that 

+you have read, understood and will comply with the following terms and 

+conditions:

+

+Permission to copy, display, make derivative works of, and distribute 

+the Service Component Architecture JavaDoc, Interface Definition Files 

+and XSD files (the "Artifacts") in any medium without fee or royalty is 

+hereby granted, provided that you include the following on ALL copies 

+of the Artifacts, or portions thereof, that you make: 

+

+1. A link or URL to the Artifacts at this location:

+http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications 

+

+2. The full text of this copyright notice as shown in the Artifacts.

+

+THE ARTIFACTS ARE PROVIDED "AS IS," AND THE AUTHORS MAKE NO 

+REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, REGARDING THE 

+ARTIFACTS AND THE IMPLEMENTATION OF THEIR CONTENTS, INCLUDING, BUT NOT 

+LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR 

+PURPOSE, NON-INFRINGEMENT OR TITLE.  

+

+THE AUTHORS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL, 

+INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF OR RELATING TO ANY 

+USE OR DISTRIBUTION OF THE ARTIFACTS.

+

+The name and trademarks of the Authors may NOT be used in any manner, 

+including advertising or publicity pertaining to the Service Component 

+Architecture Specification or its contents without specific, written 

+prior permission. Title to copyright in the Service Component 

+Architecture Specification and the JavaDoc, Interface Definition Files 

+and XSD Files will at all times remain with the Authors.

+

+No other rights are granted by implication, estoppel or otherwise.

+

+Revision level 1.1, last updated on 2007/11/19

+

+

+================================================================================

+

+The tuscany-base jar includes XSD files under the following OASIS license:

+

+All capitalized terms in the following text have the meanings assigned to them in the OASIS Intellectual 

+Property Rights Policy (the "OASIS IPR Policy"). The full Policy may be found at the OASIS website.

+This document and translations of it may be copied and furnished to others, and derivative works that 

+comment on or otherwise explain it or assist in its implementation may be prepared, copied, published, 

+and distributed, in whole or in part, without restriction of any kind, provided that the above copyright 

+notice and this section are included on all such copies and derivative works. However, this document 

+itself may not be modified in any way, including by removing the copyright notice or references to OASIS, 

+except as needed for the purpose of developing any document or deliverable produced by an OASIS 

+Technical Committee (in which case the rules applicable to copyrights, as set forth in the OASIS IPR 

+Policy, must be followed) or as required to translate it into languages other than English.

+The limited permissions granted above are perpetual and will not be revoked by OASIS or its successors 

+or assigns.

+This document and the information contained herein is provided on an "AS IS" basis and OASIS 

+DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY 

+WARRANTY THAT THE USE OF THE INFORMATION HEREIN WILL NOT INFRINGE ANY OWNERSHIP 

+RIGHTS OR ANY IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR 

+PURPOSE.

+OASIS requests that any OASIS Party or any other party that believes it has patent claims that would 

+necessarily be infringed by implementations of this OASIS Committee Specification or OASIS Standard, 

+to notify OASIS TC Administrator and provide an indication of its willingness to grant patent licenses to 

+such patent claims in a manner consistent with the IPR Mode of the OASIS Technical Committee that 

+produced this specification.

+OASIS invites any party to contact the OASIS TC Administrator if it is aware of a claim of ownership of 

+any patent claims that would necessarily be infringed by implementations of this specification by a patent 

+holder that is not willing to provide a license to such patent claims in a manner consistent with the IPR 

+Mode of the OASIS Technical Committee that produced this specification. OASIS may include such 

+claims on its website, but disclaims any obligation to do so.

+OASIS takes no position regarding the validity or scope of any intellectual property or other rights that 

+might be claimed to pertain to the implementation or use of the technology described in this document or 

+the extent to which any license under such rights might or might not be available; neither does it represent 

+that it has made any effort to identify any such rights. Information on OASIS' procedures with respect to 

+rights in any document or deliverable produced by an OASIS Technical Committee can be found on the 

+OASIS website. Copies of claims of rights made available for publication and any assurances of licenses 

+to be made available, or the result of an attempt made to obtain a general license or permission for the use 

+of such proprietary rights by implementers or users of this OASIS Committee Specification or OASIS 

+Standard, can be obtained from the OASIS TC Administrator. OASIS makes no representation that any 

+information or list of intellectual property rights will at any time be complete, or that any claims in such list 

+are, in fact, Essential Claims.

+The names "OASIS",  are trademarks of OASIS, the owner and developer of this specification, and should 

+be used only to refer to the organization and its official outputs. OASIS welcomes reference to, and 

+implementation and use of, specifications, while reserving the right to enforce its marks against misleading 

+uses. Please see http://www.oasis-open.org/who/trademark.php for above guidance.

+

+

+================================================================================

+

diff --git a/sca-java-2.x/branches/2.0-Beta2/distribution/tomcat/tomcat-war/src/main/webapp/NOTICE b/sca-java-2.x/branches/2.0-Beta2/distribution/tomcat/tomcat-war/src/main/webapp/NOTICE
new file mode 100644
index 0000000000..62e8bed22e
--- /dev/null
+++ b/sca-java-2.x/branches/2.0-Beta2/distribution/tomcat/tomcat-war/src/main/webapp/NOTICE
@@ -0,0 +1,79 @@
+Apache Tuscany

+Copyright (c) 2005 - 2011 The Apache Software Foundation

+

+This product includes software developed at

+The Apache Software Foundation (http://www.apache.org/).

+

+This product includes/uses the Axion : the Open Source Java Database (http://axion.tigris.org/)

+ Copyright (c) 2002-2003 Axion Development Team. All rights reserved.

+

+This product includes/uses XmlSchema developed at 

+The Apache Software Foundation (http://ws.apache.org/commons/XmlSchema)

+ Portions Copyright 2006 International Business Machines Corp.

+

+This product includes/uses the Jetty Servlet Engine (http://jetty.mortbay.org),

+developed by Mort Bay Consulting  (http://www.mortbay.com)

+

+This product includes/uses DOM4J : the flexible XML framework for java (http://www.dom4j.org/) 

+ Copyright 2001-2005 (C) MetaStuff, Ltd. All Rights Reserved.

+

+This product includes/uses software, AOP alliance (http://aopalliance.sourceforge.net)

+License: Public Domain 

+

+This product includes/uses javacc (https://javacc.dev.java.net/)

+ Copyright (c) 2003 Sun Microsystems, Inc. All  Rights Reserved.

+

+This product includes software from the GlassFish project (https://glassfish.dev.java.net/)

+    Copyright (c) 2006, Sun Microsystems, Inc.

+    

+This product includes/uses the Sourceforge wsdl4j project (http://sourceforge.net/projects/wsdl4j/)

+

+This product includes/uses JDOM (http://www.jdom.org/)

+ Copyright (C) 2000-2004 Jason Hunter & Brett McLaughlin. All rights reserved.

+

+This product includes/uses javacc (https://javacc.dev.java.net/)

+ Copyright (c) 2003 Sun Microsystems, Inc. All  Rights Reserved.

+

+This product includes/uses ASM (http://asm.objectweb.org)

+   Copyright (c) 2000-2005 INRIA, France Telecom. All rights reserved.

+

+This product includes/uses Jaxen (http://jaxen.codehaus.org/)

+   Copyright 2003-2006 The Werken Company. All Rights Reserved.

+

+This product includes/uses Serp (http://serp.sourceforge.net/) under the BSD license:

+ Copyright (c) 2002, A. Abram White. All rights reserved.

+

+This product also includes software under the BSD license

+with the following copyright:

+ Copyright (c) 2006, Sun Microsystems, Inc. All rights reserved.

+

+The Program includes all or portions of the following software: "The 

+Saxon XSLT and XQuery Processor from Saxonica Limited" distributed under

+an MPL v1.0 license. Please refer to the homepage URL at 

+http://www.saxonica.com/.

+

+This product includes/uses Serp (http://serp.sourceforge.net/) under the BSD license:

+ Copyright (c) 2002, A. Abram White. All rights reserved.

+

+This product also includes "OSGi Materials."

+ Copyright (c) 2000, 2006

+ OSGi Alliance Bishop Ranch 6

+ 2400 Camino Ramon, Suite 375

+ San Ramon, CA 94583 USA

+ All Rights Reserved. 

+

+This product includes software under the Service Component Architecture JavaDoc, 

+Interface Definition files and XSD files license.

+  (c) Copyright SCA Collaboration 2006, 2007

+

+This product includes software under the Service Data Objects JavaDoc and 

+Interface Definition file license

+

+(c) Copyright BEA Systems, Inc., International Business Machines Corporation, 

+Oracle Corporation, Primeton Technologies Ltd., Rogue Wave Software, SAP AG., 

+Software AG., Sun Microsystems, Sybase Inc., Xcalia, Zend Technologies, 

+2005, 2006. All rights reserved.

+

+This product includes software under the OASIS license

+Copyright (C) OASIS(R) 2005, 2009. All Rights Reserved.

+

diff --git a/sca-java-2.x/branches/2.0-Beta2/distribution/tomcat/tomcat-war/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/branches/2.0-Beta2/distribution/tomcat/tomcat-war/src/main/webapp/WEB-INF/web.xml
new file mode 100644
index 0000000000..e6c3d23e9e
--- /dev/null
+++ b/sca-java-2.x/branches/2.0-Beta2/distribution/tomcat/tomcat-war/src/main/webapp/WEB-INF/web.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<!DOCTYPE web-app
+    PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
+    "http://java.sun.com/dtd/web-app_2_3.dtd">
+
+<web-app>
+
+  <display-name>Tuscany Installer Application</display-name>
+
+  <servlet>
+    <servlet-name>InstallerServlet</servlet-name>
+    <servlet-class>org.apache.tuscany.sca.war.InstallerServlet</servlet-class>
+  </servlet>
+
+  <servlet-mapping>
+    <servlet-name>InstallerServlet</servlet-name>
+    <url-pattern>/installer</url-pattern>
+  </servlet-mapping>
+
+  <welcome-file-list id="WelcomeFileList">
+    <welcome-file>installer.jsp</welcome-file>
+  </welcome-file-list>
+
+</web-app>
diff --git a/sca-java-2.x/branches/2.0-Beta2/distribution/tomcat/tomcat-war/src/main/webapp/installer.jsp b/sca-java-2.x/branches/2.0-Beta2/distribution/tomcat/tomcat-war/src/main/webapp/installer.jsp
new file mode 100644
index 0000000000..68fd5101b3
--- /dev/null
+++ b/sca-java-2.x/branches/2.0-Beta2/distribution/tomcat/tomcat-war/src/main/webapp/installer.jsp
@@ -0,0 +1,106 @@
+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, either express or implied.  See the License for the

+ * specific language governing permissions and limitations

+ * under the License.    

+-->

+

+<%@ page contentType="text/html;charset=UTF-8" language="java" %>

+<%@ page import="org.apache.tuscany.sca.war.Installer" %>

+

+<%

+    Installer installer = (Installer) request.getAttribute("installer");

+%>

+

+<html>

+  <body >

+

+    <h2>Apache Tuscany Tomcat Integration</h2>

+

+    The Tuscany Tomcat integration turns Tomcat into an SCA enabled runtime so it can run SCA contributions and SCA-enabled Web Applications.

+    <p>

+

+    Status: Tuscany is <B>

+       <% if (Installer.isTuscanyHookRunning()) { %>

+          installed and active

+       <% } else if (Installer.isRestartRequired()) {%>

+          installed but Tomcat needs to be restarted

+       <% } else {%>

+          not installed

+       <% }%>

+    </B> 

+    in Tomcat.

+    <p>    

+

+    <% if (!Installer.isTuscanyHookRunning() && !Installer.isRestartRequired()) { %>

+       <B>Install Tuscany</B><BR>

+       To install Tuscany into Tomcat, click:

+                <form action='installer' method='post'>

+                <input type='submit' name='action' value='Install'>

+                </form>

+       <BR>

+   <% } else {%>

+       <B>Uninstall Tuscany</B><BR>

+       If remove Tuscany from Tomcat, click:

+                <form action='installer' method='post'>

+                <input type='submit' name='action' value='Uninstall'>

+                </form>

+       <BR>

+   <% }%>

+

+    <p>

+    <BR>

+

+    <B> 

+    <% if (installer != null) { %>

+    <%=    installer.getStatus()  %>

+    <% }%>

+    </B> 

+

+

+    <p>

+    <h2>What does this do?</h2>

+

+     This Tuscany install makes two updates to Tomcat:

+     <UL>

+       <LI>copies the jars from the tomcat-lib directory in this webapp into the Tomcat lib directory 

+       <LI>updates the Tomcat conf/server.xml to include a &lt;Listener&gt; definition for Tuscany

+     </UL>

+     Those changes cause the Tuscany listener to be called at Tomcat startup and that locates all the Host

+     defiinitions and patches them to use the TuscanyStandardContext. This enables support for deploying

+     SCA enabled webapps and plain SCA jar, zip, or folder contributions to the Host in the same way 

+     that .war files are deployed. 

+    <p>

+    The SCA domain used for running the contributions defaults to "vm:default". This can be configured 

+    by using an initilization parameter, most easiliy by defining that parameter in a context.xml file.

+    The Tomcat file conf/context.xml file defines the global defaults so that can be used for setting the 

+    deafult domain for all SCA contributions. Individual contributions can also use their own context.xml

+    files to override that default. 

+    See the <a href="http://tomcat.apache.org/tomcat-6.0-doc/config/context.html">Tomcat doc</a> for more information on using context.xml files. 

+    <p>

+    An example of setting the domain as a context.xml parameter:

+       <br>&lt;Context&gt;

+          <br>. . .

+          <br>&lt;Parameter name="org.apache.tuscany.sca.defaultDomainURI" value="tribes:myDomain"/&gt;

+          <br>. . .

+       <br>&lt;/Context&gt;

+    <p>

+    For more information visit the Tuscany website page on <a href="http://tuscany.apache.org/tuscany-tomcat-distribution.html">Tomcat Integration</a>.

+    <p>

+    Note also that this is work in progress so is liable to change as Tuscany 2.0 is developed. Feedback is welcome and appreciated so if you've any comments or requests on this Tomcat integration please email <href="mailto:dev@tuscany.apache.org">dev@tuscany.apache.org</a>.

+    <p>

+

+  </body>

+</html>