You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by an...@apache.org on 2007/06/22 13:09:23 UTC

svn commit: r549780 - in /incubator/tuscany/java/sca/modules/implementation-osgi: LICENSE NOTICE

Author: antelder
Date: Fri Jun 22 04:09:22 2007
New Revision: 549780

URL: http://svn.apache.org/viewvc?view=rev&rev=549780
Log:
Update legal files

Modified:
    incubator/tuscany/java/sca/modules/implementation-osgi/LICENSE
    incubator/tuscany/java/sca/modules/implementation-osgi/NOTICE

Modified: incubator/tuscany/java/sca/modules/implementation-osgi/LICENSE
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-osgi/LICENSE?view=diff&rev=549780&r1=549779&r2=549780
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-osgi/LICENSE (original)
+++ incubator/tuscany/java/sca/modules/implementation-osgi/LICENSE Fri Jun 22 04:09:22 2007
@@ -201,51 +201,3 @@
    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.
-
-=================================================================================================================
-
-This module implementation-script temporarily includes one file under the following BSD license:
-
- Copyright (c) 2006, Sun Microsystems, Inc.
- All rights reserved.
- 
- Redistribution and use in source and binary forms, with or without 
- modification, are permitted provided that the following conditions are met:
- 
-  - Redistributions of source code must retain the above copyright notice, this 
-    list of conditions and the following disclaimer.
- 
-  - 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.
- 
-  - Neither the name of the Sun Microsystems, Inc. nor the names of 
-    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. 
-
-=================================================================================================================

Modified: incubator/tuscany/java/sca/modules/implementation-osgi/NOTICE
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-osgi/NOTICE?view=diff&rev=549780&r1=549779&r2=549780
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-osgi/NOTICE (original)
+++ incubator/tuscany/java/sca/modules/implementation-osgi/NOTICE Fri Jun 22 04:09:22 2007
@@ -9,9 +9,3 @@
 A copy of the AL is provided with this distribution as the LICENSE file present in the
 root directory, and is also available at http://www.apache.org/licenses/.
 
-This product also includes software under the BSD license 
-(see the LICENSE file contained in this distribution), with
-the following copyright:
-
-Copyright (c) 2006, Sun Microsystems, Inc.
-All rights reserved.



---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org