Updating the license to account for design assets.

Summary:
1) Updates the code licenses to Apache 2.0.
2) Specifies that design assets (e.g. icons) are licensed for use
according to terms similar to that of how platform apps can use
our iconography.

chrome/content/facebook.js

@@ -1,37 +1,24 @@
 /**
- * Facebook Firefox Toolbar Software License 
- * Copyright (c) 2007 Facebook, Inc. 
  *
- * Permission is hereby granted, free of charge, to any person or organization
- * obtaining a copy of the software and accompanying documentation covered by
- * this license (which, together with any graphical images included with such
- * software, are collectively referred to below as the "Software") to (a) use,
- * reproduce, display, distribute, execute, and transmit the Software, (b)
- * prepare derivative works of the Software (excluding any graphical images
- * included with the Software, which may not be modified or altered), and (c)
- * permit third-parties to whom the Software is furnished to do so, all
- * subject to the following:
+ * The source code included in this file is licensed to you by Facebook under
+ * the Apache License, Version 2.0.  Accordingly, the following notice
+ * applies to the source code included in this file:
  *
- * The copyright notices in the Software and this entire statement, including
- * the above license grant, this restriction and the following disclaimer,
- * must be included in all copies of the Software, in whole or in part, and
- * all derivative works of the Software, unless such copies or derivative
- * works are solely in the form of machine-executable object code generated by
- * a source language processor.  
+ * Copyright © 2009 Facebook, Inc.
  *
- * Facebook, Inc. retains ownership of the Software and all associated
- * intellectual property rights.  All rights not expressly granted in this
- * license are reserved by Facebook, Inc.
+ * Licensed 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 SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
- * SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
- * FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
  */
 
+
 // Note that this file is intended for login-related API function calls only
 // (ie facebook.auth.*).  Other API calls go through the Facebook xpcom service.
 var Cc = Components.classes;

chrome/content/lib.js

@@ -1,37 +1,24 @@
 /**
- * Facebook Firefox Toolbar Software License
- * Copyright (c) 2007-2009 Facebook, Inc.
  *
- * Permission is hereby granted, free of charge, to any person or organization
- * obtaining a copy of the software and accompanying documentation covered by
- * this license (which, together with any graphical images included with such
- * software, are collectively referred to below as the "Software") to (a) use,
- * reproduce, display, distribute, execute, and transmit the Software, (b)
- * prepare derivative works of the Software (excluding any graphical images
- * included with the Software, which may not be modified or altered), and (c)
- * permit third-parties to whom the Software is furnished to do so, all
- * subject to the following:
+ * The source code included in this file is licensed to you by Facebook under
+ * the Apache License, Version 2.0.  Accordingly, the following notice
+ * applies to the source code included in this file:
  *
- * The copyright notices in the Software and this entire statement, including
- * the above license grant, this restriction and the following disclaimer,
- * must be included in all copies of the Software, in whole or in part, and
- * all derivative works of the Software, unless such copies or derivative
- * works are solely in the form of machine-executable object code generated by
- * a source language processor.
+ * Copyright © 2009 Facebook, Inc.
  *
- * Facebook, Inc. retains ownership of the Software and all associated
- * intellectual property rights.  All rights not expressly granted in this
- * license are reserved by Facebook, Inc.
+ * Licensed 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 SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
- * SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
- * FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
  */
 
+
 var Cc = Components.classes;
 var Ci = Components.interfaces;
 

chrome/content/login.js

@@ -1,37 +1,24 @@
 /**
- * Facebook Firefox Toolbar Software License 
- * Copyright (c) 2007 Facebook, Inc. 
  *
- * Permission is hereby granted, free of charge, to any person or organization
- * obtaining a copy of the software and accompanying documentation covered by
- * this license (which, together with any graphical images included with such
- * software, are collectively referred to below as the "Software") to (a) use,
- * reproduce, display, distribute, execute, and transmit the Software, (b)
- * prepare derivative works of the Software (excluding any graphical images
- * included with the Software, which may not be modified or altered), and (c)
- * permit third-parties to whom the Software is furnished to do so, all
- * subject to the following:
+ * The source code included in this file is licensed to you by Facebook under
+ * the Apache License, Version 2.0.  Accordingly, the following notice
+ * applies to the source code included in this file:
  *
- * The copyright notices in the Software and this entire statement, including
- * the above license grant, this restriction and the following disclaimer,
- * must be included in all copies of the Software, in whole or in part, and
- * all derivative works of the Software, unless such copies or derivative
- * works are solely in the form of machine-executable object code generated by
- * a source language processor.  
+ * Copyright © 2009 Facebook, Inc.
  *
- * Facebook, Inc. retains ownership of the Software and all associated
- * intellectual property rights.  All rights not expressly granted in this
- * license are reserved by Facebook, Inc.
+ * Licensed 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 SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
- * SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
- * FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
  */
 
+
 function debug(s) { dump('** login.js: [' + s + ']\n'); }
 
 var Cc = Components.classes;

chrome/content/notifier.js

