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/12 20:50:43 UTC
svn commit: r1230733 - in /incubator/ooo/trunk/main:
avmedia/source/java/avmedia.jar.component
configmgr/qa/unit/urebootstrap.ini solenv/bin/dbgsv.ini
Author: arist
Date: Thu Jan 12 19:50:42 2012
New Revision: 1230733
URL: http://svn.apache.org/viewvc?rev=1230733&view=rev
Log:
Update headers to Alv2 headers
Modified:
incubator/ooo/trunk/main/avmedia/source/java/avmedia.jar.component
incubator/ooo/trunk/main/configmgr/qa/unit/urebootstrap.ini
incubator/ooo/trunk/main/solenv/bin/dbgsv.ini
Modified: incubator/ooo/trunk/main/avmedia/source/java/avmedia.jar.component
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/avmedia/source/java/avmedia.jar.component?rev=1230733&r1=1230732&r2=1230733&view=diff
==============================================================================
--- incubator/ooo/trunk/main/avmedia/source/java/avmedia.jar.component (original)
+++ incubator/ooo/trunk/main/avmedia/source/java/avmedia.jar.component Thu Jan 12 19:50:42 2012
@@ -1,30 +1,24 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--**********************************************************************
-*
-* 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.
+ *
+ ***********************************************************-->
<component loader="com.sun.star.loader.Java2"
xmlns="http://openoffice.org/2010/uno-components">
Modified: incubator/ooo/trunk/main/configmgr/qa/unit/urebootstrap.ini
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/configmgr/qa/unit/urebootstrap.ini?rev=1230733&r1=1230732&r2=1230733&view=diff
==============================================================================
--- incubator/ooo/trunk/main/configmgr/qa/unit/urebootstrap.ini (original)
+++ incubator/ooo/trunk/main/configmgr/qa/unit/urebootstrap.ini Thu Jan 12 19:50:42 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.
+#
+#**************************************************************
[Bootstrap]
OOO_BASE_DIR = $ORIGIN/basis
Modified: incubator/ooo/trunk/main/solenv/bin/dbgsv.ini
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/solenv/bin/dbgsv.ini?rev=1230733&r1=1230732&r2=1230733&view=diff
==============================================================================
--- incubator/ooo/trunk/main/solenv/bin/dbgsv.ini (original)
+++ incubator/ooo/trunk/main/solenv/bin/dbgsv.ini Thu Jan 12 19:50:42 2012
@@ -1,29 +1,23 @@
=*************************************************************************
=
-= DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+= 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.
=
-= 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.
-=
-=***********************************************************************/
+=*************************************************************************
[output]
error=shell