diff options
| author | Christopher Guindon | 2016-08-03 18:35:27 +0000 |
|---|---|---|
| committer | Christopher Guindon | 2016-08-22 17:19:16 +0000 |
| commit | ec4c80bd161a7c1a9879bdbb2bc663144014886e (patch) | |
| tree | 0249f6bcc96e1a929f025c89c1e6dc1890046d2f | |
| parent | 176739294d19531e4455002df19e444f791756a0 (diff) | |
| download | legal-ec4c80bd161a7c1a9879bdbb2bc663144014886e.tar.gz legal-ec4c80bd161a7c1a9879bdbb2bc663144014886e.tar.xz legal-ec4c80bd161a7c1a9879bdbb2bc663144014886e.zip | |
Bug 498089 - [CLA 2.0] Publish ECA legal documents
Change-Id: Id3b8cddbac396b464b77b356048048b0668590fe
Signed-off-by: Christopher Guindon <chris.guindon@eclipse.org>
| -rw-r--r-- | CLA.php | 94 | ||||
| -rw-r--r-- | CoO.php | 102 | ||||
| -rw-r--r-- | DCO.html | 53 | ||||
| -rw-r--r-- | DCO.php | 47 | ||||
| -rw-r--r-- | ECA.html | 125 | ||||
| -rw-r--r-- | ECA.php | 37 | ||||
| -rw-r--r-- | _projectCommon.php | 44 | ||||
| -rw-r--r-- | clafaq.php | 121 | ||||
| -rw-r--r-- | content/eca_sidebar.php | 32 | ||||
| -rw-r--r-- | ecafaq.php | 213 | ||||
| -rw-r--r-- | index.php | 54 |
11 files changed, 652 insertions, 270 deletions
@@ -1,65 +1,41 @@ -<?php require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/app.class.php"); require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/nav.class.php"); require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/menu.class.php"); $App = new App(); $Nav = new Nav(); $Menu = new Menu(); include($App->getProjectCommon()); # All on the same line to unclutter the user's desktop' +<?php require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/app.class.php"); require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/nav.class.php"); require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/menu.class.php"); $App = new App(); $Nav = new Nav(); $Menu = new Menu(); include($App->getProjectCommon()); # All on the same line to unclutter the user's desktop' - #***************************************************************************** - # - # sample_3col.php - # - # Author: Mike Milinkovich - # Date: 2013-03-01 - # - # Description: Type your page comments here - these are not sent to the browser - # - # - #**************************************************************************** - - # - # Begin: page-specific settings. Change these. - $pageTitle = "Eclipse Foundation Contributor License Agreement"; - $pageKeywords = "certificate, CLA, contributor, legal, eclipse"; - $pageAuthor = "Mike Milinkovich"; - - # Add page-specific Nav bars here - # Format is Link text, link URL (can be http://www.someothersite.com/), target (_self, _blank), level (1, 2 or 3) - # $Nav->addNavSeparator("My Page Links", "downloads.php"); - # $Nav->addCustomNav("My Link", "mypage.php", "_self", 1); - # $Nav->addCustomNav("Google", "http://www.google.com/", "_blank", 1); + #***************************************************************************** + # + # sample_3col.php + # + # Author: Mike Milinkovich + # Date: 2013-03-01 + # + # Description: Type your page comments here - these are not sent to the browser + # + # + #**************************************************************************** - # End: page-specific settings - # - - # Paste your HTML content between the EOHTML markers! - $html = <<<EOHTML + # + # Begin: page-specific settings. Change these. + $pageTitle = "Eclipse Foundation Contributor License Agreement"; + $pageKeywords = "certificate, CLA, contributor, legal, eclipse"; + $pageAuthor = "Mike Milinkovich"; - <div id="midcolumn"> -EOHTML; - - $html .= file_get_contents('CLA.html'); + # Add page-specific Nav bars here + # Format is Link text, link URL (can be http://www.someothersite.com/), target (_self, _blank), level (1, 2 or 3) + # $Nav->addNavSeparator("My Page Links", "downloads.php"); + # $Nav->addCustomNav("My Link", "mypage.php", "_self", 1); + # $Nav->addCustomNav("Google", "http://www.google.com/", "_blank", 1); - $html .= <<<EOHTML - </div> - <div id="rightcolumn"> - <div class="sideitem"> - <h6>Related Links</h6> - <ul> - <li><a href="CLA.html">Contributor License Agreement<br/>in plain HTML</a></li> - <li><a href="clafaq.php">CLA FAQ</a></li> - <li><a href="CoO.php">Certificate of Origin</a></li> - <li><a href="index.php">Legal resources</a></li> - <li><a href="guidetolegaldoc.php">Guide to legal documents</a></li> - <li><a href="index.php#Committers" class=jump>Committer Resources</a></li> - <li><a href="http://wiki.eclipse.org/Development_Resources/Contributing_via_Git">Contributing via Git</a></li> - </ul> - <p>To complete and submit a CLA, log into the <a - href="/contribute/cla">Eclipse projects forge</a> - (you will need to create an account with the Eclipse Foundation if you have not - already done so); click on "Contributor License Agreement"; and Complete the form. - Be sure to use the same email address when you register for the - account that you intend to use when you commit to Git.</p> - </div> - </div> -EOHTML; + # End: page-specific settings + # + # Paste your HTML content between the EOHTML markers! + $html = '<div id="midcolumn">'; + $html .= file_get_contents('CLA.html'); + $html .= '</div>'; + ob_start(); + include('content/eca_sidebar.php'); + $html .= ob_get_clean(); - # Generate the web page - $App->generatePage($theme, $Menu, $Nav, $pageAuthor, $pageKeywords, $pageTitle, $html); -?> + + # Generate the web page + $App->setOutDated('2016-08-22'); + $App->generatePage($theme, $Menu, $Nav, $pageAuthor, $pageKeywords, $pageTitle, $html); @@ -1,59 +1,43 @@ -<?php require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/app.class.php"); require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/nav.class.php"); require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/menu.class.php"); $App = new App(); $Nav = new Nav(); $Menu = new Menu(); include($App->getProjectCommon()); # All on the same line to unclutter the user's desktop' - - #***************************************************************************** - # - # sample_3col.php - # - # Author: Mike Milinkovich - # Date: 2013-03-01 - # - # Description: Type your page comments here - these are not sent to the browser - # - # - #**************************************************************************** - - # - # Begin: page-specific settings. Change these. - $pageTitle = "Eclipse Foundation Contributor's Certificate of Origin"; - $pageKeywords = "certificate, CLA, contributor, legal, eclipse"; - $pageAuthor = "Mike Milinkovich"; - - # Add page-specific Nav bars here - # Format is Link text, link URL (can be http://www.someothersite.com/), target (_self, _blank), level (1, 2 or 3) - # $Nav->addNavSeparator("My Page Links", "downloads.php"); - # $Nav->addCustomNav("My Link", "mypage.php", "_self", 1); - # $Nav->addCustomNav("Google", "http://www.google.com/", "_blank", 1); - - # End: page-specific settings - # - - # Paste your HTML content between the EOHTML markers! - - - $html = <<<EOHTML - - <div id="midcolumn"> -EOHTML; - - $html .= file_get_contents('CoO.html'); - - $html .= <<<EOHTML - </div> - <div id="rightcolumn"> - <div class="sideitem"> - <h6>Related Links</h6> - <ul> - <li><a href="CoO.html">Certificate of Origin in plain HTML</a></li> - <li><a href="CLA.php">Contributor License Agreement</a></li> - <li><a href="index.php">Legal resources</a></li> - <li><a href="guidetolegaldoc.php">Guide to legal documents</a></li> - <li><a href="index.php#Committers" class=jump>Committer Resources</a></li> - </ul> - </div> - </div> -EOHTML; - - - # Generate the web page - $App->generatePage($theme, $Menu, $Nav, $pageAuthor, $pageKeywords, $pageTitle, $html); -?> +<?php require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/app.class.php"); require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/nav.class.php"); require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/menu.class.php"); $App = new App(); $Nav = new Nav(); $Menu = new Menu(); include($App->getProjectCommon()); # All on the same line to unclutter the user's desktop' + + #***************************************************************************** + # + # sample_3col.php + # + # Author: Mike Milinkovich + # Date: 2013-03-01 + # + # Description: Type your page comments here - these are not sent to the browser + # + # + #**************************************************************************** + + # + # Begin: page-specific settings. Change these. + $pageTitle = "Eclipse Foundation Contributor's Certificate of Origin"; + $pageKeywords = "certificate, CLA, contributor, legal, eclipse"; + $pageAuthor = "Mike Milinkovich"; + + # Add page-specific Nav bars here + # Format is Link text, link URL (can be http://www.someothersite.com/), target (_self, _blank), level (1, 2 or 3) + # $Nav->addNavSeparator("My Page Links", "downloads.php"); + # $Nav->addCustomNav("My Link", "mypage.php", "_self", 1); + # $Nav->addCustomNav("Google", "http://www.google.com/", "_blank", 1); + + # End: page-specific settings + # + + # Paste your HTML content between the EOHTML markers! + + $html = '<div id="midcolumn">'; + $html .= file_get_contents('CoO.html'); + $html .= '</div>'; + ob_start(); + include('content/eca_sidebar.php'); + $html .= ob_get_clean(); + + # Generate the web page + # Generate the web page + $App->setOutDated('2016-08-22'); + $App->generatePage($theme, $Menu, $Nav, $pageAuthor, $pageKeywords, $pageTitle, $html); + diff --git a/DCO.html b/DCO.html new file mode 100644 index 0000000..0eaf283 --- /dev/null +++ b/DCO.html @@ -0,0 +1,53 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2//EN"> +<!-- saved from url=(0032)http://developercertificate.org/ --> +<html><!-- + File: index.html + Editor: None, you wimpy wysiwyg people...this is hand crafted! + What are you doing reading this anyway??? +--><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> + <title>Developer Certificate of Origin</title> +</head> + +<body> +<pre>Developer Certificate of Origin +Version 1.1 + +Copyright (C) 2004, 2006 The Linux Foundation and its contributors. +1 Letterman Drive +Suite D4700 +San Francisco, CA, 94129 + +Everyone is permitted to copy and distribute verbatim copies of this +license document, but changing it is not allowed. + + +Developer's Certificate of Origin 1.1 + +By making a contribution to this project, I certify that: + +(a) The contribution was created in whole or in part by me and I + have the right to submit it under the open source license + indicated in the file; or + +(b) The contribution is based upon previous work that, to the best + of my knowledge, is covered under an appropriate open source + license and I have the right under that license to submit that + work with modifications, whether created in whole or in part + by me, under the same open source license (unless I am + permitted to submit under a different license), as indicated + in the file; or + +(c) The contribution was provided directly to me by some other + person who certified (a), (b) or (c) and I have not modified + it. + +(d) I understand and agree that this project and the contribution + are public and that a record of the contribution (including all + personal information I submit with it, including my sign-off) is + maintained indefinitely and may be redistributed consistent with + this project or the open source license(s) involved. +</pre> + + + +</body></html>
\ No newline at end of file @@ -0,0 +1,47 @@ +<?php +/******************************************************************************* + * Copyright (c) 2016 Eclipse Foundation and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://eclipse.org/legal/epl-v10.html + * + * Contributors: + * Christopher Guindon (Eclipse Foundation) - Initial implementation + *******************************************************************************/ + + require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/app.class.php"); + require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/nav.class.php"); + require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/menu.class.php"); + + $App = new App(); + $Nav = new Nav(); + $Menu = new Menu(); + + include($App->getProjectCommon()); # All on the same line to unclutter the user's desktop' + + # Begin: page-specific settings. Change these. + $pageTitle = "Developer Certificate of Origin"; + $pageKeywords = "certificate, Developer Certificate of Origin, contributor, legal, eclipse"; + $pageAuthor = "Mike Milinkovich"; + + # Paste your HTML content between the EOHTML markers! + $html = '<div id="midcolumn">'; + + // Fetch DCO.HTML and return evertying in <body> + $document = new DOMDocument; + $new_document = new DOMDocument; + $document->loadHTML(file_get_contents('DCO.html')); + $body = $document->getElementsByTagName('body')->item(0); + foreach ($body->childNodes as $child){ + $new_document->appendChild($new_document->importNode($child, true)); + } + + $html .= $new_document->saveHTML(); + $html .= '</div>'; + ob_start(); + include('content/eca_sidebar.php'); + $html .= ob_get_clean(); + + # Generate the web page + $App->generatePage($theme, $Menu, $Nav, $pageAuthor, $pageKeywords, $pageTitle, $html);
\ No newline at end of file diff --git a/ECA.html b/ECA.html new file mode 100644 index 0000000..5bde1df --- /dev/null +++ b/ECA.html @@ -0,0 +1,125 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> +<head> + <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" /> + <title>Eclipse Contributor Agreement</title> +</head> +<body lang="EN-US"> + <div id="text1"> + <h1>Eclipse Contributor Agreement</h1> + <p>Version 2.0.0 August 22, 2016</p> + + <p id="reference"> + <strong>This is a reference copy of the terms of the Eclipse Contributor Agreement. + To actually complete and submit an ECA, please go to the ECA form.</strong> + </p> + + <p> + Thank you for your interest in one or more projects managed by the Eclipse Foundation, Inc. + ("Eclipse Foundation"). In order for You (as defined below) to make intellectual + property Contributions (as defined below) now or in the future to Eclipse Foundation projects, + You must agree to this Eclipse Contributor Agreement ("ECA"). If You have any + questions about this agreement, licensing, or anything related to intellectual property at the + Eclipse Foundation, please send an email to <a href="mailto:license@eclipse.org">license@eclipse.org</a>. + </p> + + <p> + Please read this ECA carefully before accepting its terms. By accepting the ECA, You are agreeing + to be bound by its terms. If You want to accept this ECA, complete the form completely, print a + copy for Your records, and when ready, press the “Accept” button at the end of this form. + </p> + + <p> + As used in this ECA: (i) “You" (or "Your") shall mean the entity that is + making this Agreement with the Eclipse Foundation; (ii)"Contribution" shall mean any + original work of authorship, including any modifications or additions to an existing work, that + is submitted by You to the Eclipse Foundation for inclusion in, or documentation of, any of the + Eclipse Foundation projects; and (iii) “Submit” (or “Submitted”) means + any form of communication sent to the Eclipse Foundation (e.g. the content You post on electronic + mailing lists, forums, content management systems, source code control systems, code review systems, + issue tracking systems, etc. that are used by the Eclipse Foundation). + </p> + + <p> + This agreement applies to all Contributions You Submit. + </p> + + <p> + This ECA, and the license(s) associated with the particular Eclipse Foundation projects + You are contributing to, provides a license to Your Contributions to the Eclipse Foundation + and downstream consumers, but You still own Your Contributions, and except for the licenses + provided for in this ECA, You reserve all right, title and interest in Your Contributions. + </p> + + <p> + The Eclipse Foundation requires that each Contribution You Submit now or in the future to comply + with the following commitments documented in the Developer Certificate of Origin (DCO). + To confirm that You have read and agreed to each, please click on the box beside each one. + </p> + </div> + <div id="text2"> + <h2>Developer Certificate of Origin</h2> + <p>Version 1.1</p> + + <p> + Copyright (C) 2004, 2006 The Linux Foundation and its contributors.<br/> + 660 York Street, Suite 102,<br/> + San Francisco, CA 94110 USA<br/> + </p> + + <p> + Everyone is permitted to copy and distribute verbatim copies of this license document, + but changing it is not allowed. + </p> + + <h3>Developer's Certificate of Origin 1.1</h3> + + <p>By making a contribution to this project, I certify that: </p> + </div> + + <ol style="list-style-type: lower-alpha;"> + + <li id="question1"> + The contribution was created in whole or in part by me and I have the right to submit + it under the open source license indicated in the file or + </li> + + <li id="question2"> + The contribution is based upon previous work that, to the best of my knowledge, is + covered under an appropriate open source license and I have the right under that + license to submit that work with modifications, whether created in whole or in part by + me, under the same open source license (unless I am permitted to submit under a + different license), as indicated in the file or + </li> + + <li id="question3"> + The contribution was provided directly to me by some other person who certified (a), + (b) or (c) and I have not modified it. + </li> + + <li id="question4"> + I understand and agree that this project and the contribution are public and that a + record of the contribution (including al personal information I submit with it, including + my signoff) is maintained indefinitely and may be redistributed consistent with this + project or the open source license(s) involved. + </li> + </ol> + <div id="text3"> + <p> + You wil promptly notify the Eclipse Foundation if You become aware of any facts or circumstances + that would make these commitments inaccurate in any way. To do so, please send an email to + <a href="mailto:license@eclipse.org">license@eclipse.org</a> + </p> + + <p> + The Eclipse Foundation takes intellectual property very seriously, so we are going to ask + You to re­-confirm this ECA every three years. + </p> + </div> + <div id="text4"> + <p> + You represent that the information provided below is accurate. + </p> + </div> +</body> +</html>
\ No newline at end of file @@ -0,0 +1,37 @@ +<?php +/******************************************************************************* + * Copyright (c) 2016 Eclipse Foundation and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://eclipse.org/legal/epl-v10.html + * + * Contributors: + * Christopher Guindon (Eclipse Foundation) - Initial implementation + *******************************************************************************/ + + require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/app.class.php"); + require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/nav.class.php"); + require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/menu.class.php"); + + $App = new App(); + $Nav = new Nav(); + $Menu = new Menu(); + + include($App->getProjectCommon()); # All on the same line to unclutter the user's desktop' + + # Begin: page-specific settings. Change these. + $pageTitle = "Eclipse Contributor Agreement"; + $pageKeywords = "certificate, ECA, contributor, legal, eclipse"; + $pageAuthor = "Mike Milinkovich"; + + # Paste your HTML content between the EOHTML markers! + $html = '<div id="midcolumn">'; + $html .= file_get_contents('ECA.html'); + $html .= '</div>'; + ob_start(); + include('content/eca_sidebar.php'); + $html .= ob_get_clean(); + + # Generate the web page + $App->generatePage($theme, $Menu, $Nav, $pageAuthor, $pageKeywords, $pageTitle, $html);
\ No newline at end of file diff --git a/_projectCommon.php b/_projectCommon.php index ac4b89b..93292db 100644 --- a/_projectCommon.php +++ b/_projectCommon.php @@ -1,21 +1,29 @@ <?php +/******************************************************************************* + * Copyright (c) 2016 Eclipse Foundation and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://eclipse.org/legal/epl-v10.html + * + * Contributors: + * Christopher Guindon (Eclipse Foundation) - Initial implementation + *******************************************************************************/ - # Set the theme for your project's web pages. - # See the Committer Tools "Phoenix" secion in the How Do I? for list of themes - # https://dev.eclipse.org/committers/ - $theme = "solstice"; + # Set the theme for your project's web pages. + # See the Committer Tools "Phoenix" secion in the How Do I? for list of themes + # https://dev.eclipse.org/committers/ + $theme = NULL; - # Define your project-wide Nav bars here. - # Format is Link text, link URL (can be http://www.someothersite.com/), target (_self, _blank), level (1, 2 or 3) - $Nav->addNavSeparator("About Us", "/org/"); - $Nav->addCustomNav("Annual Report", "/org/foundation/reports/annual_report.php", "_self", 1); - $Nav->addCustomNav("Foundation", "/org/foundation/", "_self", 1); - $Nav->addCustomNav("Governance", "/org/documents/", "_self", 1); - $Nav->addCustomNav("Legal Resources", "/legal/", "_self", 1); - $Nav->addCustomNav("Contact Us", "/org/foundation/contact.php", "_self", 1); - - $Nav->addNavSeparator("CLA", "/legal/CLA.php"); - $Nav->addCustomNav("Validate", "https://projects.eclipse.org/user/cla/validate", "_self", 1); - $Nav->addCustomNav("Sign", "https://projects.eclipse.org/user/sign/cla", "_self", 1); - -?> + # Define your project-wide Nav bars here. + # Format is Link text, link URL (can be http://www.someothersite.com/), target (_self, _blank), level (1, 2 or 3) + $Nav->addNavSeparator("About Us", "/org/"); + $Nav->addCustomNav("Annual Report", "/org/foundation/reports/annual_report.php", "_self", 1); + $Nav->addCustomNav("Foundation", "/org/foundation/", "_self", 1); + $Nav->addCustomNav("Governance", "/org/documents/", "_self", 1); + $Nav->addCustomNav("Legal Resources", "/legal/", "_self", 1); + $Nav->addCustomNav("Contact Us", "/org/foundation/contact.php", "_self", 1); + + $Nav->addNavSeparator("ECA", "/legal/ECA.php"); + $Nav->addCustomNav("Validate", "/contribute/cla", "_self", 1); + $Nav->addCustomNav("Sign", "/contribute/cla", "_self", 1); @@ -1,108 +1,15 @@ -<?php require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/app.class.php"); require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/nav.class.php"); require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/menu.class.php"); $App = new App(); $Nav = new Nav(); $Menu = new Menu(); include($App->getProjectCommon()); # All on the same line to unclutter the user's desktop' - - - # - # Begin: page-specific settings. Change these. - $pageTitle = "Eclipse CLA FAQ"; - $pageKeywords = "legal, documents, about, contributor, license, agreement, IP, intellectual property, CLA"; - $pageAuthor = "Mike Milinkovich"; - - # Add page-specific Nav bars here - # Format is Link text, link URL (can be http://www.someothersite.com/), target (_self, _blank), level (1, 2 or 3) - # $Nav->addNavSeparator("My Page Links", "downloads.php"); - # $Nav->addCustomNav("My Link", "mypage.php", "_self", 1); - # $Nav->addCustomNav("Google", "http://www.google.com/", "_blank", 1); - - # End: page-specific settings - # - - ob_start(); - ?> - <div id="midcolumn"> - <h1><?php echo $pageTitle; ?></h1> - <p>Last updated June 27, 2013</p> - <p>The Eclipse Foundation <a href="CLA.php">Contributor License Agreement</a> (CLA) is a key document in - the process of managing intellectual property contributions to Eclipse projects. This FAQ is - intended to help explain what they are, and how they are used.</p> - <ol> - <li><strong>What does the CLA do?</strong><br/><br/> - The purpose of the CLA is to provide a written record that you have agreed to - provide your contributions of code and documentation under the licenses used by - the Eclipse project(s) you're contributing to. It also makes it clear that you - are promising that what you are contributing to Eclipse is code that you wrote, and - you have the necessary rights to contribute it to our projects. And finally, it documents a - commitment from you that your open source contributions will be permanently on - the public record.</li> - - <li><strong>Why is a CLA necessary?</strong><br/><br/> - It's basically about documenting the provenance of all of the intellectual property coming - into Eclipse. We want to have a clear record that you have agreed to the terms under which - the Eclipse community has agreed to accept contributions.</li> - - <li><strong>Does this means that the Eclipse Foundation will own my code?</strong><br/><br/> - No. The Eclipse CLA does not include a license or assignment to the Eclipse Foundation. Unlike - many other open source communities or projects, Eclipse simply wants you to license your - contributions under the open source license(s) used by the project. So you (or your employer) - will continue to own your code. </li> - - <li><strong>Why do you need to know my personal information?</strong><br/><br/> - As part of our open source project recordkeeping, we want to be able to link every line - of code to the people who contributed them. In the unlikely event of a dispute over - authorship or copyright provenance, Eclipse needs to be able to demonstrate when the code - arrived at Eclipse, how we acquired the rights to that code, and who wrote it.</li> - - <li><strong>How long is the CLA good for?</strong><br/><br/> - The CLA is good for three years, after which it will be expired and you will be asked - to complete a new one. However, if your personal information changes (e.g. your address - or your employer), we ask that you invalidate your current CLA and complete a new one.</li> - - <li><strong>Does the CLA replace my committer agreement?</strong><br/><br/> - No. Your Committer Agreement is the agreement that allows you to have write access to the Eclipse Foundation - source code repositories. The CLA is intended for people who are not committers who wish to make - contributions to Eclipse projects.</li> - - <li><strong>I am an Eclipse committer. Do I need to sign a CLA?</strong><br/><br/> - Maybe. You do not need to sign a CLA to work on the projects for which you are a committer. - However, if you want to make contributions to an Eclipse project for which you are <strong>not</strong> - a committer, you will need a CLA. - </li> - - <li><strong>What happens if I don't sign the CLA?</strong><br/><br/> - Nothing, except you won't be allowed to contribute to open source - projects at Eclipse.</li> - - <li><strong>Eclipse has been around a long time. Why are you doing CLAs now?</strong><br/><br/> - We want to make it easier for you to contribute to Eclipse projects. Previously, we have been asking contributors - to agree to the equivalent of the CLA via Bugzilla or Gerrit on each and every contribution. - Moving to CLAs is intended to streamline that process, and make it easier for contributions to - be accepted by Eclipse projects.</li> - - <li><strong>How do I sign a CLA?</strong><br/><br/> - Log into the <a - href="http://www.eclipse.org/contribute/cla">Eclipse projects forge</a> - (you will need to create an account with the Eclipse Foundation if you have not - already done so); click on "Contributor License Agreement"; and Complete the form. - Be sure to use the same email address when you register for the - account that you intend to use on Git commit records.</li> - </ol> - </div> - <div id="rightcolumn"> - <div class="sideitem"> - <h6>Related Links</h6> - <ul> - <li><a href="CLA.php">Contributor License Agreement</a></li> - <li><a href="CoO.php">Certificate of Origin</a></li> - <li><a href="index.php">Legal resources</a></li> - <li><a href="guidetolegaldoc.php">Guide to legal documents</a></li> - <li><a href="index.php#Committers" class=jump>Committer Resources</a></li> - </ul> - </div> - </div> - - <?php - $html = ob_get_contents(); - ob_end_clean(); - # Generate the web page - $App->generatePage($theme, $Menu, $Nav, $pageAuthor, $pageKeywords, $pageTitle, $html); -?> +/******************************************************************************* + * Copyright (c) 2016 Eclipse Foundation and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://eclipse.org/legal/epl-v10.html + * + * Contributors: + * Mike Milinkovich (Eclipse Foundation) - Initial implementation + * Christopher Guindon (Eclipse Foundation) + *******************************************************************************/ + // Bug 495498 - [CLA] Implement new version of CLA + // Redirect to the new ECAfaq page. + header('Location: ecafaq.php');
\ No newline at end of file diff --git a/content/eca_sidebar.php b/content/eca_sidebar.php new file mode 100644 index 0000000..dfea2d7 --- /dev/null +++ b/content/eca_sidebar.php @@ -0,0 +1,32 @@ +<?php +/******************************************************************************* + * Copyright (c) 2016 Eclipse Foundation and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://eclipse.org/legal/epl-v10.html + * + * Contributors: + * Christopher Guindon (Eclipse Foundation) - Initial implementation + *******************************************************************************/ +?> +<div id="rightcolumn"> + <div class="sideitem"> + <h6>Related Links</h6> + <ul> + <li><a href="/legal/ECA.php">Eclipse Contributor Agreement</a> [<a href="/legal/ECA.html">html</a>]</li> + <li><a href="/legal/ecafaq.php">ECA FAQ</a></li> + <li><a href="/legal/DCO.php">Developer Certificate of Origin</a> [<a href="/legal/DCO.html">html</a>]</li> + <li><a href="/legal/index.php">Legal resources</a></li> + <li><a href="/legal/guidetolegaldoc.php">Guide to legal documents</a></li> + <li><a href="/legal/index.php#Committers" class=jump>Committer Resources</a></li> + <li><a href="http://wiki.eclipse.org/Development_Resources/Contributing_via_Git">Contributing via Git</a></li> + </ul> + <p>To complete and submit a ECA, log into the <a href="/contribute/cla">Eclipse projects forge</a> + (you will need to create an account with the Eclipse Foundation if you have not + already done so); click on "Eclipse Contributor Agreement"; and Complete the form. + Be sure to use the same email address when you register for the + account that you intend to use when you commit to Git. + </p> + </div> +</div>
\ No newline at end of file diff --git a/ecafaq.php b/ecafaq.php new file mode 100644 index 0000000..1d1c3bb --- /dev/null +++ b/ecafaq.php @@ -0,0 +1,213 @@ +<?php +/******************************************************************************* + * Copyright (c) 2016 Eclipse Foundation and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://eclipse.org/legal/epl-v10.html + * + * Contributors: + * Mike Milinkovich (Eclipse Foundation) - Initial implementation + * Christopher Guindon (Eclipse Foundation) + *******************************************************************************/ + + require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/app.class.php"); + require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/nav.class.php"); + require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/menu.class.php"); + + $App = new App(); + $Nav = new Nav(); + $Menu = new Menu(); + include($App->getProjectCommon()); # All on the same line to unclutter the user's desktop' + + # Begin: page-specific settings. Change these. + $pageTitle = "Eclipse Contributor Agreement (ECA) FAQ"; + $pageKeywords = "legal, documents, about, contributor, license, agreement, IP, intellectual property, ECA"; + $pageAuthor = "Mike Milinkovich"; + + ob_start(); + ?> + <div id="midcolumn"> + <h1><?php echo $pageTitle; ?></h1> + <p>Last updated August 10, 2016</p> + <p>The <a href="ECA.php">Eclipse Contributor Agreement</a> (ECA) is a key document in + the process of managing intellectual property contributions to Eclipse projects. This FAQ is + intended to help explain what they are, and how they are used.</p> + <div class="panel-group" id="accordion" role="tablist" aria-multiselectable="true"> + <div class="panel panel-info"> + <div class="panel-heading" role="tab" id="headingOne"> + <h4 class="panel-title"> + <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseOne" aria-expanded="true" aria-controls="collapseOne"> + 1. What does the ECA do? + </a> + </h4> + </div> + <div id="collapseOne" class="panel-collapse collapse in" role="tabpanel" aria-labelledby="headingOne"> + <div class="panel-body"> + The purpose of the ECA is to provide a written record that you have agreed to + provide your contributions of code and documentation under the licenses used by + the Eclipse project(s) you're contributing to. It also makes it clear that you + are promising that what you are contributing to Eclipse is code that you wrote, and + you have the necessary rights to contribute it to our projects. And finally, it documents a + commitment from you that your open source contributions will be permanently on + the public record. + </div> + </div> + </div> + <div class="panel panel-info"> + <div class="panel-heading" role="tab" id="headingTwo"> + <h4 class="panel-title"> + <a class="collapsed" role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseTwo" aria-expanded="false" aria-controls="collapseTwo"> + 2. Why is a ECA necessary? + </a> + </h4> + </div> + <div id="collapseTwo" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingTwo"> + <div class="panel-body"> + It's basically about documenting the provenance of all of the intellectual property coming + into Eclipse. We want to have a clear record that you have agreed to the terms under which + the Eclipse community has agreed to accept contributions. + </div> + </div> + </div> + <div class="panel panel-info"> + <div class="panel-heading" role="tab" id="headingThree"> + <h4 class="panel-title"> + <a class="collapsed" role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseThree" aria-expanded="false" aria-controls="collapseThree"> + 3. Does this means that the Eclipse Foundation will own my code? + </a> + </h4> + </div> + <div id="collapseThree" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingThree"> + <div class="panel-body"> + No. The ECA does not include a license or assignment to the Eclipse Foundation. Unlike + many other open source communities or projects, Eclipse simply wants you to license your + contributions under the open source license(s) used by the project. So you (or your employer) + will continue to own your code. + </div> + </div> + </div> + <div class="panel panel-info"> + <div class="panel-heading" role="tab" id="headingFour"> + <h4 class="panel-title"> + <a class="collapsed" role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseFour" aria-expanded="false" aria-controls="collapseFour"> + 4. Why do you need to know my personal information? + </a> + </h4> + </div> + <div id="collapseFour" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingFour"> + <div class="panel-body"> + As part of our open source project recordkeeping, we want to be able to link every line + of code to the people who contributed them. In the unlikely event of a dispute over + authorship or copyright provenance, Eclipse needs to be able to demonstrate when the code + arrived at Eclipse, how we acquired the rights to that code, and who wrote it + </div> + </div> + </div> + <div class="panel panel-info"> + <div class="panel-heading" role="tab" id="headingFive"> + <h4 class="panel-title"> + <a class="collapsed" role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseFive" aria-expanded="false" aria-controls="collapseFive"> + 5. How long is the ECA good for? + </a> + </h4> + </div> + <div id="collapseFive" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingFive"> + <div class="panel-body"> + The ECA is good for three years, after which it will be expired and you will be asked + to complete a new one. However, if your personal information changes (e.g. your address + or your employer), we ask that you invalidate your current ECA and complete a new one. + </div> + </div> + </div> + <div class="panel panel-info"> + <div class="panel-heading" role="tab" id="headingSix"> + <h4 class="panel-title"> + <a class="collapsed" role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseSix" aria-expanded="false" aria-controls="collapseSix"> + 6. Does the ECA replace my committer agreement? + </a> + </h4> + </div> + <div id="collapseSix" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingSix"> + <div class="panel-body"> + No. Your Committer Agreement is the agreement that allows you to have write access to the Eclipse Foundation + source code repositories. The ECA is intended for people who are not committers who wish to make + contributions to Eclipse projects. + </div> + </div> + </div> + <div class="panel panel-info"> + <div class="panel-heading" role="tab" id="headingSeven"> + <h4 class="panel-title"> + <a class="collapsed" role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseSeven" aria-expanded="false" aria-controls="collapseSeven"> + 7. I am an Eclipse committer. Do I need to sign a ECA? + </a> + </h4> + </div> + <div id="collapseSeven" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingSeven"> + <div class="panel-body"> + Maybe. You do not need to sign a ECA to work on the projects for which you are a committer. + However, if you want to make contributions to an Eclipse project for which you are <strong>not</strong> + a committer, you will need a ECA. + </div> + </div> + </div> + <div class="panel panel-info"> + <div class="panel-heading" role="tab" id="headingEight"> + <h4 class="panel-title"> + <a class="collapsed" role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseEight" aria-expanded="false" aria-controls="collapseEight"> + 8. What happens if I don't sign the ECA? + </a> + </h4> + </div> + <div id="collapseEight" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingEight"> + <div class="panel-body"> + Nothing, except you won't be allowed to contribute to open source + projects at Eclipse + </div> + </div> + </div> + <div class="panel panel-info"> + <div class="panel-heading" role="tab" id="headingNine"> + <h4 class="panel-title"> + <a class="collapsed" role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseNine" aria-expanded="false" aria-controls="collapseNine"> + 9. Eclipse has been around a long time. Why are you doing ECAs now? + </a> + </h4> + </div> + <div id="collapseNine" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingNine"> + <div class="panel-body"> + We want to make it easier for you to contribute to Eclipse projects. Previously, we have been asking contributors + to agree to the equivalent of the ECA via Bugzilla or Gerrit on each and every contribution. + Moving to ECAs is intended to streamline that process, and make it easier for contributions to + be accepted by Eclipse projects. + </div> + </div> + </div> + <div class="panel panel-info"> + <div class="panel-heading" role="tab" id="headingTen"> + <h4 class="panel-title"> + <a class="collapsed" role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseTen" aria-expanded="false" aria-controls="collapseTen"> + 10. How do I sign a ECA? + </a> + </h4> + </div> + <div id="collapseTen" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingTen"> + <div class="panel-body"> + Log into the <a href="http://www.eclipse.org/contribute/cla">Eclipse projects forge</a> + (you will need to create an account with the Eclipse Foundation if you have not + already done so); click on "Eclipse Contributor Agreement"; and Complete the form. + Be sure to use the same email address when you register for the + account that you intend to use on Git commit records. + </div> + </div> + </div> + </div> + </div> +<?php + include('content/eca_sidebar.php'); + $html = ob_get_contents(); + ob_end_clean(); + + # Generate the web page + $App->generatePage($theme, $Menu, $Nav, $pageAuthor, $pageKeywords, $pageTitle, $html); @@ -2,11 +2,11 @@ # - # Begin: page-specific settings. Change these. + # Begin: page-specific settings. Change these. $pageTitle = "Legal Resources"; $pageKeywords = "legal, documents, about"; $pageAuthor = "M. Ward Nov 18/05"; - + # Add page-specific Nav bars here # Format is Link text, link URL (can be http://www.someothersite.com/), target (_self, _blank), level (1, 2 or 3) # $Nav->addNavSeparator("My Page Links", "downloads.php"); @@ -15,8 +15,8 @@ # End: page-specific settings # - - # Paste your HTML content between the EOHTML markers! + + # Paste your HTML content between the EOHTML markers! $html = <<<EOHTML <div id="midcolumn"> @@ -31,13 +31,13 @@ <li><a href="#Committers" class=jump>Committer Resources</a></li> </ul> </blockquote> - + <div class="homeitem3col"> <h3><a name="GettingStarted"></a>Getting Started</h3> <ul> - <li><a href="guidetolegaldoc.php">Guide to the Legal Documents:</a> + <li><a href="guidetolegaldoc.php">Guide to the Legal Documents:</a> This provides an in-depth look at the many legal documents related to the Eclipse open source community. This content is of value to committers, contributors, redistributors of Eclipse content, developers of Eclipse-based products and users of Eclipse technologies. - </li> + </li> <li><A href="eplfaq.php">EPL Frequently Asked Questions:</A> This FAQ answers some of the commonly asked questions about the Eclipse Public License (EPL). </li> @@ -48,13 +48,13 @@ </li> </ul> </div> - + <div class="homeitem3col"> <h3><a name="Agreements"></a>Agreements and Licenses</h3> <ul> <li><a href="termsofuse.php">Web Site Terms of Use:</a> - By accessing, browsing or using this web site, you acknowledge that you have - read, understood, and agree to be bound by the terms and conditions + By accessing, browsing or using this web site, you acknowledge that you have + read, understood, and agree to be bound by the terms and conditions contained in this agreement. </li> <li><A href="../org/documents/epl-v10.php">Eclipse Public License (EPL):</A> @@ -62,15 +62,15 @@ </li> <li><A href="../org/documents/edl-v10.php">Eclipse Distribution License (EDL):</A> The BSD license used by some Eclipse projects which require dual-licensing along with the EPL. - Other than for <a href="noncodelicenses.php">example code or build scipts</a>, use of this + Other than for <a href="noncodelicenses.php">example code or build scipts</a>, use of this license by an Eclipse project is on a case-by-case basis and requires unanimous approval of the <a href="../org/foundation/directors.php">Board of Directors</a>. </li> - <li><a href="CLA.php">Contributor License Agreement:</a> + <li><a href="ECA.php">Eclipse Contributor Agreement:</a> If you are contributing code or documentation to Eclipse Foundation projects you are required to complete this agreement. </li> - <li><a href="CoO.php">Contributor's Certificate of Originality:</a> + <li><a href="DCO.php">Developer Certificate of Origin:</a> If you are contributing code or documentation to Eclipse Foundation projects, and using the git signed-off-by mechanism, you are agreeing to this certificate. </li> @@ -78,13 +78,13 @@ Contact information for the Eclipse Foundation's Copyright Agent. </li> <li><A href="epl/notice.php">Eclipse Foundation Software User Agreement:</A> - By downloading builds or accessing Eclipse Foundation source code repositories, you - acknowledge that you have read, understood, and agree to be bound by the - terms and conditions contained in this agreement. + By downloading builds or accessing Eclipse Foundation source code repositories, you + acknowledge that you have read, understood, and agree to be bound by the + terms and conditions contained in this agreement. </li> <li><a href="noncodelicenses.php">Approved Licenses for Non-Code, Example, and Other Content:</a> The Board of Directors has approved the use of certain licenses for specific types of - content on eclipse.org. + content on eclipse.org. </li> <li><A href="updatemanager.php">Eclipse Foundation Update Manager Agreement:</A> If you package "downloadable features" to be installed @@ -97,16 +97,16 @@ <h3><a name="Trademarks"></a>Privacy and Trademarks</h3> <ul> <li><A href="privacy.php">Privacy Policy:</A> - Your privacy is important to us. This statement discloses the information practices for this web site, including what type of + Your privacy is important to us. This statement discloses the information practices for this web site, including what type of information is gathered and tracked, how the information is used, and with whom the information is shared. </li> <li><A href="logo_guidelines.php">Trademark Usage Guidelines:</A> Guidelines on permissable use of Eclipse logos and trademarks. - </li> + </li> <li><A href="Trademark_Transfer_Agreement.pdf">Trademark Transfer Agreement:</A> Pre-existing projects which move to the Eclipse Foundation will be required to execute this agreement to ensure that the Eclipse Foundation has rights to any trademarks associated with the project name. - </li> + </li> <li><A href="trademarkattributions.php">Trademark Attributions:</A> Content on this web site may make reference to trademarks requiring attribution. </li> @@ -126,7 +126,7 @@ Committers covered by an Individual Committer Agreement must document the consent of their employer when participating in Eclipse projects. </li> - + </ul> </div> <div class="homeitem3col"> @@ -145,17 +145,17 @@ <li><A href="ContributionQuestionnairePart1-v1.0.php">Contribution Questionnaire:</A> Prior to committing a significant contribution of content to an Eclipse Foundation project, the committer must fill out this questionnaire and submit it to the Eclipse Management Organization (EMO) for approval. In addition to the EMO, the relevant PMC must also provide a technical review and approval of the contribution. Follow the link to find out more about what we mean by "significant contribution". Bug fixes or minor enhancements do not require PMC or EMO approval. </li> - + <li><A href="epl/about.php">"About" Templates:</A> - This provides templates for the "about.html" ("About") files used to describe - EPL-licensed content. + This provides templates for the "about.html" ("About") files used to describe + EPL-licensed content. </li> <li><A href="copyrightandlicensenotice.php">Default Copyright and License Notice:</A> The standard copyright and license notice should appear in all source files where possible. Variations on this notice may be required (for example where a license other than the CPL or EPL governs the use of the file). </li> <li><A href="http://wiki.eclipse.org/Development_Resources/Automatic_IP_Log#Contributors">Using the IPLog+ Flag in Bugzilla:</A> - There are two different ways to mark a contribution in bugzilla. If the contribution is an attachment to a bug such as a patch, the attachment itself should be marked with the iplog+ flag. If the contribution is in the form of a comment in the bug, then the iplog+ flag should be set on the bug itself. + There are two different ways to mark a contribution in bugzilla. If the contribution is an attachment to a bug such as a patch, the attachment itself should be marked with the iplog+ flag. If the contribution is in the form of a comment in the bug, then the iplog+ flag should be set on the bug itself. </li> <li><A href="/projects/dev_process/new-committer.php">New Committer Process:</A> The process for project leads and PMC members to add additional @@ -164,7 +164,7 @@ <li><a href="http://live.eclipse.org/search/node/Janet+Campbell">Recorded IP Presentations</a> </li> </ul> - </div> + </div> </div> <div id="rightcolumn"> <div class="sideitem"> @@ -174,7 +174,7 @@ </ul> </div> </div> - + EOHTML; |