INTEGRATION: CWS ooo19126 (1.1.1.1.86); FILE MERGED

2005/09/05 17:02:17 rt 1.1.1.1.86.1: #i54170# Change license header: remove SISSL

2 files changed, 42 insertions, 95 deletions

diff --git a/xmlsecurity/tools/uno/XMLTreeCellRanderer.java b/xmlsecurity/tools/uno/XMLTreeCellRanderer.java
index 77599eb1c..0ecab2247 100644
--- a/xmlsecurity/tools/uno/XMLTreeCellRanderer.java
+++ b/xmlsecurity/tools/uno/XMLTreeCellRanderer.java
@@ -1,61 +1,35 @@
 /*************************************************************************
  *
- *	$RCSfile: XMLTreeCellRanderer.java,v $
+ *  OpenOffice.org - a multi-platform office productivity suite
  *
- *	$Revision: 1.1.1.1 $
+ *  $RCSfile: XMLTreeCellRanderer.java,v $
  *
- *	last change: $Author: mt $ $Date: 2004-07-12 13:15:24 $
+ *  $Revision: 1.2 $
  *
- *	The Contents of this file are made available subject to the terms of
- *	either of the following licenses
+ *  last change: $Author: rt $ $Date: 2005-09-09 17:45:52 $
  *
- *		   - GNU Lesser General Public License Version 2.1
- *		   - Sun Industry Standards Source License Version 1.1
+ *  The Contents of this file are made available subject to
+ *  the terms of GNU Lesser General Public License Version 2.1.
  *
- *	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
+ *    GNU Lesser General Public License Version 2.1
+ *    =============================================
+ *    Copyright 2005 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 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
- *
- *
- *	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.
- *
- *	Software provided under this License is provided on an "AS IS" basis,
- *	WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
- *	WITHOUT LIMITATION, WARRANTIES 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 Initial Developer of the Original Code is: Sun Microsystems, Inc.
- *
- *	Copyright: 2000 by Sun Microsystems, Inc.
- *
- *	All Rights Reserved.
- *
- *	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
  *
  ************************************************************************/
 
diff --git a/xmlsecurity/tools/uno/makefile.mk b/xmlsecurity/tools/uno/makefile.mk
index 595a3ebc8..45c447312 100644
--- a/xmlsecurity/tools/uno/makefile.mk
+++ b/xmlsecurity/tools/uno/makefile.mk
@@ -1,62 +1,35 @@
 #*************************************************************************
 #
-#   $RCSfile: makefile.mk,v $
-#
-#   $Revision: 1.1.1.1 $
-#
-#   last change: $Author: mt $ $Date: 2004-07-12 13:15: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
-#
-#   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
+#   OpenOffice.org - a multi-platform office productivity suite
 #
+#   $RCSfile: makefile.mk,v $
 #
-#   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.
+#   $Revision: 1.2 $
 #
-#   Software provided under this License is provided on an "AS IS" basis,
-#   WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-#   WITHOUT LIMITATION, WARRANTIES 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.
+#   last change: $Author: rt $ $Date: 2005-09-09 17:46:07 $
 #
-#   The Initial Developer of the Original Code is: Sun Microsystems, Inc.
+#   The Contents of this file are made available subject to
+#   the terms of GNU Lesser General Public License Version 2.1.
 #
-#   Copyright: 2000 by Sun Microsystems, Inc.
 #
-#   All Rights Reserved.
+#     GNU Lesser General Public License Version 2.1
+#     =============================================
+#     Copyright 2005 by Sun Microsystems, Inc.
+#     901 San Antonio Road, Palo Alto, CA 94303, USA
 #
-#   Contributor(s): _______________________________________
+#     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
 #
 #*************************************************************************