From 7d9799a55d37354b88f1dab22ca34f962e88c18c Mon Sep 17 00:00:00 2001 From: Rüdiger Timm Date: Fri, 11 Apr 2008 10:12:25 +0000 Subject: INTEGRATION: CWS changefileheader (1.5.64); FILE MERGED 2008/03/31 07:24:23 rt 1.5.64.1: #i87441# Change license header to LPGL v3. --- jurt/com/sun/star/comp/connections/makefile.mk | 42 +++++++++----------- .../com/sun/star/comp/urlresolver/UrlResolver.java | 45 ++++++++++------------ 2 files changed, 39 insertions(+), 48 deletions(-) (limited to 'jurt/com') diff --git a/jurt/com/sun/star/comp/connections/makefile.mk b/jurt/com/sun/star/comp/connections/makefile.mk index f5699a5db..02f536af5 100644 --- a/jurt/com/sun/star/comp/connections/makefile.mk +++ b/jurt/com/sun/star/comp/connections/makefile.mk @@ -1,35 +1,31 @@ #************************************************************************* # -# OpenOffice.org - a multi-platform office productivity suite +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2008 by Sun Microsystems, Inc. # -# $RCSfile: makefile.mk,v $ +# OpenOffice.org - a multi-platform office productivity suite # -# $Revision: 1.5 $ +# $RCSfile: makefile.mk,v $ # -# last change: $Author: rt $ $Date: 2005-09-07 18:50:46 $ +# $Revision: 1.6 $ # -# The Contents of this file are made available subject to -# the terms of GNU Lesser General Public License Version 2.1. +# This file is part of OpenOffice.org. # +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. # -# GNU Lesser General Public License Version 2.1 -# ============================================= -# Copyright 2005 by Sun Microsystems, Inc. -# 901 San Antonio Road, Palo Alto, CA 94303, USA +# OpenOffice.org 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 version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). # -# 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 +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# +# for a copy of the LGPLv3 License. # #************************************************************************* diff --git a/jurt/com/sun/star/comp/urlresolver/UrlResolver.java b/jurt/com/sun/star/comp/urlresolver/UrlResolver.java index 36a77f51e..902d62bc6 100644 --- a/jurt/com/sun/star/comp/urlresolver/UrlResolver.java +++ b/jurt/com/sun/star/comp/urlresolver/UrlResolver.java @@ -1,35 +1,30 @@ /************************************************************************* * - * OpenOffice.org - a multi-platform office productivity suite + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2008 by Sun Microsystems, Inc. * - * $RCSfile: UrlResolver.java,v $ + * OpenOffice.org - a multi-platform office productivity suite * - * $Revision: 1.5 $ + * $RCSfile: UrlResolver.java,v $ + * $Revision: 1.6 $ * - * last change: $Author: rt $ $Date: 2005-09-07 18:53:03 $ + * This file is part of OpenOffice.org. * - * The Contents of this file are made available subject to - * the terms of GNU Lesser General Public License Version 2.1. + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. * + * OpenOffice.org 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 version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). * - * 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 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 + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * + * for a copy of the LGPLv3 License. * ************************************************************************/ @@ -64,7 +59,7 @@ import com.sun.star.uno.UnoRuntime; /** * This component gives a factory for an UnoUrlResolver service. *

- * @version $Revision: 1.5 $ $ $Date: 2005-09-07 18:53:03 $ + * @version $Revision: 1.6 $ $ $Date: 2008-04-11 11:12:25 $ * @author Kay Ramme * @see com.sun.star.brige.XBrideFactory * @see com.sun.star.connection.Connector -- cgit v1.2.3