You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ar...@apache.org on 2012/01/19 01:56:10 UTC
svn commit: r1233144 - in /incubator/ooo/trunk/main:
extras/source/templates/wizard/web/lang/ l10ntools/scripts/
migrationanalysis/src/wizard/ ure/source/uretest/
xmerge/source/xmerge/java/org/openoffice/xmerge/util/
Author: arist
Date: Thu Jan 19 00:56:10 2012
New Revision: 1233144
URL: http://svn.apache.org/viewvc?rev=1233144&view=rev
Log:
Update headers to Alv2 headers
Modified:
incubator/ooo/trunk/main/extras/source/templates/wizard/web/lang/makefile.mk
incubator/ooo/trunk/main/l10ntools/scripts/localize.pl
incubator/ooo/trunk/main/l10ntools/scripts/localize_old.pl
incubator/ooo/trunk/main/migrationanalysis/src/wizard/Get Directory Dialog.bas
incubator/ooo/trunk/main/ure/source/uretest/Makefile.pln
incubator/ooo/trunk/main/xmerge/source/xmerge/java/org/openoffice/xmerge/util/resources.properties
Modified: incubator/ooo/trunk/main/extras/source/templates/wizard/web/lang/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/extras/source/templates/wizard/web/lang/makefile.mk?rev=1233144&r1=1233143&r2=1233144&view=diff
==============================================================================
--- incubator/ooo/trunk/main/extras/source/templates/wizard/web/lang/makefile.mk (original)
+++ incubator/ooo/trunk/main/extras/source/templates/wizard/web/lang/makefile.mk Thu Jan 19 00:56:10 2012
@@ -1,29 +1,23 @@
-#/*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# 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.
-#
-# 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).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
+#**************************************************************
+#
+# 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.
+#
+#**************************************************************
PRJ=..$/..$/..$/..$/..
Modified: incubator/ooo/trunk/main/l10ntools/scripts/localize.pl
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/l10ntools/scripts/localize.pl?rev=1233144&r1=1233143&r2=1233144&view=diff
==============================================================================
--- incubator/ooo/trunk/main/l10ntools/scripts/localize.pl (original)
+++ incubator/ooo/trunk/main/l10ntools/scripts/localize.pl Thu Jan 19 00:56:10 2012
@@ -273,32 +273,26 @@ sub get_license_header{
"#\n".
"# DO NOT EDIT! This file will be overwritten by localisation process\n".
"#\n".
-"#*************************************************************************\n".
-"#\n".
-"# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.\n".
-"# \n".
-"# Copyright 2000, 2010 Oracle and/or its affiliates.\n".
-"#\n".
-"# OpenOffice.org - a multi-platform office productivity suite\n".
-"#\n".
-"# This file is part of OpenOffice.org.\n".
-"#\n".
-"# OpenOffice.org is free software: you can redistribute it and/or modify\n".
-"# it under the terms of the GNU Lesser General Public License version 3\n".
-"# only, as published by the Free Software Foundation.\n".
-"#\n".
-"# OpenOffice.org is distributed in the hope that it will be useful,\n".
-"# but WITHOUT ANY WARRANTY; without even the implied warranty of\n".
-"# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n".
-"# GNU Lesser General Public License version 3 for more details\n".
-"# (a copy is included in the LICENSE file that accompanied this code).\n".
-"#\n".
-"# You should have received a copy of the GNU Lesser General Public License\n".
-"# version 3 along with OpenOffice.org. If not, see\n".
-"# <http://www.openoffice.org/license.html>\n".
-"# for a copy of the LGPLv3 License.\n".
-"#\n".
-"#*************************************************************************\n";
+"#**************************************************************\n".
+"# \n".
+"# Licensed to the Apache Software Foundation (ASF) under one\n".
+"# or more contributor license agreements. See the NOTICE file\n".
+"# distributed with this work for additional information\n".
+"# regarding copyright ownership. The ASF licenses this file\n".
+"# to you under the Apache License, Version 2.0 (the\n".
+"# "License"); you may not use this file except in compliance\n".
+"# with the License. You may obtain a copy of the License at\n".
+"# \n".
+"# http://www.apache.org/licenses/LICENSE-2.0\n".
+"# \n".
+"# Unless required by applicable law or agreed to in writing,\n".
+"# software distributed under the License is distributed on an\n".
+"# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY\n".
+"# KIND, either express or implied. See the License for the\n".
+"# specific language governing permissions and limitations\n".
+"# under the License.\n".
+"# \n".
+"#**************************************************************\n";
}
######## Check input sdf file and use only the correct part
sub merge_gsicheck{
Modified: incubator/ooo/trunk/main/l10ntools/scripts/localize_old.pl
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/l10ntools/scripts/localize_old.pl?rev=1233144&r1=1233143&r2=1233144&view=diff
==============================================================================
--- incubator/ooo/trunk/main/l10ntools/scripts/localize_old.pl (original)
+++ incubator/ooo/trunk/main/l10ntools/scripts/localize_old.pl Thu Jan 19 00:56:10 2012
@@ -270,32 +270,26 @@ sub get_license_header{
"#\n".
"# DO NOT EDIT! This file will be overwritten by localisation process\n".
"#\n".
-"#*************************************************************************\n".
-"#\n".
-"# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.\n".
-"# \n".
-"# Copyright 2000, 2010 Oracle and/or its affiliates.\n".
-"#\n".
-"# OpenOffice.org - a multi-platform office productivity suite\n".
-"#\n".
-"# This file is part of OpenOffice.org.\n".
-"#\n".
-"# OpenOffice.org is free software: you can redistribute it and/or modify\n".
-"# it under the terms of the GNU Lesser General Public License version 3\n".
-"# only, as published by the Free Software Foundation.\n".
-"#\n".
-"# OpenOffice.org is distributed in the hope that it will be useful,\n".
-"# but WITHOUT ANY WARRANTY; without even the implied warranty of\n".
-"# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n".
-"# GNU Lesser General Public License version 3 for more details\n".
-"# (a copy is included in the LICENSE file that accompanied this code).\n".
-"#\n".
-"# You should have received a copy of the GNU Lesser General Public License\n".
-"# version 3 along with OpenOffice.org. If not, see\n".
-"# <http://www.openoffice.org/license.html>\n".
-"# for a copy of the LGPLv3 License.\n".
-"#\n".
-"#*************************************************************************\n";
+"#**************************************************************\n".
+"# \n".
+"# Licensed to the Apache Software Foundation (ASF) under one\n".
+"# or more contributor license agreements. See the NOTICE file\n".
+"# distributed with this work for additional information\n".
+"# regarding copyright ownership. The ASF licenses this file\n".
+"# to you under the Apache License, Version 2.0 (the\n".
+"# "License"); you may not use this file except in compliance\n".
+"# with the License. You may obtain a copy of the License at\n".
+"# \n".
+"# http://www.apache.org/licenses/LICENSE-2.0\n".
+"# \n".
+"# Unless required by applicable law or agreed to in writing,\n".
+"# software distributed under the License is distributed on an\n".
+"# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY\n".
+"# KIND, either express or implied. See the License for the\n".
+"# specific language governing permissions and limitations\n".
+"# under the License.\n".
+"# \n".
+"#**************************************************************\n";
}
######## Check input sdf file and use only the correct part
sub merge_gsicheck{
Modified: incubator/ooo/trunk/main/migrationanalysis/src/wizard/Get Directory Dialog.bas
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/migrationanalysis/src/wizard/Get%20Directory%20Dialog.bas?rev=1233144&r1=1233143&r2=1233144&view=diff
==============================================================================
--- incubator/ooo/trunk/main/migrationanalysis/src/wizard/Get Directory Dialog.bas (original)
+++ incubator/ooo/trunk/main/migrationanalysis/src/wizard/Get Directory Dialog.bas Thu Jan 19 00:56:10 2012
@@ -1,30 +1,24 @@
Attribute VB_Name = "BrowseDirectorysOnly"
-'/*************************************************************************
-' *
-' * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-' *
-' * Copyright 2000, 2010 Oracle and/or its affiliates.
-' *
-' * OpenOffice.org - a multi-platform office productivity suite
-' *
-' * 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.
-' *
-' * 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).
-' *
-' * You should have received a copy of the GNU Lesser General Public License
-' * version 3 along with OpenOffice.org. If not, see
-' * <http://www.openoffice.org/license.html>
-' * for a copy of the LGPLv3 License.
-' *
-' ************************************************************************/
+'*************************************************************************
+'
+' 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.
+'
+'*************************************************************************
' Modified as BIF_STATUSTEXT overflows for nested folders so is no longer
' shown.
Modified: incubator/ooo/trunk/main/ure/source/uretest/Makefile.pln
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/ure/source/uretest/Makefile.pln?rev=1233144&r1=1233143&r2=1233144&view=diff
==============================================================================
--- incubator/ooo/trunk/main/ure/source/uretest/Makefile.pln (original)
+++ incubator/ooo/trunk/main/ure/source/uretest/Makefile.pln Thu Jan 19 00:56:10 2012
@@ -1,29 +1,23 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# 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.
-#
-# 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).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
+#**************************************************************
+#
+# 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.
+#
+#**************************************************************
# The following variable must be set (see README):
#SDK_HOME := /opt/openoffice.org/basis3.1/sdk
Modified: incubator/ooo/trunk/main/xmerge/source/xmerge/java/org/openoffice/xmerge/util/resources.properties
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/xmerge/source/xmerge/java/org/openoffice/xmerge/util/resources.properties?rev=1233144&r1=1233143&r2=1233144&view=diff
==============================================================================
--- incubator/ooo/trunk/main/xmerge/source/xmerge/java/org/openoffice/xmerge/util/resources.properties (original)
+++ incubator/ooo/trunk/main/xmerge/source/xmerge/java/org/openoffice/xmerge/util/resources.properties Thu Jan 19 00:56:10 2012
@@ -1,29 +1,23 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# 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.
-#
-# 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).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
+#**************************************************************
+#
+# 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.
+#
+#**************************************************************
# x-no-translate