diff options
| author | nash <nash@13f79535-47bb-0310-9956-ffa450edef68> | 2010-11-02 21:27:11 +0000 |
|---|---|---|
| committer | nash <nash@13f79535-47bb-0310-9956-ffa450edef68> | 2010-11-02 21:27:11 +0000 |
| commit | 75d0f6c142c6b8bfd6f6de8d4919ea4b70921542 (patch) | |
| tree | 6979856dfed7f91c71759b233ee3db524677cbdf /sca-java-1.x/trunk/modules/implementation-script | |
| parent | 82559b1bbb5f3a5e093f21fd59392e7cacd29e16 (diff) | |
Merge r1030212 TUSCANY-3764: Fix problems and inconsistencies in LICENSE and NOTICE files
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1030233 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'sca-java-1.x/trunk/modules/implementation-script')
| -rw-r--r-- | sca-java-1.x/trunk/modules/implementation-script/LICENSE | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/sca-java-1.x/trunk/modules/implementation-script/LICENSE b/sca-java-1.x/trunk/modules/implementation-script/LICENSE index 4b5ab74408..567dfc5096 100644 --- a/sca-java-1.x/trunk/modules/implementation-script/LICENSE +++ b/sca-java-1.x/trunk/modules/implementation-script/LICENSE @@ -201,19 +201,19 @@ See the License for the specific language governing permissions and limitations under the License. -=============================================================================================================== -Apache Tuscany SCA for Java Subcomponents -=========================================: +================================================================================ -The Tuscany SCA for Java release includes a number of subcomponents with -separate copyright notices and license terms. Your use of the source -code for the these subcomponents is subject to the terms and -conditions of the following licenses. +APACHE TUSCANY SCA SUBCOMPONENTS: -================================================================================================================= +Apache Tuscany SCA for Java includes a number of subcomponents with +separate copyright notices and license terms. Your use of these subcomponents +is subject to the terms and conditions of the following licenses. -This module implementation-script temporarily includes one file under the following BSD license: +================================================================================ + +This module implementation-script temporarily includes one file under the +following BSD license: Copyright (c) 2006, Sun Microsystems, Inc. All rights reserved. @@ -248,4 +248,4 @@ This module implementation-script temporarily includes one file under the follow SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -================================================================================================================= +================================================================================ |