Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Master -> Main Rename #1596

Merged
merged 19 commits into from
Sep 30, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitattributes
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Set the default behavior, in case people don't have core.autocrlf set.
# We need this due to https://github.com/Islandora-CLAW/CLAW/issues/188.
# We need this due to https://github.com/Islandora/documentation/issues/188.
* text=auto
* text eol=lf

Expand Down
28 changes: 14 additions & 14 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,45 +1,45 @@
[submodule "Alpaca"]
path = Alpaca
url = https://github.com/Islandora-CLAW/Alpaca
url = https://github.com/Islandora/Alpaca
[submodule "islandora"]
path = islandora
url = https://github.com/Islandora-CLAW/islandora
url = https://github.com/Islandora/islandora
[submodule "islandora_defaults"]
path = islandora_defaults
url = https://github.com/Islandora-CLAW/islandora_defaults
url = https://github.com/Islandora/islandora_defaults
[submodule "migrate_islandora_csv"]
path = migrate_islandora_csv
url = https://github.com/Islandora-CLAW/migrate_islandora_csv
url = https://github.com/Islandora/migrate_islandora_csv
[submodule "controlled_access_terms"]
path = controlled_access_terms
url = https://github.com/Islandora-CLAW/controlled_access_terms
url = https://github.com/Islandora/controlled_access_terms
[submodule "claw-playbook"]
path = claw-playbook
url = https://github.com/Islandora-Devops/claw-playbook
url = https://github.com/Islandora-Devops/islandora-playbook
[submodule "chullo"]
path = chullo
url = https://github.com/Islandora-CLAW/chullo
url = https://github.com/Islandora/chullo
[submodule "Crayfish"]
path = Crayfish
url = https://github.com/Islandora-CLAW/Crayfish
url = https://github.com/Islandora/Crayfish
[submodule "jsonld"]
path = jsonld
url = https://github.com/Islandora-CLAW/jsonld
url = https://github.com/Islandora/jsonld
[submodule "Syn"]
path = Syn
url = https://github.com/Islandora-CLAW/Syn
url = https://github.com/Islandora/Syn
[submodule "Crayfish-Commons"]
path = Crayfish-Commons
url = https://github.com/Islandora-CLAW/Crayfish-Commons
url = https://github.com/Islandora/Crayfish-Commons
[submodule "carapace"]
path = carapace
url = https://github.com/Islandora-CLAW/carapace
url = https://github.com/Islandora/carapace
[submodule "openseadragon"]
path = openseadragon
url = https://github.com/Islandora-CLAW/openseadragon
url = https://github.com/Islandora/openseadragon
[submodule "drupal-project"]
path = drupal-project
url = https://github.com/Islandora-CLAW/drupal-project
url = https://github.com/Islandora/drupal-project
[submodule "migrate_7x_claw"]
path = migrate_7x_claw
url = https://github.com/Islandora-Devops/migrate_7x_claw
2 changes: 1 addition & 1 deletion .scripts/travis_setup_drupal.sh
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ phpcs --config-set installed_paths /opt/utils/vendor/drupal/coder/coder_sniffer

echo "Composer install drupal site"
cd /opt
git clone --branch 8.x-1.x https://github.com/Islandora-CLAW/drupal-project.git drupal
git clone --branch 8.x-1.x https://github.com/Islandora/drupal-project.git drupal
cd drupal
if [ -z "$COMPOSER_PATH" ]; then
composer install
Expand Down
6 changes: 3 additions & 3 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ If you would like to submit a use case to the Islandora 8 project, please submit

### Documentation

