Merging the 1.x delta on top of the equinox based modules

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

1 files changed, 5 insertions, 16 deletions

diff --git a/java/sca/modules/host-webapp/src/main/resources/META-INF/sca.tld b/java/sca/modules/host-webapp/src/main/resources/META-INF/sca.tld
index 089cdc1607..91ee6cb922 100644
--- a/java/sca/modules/host-webapp/src/main/resources/META-INF/sca.tld
+++ b/java/sca/modules/host-webapp/src/main/resources/META-INF/sca.tld
@@ -1,21 +1,10 @@
 <?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.    

+(c) Copyright BEA Systems, Inc., Cape Clear Software, International Business Machines Corp, Interface21, IONA

+Technologies, Oracle, Primeton Technologies, Progress Software, Red Hat, Rogue Wave Software, SAP AG., Siemens

+AG., Software AG., Sun Microsystems, Inc., Sybase Inc., TIBCO Software Inc., 2005, 2008. All rights reserved.

+

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

  -->

 

 <!DOCTYPE taglib PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN" "http://java.sun.com/xml/ns/javaee/web-jsptaglibrary_2_1.xsd">