From bba772672ae1d97380a2dc39a7b4bea7774c379a Mon Sep 17 00:00:00 2001 From: Chip Childers Date: Tue, 25 Sep 2012 16:28:19 -0400 Subject: [PATCH] Switched copyright symbols to (c) for easier reading in places where the character encoding is garbled. --- LICENSE | 64 ++++++++++++++++++------------------ tools/whisker/descriptor.xml | 64 ++++++++++++++++++------------------ 2 files changed, 64 insertions(+), 64 deletions(-) diff --git a/LICENSE b/LICENSE index 9a6d2c97319..d28673b93bf 100644 --- a/LICENSE +++ b/LICENSE @@ -184,7 +184,7 @@ This distribution contains third party resources. Within the . directory licensed under the BSD (3-clause) http://www.opensource.org/licenses/BSD-3-Clause (as follows) - Copyright © 2005-2010 Thomas Nagy + Copyright (c) 2005-2010 Thomas Nagy Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions @@ -217,7 +217,7 @@ Within the . directory Within the awsapi directory licensed under the BSD (3-clause) http://www.opensource.org/licenses/BSD-3-Clause (as follows) - Copyright © 2005-2010 Thomas Nagy + Copyright (c) 2005-2010 Thomas Nagy Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions @@ -250,7 +250,7 @@ Within the awsapi directory Within the console-proxy/js directory licensed under the MIT License http://www.opensource.org/licenses/mit-license.php (as follows) - Copyright © 2009, John Resig + Copyright (c) 2009, John Resig Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the @@ -333,12 +333,12 @@ Within the deps/awsapi-lib directory antlr-2.7.6.jar http://repo1.maven.org/maven2/antlr/antlr/2.7.6/antlr-2.7.6-sources.jar licensed under the Apache License, Version 2 http://www.apache.org/licenses/LICENSE-2.0.txt (as above) - Copyright © 2004-2008 The Apache Software Foundation + Copyright (c) 2004-2008 The Apache Software Foundation from The Apache Software Foundation http://www.apache.org/ XmlSchema-1.4.3.jar licensed under the Apache License, Version 2 http://www.apache.org/licenses/LICENSE-2.0.txt (as above) - Copyright © 2004-2012 The Apache Software Foundation + Copyright (c) 2004-2012 The Apache Software Foundation from The Apache Software Foundation http://www.apache.org/ apache-log4j-extras-1.0.jar http://logging.apache.org/log4j/companions/extras/ axiom-api-1.2.8.jar http://ws.apache.org/axiom/source-repository.html @@ -370,7 +370,7 @@ Within the deps/awsapi-lib directory xml-apis.jar http://repo1.maven.org/maven2/xml-apis/xml-apis/1.3.04/xml-apis-1.3.04-sources.jar licensed under the Apache License, Version 2 http://www.apache.org/licenses/LICENSE-2.0.txt (as above) - Copyright © 2009 Google Inc. + Copyright (c) 2009 Google Inc. from Google Inc. http://google.com cloud-gson.jar http://code.google.com/p/google-gson/ @@ -381,7 +381,7 @@ Within the deps/awsapi-lib directory licensed under the BSD (3-clause) http://www.opensource.org/licenses/BSD-3-Clause (as follows) - Copyright © 2002-2011 Atsuhiko Yamanaka, JCraft,Inc. + Copyright (c) 2002-2011 Atsuhiko Yamanaka, JCraft,Inc. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions @@ -412,7 +412,7 @@ Within the deps/awsapi-lib directory licensed under the COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 http://www.opensource.org/licenses/CDDL-1.0 (as follows) - Copyright © 1997-2010 Oracle and/or its affiliates. All rights reserved. + Copyright (c) 1997-2010 Oracle and/or its affiliates. All rights reserved. COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 @@ -802,7 +802,7 @@ Within the deps/awsapi-lib directory licensed under the COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 http://www.opensource.org/licenses/CDDL-1.0 (as follows) - Copyright © 2006 Sun Microsystems, Inc. All rights reserved. + Copyright (c) 2006 Sun Microsystems, Inc. All rights reserved. COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 @@ -1190,7 +1190,7 @@ Within the deps/awsapi-lib directory licensed under the COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 http://www.opensource.org/licenses/CDDL-1.0 (as follows) - Copyright © 1997-2010 Oracle and/or its affiliates. All rights reserved. + Copyright (c) 1997-2010 Oracle and/or its affiliates. All rights reserved. COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 @@ -1845,7 +1845,7 @@ Within the deps/awsapi-lib directory licensed under the MIT License http://www.opensource.org/licenses/mit-license.php (as follows) - Copyright © 2004-2011 QOS.ch + Copyright (c) 2004-2011 QOS.ch Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the @@ -2357,7 +2357,7 @@ Within the patches/systemvm/debian/config/etc directory Within the patches/systemvm/debian/config/etc/apache2 directory licensed under the Apache License, Version 2 http://www.apache.org/licenses/LICENSE-2.0.txt (as above) - Copyright © 2012 The Apache Software Foundation + Copyright (c) 2012 The Apache Software Foundation from The Apache Software Foundation http://www.apache.org/ httpd.conf ports.conf @@ -2368,14 +2368,14 @@ Within the patches/systemvm/debian/config/etc/apache2 directory Within the scripts/storage/secondary directory licensed under the Apache License, Version 2 http://www.apache.org/licenses/LICENSE-2.0.txt (as above) - Copyright © 2010-2011 OpenStack, LLC. + Copyright (c) 2010-2011 OpenStack, LLC. from OpenStack, LLC http://www.openstack.org swift Within the scripts/vm/hypervisor/xenserver directory licensed under the Apache License, Version 2 http://www.apache.org/licenses/LICENSE-2.0.txt (as above) - Copyright © 2010-2011 OpenStack, LLC. + Copyright (c) 2010-2011 OpenStack, LLC. from OpenStack, LLC http://www.openstack.org swift @@ -2387,7 +2387,7 @@ Within the target/jar directory licensed under the Apache License, Version 1.1 http://www.apache.org/licenses/LICENSE-1.1 (as follows) - Copyright © 2012 The Apache Software Foundation + Copyright (c) 2012 The Apache Software Foundation /* ==================================================================== * The Apache Software License, Version 1.1 @@ -2447,7 +2447,7 @@ Within the target/jar directory cloud-commons-discovery.jar http://commons.apache.org/discovery/ licensed under the Apache License, Version 2 http://www.apache.org/licenses/LICENSE-2.0.txt (as above) - Copyright © 2012 The Apache Software Foundation + Copyright (c) 2012 The Apache Software Foundation from The Apache Software Foundation http://www.apache.org/ cloud-axis.jar http://axis.apache.org/axis/ cloud-cglib.jar http://cglib.sourceforge.net/ @@ -2471,12 +2471,12 @@ Within the target/jar directory cloud-jasypt-1.9.jar http://www.jasypt.org licensed under the Apache License, Version 2 http://www.apache.org/licenses/LICENSE-2.0.txt (as above) - Copyright © 2003-2007 Luck Consulting Pty Ltd + Copyright (c) 2003-2007 Luck Consulting Pty Ltd from Luck Consulting Pty Ltd http://gregluck.com/blog/about/ cloud-ehcache.jar http://ehcache.org/ licensed under the Apache License, Version 2 http://www.apache.org/licenses/LICENSE-2.0.txt (as above) - Copyright © 2009 Google Inc. + Copyright (c) 2009 Google Inc. from Google Inc. http://google.com cloud-google-gson-1.7.1.jar http://code.google.com/p/google-gson/ @@ -2488,7 +2488,7 @@ Within the target/jar directory licensed under the BSD (3-clause) http://www.opensource.org/licenses/BSD-3-Clause (as follows) - Copyright © 2009, Caringo, Inc. + Copyright (c) 2009, Caringo, Inc. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions @@ -2519,7 +2519,7 @@ Within the target/jar directory licensed under the BSD (3-clause) http://www.opensource.org/licenses/BSD-3-Clause (as follows) - Copyright © 2002-2011 Atsuhiko Yamanaka, JCraft,Inc. + Copyright (c) 2002-2011 Atsuhiko Yamanaka, JCraft,Inc. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions @@ -2550,7 +2550,7 @@ Within the target/jar directory licensed under the BSD (3-clause) http://www.opensource.org/licenses/BSD-3-Clause (as follows) - Copyright © 2007-2008 Trilead AG (http://www.trilead.com) + Copyright (c) 2007-2008 Trilead AG (http://www.trilead.com) All rights reserved. Redistribution and use in source and binary forms, with or without @@ -2611,7 +2611,7 @@ Within the target/jar directory licensed under the COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 http://www.opensource.org/licenses/CDDL-1.0 (as follows) - Copyright © 2006 Sun Microsystems, Inc. All rights reserved. + Copyright (c) 2006 Sun Microsystems, Inc. All rights reserved. COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 @@ -3000,7 +3000,7 @@ Within the target/jar directory licensed under the COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 http://www.opensource.org/licenses/CDDL-1.0 (as follows) - Copyright © 1997-2010 Oracle and/or its affiliates. All rights reserved. + Copyright (c) 1997-2010 Oracle and/or its affiliates. All rights reserved. COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 @@ -3388,7 +3388,7 @@ Within the target/jar directory licensed under the Common Public License - v 1.0 http://opensource.org/licenses/cpl1.0 (as follows) - Copyright © IBM Corp 2006 + Copyright (c) IBM Corp 2006 Common Public License Version 1.0 (CPL) @@ -3830,7 +3830,7 @@ Within the target/jar directory licensed under the Eclipse Distribution License Version 1.0 http://www.eclipse.org/org/documents/edl-v10.php (as follows) - Copyright © 2012 The Eclipse Foundation. + Copyright (c) 2012 The Eclipse Foundation. Eclipse Distribution License Version 1.0 @@ -3906,7 +3906,7 @@ Within the ui/lib directory licensed under the BSD (2-clause) http://www.opensource.org/licenses/BSD-2-Clause (as follows) - Copyright © 2008 George McGinley Smith + Copyright (c) 2008 George McGinley Smith All rights reserved. Redistribution and use in source and binary forms, with or without modification, @@ -3938,7 +3938,7 @@ Within the ui/lib directory licensed under the MIT License http://www.opensource.org/licenses/mit-license.php (as follows) - Copyright © 2011, John Resig + Copyright (c) 2011, John Resig Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the @@ -3964,7 +3964,7 @@ Within the ui/lib directory licensed under the MIT License http://www.opensource.org/licenses/mit-license.php (as follows) - Copyright © 2006 - 2011 Jörn Zaefferer + Copyright (c) 2006 - 2011 Jörn Zaefferer Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the @@ -3990,7 +3990,7 @@ Within the ui/lib directory licensed under the MIT License http://www.opensource.org/licenses/mit-license.php (as follows) - Copyright © 2010, Sebastian Tschan + Copyright (c) 2010, Sebastian Tschan Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the @@ -4016,7 +4016,7 @@ Within the ui/lib directory licensed under the MIT License http://www.opensource.org/licenses/mit-license.php (as follows) - Copyright © 2006 Klaus Hartl (stilbuero.de) + Copyright (c) 2006 Klaus Hartl (stilbuero.de) Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the @@ -4162,7 +4162,7 @@ Within the ui/lib/jquery-ui directory Within the ui/lib/qunit directory licensed under the MIT License http://www.opensource.org/licenses/mit-license.php (as follows) - Copyright © 2012 John Resig, Jörn Zaefferer + Copyright (c) 2012 John Resig, Jörn Zaefferer Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the @@ -4190,7 +4190,7 @@ Within the ui/lib/qunit directory Within the utils/src/com/cloud/utils/db directory licensed under the Apache License, Version 2 http://www.apache.org/licenses/LICENSE-2.0.txt (as above) - Copyright © 2004 Clinton Begin + Copyright (c) 2004 Clinton Begin from Clinton Begin http://code.google.com/p/mybatis/ ScriptRunner.java http://code.google.com/p/mybatis/ diff --git a/tools/whisker/descriptor.xml b/tools/whisker/descriptor.xml index 18f17380b71..1159824d188 100644 --- a/tools/whisker/descriptor.xml +++ b/tools/whisker/descriptor.xml @@ -2409,7 +2409,7 @@ The Apache Software Foundation (http://www.apache.org/). -Copyright © 2005-2010 Thomas Nagy +Copyright (c) 2005-2010 Thomas Nagy @@ -2419,7 +2419,7 @@ Copyright © 2005-2010 Thomas Nagy -Copyright © 2012 The Apache Software Foundation +Copyright (c) 2012 The Apache Software Foundation @@ -2452,7 +2452,7 @@ All rights reserved. -Copyright © 2009, John Resig +Copyright (c) 2009, John Resig @@ -2462,7 +2462,7 @@ Copyright © 2009, John Resig -Copyright © 2011, John Resig +Copyright (c) 2011, John Resig @@ -2470,7 +2470,7 @@ Copyright © 2011, John Resig -Copyright © 2006 - 2011 Jörn Zaefferer +Copyright (c) 2006 - 2011 Jörn Zaefferer @@ -2478,7 +2478,7 @@ Copyright © 2006 - 2011 Jörn Zaefferer -Copyright © 2010, Sebastian Tschan +Copyright (c) 2010, Sebastian Tschan @@ -2486,7 +2486,7 @@ Copyright © 2010, Sebastian Tschan -Copyright © 2006 Klaus Hartl (stilbuero.de) +Copyright (c) 2006 Klaus Hartl (stilbuero.de) @@ -2494,7 +2494,7 @@ Copyright © 2006 Klaus Hartl (stilbuero.de) -Copyright © 2008 George McGinley Smith +Copyright (c) 2008 George McGinley Smith All rights reserved. @@ -2554,7 +2554,7 @@ Updated November 2009 with contributions from: btburnett3, Anthony Aragues and X -Copyright © 2012 John Resig, Jörn Zaefferer +Copyright (c) 2012 John Resig, Jörn Zaefferer @@ -2565,7 +2565,7 @@ Copyright © 2012 John Resig, Jörn Zaefferer -Copyright © 2005-2010 Thomas Nagy +Copyright (c) 2005-2010 Thomas Nagy @@ -2575,7 +2575,7 @@ Copyright © 2005-2010 Thomas Nagy -Copyright © 2004 Clinton Begin +Copyright (c) 2004 Clinton Begin ` @@ -2585,7 +2585,7 @@ Copyright © 2004 Clinton Begin -Copyright © 2012 The Apache Software Foundation +Copyright (c) 2012 The Apache Software Foundation @@ -2607,7 +2607,7 @@ Copyright © 2012 The Apache Software Foundation -Copyright © 2012 The Apache Software Foundation +Copyright (c) 2012 The Apache Software Foundation @@ -2623,7 +2623,7 @@ Copyright (c) 2007-2010, The JASYPT team (http://www.jasypt.org) -Copyright © 2003-2007 Luck Consulting Pty Ltd +Copyright (c) 2003-2007 Luck Consulting Pty Ltd @@ -2631,7 +2631,7 @@ Copyright © 2003-2007 Luck Consulting Pty Ltd -Copyright © 2006 Sun Microsystems, Inc. All rights reserved. +Copyright (c) 2006 Sun Microsystems, Inc. All rights reserved. @@ -2640,7 +2640,7 @@ Copyright © 2006 Sun Microsystems, Inc. All rights reserved. -Copyright © 1997-2010 Oracle and/or its affiliates. All rights reserved. +Copyright (c) 1997-2010 Oracle and/or its affiliates. All rights reserved. @@ -2648,7 +2648,7 @@ Copyright © 1997-2010 Oracle and/or its affiliates. All rights reserved. -Copyright © 2009 Google Inc. +Copyright (c) 2009 Google Inc. @@ -2656,7 +2656,7 @@ Copyright © 2009 Google Inc. -Copyright © 2012 The Eclipse Foundation. +Copyright (c) 2012 The Eclipse Foundation. @@ -2664,7 +2664,7 @@ Copyright © 2012 The Eclipse Foundation. -Copyright © 2009, Caringo, Inc. +Copyright (c) 2009, Caringo, Inc. @@ -2672,7 +2672,7 @@ Copyright © 2009, Caringo, Inc. -Copyright © 2002-2011 Atsuhiko Yamanaka, JCraft,Inc. +Copyright (c) 2002-2011 Atsuhiko Yamanaka, JCraft,Inc. @@ -2680,7 +2680,7 @@ Copyright © 2002-2011 Atsuhiko Yamanaka, JCraft,Inc. -Copyright © IBM Corp 2006 +Copyright (c) IBM Corp 2006 @@ -2701,7 +2701,7 @@ Copyright © IBM Corp 2006 -Copyright © 2007-2008 Trilead AG (http://www.trilead.com) +Copyright (c) 2007-2008 Trilead AG (http://www.trilead.com) All rights reserved. @@ -2730,7 +2730,7 @@ All rights reserved. -Copyright © 2010-2011 OpenStack, LLC. +Copyright (c) 2010-2011 OpenStack, LLC. @@ -2740,7 +2740,7 @@ Copyright © 2010-2011 OpenStack, LLC. -Copyright © 2010-2011 OpenStack, LLC. +Copyright (c) 2010-2011 OpenStack, LLC. @@ -2750,7 +2750,7 @@ Copyright © 2010-2011 OpenStack, LLC. -Copyright © 2004-2008 The Apache Software Foundation +Copyright (c) 2004-2008 The Apache Software Foundation @@ -2764,7 +2764,7 @@ Copyright © 2004-2008 The Apache Software Foundation -Copyright © 2004-2011 QOS.ch +Copyright (c) 2004-2011 QOS.ch @@ -2773,7 +2773,7 @@ Copyright © 2004-2011 QOS.ch -Copyright © 2004-2012 The Apache Software Foundation +Copyright (c) 2004-2012 The Apache Software Foundation @@ -2808,7 +2808,7 @@ Copyright © 2004-2012 The Apache Software Foundation -Copyright © 2009 Google Inc. +Copyright (c) 2009 Google Inc. @@ -2823,7 +2823,7 @@ Copyright © 2009 Google Inc. -Copyright © 1997-2010 Oracle and/or its affiliates. All rights reserved. +Copyright (c) 1997-2010 Oracle and/or its affiliates. All rights reserved. @@ -2833,7 +2833,7 @@ Copyright © 1997-2010 Oracle and/or its affiliates. All rights reserved. -Copyright © 2006 Sun Microsystems, Inc. All rights reserved. +Copyright (c) 2006 Sun Microsystems, Inc. All rights reserved. @@ -2841,7 +2841,7 @@ Copyright © 2006 Sun Microsystems, Inc. All rights reserved. -Copyright © 2002-2011 Atsuhiko Yamanaka, JCraft,Inc. +Copyright (c) 2002-2011 Atsuhiko Yamanaka, JCraft,Inc. @@ -2855,7 +2855,7 @@ Copyright © 2002-2011 Atsuhiko Yamanaka, JCraft,Inc. -Copyright © 1997-2010 Oracle and/or its affiliates. All rights reserved. +Copyright (c) 1997-2010 Oracle and/or its affiliates. All rights reserved.