You can contribute documentation in two different ways. One way is to create an issue [here](https://github.com/Islandora/documentation/issues/new), prepending "Documentation:" to the title of the issue. Another way is by pull request, which is the same process as [Contribute Code](https://github.com/Islandora/documentation/blob/master/CONTRIBUTING.md#contribute-code). All documentation resides in [`docs`](https://github.com/Islandora/documentation/tree/master/docs).
You can contribute documentation in two different ways. One way is to create an issue [here](https://github.com/Islandora/documentation/issues/new), prepending "Documentation:" to the title of the issue. Another way is by pull request, which is the same process as [Contribute Code](https://github.com/Islandora/documentation/blob/main/CONTRIBUTING.md#contribute-code). All documentation resides in [`docs`](https://github.com/Islandora/documentation/tree/main/docs).

### Request a new feature

Expand Down Expand Up @@ -58,9 +58,9 @@ Contributions to the Islandora codebase should be sent as GitHub pull requests.

Take a look at [Creating a pull request](https://help.github.com/articles/creating-a-pull-request). In a nutshell you need to:

1. [Fork](https://help.github.com/articles/fork-a-repo) this repository to your personal or institutional GitHub account (depending on the CLA you are working under). Be cautious of which branches you work from though (you'll want to base your work off master, or for Drupal modules use the most recent version branch). See [Fork a repo](https://help.github.com/articles/fork-a-repo) for detailed instructions.
1. [Fork](https://help.github.com/articles/fork-a-repo) this repository to your personal or institutional GitHub account (depending on the CLA you are working under). Be cautious of which branches you work from though (you'll want to base your work off main, or for Drupal modules use the most recent version branch). See [Fork a repo](https://help.github.com/articles/fork-a-repo) for detailed instructions.
2. Commit any changes to your fork.
3. Send a [pull request](https://help.github.com/articles/creating-a-pull-request) using the [pull request template](https://github.com/Islandora/documentation/blob/master/.github/PULL_REQUEST_TEMPLATE.md) to the Islandora GitHub repository that you forked in step 1. If your pull request is related to an existing issue -- for instance, because you reported a [bug/issue](https://github.com/Islandora/documentation/issues) earlier -- prefix the title of your pull request with the corresponding issue number (e.g. `issue-123: ...`). Please also include a reference to the issue in the description of the pull. This can be done by using '#' plus the issue number like so '#123', also try to pick an appropriate name for the branch in which you're issuing the pull request from.
3. Send a [pull request](https://help.github.com/articles/creating-a-pull-request) using the [pull request template](https://github.com/Islandora/documentation/blob/main/.github/PULL_REQUEST_TEMPLATE.md) to the Islandora GitHub repository that you forked in step 1. If your pull request is related to an existing issue -- for instance, because you reported a [bug/issue](https://github.com/Islandora/documentation/issues) earlier -- prefix the title of your pull request with the corresponding issue number (e.g. `issue-123: ...`). Please also include a reference to the issue in the description of the pull. This can be done by using '#' plus the issue number like so '#123', also try to pick an appropriate name for the branch in which you're issuing the pull request from.

You may want to read [Syncing a fork](https://help.github.com/articles/syncing-a-fork) for instructions on how to keep your fork up to date with the latest changes of the upstream (official) repository.

Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Islandora 8 is the next generation of Islandora. It pairs [Drupal 8](https://www
For more details, please check out the following resources:

* [Documentation](https://islandora.github.io/documentation/)
* [Contributing](https://github.com/Islandora/documentation/blob/master/CONTRIBUTING.md)
* [Contributing](https://github.com/Islandora/documentation/blob/main/CONTRIBUTING.md)

* [Weekly Tech Calls](https://github.com/Islandora/documentation/wiki#islandora-8-tech-calls)
* [2015](https://github.com/Islandora/documentation/wiki/2015)
Expand All @@ -30,7 +30,7 @@ For more details, please check out the following resources:
This repository pulls in additional documentation from the following repositories, which is reflected in the repository tree.

* [Alpaca](https://github.com/islandora/Alpaca): Event driven middleware based on Apache Camel that synchronizes a Fedora with Drupal.
* [docs](https://github.com/Islandora/documentation/tree/master/docs): Documentation!
* [docs](https://github.com/Islandora/documentation/tree/main/docs): Documentation!
* [carapace](https://github.com/islandora/carapace/): A starter theme for an Islandora 8 repository.
* [chullo](https://github.com/islandora/chullo/): PHP client for Fedora 4 built using Guzzle and EasyRdf.
* [islandora-playbook](https://github.com/Islandora-Devops/islandora-playbook): Ansible installer.
Expand Down
2 changes: 1 addition & 1 deletion docs/alpaca/alpaca-technical-stack.md
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ Maven has camel-archetype-blueprint which can be used to create apache-camel OSG
mvn archetype:generate -DarchetypeGroupId=org.apache.camel.archetypes -DarchetypeArtifactId=camel-archetype-blueprint -DarchetypeVersion=2.9.0 -DarchetypeRepository=https://repository.apache.org/content/groups/snapshots-g
```

However, it is easier to copy the structure of an existing project such as [islandora-connector-broadcast](https://github.com/Islandora/Alpaca/tree/master/islandora-connector-broadcast).
However, it is easier to copy the structure of an existing project such as [islandora-connector-broadcast](https://github.com/Islandora/Alpaca/tree/main/islandora-connector-broadcast).

```
cp -R islandora-connector-broadcast/ islandora-connector-helloworld
Expand Down
8 changes: 4 additions & 4 deletions docs/contributing/committers.md
Original file line number Diff line number Diff line change
Expand Up @@ -83,14 +83,14 @@ This section describes the process for handling the voting of a new committer.

Summary:

1. Call a vote ([templates/committerVote.txt](https://raw.githubusercontent.com/Islandora/documentation/master/docs/contributing/templates/committerVote.txt))
2. Close a vote ([templates/closeCommitterVote.txt](https://raw.githubusercontent.com/Islandora/documentation/master/docs/contributing/templates/closeCommitterVote.txt))
3. Invite the new committer ([templates/committerInvite.txt](https://raw.githubusercontent.com/Islandora/documentation/master/docs/contributing/templates/committerInvite.txt)), if no CLA is on file ([templates/committerInviteCLA.txt](https://raw.githubusercontent.com/Islandora/documentation/master/docs/contributing/templates/committerInviteCLA.txt))
1. Call a vote ([templates/committerVote.txt](https://raw.githubusercontent.com/Islandora/documentation/main/docs/contributing/templates/committerVote.txt))
2. Close a vote ([templates/closeCommitterVote.txt](https://raw.githubusercontent.com/Islandora/documentation/main/docs/contributing/templates/closeCommitterVote.txt))
3. Invite the new committer ([templates/committerInvite.txt](https://raw.githubusercontent.com/Islandora/documentation/main/docs/contributing/templates/committerInvite.txt)), if no CLA is on file ([templates/committerInviteCLA.txt](https://raw.githubusercontent.com/Islandora/documentation/main/docs/contributing/templates/committerInviteCLA.txt))

If they accept, then do:

1. Add to the Islandora 8 Committer team of the Github Islandora organization.
2. Add to Committer team of GitHub Islandora-Labs organization
3. Add to islandora-committers google-group
4. Add to committers wiki page: Islandora 8 Committers (this page)
5. Announce the new committer ([template/committerAnnounce.txt](https://raw.githubusercontent.com/Islandora/documentation/master/docs/contributing/templates/committerAnnounce.txt))
5. Announce the new committer ([template/committerAnnounce.txt](https://raw.githubusercontent.com/Islandora/documentation/main/docs/contributing/templates/committerAnnounce.txt))
10 changes: 5 additions & 5 deletions docs/contributing/hacking-on-islandora.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,19 @@ One of the goals of the Islandora 8 project is to lower the barrier to entry for

1. Install [VirtualBox](https://www.virtualbox.org/)
2. Install [Vagrant](https://www.vagrantup.com/)
3. Fork [Islandora CLAW](https://github.com/Islandora-CLAW/CLAW) and clone it onto your machine using the master branch
3. Fork [Islandora CLAW](https://github.com/Islandora-CLAW/CLAW) and clone it onto your machine using the main branch
```bash
~ $ git clone -b master https://github.com/your_github_name/islandora.git
~ $ git clone -b main https://github.com/your_github_name/islandora.git
```
OR
If you're already a developer and have previously forked and cloned Islandora CLAW, just add the master branch from Islandora-CLAW to your existing checkout:
If you're already a developer and have previously forked and cloned Islandora CLAW, just add the main branch from Islandora-CLAW to your existing checkout:
```bash
~ $ cd /path/to/islandora
/path/to/CLAW $ git remote add claw https://github.com/Islandora-CLAW/CLAW.git
/path/to/CLAW $ git fetch claw
/path/to/CLAW $ git checkout master
/path/to/CLAW $ git checkout main
```
5. Navigate into the `install` directory of your master checkout
5. Navigate into the `install` directory of your main checkout
```bash
~ $ cd /path/to/CLAW/install
```
Expand Down
2 changes: 1 addition & 1 deletion docs/installation/playbook.md
Original file line number Diff line number Diff line change
Expand Up @@ -272,4 +272,4 @@ change this, set a new value for `ansible_port` in `inventory/vagrant/hosts`.

If you run into any issues installing the environment, do not hesitate to email the [mailing list](mailto:islandora@googlegroups.com) to
ask for help. If you think you've stumbled across a bug in the installer, please create an issue in the
[Islandora 8 issue queue](http://github.com/Islandora-CLAW/CLAW/issues) and give it an `ansible` tag.
[Islandora 8 issue queue](http://github.com/Islandora/documentation/issues) and give it an `ansible` tag.
2 changes: 1 addition & 1 deletion docs/technical-documentation/adding_format_jsonld.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Drupal requires the use of a `_format` query parameter to get alternate representations of a node/media.

By default, Islandora deploys with the [jsonld](https://github.com/Islandora/jsonld) module and the [Milliner](https://github.com/Islandora/Crayfish/tree/master/Milliner) microservice. These two components are configured to strip this `_format` query parameter off of the end of URIs.
By default, Islandora deploys with the [jsonld](https://github.com/Islandora/jsonld) module and the [Milliner](https://github.com/Islandora/Crayfish/tree/main/Milliner) microservice. These two components are configured to strip this `_format` query parameter off of the end of URIs.

This means that when your content is indexed in Fedora, the triplestore, etc... it's URI will
be something like `http://localhost:8000/node/1` and not `http://localhost:8000/node/1?_format=jsonld`.
Expand Down
2 changes: 1 addition & 1 deletion docs/technical-documentation/alpaca_tips.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ This service receives requests from Drupal when it wants to create derivatives a
This service overrides the default http client with Islandora specific configuration.

## islandora-indexing-fcrepo
This service receives requests from Drupal in response to write operations on entities. These requests are passed along to [Milliner](https://github.com/Islandora/Crayfish/tree/dev/Milliner) microservice in [Crayfish](https://github.com/Islandora/Crayfish) to convert Drupal entities into Fedora resources and communicate with Fedora (via [Chullo](https://github.com/Islandora-CLAW/chullo)).
This service receives requests from Drupal in response to write operations on entities. These requests are passed along to [Milliner](https://github.com/Islandora/Crayfish/tree/dev/Milliner) microservice in [Crayfish](https://github.com/Islandora/Crayfish) to convert Drupal entities into Fedora resources and communicate with Fedora (via [Chullo](https://github.com/Islandora/chullo)).

## islandora-indexing-triplestore
This service receives requests from Drupal on indexing and deleting in order to persist/delete content in the triplestore.
Expand Down
2 changes: 1 addition & 1 deletion docs/technical-documentation/docs-build.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Introduction

This documentation is built using [mkdocs](http://www.mkdocs.org/), a static site generator that is geared towards building project documentation. The documentation is created in the [Markdown](http://en.wikipedia.org/wiki/Markdown) format, and it all resides in the [`docs`](https://github.com/Islandora-CLAW/CLAW/tree/master/docs) directory in the repository. The organization of the documentation is controlled by the [`mkdocs.yml`](https://github.com/Islandora-CLAW/CLAW/blob/master/mkdocs.yml) in the root of the repository.
This documentation is built using [mkdocs](http://www.mkdocs.org/), a static site generator that is geared towards building project documentation. The documentation is created in the [Markdown](http://en.wikipedia.org/wiki/Markdown) format, and it all resides in the [`docs`](https://github.com/Islandora/documentation/tree/main/docs) directory in the repository. The organization of the documentation is controlled by the [`mkdocs.yml`](https://github.com/Islandora/documentation/blob/main/mkdocs.yml) in the root of the repository.

## Prerequisites

Expand Down
Loading