INTEGRATION: CWS ooo19126 (1.1.90); FILE MERGED

2005/09/05 12:05:39 rt 1.1.90.1: #i54170# Change license header: remove SISSL

2 files changed, 31 insertions, 57 deletions

diff --git a/scripting/workben/installer/Scripting.JavaScript.xcu b/scripting/workben/installer/Scripting.JavaScript.xcu
index 12c5b0ee22..388548e2ba 100755
--- a/scripting/workben/installer/Scripting.JavaScript.xcu
+++ b/scripting/workben/installer/Scripting.JavaScript.xcu
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<oor:node xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" oor:name="Scripting" oor:package="org.openoffice.Office">

-    <node oor:name="ScriptRuntimes">

-        <node oor:name="JavaScript" oor:op="replace">

-            <prop oor:name="SupportedFileExtensions">

-                <value xml:lang="en-US">js</value>

-            </prop>

-        </node>

-    </node>

-</oor:node>

+<?xml version="1.0" encoding="UTF-8"?>
+<oor:node xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" oor:name="Scripting" oor:package="org.openoffice.Office">
+    <node oor:name="ScriptRuntimes">
+        <node oor:name="JavaScript" oor:op="replace">
+            <prop oor:name="SupportedFileExtensions">
+                <value xml:lang="en-US">js</value>
+            </prop>
+        </node>
+    </node>
+</oor:node>
diff --git a/scripting/workben/installer/Scripting.xcs b/scripting/workben/installer/Scripting.xcs
index f3b502817f..a38f0121d8 100644
--- a/scripting/workben/installer/Scripting.xcs
+++ b/scripting/workben/installer/Scripting.xcs
@@ -1,62 +1,36 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--***********************************************************************
  *
- *  $RCSfile: Scripting.xcs,v $
- *
- *  $Revision: 1.1 $
- *
- *  last change: $Author: dfoster $ $Date: 2003-05-29 14:20:24 $
- *
- *  The Contents of this file are made available subject to the terms of
- *  either of the following licenses
- *
- *         - GNU Lesser General Public License Version 2.1
- *         - Sun Industry Standards Source License Version 1.1
+ *  OpenOffice.org - a multi-platform office productivity suite
  *
- *  Sun Microsystems Inc., October, 2000
- *
- *  GNU Lesser General Public License Version 2.1
- *  =============================================
- *  Copyright 2000 by Sun Microsystems, Inc.
- *  901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *  This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Lesser General Public
- *  License version 2.1, as published by the Free Software Foundation.
- *
- *  This library is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *  Lesser General Public License for more details.
- *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *  MA  02111-1307  USA
+ *  $RCSfile: Scripting.xcs,v $
  *
+ *  $Revision: 1.2 $
  *
- *  Sun Industry Standards Source License Version 1.1
- *  =================================================
- *  The contents of this file are subject to the Sun Industry Standards
- *  Source License Version 1.1 (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.openoffice.org/license.html.
+ *  last change: $Author: rt $ $Date: 2005-09-09 02:46:13 $
  *
- *  Software provided under this License is provided on an "AS IS" basis,
- *  WITHOUT WARRUNTY OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING,
- *  WITHOUT LIMITATION, WARRUNTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
- *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
- *  See the License for the specific provisions governing your rights and
- *  obligations concerning the Software.
+ *  The Contents of this file are made available subject to
+ *  the terms of GNU Lesser General Public License Version 2.1.
  *
- *  The Initial Developer of the Original Code is: Sun Microsystems, Inc..
  *
- *  Copyright: 2000 by Sun Microsystems, Inc.
+ *    GNU Lesser General Public License Version 2.1
+ *    =============================================
+ *    Copyright 2005 by Sun Microsystems, Inc.
+ *    901 San Antonio Road, Palo Alto, CA 94303, USA
  *
- *  All Rights Reserved.
+ *    This library is free software; you can redistribute it and/or
+ *    modify it under the terms of the GNU Lesser General Public
+ *    License version 2.1, as published by the Free Software Foundation.
  *
- *  Contributor(s): _______________________________________
+ *    This library is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *    Lesser General Public License for more details.
  *
+ *    You should have received a copy of the GNU Lesser General Public
+ *    License along with this library; if not, write to the Free Software
+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ *    MA  02111-1307  USA
  *
  ************************************************************************ -->
 <!DOCTYPE oor:component-schema SYSTEM "../../../../component-schema.dtd">