You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@annotator.apache.org by bi...@apache.org on 2020/03/19 17:59:46 UTC
[incubator-annotator] branch improve-licensing created (now c43a970)
This is an automated email from the ASF dual-hosted git repository.
bigbluehat pushed a change to branch improve-licensing
in repository https://gitbox.apache.org/repos/asf/incubator-annotator.git.
at c43a970 Add license info to fragment.pegjs
This branch includes the following new commits:
new 76b81d9 Add Apache Rat details to README
new c43a970 Add license info to fragment.pegjs
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[incubator-annotator] 01/02: Add Apache Rat details to README
Posted by bi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
bigbluehat pushed a commit to branch improve-licensing
in repository https://gitbox.apache.org/repos/asf/incubator-annotator.git
commit 76b81d9d6d2e1764b2f837e170473ee23a9727bc
Author: Benjamin Young <by...@wiley.com>
AuthorDate: Thu Mar 19 13:57:47 2020 -0400
Add Apache Rat details to README
---
README.md | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/README.md b/README.md
index 1666ee1..c032c0b 100644
--- a/README.md
+++ b/README.md
@@ -55,6 +55,17 @@ $ yarn start
Once the test server has started, you can browse a local demo, and run tests in
a browser by visiting `http://localhost:8080/`.
+##### Validate Licensing
+
+[Apache Rat (Release Audit Tool)](https://creadur.apache.org/rat/) is a
+preferred code license checking tool used by [the ASF](https://apache.org/).
+The included `.ratignore` file contains a list of files to exclude from scans.
+
+To check for included licenses, run the following and view the output report:
+```sh
+java -jar ~/bin/apache-rat-0.13/apache-rat-0.13.jar -E .ratignore -d . > rat_report.txt
+```
+
## Selectors
Many Annotations refer to part of a resource, rather than all of it, as the Target. We call that part of the resource a Segment (of Interest). A Selector is used to describe how to determine the Segment from within the Source resource.
[incubator-annotator] 02/02: Add license info to fragment.pegjs
Posted by bi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
bigbluehat pushed a commit to branch improve-licensing
in repository https://gitbox.apache.org/repos/asf/incubator-annotator.git
commit c43a970374dbcbd14107b30675cba31af82d9831
Author: Benjamin Young <by...@wiley.com>
AuthorDate: Thu Mar 19 13:58:37 2020 -0400
Add license info to fragment.pegjs
Also update .ratignore to ignore generated fragment.js, but still
report on the source file: fragment.pegjs (which now has license info).
---
.ratignore | 2 +-
LICENSE | 45 +++++++++++++++++++++++++
packages/fragment-identifier/src/fragment.pegjs | 3 ++
3 files changed, 49 insertions(+), 1 deletion(-)
diff --git a/.ratignore b/.ratignore
index f6e8650..d8dd0e8 100644
--- a/.ratignore
+++ b/.ratignore
@@ -8,7 +8,7 @@
.nycrc
.ratignore
.travis.yml
-fragment.pegjs
+fragment.js
lerna.json
node_modules
package.json
diff --git a/LICENSE b/LICENSE
index d645695..f937654 100644
--- a/LICENSE
+++ b/LICENSE
@@ -200,3 +200,48 @@
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.
+
+
+---
+
+
+For the packages/fragment-identifier/src/fragment.js and
+packages/fragment-identifier/src/fragment.pegjs components from
+https://github.com/w3c/web-annotation/:
+
+License
+
+By obtaining and/or copying this work, you (the licensee) agree that you have
+read, understood, and will comply with the following terms and conditions.
+
+Permission to copy, modify, and distribute this work, with or without
+modification, for any purpose and without fee or royalty is hereby granted,
+provided that you include the following on ALL copies of the work or portions
+thereof, including modifications:
+
+ * The full text of this NOTICE in a location viewable to users of the
+ redistributed or derivative work.
+
+ * Any pre-existing intellectual property disclaimers, notices, or terms and
+ conditions. If none exist, the W3C Software and Document Short Notice
+ should be included.
+
+ * Notice of any changes or modifications, through a copyright statement on
+ the new code or document such as "This software or document includes
+ material copied from or derived from [title and URI of the W3C document].
+ Copyright © [YEAR] W3C® (MIT, ERCIM, Keio, Beihang)."
+
+Disclaimers
+
+THIS WORK IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKE NO REPRESENTATIONS OR
+WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO, WARRANTIES OF
+MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE
+SOFTWARE OR DOCUMENT WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS,
+TRADEMARKS OR OTHER RIGHTS.
+
+COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR DOCUMENT.
+
+The name and trademarks of copyright holders may NOT be used in advertising or
+publicity pertaining to the work without specific, written prior permission.
+Title to copyright in this work will at all times remain with copyright holders.
diff --git a/packages/fragment-identifier/src/fragment.pegjs b/packages/fragment-identifier/src/fragment.pegjs
index 871e94a..624b6fb 100644
--- a/packages/fragment-identifier/src/fragment.pegjs
+++ b/packages/fragment-identifier/src/fragment.pegjs
@@ -1,3 +1,6 @@
+// @license: W3C Software and Document Notice and License, https://www.w3.org/Consortium/Legal/2015/copyright-software-and-document
+// @author: Ivan Herman
+
{
function collect() {
var ret = {};