From 890209114474d5b0c73157840593de9f1df3f79b Mon Sep 17 00:00:00 2001 From: nruest Date: Thu, 28 Jul 2016 14:19:00 -0400 Subject: [PATCH] More update for MIT license move. --- LICENSE | 2 +- NOTICE | 2 ++ README.md | 1 + commands/composer.json | 19 ++++++++++++++++++ .../component/IslandoraComponent.java | 18 +++++++++++++++++ .../component/IslandoraEndpoint.java | 18 +++++++++++++++++ .../component/IslandoraExecBinding.java | 18 +++++++++++++++++ .../component/IslandoraPHPException.java | 20 ++++++++++++++++++- .../component/IslandoraProducer.java | 18 +++++++++++++++++ .../triplestore/TriplestoreIndexer.java | 18 +++++++++++++++++ .../triplestore/TriplestoreIndexer.java | 18 +++++++++++++++++ 11 files changed, 150 insertions(+), 2 deletions(-) create mode 100644 NOTICE diff --git a/LICENSE b/LICENSE index 07afddaf..b97ff7ff 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ The MIT License (MIT) -Copyright (c) 2015 Islandora Foundation +Copyright (c) 2015-2016 Islandora Foundation Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/NOTICE b/NOTICE new file mode 100644 index 00000000..18a20fbd --- /dev/null +++ b/NOTICE @@ -0,0 +1,2 @@ +Alpaca +Copyright 2013-2016 Islandora Foundation diff --git a/README.md b/README.md index 5b7b5bff..1d2b7233 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,7 @@ # ![Alpaca](https://cloud.githubusercontent.com/assets/2371345/15409648/16c140b4-1dec-11e6-81d9-41929bc83b1f.png) Alpaca [![Build Status](https://travis-ci.org/Islandora-CLAW/Alpaca.svg?branch=master)](https://travis-ci.org/Islandora-CLAW/Alpaca) [![Contribution Guidelines](http://img.shields.io/badge/CONTRIBUTING-Guidelines-blue.svg)](./CONTRIBUTING.md) +[![LICENSE](https://img.shields.io/badge/license-MIT-blue.svg?style=flat-square)](./LICENSE) ## Description diff --git a/commands/composer.json b/commands/composer.json index 4924138c..9acf3ea0 100644 --- a/commands/composer.json +++ b/commands/composer.json @@ -5,6 +5,25 @@ "hanneskod/classtools": "1.0.0", "easyrdf/easyrdf": "0.9.1" }, + "license": "MIT", + "authors": [ + { + "name": "Islandora Foundation", + "email": "community@islandora.ca", + "role": "Owner" + + }, + { + "name": "Daniel Lamb", + "email": "dlamb@islandora.ca", + "role": "Maintainer" + }, + { + "name": "Nick Ruest", + "email": "ruestn@gmail.com", + "role": "Maintainer" + } + ], "autoload": { "psr-4": {"Islandora\\": "src/"} } diff --git a/component/src/main/java/ca/islandora/component/IslandoraComponent.java b/component/src/main/java/ca/islandora/component/IslandoraComponent.java index cb864941..4a2bf8ab 100644 --- a/component/src/main/java/ca/islandora/component/IslandoraComponent.java +++ b/component/src/main/java/ca/islandora/component/IslandoraComponent.java @@ -1,3 +1,21 @@ +/* + * Licensed to Islandora Foundation under one or more contributor license + * agreements. See the NOTICE file distributed with this work for additional + * information regarding copyright ownership. + * + * The Islandora Foundation licenses this file to you under the MIT License. + * You may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://opensource.org/licenses/MIT + * + * 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. + */ + package ca.islandora.component; import java.net.URLDecoder; diff --git a/component/src/main/java/ca/islandora/component/IslandoraEndpoint.java b/component/src/main/java/ca/islandora/component/IslandoraEndpoint.java index 7f5a1123..b13f3b83 100644 --- a/component/src/main/java/ca/islandora/component/IslandoraEndpoint.java +++ b/component/src/main/java/ca/islandora/component/IslandoraEndpoint.java @@ -1,3 +1,21 @@ +/* + * Licensed to Islandora Foundation under one or more contributor license + * agreements. See the NOTICE file distributed with this work for additional + * information regarding copyright ownership. + * + * The Islandora Foundation licenses this file to you under the MIT License. + * You may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://opensource.org/licenses/MIT + * + * 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. + */ + package ca.islandora.component; import org.apache.camel.Consumer; diff --git a/component/src/main/java/ca/islandora/component/IslandoraExecBinding.java b/component/src/main/java/ca/islandora/component/IslandoraExecBinding.java index cea374de..0a1c3c28 100644 --- a/component/src/main/java/ca/islandora/component/IslandoraExecBinding.java +++ b/component/src/main/java/ca/islandora/component/IslandoraExecBinding.java @@ -1,3 +1,21 @@ +/* + * Licensed to Islandora Foundation under one or more contributor license + * agreements. See the NOTICE file distributed with this work for additional + * information regarding copyright ownership. + * + * The Islandora Foundation licenses this file to you under the MIT License. + * You may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://opensource.org/licenses/MIT + * + * 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. + */ + package ca.islandora.component; import java.io.File; diff --git a/component/src/main/java/ca/islandora/component/IslandoraPHPException.java b/component/src/main/java/ca/islandora/component/IslandoraPHPException.java index 2371cd36..17e11a43 100644 --- a/component/src/main/java/ca/islandora/component/IslandoraPHPException.java +++ b/component/src/main/java/ca/islandora/component/IslandoraPHPException.java @@ -1,3 +1,21 @@ +/* + * Licensed to Islandora Foundation under one or more contributor license + * agreements. See the NOTICE file distributed with this work for additional + * information regarding copyright ownership. + * + * The Islandora Foundation licenses this file to you under the MIT License. + * You may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://opensource.org/licenses/MIT + * + * 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. + */ + package ca.islandora.component; import org.apache.camel.RuntimeCamelException; @@ -23,4 +41,4 @@ public IslandoraPHPException(String message, Throwable cause) { public IslandoraPHPException(Throwable cause) { super(cause); } -} \ No newline at end of file +} diff --git a/component/src/main/java/ca/islandora/component/IslandoraProducer.java b/component/src/main/java/ca/islandora/component/IslandoraProducer.java index 4df005dd..6d564194 100644 --- a/component/src/main/java/ca/islandora/component/IslandoraProducer.java +++ b/component/src/main/java/ca/islandora/component/IslandoraProducer.java @@ -1,3 +1,21 @@ +/* + * Licensed to Islandora Foundation under one or more contributor license + * agreements. See the NOTICE file distributed with this work for additional + * information regarding copyright ownership. + * + * The Islandora Foundation licenses this file to you under the MIT License. + * You may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://opensource.org/licenses/MIT + * + * 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. + */ + package ca.islandora.component; import java.nio.charset.StandardCharsets; diff --git a/indexing/islandora-indexing-triplestore/src/main/java/ca/islandora/indexing/triplestore/TriplestoreIndexer.java b/indexing/islandora-indexing-triplestore/src/main/java/ca/islandora/indexing/triplestore/TriplestoreIndexer.java index 281393e7..06b39f58 100644 --- a/indexing/islandora-indexing-triplestore/src/main/java/ca/islandora/indexing/triplestore/TriplestoreIndexer.java +++ b/indexing/islandora-indexing-triplestore/src/main/java/ca/islandora/indexing/triplestore/TriplestoreIndexer.java @@ -1,3 +1,21 @@ +/* + * Licensed to Islandora Foundation under one or more contributor license + * agreements. See the NOTICE file distributed with this work for additional + * information regarding copyright ownership. + * + * The Islandora Foundation licenses this file to you under the MIT License. + * You may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://opensource.org/licenses/MIT + * + * 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. + */ + package ca.islandora.indexing.triplestore; import org.apache.camel.LoggingLevel; diff --git a/islandora-indexing-triplestore/src/main/java/ca/islandora/indexing/triplestore/TriplestoreIndexer.java b/islandora-indexing-triplestore/src/main/java/ca/islandora/indexing/triplestore/TriplestoreIndexer.java index 6484acd4..31693065 100644 --- a/islandora-indexing-triplestore/src/main/java/ca/islandora/indexing/triplestore/TriplestoreIndexer.java +++ b/islandora-indexing-triplestore/src/main/java/ca/islandora/indexing/triplestore/TriplestoreIndexer.java @@ -1,3 +1,21 @@ +/* + * Licensed to Islandora Foundation under one or more contributor license + * agreements. See the NOTICE file distributed with this work for additional + * information regarding copyright ownership. + * + * The Islandora Foundation licenses this file to you under the MIT License. + * You may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://opensource.org/licenses/MIT + * + * 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. + */ + package ca.islandora.indexing.triplestore; import org.apache.camel.builder.RouteBuilder;