incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ar...@apache.org
Subject svn commit: r1232666 - in /incubator/ooo/trunk/main: framework/test/typecfg/xml2xcd.cxx tools/bootstrp/mkcreate.cxx unodevtools/source/skeletonmaker/skeletoncommon.cxx
Date Wed, 18 Jan 2012 00:47:01 GMT
Author: arist
Date: Wed Jan 18 00:47:00 2012
New Revision: 1232666

URL: http://svn.apache.org/viewvc?rev=1232666&view=rev
Log:
Update headers to Alv2 headers

Modified:
    incubator/ooo/trunk/main/framework/test/typecfg/xml2xcd.cxx
    incubator/ooo/trunk/main/tools/bootstrp/mkcreate.cxx
    incubator/ooo/trunk/main/unodevtools/source/skeletonmaker/skeletoncommon.cxx

Modified: incubator/ooo/trunk/main/framework/test/typecfg/xml2xcd.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/framework/test/typecfg/xml2xcd.cxx?rev=1232666&r1=1232665&r2=1232666&view=diff
==============================================================================
--- incubator/ooo/trunk/main/framework/test/typecfg/xml2xcd.cxx (original)
+++ incubator/ooo/trunk/main/framework/test/typecfg/xml2xcd.cxx Wed Jan 18 00:47:00 2012
@@ -515,61 +515,50 @@ void XCDGenerator::impl_generateXCD()
 void XCDGenerator::impl_generateCopyright()
 {
     m_aData.sBufferStandard.appendAscii( "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n"
                               );
-    m_aData.sBufferStandard.appendAscii( "<!-- \n"                                   
                                 );
-    m_aData.sBufferStandard.appendAscii( "  DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS
FILE HEADER.\n"           );
-    m_aData.sBufferStandard.appendAscii( "\n"                                           
                              );
-    m_aData.sBufferStandard.appendAscii( "   Copyright 2000, 2010 Oracle and/or its affiliates.\n"
                              );
-    m_aData.sBufferStandard.appendAscii( "\n"                                           
                              );
-    m_aData.sBufferStandard.appendAscii( "   OpenOffice.org - a multi-platform office productivity
suite\n"            );
-    m_aData.sBufferStandard.appendAscii( "\n"                                           
                              );
-    m_aData.sBufferStandard.appendAscii( "   This file is part of OpenOffice.org.\n"    
                              );
-    m_aData.sBufferStandard.appendAscii( "\n"                                           
                              );
-    m_aData.sBufferStandard.appendAscii( "   OpenOffice.org is free software: you can redistribute
it and/or modify\n" );
-    m_aData.sBufferStandard.appendAscii( "   it under the terms of the GNU Lesser General
Public License version 3\n"  );
-    m_aData.sBufferStandard.appendAscii( "   only, as published by the Free Software Foundation.\n"
                   );
-    m_aData.sBufferStandard.appendAscii( "\n"                                           
                              );
-    m_aData.sBufferStandard.appendAscii( "   OpenOffice.org is distributed in the hope that
it will be useful,\n"      );
-    m_aData.sBufferStandard.appendAscii( "   but WITHOUT ANY WARRANTY; without even the implied
warranty of\n"         );
-    m_aData.sBufferStandard.appendAscii( "   MERCHANTABILITY or FITNESS FOR A PARTICULAR
PURPOSE.  See the\n"          );
-    m_aData.sBufferStandard.appendAscii( "   GNU Lesser General Public License version 3
for more details\n"           );
-    m_aData.sBufferStandard.appendAscii( "   (a copy is included in the LICENSE file that
accompanied this code).\n"   );
-    m_aData.sBufferStandard.appendAscii( "\n"                                           
                              );
-    m_aData.sBufferStandard.appendAscii( "   You should have received a copy of the GNU Lesser
General Public License\n");
-    m_aData.sBufferStandard.appendAscii( "   version 3 along with OpenOffice.org.  If not,
see\n"                      );
-    m_aData.sBufferStandard.appendAscii( "   <http://www.openoffice.org/license.html>\n"
                              );
-    m_aData.sBufferStandard.appendAscii( "   for a copy of the LGPLv3 License.\n"       
                              );
-    m_aData.sBufferStandard.appendAscii( "\n"                                           
                              );
-    m_aData.sBufferStandard.appendAscii( "-->\n"                                     
                                 );
+    m_aData.sBufferStandard.appendAscii( "<!--***********************************************************\n");
+    m_aData.sBufferStandard.appendAscii( " *\n");
+    m_aData.sBufferStandard.appendAscii( " * Licensed to the Apache Software Foundation (ASF)
under one\n");
+    m_aData.sBufferStandard.appendAscii( " * or more contributor license agreements.  See
the NOTICE file\n");
+    m_aData.sBufferStandard.appendAscii( " * distributed with this work for additional information\n");
+    m_aData.sBufferStandard.appendAscii( " * regarding copyright ownership.  The ASF licenses
this file\n");
+    m_aData.sBufferStandard.appendAscii( " * to you under the Apache License, Version 2.0
(the\n");
+    m_aData.sBufferStandard.appendAscii( " * \"License\"); you may not use this file except
in compliance\n");
+    m_aData.sBufferStandard.appendAscii( " * with the License.  You may obtain a copy of
the License at\n");
+    m_aData.sBufferStandard.appendAscii( " *\n");
+    m_aData.sBufferStandard.appendAscii( " *   http://www.apache.org/licenses/LICENSE-2.0\n");
+    m_aData.sBufferStandard.appendAscii( " * \n");
+    m_aData.sBufferStandard.appendAscii( " * Unless required by applicable law or agreed
to in writing,\n");
+    m_aData.sBufferStandard.appendAscii( " * software distributed under the License is distributed
on an\n");
+    m_aData.sBufferStandard.appendAscii( " * \"AS IS\" BASIS, WITHOUT WARRANTIES OR CONDITIONS
OF ANY\n");
+    m_aData.sBufferStandard.appendAscii( " * KIND, either express or implied.  See the License
for the\n");
+    m_aData.sBufferStandard.appendAscii( " * specific language governing permissions and
limitations\n");
+    m_aData.sBufferStandard.appendAscii( " * under the License.\n");
+    m_aData.sBufferStandard.appendAscii( " * \n");
+    m_aData.sBufferStandard.appendAscii( " ***********************************************************-->\n");
 
     if( m_aData.nVersionOutput >= DRAFT_SPLIT_VERSION )
     {
         m_aData.sBufferAdditional.appendAscii( "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n"
                               );
-        m_aData.sBufferAdditional.appendAscii( "<!-- \n"                             
                                       );
-        m_aData.sBufferAdditional.appendAscii( "\n"                                     
                                    );
-        m_aData.sBufferAdditional.appendAscii( "  DO NOT ALTER OR REMOVE COPYRIGHT NOTICES
OR THIS FILE HEADER.\n"           );
-        m_aData.sBufferAdditional.appendAscii( "\n"                                     
                                    );
-        m_aData.sBufferAdditional.appendAscii( "  Copyright 2000, 2010 Oracle and/or its
affiliates.\n"                                );
-        m_aData.sBufferAdditional.appendAscii( "\n"                                     
                                    );
-        m_aData.sBufferAdditional.appendAscii( "  OpenOffice.org - a multi-platform office
productivity suite\n"             );
-        m_aData.sBufferAdditional.appendAscii( "\n"                                     
                                    );
-        m_aData.sBufferAdditional.appendAscii( "  This file is part of OpenOffice.org.\n"
                                   );
-        m_aData.sBufferAdditional.appendAscii( "\n"                                     
                                    );
-        m_aData.sBufferAdditional.appendAscii( "  OpenOffice.org is free software: you can
redistribute it and/or modify\n"  );
-        m_aData.sBufferAdditional.appendAscii( "  it under the terms of the GNU Lesser General
Public License version 3\n"   );
-        m_aData.sBufferAdditional.appendAscii( "  only, as published by the Free Software
Foundation.\n"                     );
-        m_aData.sBufferAdditional.appendAscii( "\n"                                     
                                    );
-        m_aData.sBufferAdditional.appendAscii( "  OpenOffice.org is distributed in the hope
that it will be useful,\n"       );
-        m_aData.sBufferAdditional.appendAscii( "  but WITHOUT ANY WARRANTY; without even
the implied warranty of\n"          );
-        m_aData.sBufferAdditional.appendAscii( "  MERCHANTABILITY or FITNESS FOR A PARTICULAR
PURPOSE.  See the\n"           );
-        m_aData.sBufferAdditional.appendAscii( "  GNU Lesser General Public License version
3 for more details\n"            );
-        m_aData.sBufferAdditional.appendAscii( "  (a copy is included in the LICENSE file
that accompanied this code).\n"    );
-        m_aData.sBufferAdditional.appendAscii( "\n"                                     
                                    );
-        m_aData.sBufferAdditional.appendAscii( "  You should have received a copy of the
GNU Lesser General Public License\n");
-        m_aData.sBufferAdditional.appendAscii( "  version 3 along with OpenOffice.org.  If
not, see\n"                       );
-        m_aData.sBufferAdditional.appendAscii( "  <http://www.openoffice.org/license.html>\n"
                               );
-        m_aData.sBufferAdditional.appendAscii( "  for a copy of the LGPLv3 License.\n"  
                                    );
-        m_aData.sBufferAdditional.appendAscii( "\n"                                     
                                    );
-        m_aData.sBufferAdditional.appendAscii( "-->\n"                               
                                       );
+    m_aData.sBufferStandard.appendAscii( "<!--***********************************************************\n");
+    m_aData.sBufferStandard.appendAscii( " *\n");
+    m_aData.sBufferStandard.appendAscii( " * Licensed to the Apache Software Foundation (ASF)
under one\n");
+    m_aData.sBufferStandard.appendAscii( " * or more contributor license agreements.  See
the NOTICE file\n");
+    m_aData.sBufferStandard.appendAscii( " * distributed with this work for additional information\n");
+    m_aData.sBufferStandard.appendAscii( " * regarding copyright ownership.  The ASF licenses
this file\n");
+    m_aData.sBufferStandard.appendAscii( " * to you under the Apache License, Version 2.0
(the\n");
+    m_aData.sBufferStandard.appendAscii( " * \"License\"); you may not use this file except
in compliance\n");
+    m_aData.sBufferStandard.appendAscii( " * with the License.  You may obtain a copy of
the License at\n");
+    m_aData.sBufferStandard.appendAscii( " *\n");
+    m_aData.sBufferStandard.appendAscii( " *   http://www.apache.org/licenses/LICENSE-2.0\n");
+    m_aData.sBufferStandard.appendAscii( " * \n");
+    m_aData.sBufferStandard.appendAscii( " * Unless required by applicable law or agreed
to in writing,\n");
+    m_aData.sBufferStandard.appendAscii( " * software distributed under the License is distributed
on an\n");
+    m_aData.sBufferStandard.appendAscii( " * \"AS IS\" BASIS, WITHOUT WARRANTIES OR CONDITIONS
OF ANY\n");
+    m_aData.sBufferStandard.appendAscii( " * KIND, either express or implied.  See the License
for the\n");
+    m_aData.sBufferStandard.appendAscii( " * specific language governing permissions and
limitations\n");
+    m_aData.sBufferStandard.appendAscii( " * under the License.\n");
+    m_aData.sBufferStandard.appendAscii( " * \n");
+    m_aData.sBufferStandard.appendAscii( " ***********************************************************-->\n");
     }
 }
 

Modified: incubator/ooo/trunk/main/tools/bootstrp/mkcreate.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/tools/bootstrp/mkcreate.cxx?rev=1232666&r1=1232665&r2=1232666&view=diff
==============================================================================
--- incubator/ooo/trunk/main/tools/bootstrp/mkcreate.cxx (original)
+++ incubator/ooo/trunk/main/tools/bootstrp/mkcreate.cxx Wed Jan 18 00:47:00 2012
@@ -702,32 +702,26 @@ sal_Bool SourceDirectory::CreateRecursiv
 	}
 
 	ByteString sHeader(
-		"#*************************************************************************\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"
 		"\n"
 	);
 	if ( !bMakefileMk ) {

Modified: incubator/ooo/trunk/main/unodevtools/source/skeletonmaker/skeletoncommon.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/unodevtools/source/skeletonmaker/skeletoncommon.cxx?rev=1232666&r1=1232665&r2=1232666&view=diff
==============================================================================
--- incubator/ooo/trunk/main/unodevtools/source/skeletonmaker/skeletoncommon.cxx (original)
+++ incubator/ooo/trunk/main/unodevtools/source/skeletonmaker/skeletoncommon.cxx Wed Jan 18
00:47:00 2012
@@ -48,32 +48,26 @@ void printLicenseHeader(std::ostream& o,
     if ( index != -1 )
         shortfilename = filename.copy(index+1);
                        
-    o << "/*************************************************************************\n"
-        " *\n"
-        " * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.\n"
+    o << "/**************************************************************\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";

+        " * 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\n"
 }
 
 bool getOutputStream(ProgramOptions const & options,



Mime
View raw message