@@ -1,37 +1,24 @@
 /**
- * Facebook Firefox Toolbar Software License
- * Copyright (c) 2007-2009 Facebook, Inc.
  *
- * Permission is hereby granted, free of charge, to any person or organization
- * obtaining a copy of the software and accompanying documentation covered by
- * this license (which, together with any graphical images included with such
- * software, are collectively referred to below as the "Software") to (a) use,
- * reproduce, display, distribute, execute, and transmit the Software, (b)
- * prepare derivative works of the Software (excluding any graphical images
- * included with the Software, which may not be modified or altered), and (c)
- * permit third-parties to whom the Software is furnished to do so, all
- * subject to the following:
+ * The source code included in this file is licensed to you by Facebook under
+ * the Apache License, Version 2.0.  Accordingly, the following notice
+ * applies to the source code included in this file:
  *
- * The copyright notices in the Software and this entire statement, including
- * the above license grant, this restriction and the following disclaimer,
- * must be included in all copies of the Software, in whole or in part, and
- * all derivative works of the Software, unless such copies or derivative
- * works are solely in the form of machine-executable object code generated by
- * a source language processor.
+ * Copyright © 2009 Facebook, Inc.
  *
- * Facebook, Inc. retains ownership of the Software and all associated
- * intellectual property rights.  All rights not expressly granted in this
- * license are reserved by Facebook, Inc.
+ * Licensed 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 SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
- * SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
- * FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
  */
 
+
 var _src   = window.arguments[0],
     _label = window.arguments[1],
     _url   = window.arguments[2],

chrome/content/photoupload/photoupload.js

@@ -1,37 +1,24 @@
 /**
- * Facebook Firefox Toolbar Software License
- * Copyright (c) 2009 Facebook, Inc.
  *
- * Permission is hereby granted, free of charge, to any person or organization
- * obtaining a copy of the software and accompanying documentation covered by
- * this license (which, together with any graphical images included with such
- * software, are collectively referred to below as the "Software") to (a) use,
- * reproduce, display, distribute, execute, and transmit the Software, (b)
- * prepare derivative works of the Software (excluding any graphical images
- * included with the Software, which may not be modified or altered), and (c)
- * permit third-parties to whom the Software is furnished to do so, all
- * subject to the following:
+ * The source code included in this file is licensed to you by Facebook under
+ * the Apache License, Version 2.0.  Accordingly, the following notice
+ * applies to the source code included in this file:
  *
- * The copyright notices in the Software and this entire statement, including
- * the above license grant, this restriction and the following disclaimer,
- * must be included in all copies of the Software, in whole or in part, and
- * all derivative works of the Software, unless such copies or derivative
- * works are solely in the form of machine-executable object code generated by
- * a source language processor.
+ * Copyright © 2009 Facebook, Inc.
  *
- * Facebook, Inc. retains ownership of the Software and all associated
- * intellectual property rights.  All rights not expressly granted in this
- * license are reserved by Facebook, Inc.
+ * Licensed 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 SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
- * SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
- * FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
  */
 
+
 // Constants
 
 const Cc = Components.classes;

chrome/content/photoupload/taggingdialog.js

@@ -1,35 +1,21 @@
 /**
- * Facebook Firefox Toolbar Software License
- * Copyright (c) 2009 Facebook, Inc.
  *
- * Permission is hereby granted, free of charge, to any person or organization
- * obtaining a copy of the software and accompanying documentation covered by
- * this license (which, together with any graphical images included with such
- * software, are collectively referred to below as the "Software") to (a) use,
- * reproduce, display, distribute, execute, and transmit the Software, (b)
- * prepare derivative works of the Software (excluding any graphical images
- * included with the Software, which may not be modified or altered), and (c)
- * permit third-parties to whom the Software is furnished to do so, all
- * subject to the following:
+ * The source code included in this file is licensed to you by Facebook under
+ * the Apache License, Version 2.0.  Accordingly, the following notice
+ * applies to the source code included in this file:
  *
- * The copyright notices in the Software and this entire statement, including
- * the above license grant, this restriction and the following disclaimer,
- * must be included in all copies of the Software, in whole or in part, and
- * all derivative works of the Software, unless such copies or derivative
- * works are solely in the form of machine-executable object code generated by
- * a source language processor.
+ * Copyright © 2009 Facebook, Inc.
  *
- * Facebook, Inc. retains ownership of the Software and all associated
- * intellectual property rights.  All rights not expressly granted in this
- * license are reserved by Facebook, Inc.
+ * Licensed 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 SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
- * SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
- * FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
  */
 
 // Debugging.

chrome/content/sidebar.js

@@ -1,37 +1,24 @@
 /**
- * Facebook Firefox Toolbar Software License
- * Copyright (c) 2007-2009 Facebook, Inc.
  *
- * Permission is hereby granted, free of charge, to any person or organization
- * obtaining a copy of the software and accompanying documentation covered by
- * this license (which, together with any graphical images included with such
- * software, are collectively referred to below as the "Software") to (a) use,
- * reproduce, display, distribute, execute, and transmit the Software, (b)
- * prepare derivative works of the Software (excluding any graphical images
- * included with the Software, which may not be modified or altered), and (c)
- * permit third-parties to whom the Software is furnished to do so, all
- * subject to the following:
+ * The source code included in this file is licensed to you by Facebook under
+ * the Apache License, Version 2.0.  Accordingly, the following notice
+ * applies to the source code included in this file:
  *
- * The copyright notices in the Software and this entire statement, including
- * the above license grant, this restriction and the following disclaimer,
- * must be included in all copies of the Software, in whole or in part, and
- * all derivative works of the Software, unless such copies or derivative
- * works are solely in the form of machine-executable object code generated by
- * a source language processor.
+ * Copyright © 2009 Facebook, Inc.
  *
- * Facebook, Inc. retains ownership of the Software and all associated
- * intellectual property rights.  All rights not expressly granted in this
- * license are reserved by Facebook, Inc.
+ * Licensed 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 SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
- * SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
- * FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
  */
 
+
 var Cc = Components.classes;
 var Ci = Components.interfaces;