diff --git a/LICENSE b/LICENSE index e06d2081..8276df3e 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Apache License + Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -175,18 +175,8 @@ Apache License END OF TERMS AND CONDITIONS - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "{}" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright {yyyy} {name of copyright owner} +----------------------------------------------------------------------- + Copyright 2013-2021 Lyrasis, Inc. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -199,4 +189,3 @@ Apache License 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. - diff --git a/NOTICE b/NOTICE new file mode 100644 index 00000000..0ea0510e --- /dev/null +++ b/NOTICE @@ -0,0 +1,2 @@ +Fedora Camel Toolbox +Copyright 2013-2021 Lyrasis diff --git a/README.md b/README.md index d984c089..b90d173d 100644 --- a/README.md +++ b/README.md @@ -38,17 +38,17 @@ where your `configuration.properties` file is a standard java properties file. The Camel Toolbox can be started using Docker Compose which will create containers for Fedora, Fuseki, Solr, and the Camel Toolbox application. -Configuration for the Camel Toolbox can be done through the `fcrepo-camel-config/configuration.properties` or through +Configuration for the Camel Toolbox can be done through the `docker-compose/camel-toolbox-config/configuration.properties` or through environment variables (not yet available) as standard java properties as key value pairs. To run with the docker containers the following properties are set by default: ``` jms.brokerUrl=tcp://fcrepo:61616 fcrepo.baseUrl=http://fcrepo:8080/fcrepo/rest -solr.indexer.enabled=true +solr.indexing.enabled=true solr.baseUrl=http://solr:8983/solr/fcrepo -triplestore.indexer.enabled=true +triplestore.indexing.enabled=true triplestore.baseUrl=http://fuseki:3030/fcrepo audit.enabled=true @@ -57,15 +57,17 @@ fcrepo.authHost=fcrepo reindexing.rest.host=0.0.0.0 ``` -Then to start the Camel Toolbox, Fedora, Fuseki, and Solr containers run +Then to start, the Camel Toolbox, Fedora, Fuseki, and Solr containers run ``` +cd ./docker-compose docker-compose up -d ``` -If you need to rebuild the docker image, it can be done through docker compose as long as the `build` is specified -for the `camel-toolbox` container: +If you need to rebuild the docker image locally you can do so like so: ``` -docker-compose build +mvn clean install +FCREPO_CAMEL_TOOLBOX_VERSION=$(mvn org.apache.maven.plugins:maven-help-plugin:3.2.0:evaluate -Dexpression=project.version -q -DforceStdout) +docker buildx build --load --tag="fcrepo/fcrepo-camel-toolbox" --tag="fcrepo/fcrepo-camel-toolbox:${FCREPO_CAMEL_TOOLBOX_VERSION}" . ``` ## Note @@ -100,29 +102,20 @@ then the asynchonous integrations will be less prone to configuration errors. | fcrepo.authUsername | A valid username | fcrepoAdmin | | fcrepo.authPassword | A valid password | fcrepoAdmin | | fcrepo.authHostName | The hostname of the Fedora installation which the authUsername and authPassword should be applied to | localhost | -| fcrepo.authPort | | 8080 | +| error.maxRedeliveries | The maximum number of redelivery attempts before failing. | 10 | -### Repository Audit Service (Triplestore) - -This application listens to Fedora's event stream, and stores -audit-related events in an external triplestore. Both -[Jena Fuseki](http://jena.apache.org/documentation/serving_data/) -and [Open RDF Sesame](http://rdf4j.org/) are supported. +### ActiveMQ Service -More information about the -[audit service](https://wiki.duraspace.org/display/FF/Design+-+Audit+Service) -is available on the Fedora wiki. +This implements a connector to an ActiveMQ broker. #### Properties | Name | Description| Default Value | | :--- | :---| :---- | -| audit.enabled | Enables/disables audit triplestore service | false | -| audit.input.stream | Audit Service jms message stream | broker:topic:fedora | -| audit.event.baseUri | The baseUri to use for event URIs in the triplestore. A `UUID` will be appended to this value, forming, for instance: `http://example.com/event/{UUID}` | http://example.com/event | -| audit.triplestore.baseUrl| The base url for the external triplestore service | http://localhost:3030/fuseki/test/update | -| audit.triplestore.authUsername| Username for basic authentication against triplestore | | -| audit.triplestore.authPassword| Password for basic authentication against triplestore | | -| audit.filter.containers | A comma-delimited list of URIs to be filtered (ignored) by the audit service | http://localhost:8080/fcrepo/rest/audit | +| jms.brokerUrl | JMS Broker endpoint | tcp://localhost:61616 | +| jms.username | JMS username | null | +| jms.password | JMS password | null | +| jms.connections | The JMS connection count | 10 | +| jms.consumers | The JMS consumer count | 1 | ### Repository Indexer (Solr) @@ -133,35 +126,16 @@ indexes objects into an external Solr server. #### Properties | Name | Description| Default Value | | :--- | :---| :---- | -| solr.indexer.enabled | Enables/disables the SOLR indexing service. Disabled by default | false | -| error.maxRedeliveries | | 10 | -| fcrepo.checkHasIndexingTransformation | | true | -| fcrepo.defaultTransform | ? | null | -| input.stream | The JMS topic or queue serving as the message source | broker:topic:fedora | +| solr.indexing.enabled | Enables/disables the SOLR indexing service. Disabled by default | false | +| solr.fcrepo.checkHasIndexingTransformation | When true, check for an indexing transform in the resource matadata. | true | +| solr.fcrepo.defaultTransform | The solr default ldpath transform when none is provide in resource metadata. | null | +| solr.input.stream | The JMS topic or queue serving as the message source | broker:topic:fedora | | solr.reindex.stream | The JMS topic or queue serving as the reindex message source | broker:queue:solr.reindex | | solr.commitWithin | Milliseconds within which commits should occur | 10000 | -| indexing.predicate | ? | false | -| ldpath.service.baseUrl | The LDPath service base url | http://localhost:9085/ldpath | -| filter.containers | A comma-separate list of containers that should be ignored by the indexer | http://localhost:8080/fcrepo/rest/audit | - -### HTTP Message Forwarder (HTTP) - -This application listens to Fedora's event stream and -forwards message identifiers and event types as JSON POSTs to an HTTP endpoint. - -#### Properties - -| Name | Description| Default Value | -| :--- | :---| :---- | -| http.indexer.enabled | Enables/disables the HTTP indexing service. Disabled by default | false | -| http.input.stream | The JMS topic or queue serving as the message source | broker:topic:fedora | -| http.reindex.stream | The JMS topic or queue serving as the reindex message source | broker:queue:http.reindex | -| http.filter.containers | A comma-separate list of containers that should be ignored by the indexer | http://localhost:8080/fcrepo/rest/audit | -| http.baseUrl | The HTTP endpoint that will receive forwarded JMS messages (REQUIRED) | | -| http.authUsername | Optional username for basic authentication if required by http.baseUrl | | -| http.authPassword | Optional password for basic authentication if required by http.baseUrl | | +| solr.indexing.predicate | When true, check that resource is of type http://fedora.info/definitions/v4/indexing#Indexable; otherwise do not index it. | false | +| solr.ldpath.service.baseUrl | The LDPath service base url | http://localhost:9085/ldpath | +| solr.filter.containers | A comma-separate list of containers that should be ignored by the indexer | http://localhost:8080/fcrepo/rest/audit | -Note: you MUST set the http.baseUrl property in order for this service to do anything meaningful. ### Repository Indexer (Triplestore) @@ -171,17 +145,17 @@ indexes objects into an external triplestore. #### Properties | Name | Description| Default Value | | :--- | :---| :---- | -| triplestore.indexer.enabled | Enables the triplestore indexing service. Disabled by default | false | +| triplestore.indexing.enabled | Enables the triplestore indexing service. Disabled by default | false | | triplestore.baseUrl | Base URL for the triplestore | http://localhost:8080/fuseki/test/update | -| triplestore.authUsername | Username for basic authentication against triplestore | | -| triplestore.authPassword | Password for basic authentication against triplestore | | -| triplestore.input.stream | The JMS topic or queue serving as the message source | broker:topic:fedora | | -| triplestore.reindex.stream | The JMS topic or queue serving as the reindex message source | broker:queue:solr.reindex | | -| triplestore.indexing.predicate | ? | false | | -| triplestore.filter.containers | A comma-separate list of containers that should be ignored by the indexer | http://localhost:8080/fcrepo/rest/audit | | -| triplestore.namedGraph | ? | null | | -| triplestore.prefer.include | ? | null | | -| triplestore.prefer.omit | ? | http://www.w3.org/ns/ldp#PreferContainment | | +| triplestore.authUsername | Username for basic authentication against triplestore | +| triplestore.authPassword | Password for basic authentication against triplestore | +| triplestore.input.stream | The JMS topic or queue serving as the message source | broker:topic:fedora | +| triplestore.reindex.stream | The JMS topic or queue serving as the reindex message source | broker:queue:triplestore.reindex | +| triplestore.indexing.predicate | When true, check that resource is of type http://fedora.info/definitions/v4/indexing#Indexable; otherwise do not index it. | false | +| triplestore.filter.containers | A comma-separate list of containers that should be ignored by the indexer | http://localhost:8080/fcrepo/rest/audit | +| triplestore.namedGraph | A named graph to be used when indexing rdf | null | +| triplestore.prefer.include | A list of [valid prefer values](https://fedora.info/2021/05/01/spec/#additional-prefer-values) defining predicates to be included | null | +| triplestore.prefer.omit | A list of [valid prefer values](https://fedora.info/2021/05/01/spec/#additional-prefer-values) defining predicates to be omitted. | http://www.w3.org/ns/ldp#PreferContainment | ### LDPath Service @@ -217,12 +191,12 @@ the entire `LDPath` program. The `Content-Type` of the request should be either #### Properties | Name | Description| Default Value | | :--- | :---| :---- | -| fcrepo.cache.timeout | The timeout in seconds for the ldpath cache | 0 | -| rest.prefix | The LDPath rest endpoint prefix | no | /ldpath| -| rest.port| The LDPath rest endpoint port | no | 9085 | -| rest.host| The LDPath rest endpoint host | no | localhost | -| cache.timeout | LDCache ? timeout in seconds | no | 86400 | -| ldcache.directory | LDCache directory | no | ldcache/ | +| ldpath.fcrepo.cache.timeout | The timeout in seconds for the ldpath cache | 0 | +| ldpath.rest.prefix | The LDPath rest endpoint prefix | no | /ldpath| +| ldpath.rest.port| The LDPath rest endpoint port | no | 9085 | +| ldpath.rest.host| The LDPath rest endpoint host | no | localhost | +| ldpath.cache.timeout | LDCache timeout in seconds | no | 86400 | +| ldpath.ldcache.directory | LDCache directory | no | ldcache/ | | ldpath.transform.path | The LDPath transform file path | classpath:org/fcrepo/camel/ldpath/default.ldpath | ### Reindexing Service @@ -243,24 +217,29 @@ service: | Name | Description| Default Value | | :--- | :---| :---- | | reindexing.enabled | Enables/disables the reindexing component. Enabled by default | true | -| reindexing.error.maxRedeliveries | Maximum redelivery attempts | 10 | | reindexing.stream | Reindexing jms message stream | broker:queue:reindexing | | reindexing.rest.host | Reindexing service host | localhost | | reindexing.rest.port | Reindexing service port | 9080 | | reindexing.rest.prefix | Reindexing rest URI prefix | /reindexing | -### ActiveMQ Service +### HTTP Message Forwarding Service (HTTP) -This implements a connector to an ActiveMQ broker. +This application listens to Fedora's event stream and +forwards message identifiers and event types as JSON POSTs to an HTTP endpoint. #### Properties + | Name | Description| Default Value | | :--- | :---| :---- | -| jms.brokerUrl | JMS Broker endpoint | tcp://localhost:61616 | -| jms.username | JMS username | null | -| jms.password | JMS password | null | -| jms.connections | The JMS connection count | 10 | -| jms.consumers | The JMS consumer count | 1 | +| http.enabled | Enables/disables the HTTP forwarding service. Disabled by default | false | +| http.input.stream | The JMS topic or queue serving as the message source | broker:topic:fedora | +| http.reindex.stream | The JMS topic or queue serving as the reindex message source | broker:queue:http.reindex | +| http.filter.containers | A comma-separate list of containers that should be ignored by the indexer | http://localhost:8080/fcrepo/rest/audit | +| http.baseUrl | The HTTP endpoint that will receive forwarded JMS messages (REQUIRED) | | +| http.authUsername | Optional username for basic authentication if required by http.baseUrl | | +| http.authPassword | Optional password for basic authentication if required by http.baseUrl | | + +Note: you MUST set the http.baseUrl property in order for this service to do anything meaningful. ### Fixity Checking Service @@ -277,7 +256,31 @@ the repository. | fixity.success| It is also possible to trigger an action on success. By default, this is a no-op. The value should be a camel route action. To log it to a file use something like this: file:/tmp/?fileName=fixity-succes.log&fileExist=Append | null | | fixity.failure | Most importantly, it is possible to configure what should happen when a fixity check fails. In the default example below, the fixity output is written to a file in `/tmp/fixityErrors.log`. But this can be changed to send a message to an email address (`fixity.failure=smtp:admin@example.org?subject=Fixity`) or use just about any other camel component.| file:/tmp/?fileName=fixity-errors.log&fileExist=Append | -## Building + +### Repository Audit Service (Triplestore) + +This application listens to Fedora's event stream, and stores +audit-related events in an external triplestore. Both +[Jena Fuseki](http://jena.apache.org/documentation/serving_data/) +and [Open RDF Sesame](http://rdf4j.org/) are supported. + +More information about the +[audit service](https://wiki.duraspace.org/display/FF/Design+-+Audit+Service) +is available on the Fedora wiki. + +#### Properties +| Name | Description| Default Value | +| :--- | :---| :---- | +| audit.enabled | Enables/disables audit triplestore service | false | +| audit.input.stream | Audit Service jms message stream | broker:topic:fedora | +| audit.event.baseUri | The baseUri to use for event URIs in the triplestore. A `UUID` will be appended to this value, forming, for instance: `http://example.com/event/{UUID}` | http://example.com/event | +| audit.triplestore.baseUrl| The base url for the external triplestore service | http://localhost:3030/fuseki/test/update | +| audit.triplestore.authUsername| Username for basic authentication against triplestore | | +| audit.triplestore.authPassword| Password for basic authentication against triplestore | | +| audit.filter.containers | A comma-delimited list of URIs to be filtered (ignored) by the audit service | http://localhost:8080/fcrepo/rest/audit | + + +## Troubleshooting ### java.lang.IllegalArgumentException: Credentials may not be null diff --git a/docker-compose/camel-toolbox-config/configuration.properties b/docker-compose/camel-toolbox-config/configuration.properties index 9dd06c45..f2ef00ff 100644 --- a/docker-compose/camel-toolbox-config/configuration.properties +++ b/docker-compose/camel-toolbox-config/configuration.properties @@ -3,10 +3,10 @@ fcrepo.authHost=fcrepo jms.brokerUrl=tcp://fcrepo:61616 -solr.indexer.enabled=true +solr.indexing.enabled=true solr.baseUrl=http://solr:8983/solr/fcrepo -triplestore.indexer.enabled=true +triplestore.indexing.enabled=true triplestore.baseUrl=http://fuseki:3030/fcrepo reindexing.rest.host=0.0.0.0 diff --git a/fcrepo-audit-triplestore/README.md b/fcrepo-audit-triplestore/README.md deleted file mode 100644 index 1181b4b0..00000000 --- a/fcrepo-audit-triplestore/README.md +++ /dev/null @@ -1,42 +0,0 @@ -# Fedora Audit Service (Triplestore) - -This service listens for repository messages (create, update, delete) from Fedora, translates them into RDF and logs them to an external triple store thereby creating an audit log of all changes to the Fedora repository. - -## Configuration - - audit.enabled=false - -Set this property to true to enable the audit service. - -A comma-delimited list of URIs to filter. That is, any Fedora resource that either -matches or is contained in one of the URIs listed will not be processed by the -audit-triplestore application. - - audit.filter.containers=http://localhost:8080/fcrepo/rest/audit - -In the event of failure, the maximum number of times a redelivery will be attempted. - - error.maxRedeliveries=10 - -The baseUri to use for event URIs in the triplestore. A `UUID` will be appended -to this value, forming, for instance: `http://example.com/event/{UUID}` - - audit.event.baseUri=http://example.com/event - -The camel URI for the incoming message stream (e.g. with the ActiveMQ service). - - audit.input.stream=broker:topic:fedora - -The base URL of the triplestore being used. - - audit.triplestore.baseUrl=http://localhost:3030/fuseki/test/update - -In case your triple store needs basic authentication. - - audit.triplestore.authUsername=admin - audit.triplestore.authPassword=password - -For more help see the Apache Camel documentation - - http://camel.apache.org/ - diff --git a/fcrepo-audit-triplestore/src/main/java/org/fcrepo/camel/audit/triplestore/AuditHeaders.java b/fcrepo-audit-triplestore/src/main/java/org/fcrepo/camel/audit/triplestore/AuditHeaders.java index b153ce97..98e03649 100644 --- a/fcrepo-audit-triplestore/src/main/java/org/fcrepo/camel/audit/triplestore/AuditHeaders.java +++ b/fcrepo-audit-triplestore/src/main/java/org/fcrepo/camel/audit/triplestore/AuditHeaders.java @@ -1,19 +1,7 @@ /* - * Licensed to DuraSpace under one or more contributor license agreements. - * See the NOTICE file distributed with this work for additional information - * regarding copyright ownership. - * - * DuraSpace licenses this file to you 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 contents of this file are subject to the license and copyright + * detailed in the LICENSE and NOTICE files at the root of the source + * tree. */ package org.fcrepo.camel.audit.triplestore; diff --git a/fcrepo-audit-triplestore/src/main/java/org/fcrepo/camel/audit/triplestore/AuditSparqlProcessor.java b/fcrepo-audit-triplestore/src/main/java/org/fcrepo/camel/audit/triplestore/AuditSparqlProcessor.java index d8f9e6e5..e41ef43e 100644 --- a/fcrepo-audit-triplestore/src/main/java/org/fcrepo/camel/audit/triplestore/AuditSparqlProcessor.java +++ b/fcrepo-audit-triplestore/src/main/java/org/fcrepo/camel/audit/triplestore/AuditSparqlProcessor.java @@ -1,19 +1,7 @@ /* - * Licensed to DuraSpace under one or more contributor license agreements. - * See the NOTICE file distributed with this work for additional information - * regarding copyright ownership. - * - * DuraSpace licenses this file to you 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 contents of this file are subject to the license and copyright + * detailed in the LICENSE and NOTICE files at the root of the source + * tree. */ package org.fcrepo.camel.audit.triplestore; diff --git a/fcrepo-audit-triplestore/src/main/java/org/fcrepo/camel/audit/triplestore/EventRouter.java b/fcrepo-audit-triplestore/src/main/java/org/fcrepo/camel/audit/triplestore/EventRouter.java index 54a2bf96..a50ec983 100644 --- a/fcrepo-audit-triplestore/src/main/java/org/fcrepo/camel/audit/triplestore/EventRouter.java +++ b/fcrepo-audit-triplestore/src/main/java/org/fcrepo/camel/audit/triplestore/EventRouter.java @@ -1,19 +1,7 @@ /* - * Licensed to DuraSpace under one or more contributor license agreements. - * See the NOTICE file distributed with this work for additional information - * regarding copyright ownership. - * - * DuraSpace licenses this file to you 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 contents of this file are subject to the license and copyright + * detailed in the LICENSE and NOTICE files at the root of the source + * tree. */ package org.fcrepo.camel.audit.triplestore; diff --git a/fcrepo-audit-triplestore/src/main/java/org/fcrepo/camel/audit/triplestore/FcrepoAuditTriplestoreConfig.java b/fcrepo-audit-triplestore/src/main/java/org/fcrepo/camel/audit/triplestore/FcrepoAuditTriplestoreConfig.java index a0347c79..71eff1f1 100644 --- a/fcrepo-audit-triplestore/src/main/java/org/fcrepo/camel/audit/triplestore/FcrepoAuditTriplestoreConfig.java +++ b/fcrepo-audit-triplestore/src/main/java/org/fcrepo/camel/audit/triplestore/FcrepoAuditTriplestoreConfig.java @@ -1,19 +1,7 @@ /* - * Licensed to DuraSpace under one or more contributor license agreements. - * See the NOTICE file distributed with this work for additional information - * regarding copyright ownership. - * - * DuraSpace licenses this file to you 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 contents of this file are subject to the license and copyright + * detailed in the LICENSE and NOTICE files at the root of the source + * tree. */ package org.fcrepo.camel.audit.triplestore; diff --git a/fcrepo-audit-triplestore/src/test/java/org/fcrepo/camel/audit/triplestore/ProcessorTest.java b/fcrepo-audit-triplestore/src/test/java/org/fcrepo/camel/audit/triplestore/ProcessorTest.java index f6ad2994..0e955051 100644 --- a/fcrepo-audit-triplestore/src/test/java/org/fcrepo/camel/audit/triplestore/ProcessorTest.java +++ b/fcrepo-audit-triplestore/src/test/java/org/fcrepo/camel/audit/triplestore/ProcessorTest.java @@ -1,19 +1,7 @@ /* - * Licensed to DuraSpace under one or more contributor license agreements. - * See the NOTICE file distributed with this work for additional information - * regarding copyright ownership. - * - * DuraSpace licenses this file to you 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 contents of this file are subject to the license and copyright + * detailed in the LICENSE and NOTICE files at the root of the source + * tree. */ package org.fcrepo.camel.audit.triplestore; diff --git a/fcrepo-audit-triplestore/src/test/java/org/fcrepo/camel/audit/triplestore/RouteDisabledTest.java b/fcrepo-audit-triplestore/src/test/java/org/fcrepo/camel/audit/triplestore/RouteDisabledTest.java index f3487ce2..3a39cd76 100644 --- a/fcrepo-audit-triplestore/src/test/java/org/fcrepo/camel/audit/triplestore/RouteDisabledTest.java +++ b/fcrepo-audit-triplestore/src/test/java/org/fcrepo/camel/audit/triplestore/RouteDisabledTest.java @@ -1,19 +1,7 @@ /* - * Licensed to DuraSpace under one or more contributor license agreements. - * See the NOTICE file distributed with this work for additional information - * regarding copyright ownership. - * - * DuraSpace licenses this file to you 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 contents of this file are subject to the license and copyright + * detailed in the LICENSE and NOTICE files at the root of the source + * tree. */ package org.fcrepo.camel.audit.triplestore; diff --git a/fcrepo-audit-triplestore/src/test/java/org/fcrepo/camel/audit/triplestore/RouteTest.java b/fcrepo-audit-triplestore/src/test/java/org/fcrepo/camel/audit/triplestore/RouteTest.java index 56aad1df..027b57d9 100644 --- a/fcrepo-audit-triplestore/src/test/java/org/fcrepo/camel/audit/triplestore/RouteTest.java +++ b/fcrepo-audit-triplestore/src/test/java/org/fcrepo/camel/audit/triplestore/RouteTest.java @@ -1,19 +1,7 @@ /* - * Licensed to DuraSpace under one or more contributor license agreements. - * See the NOTICE file distributed with this work for additional information - * regarding copyright ownership. - * - * DuraSpace licenses this file to you 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 contents of this file are subject to the license and copyright + * detailed in the LICENSE and NOTICE files at the root of the source + * tree. */ package org.fcrepo.camel.audit.triplestore; diff --git a/fcrepo-audit-triplestore/src/test/java/org/fcrepo/camel/audit/triplestore/integration/AuditSparqlIT.java b/fcrepo-audit-triplestore/src/test/java/org/fcrepo/camel/audit/triplestore/integration/AuditSparqlIT.java index 122fe438..7266cba2 100644 --- a/fcrepo-audit-triplestore/src/test/java/org/fcrepo/camel/audit/triplestore/integration/AuditSparqlIT.java +++ b/fcrepo-audit-triplestore/src/test/java/org/fcrepo/camel/audit/triplestore/integration/AuditSparqlIT.java @@ -1,19 +1,7 @@ /* - * Licensed to DuraSpace under one or more contributor license agreements. - * See the NOTICE file distributed with this work for additional information - * regarding copyright ownership. - * - * DuraSpace licenses this file to you 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 contents of this file are subject to the license and copyright + * detailed in the LICENSE and NOTICE files at the root of the source + * tree. */ package org.fcrepo.camel.audit.triplestore.integration; diff --git a/fcrepo-audit-triplestore/src/test/java/org/fcrepo/camel/audit/triplestore/integration/RouteAuthTestIT.java b/fcrepo-audit-triplestore/src/test/java/org/fcrepo/camel/audit/triplestore/integration/RouteAuthTestIT.java index 0aaee702..82e1f2d3 100644 --- a/fcrepo-audit-triplestore/src/test/java/org/fcrepo/camel/audit/triplestore/integration/RouteAuthTestIT.java +++ b/fcrepo-audit-triplestore/src/test/java/org/fcrepo/camel/audit/triplestore/integration/RouteAuthTestIT.java @@ -1,19 +1,7 @@ /* - * Licensed to DuraSpace under one or more contributor license agreements. - * See the NOTICE file distributed with this work for additional information - * regarding copyright ownership. - * - * DuraSpace licenses this file to you 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 contents of this file are subject to the license and copyright + * detailed in the LICENSE and NOTICE files at the root of the source + * tree. */ package org.fcrepo.camel.audit.triplestore.integration; diff --git a/fcrepo-camel-common/src/main/java/org/fcrepo/camel/common/config/BasePropsConfig.java b/fcrepo-camel-common/src/main/java/org/fcrepo/camel/common/config/BasePropsConfig.java index 027e8a2f..c4916997 100644 --- a/fcrepo-camel-common/src/main/java/org/fcrepo/camel/common/config/BasePropsConfig.java +++ b/fcrepo-camel-common/src/main/java/org/fcrepo/camel/common/config/BasePropsConfig.java @@ -1,19 +1,7 @@ /* - * Licensed to DuraSpace under one or more contributor license agreements. - * See the NOTICE file distributed with this work for additional information - * regarding copyright ownership. - * - * DuraSpace licenses this file to you 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 contents of this file are subject to the license and copyright + * detailed in the LICENSE and NOTICE files at the root of the source + * tree. */ package org.fcrepo.camel.common.config; diff --git a/fcrepo-camel-common/src/main/java/org/fcrepo/camel/common/config/ConditionOnProperty.java b/fcrepo-camel-common/src/main/java/org/fcrepo/camel/common/config/ConditionOnProperty.java index 62e4e590..406a10ef 100644 --- a/fcrepo-camel-common/src/main/java/org/fcrepo/camel/common/config/ConditionOnProperty.java +++ b/fcrepo-camel-common/src/main/java/org/fcrepo/camel/common/config/ConditionOnProperty.java @@ -1,19 +1,7 @@ /* - * Licensed to DuraSpace under one or more contributor license agreements. - * See the NOTICE file distributed with this work for additional information - * regarding copyright ownership. - * - * DuraSpace licenses this file to you 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 contents of this file are subject to the license and copyright + * detailed in the LICENSE and NOTICE files at the root of the source + * tree. */ package org.fcrepo.camel.common.config; diff --git a/fcrepo-camel-common/src/main/java/org/fcrepo/camel/common/config/ConditionOnPropertyFalse.java b/fcrepo-camel-common/src/main/java/org/fcrepo/camel/common/config/ConditionOnPropertyFalse.java index 5bea5981..cae7701c 100644 --- a/fcrepo-camel-common/src/main/java/org/fcrepo/camel/common/config/ConditionOnPropertyFalse.java +++ b/fcrepo-camel-common/src/main/java/org/fcrepo/camel/common/config/ConditionOnPropertyFalse.java @@ -1,19 +1,7 @@ /* - * Licensed to DuraSpace under one or more contributor license agreements. - * See the NOTICE file distributed with this work for additional information - * regarding copyright ownership. - * - * DuraSpace licenses this file to you 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 contents of this file are subject to the license and copyright + * detailed in the LICENSE and NOTICE files at the root of the source + * tree. */ package org.fcrepo.camel.common.config; diff --git a/fcrepo-camel-common/src/main/java/org/fcrepo/camel/common/config/ConditionOnPropertyTrue.java b/fcrepo-camel-common/src/main/java/org/fcrepo/camel/common/config/ConditionOnPropertyTrue.java index 45549a1f..a6ef739b 100644 --- a/fcrepo-camel-common/src/main/java/org/fcrepo/camel/common/config/ConditionOnPropertyTrue.java +++ b/fcrepo-camel-common/src/main/java/org/fcrepo/camel/common/config/ConditionOnPropertyTrue.java @@ -1,19 +1,7 @@ /* - * Licensed to DuraSpace under one or more contributor license agreements. - * See the NOTICE file distributed with this work for additional information - * regarding copyright ownership. - * - * DuraSpace licenses this file to you 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 contents of this file are subject to the license and copyright + * detailed in the LICENSE and NOTICE files at the root of the source + * tree. */ package org.fcrepo.camel.common.config; diff --git a/fcrepo-camel-common/src/main/java/org/fcrepo/camel/common/helpers/BasicAuth.java b/fcrepo-camel-common/src/main/java/org/fcrepo/camel/common/helpers/BasicAuth.java index 5bd8dc3f..646c9e86 100644 --- a/fcrepo-camel-common/src/main/java/org/fcrepo/camel/common/helpers/BasicAuth.java +++ b/fcrepo-camel-common/src/main/java/org/fcrepo/camel/common/helpers/BasicAuth.java @@ -1,19 +1,7 @@ /* - * Licensed to DuraSpace under one or more contributor license agreements. - * See the NOTICE file distributed with this work for additional information - * regarding copyright ownership. - * - * DuraSpace licenses this file to you 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 contents of this file are subject to the license and copyright + * detailed in the LICENSE and NOTICE files at the root of the source + * tree. */ package org.fcrepo.camel.common.helpers; diff --git a/fcrepo-camel-common/src/main/java/org/fcrepo/camel/common/processor/AddBasicAuthProcessor.java b/fcrepo-camel-common/src/main/java/org/fcrepo/camel/common/processor/AddBasicAuthProcessor.java index 3e2d8788..485cdde6 100644 --- a/fcrepo-camel-common/src/main/java/org/fcrepo/camel/common/processor/AddBasicAuthProcessor.java +++ b/fcrepo-camel-common/src/main/java/org/fcrepo/camel/common/processor/AddBasicAuthProcessor.java @@ -1,19 +1,7 @@ /* - * Licensed to DuraSpace under one or more contributor license agreements. - * See the NOTICE file distributed with this work for additional information - * regarding copyright ownership. - * - * DuraSpace licenses this file to you 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 contents of this file are subject to the license and copyright + * detailed in the LICENSE and NOTICE files at the root of the source + * tree. */ package org.fcrepo.camel.common.processor; diff --git a/fcrepo-camel-toolbox-app/pom.xml b/fcrepo-camel-toolbox-app/pom.xml index 4198a535..ca8e2167 100644 --- a/fcrepo-camel-toolbox-app/pom.xml +++ b/fcrepo-camel-toolbox-app/pom.xml @@ -34,7 +34,7 @@ ${project.parent.groupId} - fcrepo-indexing-http + fcrepo-http-forwarding ${project.parent.version} diff --git a/fcrepo-camel-toolbox-app/src/main/java/org/fcrepo/camel/toolbox/app/AppConfig.java b/fcrepo-camel-toolbox-app/src/main/java/org/fcrepo/camel/toolbox/app/AppConfig.java index 38c58e24..afcc3f08 100644 --- a/fcrepo-camel-toolbox-app/src/main/java/org/fcrepo/camel/toolbox/app/AppConfig.java +++ b/fcrepo-camel-toolbox-app/src/main/java/org/fcrepo/camel/toolbox/app/AppConfig.java @@ -1,19 +1,7 @@ /* - * Licensed to DuraSpace under one or more contributor license agreements. - * See the NOTICE file distributed with this work for additional information - * regarding copyright ownership. - * - * DuraSpace licenses this file to you 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 contents of this file are subject to the license and copyright + * detailed in the LICENSE and NOTICE files at the root of the source + * tree. */ package org.fcrepo.camel.toolbox.app; diff --git a/fcrepo-camel-toolbox-app/src/main/java/org/fcrepo/camel/toolbox/app/AppVersionProvider.java b/fcrepo-camel-toolbox-app/src/main/java/org/fcrepo/camel/toolbox/app/AppVersionProvider.java index 72f2fb63..83b2f265 100644 --- a/fcrepo-camel-toolbox-app/src/main/java/org/fcrepo/camel/toolbox/app/AppVersionProvider.java +++ b/fcrepo-camel-toolbox-app/src/main/java/org/fcrepo/camel/toolbox/app/AppVersionProvider.java @@ -1,19 +1,7 @@ /* - * Licensed to DuraSpace under one or more contributor license agreements. - * See the NOTICE file distributed with this work for additional information - * regarding copyright ownership. - * - * DuraSpace licenses this file to you 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 contents of this file are subject to the license and copyright + * detailed in the LICENSE and NOTICE files at the root of the source + * tree. */ package org.fcrepo.camel.toolbox.app; diff --git a/fcrepo-camel-toolbox-app/src/main/java/org/fcrepo/camel/toolbox/app/Driver.java b/fcrepo-camel-toolbox-app/src/main/java/org/fcrepo/camel/toolbox/app/Driver.java index 294f8fd8..f2832e22 100644 --- a/fcrepo-camel-toolbox-app/src/main/java/org/fcrepo/camel/toolbox/app/Driver.java +++ b/fcrepo-camel-toolbox-app/src/main/java/org/fcrepo/camel/toolbox/app/Driver.java @@ -1,19 +1,7 @@ /* - * Licensed to DuraSpace under one or more contributor license agreements. - * See the NOTICE file distributed with this work for additional information - * regarding copyright ownership. - * - * DuraSpace licenses this file to you 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 contents of this file are subject to the license and copyright + * detailed in the LICENSE and NOTICE files at the root of the source + * tree. */ package org.fcrepo.camel.toolbox.app; diff --git a/fcrepo-fixity/README.md b/fcrepo-fixity/README.md deleted file mode 100644 index b9664588..00000000 --- a/fcrepo-fixity/README.md +++ /dev/null @@ -1,27 +0,0 @@ -# Fedora Fixity Service - -This application implements a fixity checking service for -[Fedora4](http://fcrepo.org) that can be used to send alerts about -checksum errors. - -By default, errors will be saved to a file in `/tmp`, but this can be -modified by specifying an alternate value for `fixity.failure`. It is -also possible to trigger an event on successful fixity checks. - -This service is typically used in conjunction with the -[fcrepo-reindexing](https://github.com/fcrepo-exts/fcrepo-camel-toolbox/tree/master/fcrepo-reindexing) -module. For example: - - curl -XPOST localhost:9080/reindexing/fedora/path -H"Content-Type: application/json" \ - -d '["broker:queue:fixity"]' - -## Building - -To build this project use - - MAVEN_OPTS="-Xmx1024m" mvn install - -For more help see the Apache Camel documentation - - http://camel.apache.org/ - diff --git a/fcrepo-fixity/src/main/java/org/fcrepo/camel/fixity/FcrepoFixityConfig.java b/fcrepo-fixity/src/main/java/org/fcrepo/camel/fixity/FcrepoFixityConfig.java index 1d996607..79e04bd2 100644 --- a/fcrepo-fixity/src/main/java/org/fcrepo/camel/fixity/FcrepoFixityConfig.java +++ b/fcrepo-fixity/src/main/java/org/fcrepo/camel/fixity/FcrepoFixityConfig.java @@ -1,19 +1,7 @@ /* - * Licensed to DuraSpace under one or more contributor license agreements. - * See the NOTICE file distributed with this work for additional information - * regarding copyright ownership. - * - * DuraSpace licenses this file to you 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 contents of this file are subject to the license and copyright + * detailed in the LICENSE and NOTICE files at the root of the source + * tree. */ package org.fcrepo.camel.fixity; diff --git a/fcrepo-fixity/src/main/java/org/fcrepo/camel/fixity/FixityRouter.java b/fcrepo-fixity/src/main/java/org/fcrepo/camel/fixity/FixityRouter.java index 6815ac31..9b7b6b4f 100644 --- a/fcrepo-fixity/src/main/java/org/fcrepo/camel/fixity/FixityRouter.java +++ b/fcrepo-fixity/src/main/java/org/fcrepo/camel/fixity/FixityRouter.java @@ -1,19 +1,7 @@ /* - * Licensed to DuraSpace under one or more contributor license agreements. - * See the NOTICE file distributed with this work for additional information - * regarding copyright ownership. - * - * DuraSpace licenses this file to you 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 contents of this file are subject to the license and copyright + * detailed in the LICENSE and NOTICE files at the root of the source + * tree. */ package org.fcrepo.camel.fixity; diff --git a/fcrepo-fixity/src/test/java/org/fcrepo/camel/fixity/RouteDisabledTest.java b/fcrepo-fixity/src/test/java/org/fcrepo/camel/fixity/RouteDisabledTest.java index 4e44e2cc..a42f4e1e 100644 --- a/fcrepo-fixity/src/test/java/org/fcrepo/camel/fixity/RouteDisabledTest.java +++ b/fcrepo-fixity/src/test/java/org/fcrepo/camel/fixity/RouteDisabledTest.java @@ -1,19 +1,7 @@ /* - * Licensed to DuraSpace under one or more contributor license agreements. - * See the NOTICE file distributed with this work for additional information - * regarding copyright ownership. - * - * DuraSpace licenses this file to you 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 contents of this file are subject to the license and copyright + * detailed in the LICENSE and NOTICE files at the root of the source + * tree. */ package org.fcrepo.camel.fixity; diff --git a/fcrepo-fixity/src/test/java/org/fcrepo/camel/fixity/RouteTest.java b/fcrepo-fixity/src/test/java/org/fcrepo/camel/fixity/RouteTest.java index 2d8213df..2117c80d 100644 --- a/fcrepo-fixity/src/test/java/org/fcrepo/camel/fixity/RouteTest.java +++ b/fcrepo-fixity/src/test/java/org/fcrepo/camel/fixity/RouteTest.java @@ -1,19 +1,7 @@ /* - * Licensed to DuraSpace under one or more contributor license agreements. - * See the NOTICE file distributed with this work for additional information - * regarding copyright ownership. - * - * DuraSpace licenses this file to you 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 contents of this file are subject to the license and copyright + * detailed in the LICENSE and NOTICE files at the root of the source + * tree. */ package org.fcrepo.camel.fixity; diff --git a/fcrepo-fixity/src/test/java/org/fcrepo/camel/fixity/integration/RouteIT.java b/fcrepo-fixity/src/test/java/org/fcrepo/camel/fixity/integration/RouteIT.java index 4f6fe62c..5e33b0ac 100644 --- a/fcrepo-fixity/src/test/java/org/fcrepo/camel/fixity/integration/RouteIT.java +++ b/fcrepo-fixity/src/test/java/org/fcrepo/camel/fixity/integration/RouteIT.java @@ -1,19 +1,7 @@ /* - * Licensed to DuraSpace under one or more contributor license agreements. - * See the NOTICE file distributed with this work for additional information - * regarding copyright ownership. - * - * DuraSpace licenses this file to you 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 contents of this file are subject to the license and copyright + * detailed in the LICENSE and NOTICE files at the root of the source + * tree. */ package org.fcrepo.camel.fixity.integration; diff --git a/fcrepo-indexing-http/pom.xml b/fcrepo-http-forwarding/pom.xml similarity index 95% rename from fcrepo-indexing-http/pom.xml rename to fcrepo-http-forwarding/pom.xml index 07f2e497..1a29f248 100644 --- a/fcrepo-indexing-http/pom.xml +++ b/fcrepo-http-forwarding/pom.xml @@ -9,11 +9,11 @@ 6.0.0-SNAPSHOT - fcrepo-indexing-http + fcrepo-http-forwarding jar - Fedora Indexing Service with a Http backend - Camel-based indexing service for Http + Fedora Http Message Forwarding Service + Camel-based HTTP forwarding service diff --git a/fcrepo-indexing-http/src/main/java/org/fcrepo/camel/indexing/http/FcrepoHttpIndexerConfig.java b/fcrepo-http-forwarding/src/main/java/org/fcrepo/camel/httpforwarding/FcrepoHttpForwardingConfig.java similarity index 61% rename from fcrepo-indexing-http/src/main/java/org/fcrepo/camel/indexing/http/FcrepoHttpIndexerConfig.java rename to fcrepo-http-forwarding/src/main/java/org/fcrepo/camel/httpforwarding/FcrepoHttpForwardingConfig.java index 710b1f7f..ffdd261f 100644 --- a/fcrepo-indexing-http/src/main/java/org/fcrepo/camel/indexing/http/FcrepoHttpIndexerConfig.java +++ b/fcrepo-http-forwarding/src/main/java/org/fcrepo/camel/httpforwarding/FcrepoHttpForwardingConfig.java @@ -1,21 +1,9 @@ /* - * Licensed to DuraSpace under one or more contributor license agreements. - * See the NOTICE file distributed with this work for additional information - * regarding copyright ownership. - * - * DuraSpace licenses this file to you 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 contents of this file are subject to the license and copyright + * detailed in the LICENSE and NOTICE files at the root of the source + * tree. */ -package org.fcrepo.camel.indexing.http; +package org.fcrepo.camel.httpforwarding; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.http.HttpComponent; @@ -33,14 +21,14 @@ * @author Demian Katz */ @Configuration -@Conditional(FcrepoHttpIndexerConfig.HttpIndexerEnabled.class) -public class FcrepoHttpIndexerConfig extends BasePropsConfig { +@Conditional(FcrepoHttpForwardingConfig.HttpForwardingingEnabled.class) +public class FcrepoHttpForwardingConfig extends BasePropsConfig { - static final String HTTP_INDEXER_ENABLED = "http.indexer.enabled"; + static final String HTTP_FORWARDING_ENABLED = "http.enabled"; - static class HttpIndexerEnabled extends ConditionOnPropertyTrue { - HttpIndexerEnabled() { - super(FcrepoHttpIndexerConfig.HTTP_INDEXER_ENABLED, false); + static class HttpForwardingingEnabled extends ConditionOnPropertyTrue { + HttpForwardingingEnabled() { + super(FcrepoHttpForwardingConfig.HTTP_FORWARDING_ENABLED, false); } } diff --git a/fcrepo-indexing-http/src/main/java/org/fcrepo/camel/indexing/http/HttpRouter.java b/fcrepo-http-forwarding/src/main/java/org/fcrepo/camel/httpforwarding/HttpRouter.java similarity index 81% rename from fcrepo-indexing-http/src/main/java/org/fcrepo/camel/indexing/http/HttpRouter.java rename to fcrepo-http-forwarding/src/main/java/org/fcrepo/camel/httpforwarding/HttpRouter.java index 96366438..34d74aea 100644 --- a/fcrepo-indexing-http/src/main/java/org/fcrepo/camel/indexing/http/HttpRouter.java +++ b/fcrepo-http-forwarding/src/main/java/org/fcrepo/camel/httpforwarding/HttpRouter.java @@ -1,21 +1,9 @@ /* - * Licensed to DuraSpace under one or more contributor license agreements. - * See the NOTICE file distributed with this work for additional information - * regarding copyright ownership. - * - * DuraSpace licenses this file to you 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 contents of this file are subject to the license and copyright + * detailed in the LICENSE and NOTICE files at the root of the source + * tree. */ -package org.fcrepo.camel.indexing.http; +package org.fcrepo.camel.httpforwarding; import org.apache.camel.LoggingLevel; import org.apache.camel.builder.RouteBuilder; @@ -48,7 +36,7 @@ public class HttpRouter extends RouteBuilder { private static final Logger LOGGER = getLogger(HttpRouter.class); @Autowired - private FcrepoHttpIndexerConfig config; + private FcrepoHttpForwardingConfig config; /** * Configure the message route workflow. @@ -107,7 +95,7 @@ public void configure() throws Exception { header(FCREPO_URI).isEqualTo(constant(uri)))) .collect(toList())))) .log(LoggingLevel.INFO, LOGGER, "sending ${headers[CamelFcrepoUri]} to http endpoint...") - .to("mustache:org/fcrepo/camel/indexing/http/httpMessage.mustache") + .to("mustache:org/fcrepo/camel/httpforwarding/httpMessage.mustache") .setHeader(HTTP_METHOD).constant("POST") .setHeader(CONTENT_TYPE).constant("application/json") .process(new AddBasicAuthProcessor(config.getHttpAuthUsername(), config.getHttpAuthPassword())) diff --git a/fcrepo-indexing-http/src/main/resources/org/fcrepo/camel/indexing/http/httpMessage.mustache b/fcrepo-http-forwarding/src/main/resources/org/fcrepo/camel/httpforwarding/httpMessage.mustache similarity index 100% rename from fcrepo-indexing-http/src/main/resources/org/fcrepo/camel/indexing/http/httpMessage.mustache rename to fcrepo-http-forwarding/src/main/resources/org/fcrepo/camel/httpforwarding/httpMessage.mustache diff --git a/fcrepo-indexing-http/src/test/java/org/fcrepo/camel/indexing/http/RouteTest.java b/fcrepo-http-forwarding/src/test/java/org/fcrepo/camel/httpforwarding/RouteTest.java similarity index 86% rename from fcrepo-indexing-http/src/test/java/org/fcrepo/camel/indexing/http/RouteTest.java rename to fcrepo-http-forwarding/src/test/java/org/fcrepo/camel/httpforwarding/RouteTest.java index f849cc8f..2aeb8ab3 100644 --- a/fcrepo-indexing-http/src/test/java/org/fcrepo/camel/indexing/http/RouteTest.java +++ b/fcrepo-http-forwarding/src/test/java/org/fcrepo/camel/httpforwarding/RouteTest.java @@ -1,21 +1,9 @@ /* - * Licensed to DuraSpace under one or more contributor license agreements. - * See the NOTICE file distributed with this work for additional information - * regarding copyright ownership. - * - * DuraSpace licenses this file to you 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 contents of this file are subject to the license and copyright + * detailed in the LICENSE and NOTICE files at the root of the source + * tree. */ -package org.fcrepo.camel.indexing.http; +package org.fcrepo.camel.httpforwarding; import org.apache.camel.CamelContext; import org.apache.camel.Produce; @@ -60,7 +48,6 @@ @ContextConfiguration(classes = {RouteTest.ContextConfig.class}, loader = AnnotationConfigContextLoader.class) public class RouteTest { private final String EVENT_NS = "https://www.w3.org/ns/activitystreams#"; - private final String INDEXABLE = "http://fedora.info/definitions/v4/indexing#Indexable"; private static final String baseURL = "http://localhost/rest"; private static final String httpURL = "http://localhost/http_endpoint"; private static final String fileID = "/file1"; @@ -79,7 +66,7 @@ public class RouteTest { @BeforeClass public static void beforeClass() { - System.setProperty("http.indexer.enabled", "true"); + System.setProperty("http.enabled", "true"); System.setProperty("http.filter.containers", baseURL + auditContainer); System.setProperty("http.input.stream", inputStream); System.setProperty("http.reindex.stream", reindexStream); diff --git a/fcrepo-indexing-http/src/test/java/org/fcrepo/camel/indexing/http/RouteValidationTest.java b/fcrepo-http-forwarding/src/test/java/org/fcrepo/camel/httpforwarding/RouteValidationTest.java similarity index 85% rename from fcrepo-indexing-http/src/test/java/org/fcrepo/camel/indexing/http/RouteValidationTest.java rename to fcrepo-http-forwarding/src/test/java/org/fcrepo/camel/httpforwarding/RouteValidationTest.java index 59760e5b..e9a7533b 100644 --- a/fcrepo-indexing-http/src/test/java/org/fcrepo/camel/indexing/http/RouteValidationTest.java +++ b/fcrepo-http-forwarding/src/test/java/org/fcrepo/camel/httpforwarding/RouteValidationTest.java @@ -1,21 +1,9 @@ /* - * Licensed to DuraSpace under one or more contributor license agreements. - * See the NOTICE file distributed with this work for additional information - * regarding copyright ownership. - * - * DuraSpace licenses this file to you 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 contents of this file are subject to the license and copyright + * detailed in the LICENSE and NOTICE files at the root of the source + * tree. */ -package org.fcrepo.camel.indexing.http; +package org.fcrepo.camel.httpforwarding; import org.apache.camel.CamelContext; import org.apache.camel.Produce; @@ -78,7 +66,7 @@ public class RouteValidationTest { @BeforeClass public static void beforeClass() { - System.setProperty("http.indexer.enabled", "true"); + System.setProperty("http.enabled", "true"); System.setProperty("http.filter.containers", baseURL + auditContainer); System.setProperty("http.input.stream", inputStream); System.setProperty("http.reindex.stream", reindexStream); diff --git a/fcrepo-indexing-http/src/test/java/org/fcrepo/camel/indexing/http/integration/RouteDeleteIT.java b/fcrepo-http-forwarding/src/test/java/org/fcrepo/camel/httpforwarding/integration/RouteDeleteIT.java similarity index 83% rename from fcrepo-indexing-http/src/test/java/org/fcrepo/camel/indexing/http/integration/RouteDeleteIT.java rename to fcrepo-http-forwarding/src/test/java/org/fcrepo/camel/httpforwarding/integration/RouteDeleteIT.java index 70f71dd6..e7499b32 100644 --- a/fcrepo-indexing-http/src/test/java/org/fcrepo/camel/indexing/http/integration/RouteDeleteIT.java +++ b/fcrepo-http-forwarding/src/test/java/org/fcrepo/camel/httpforwarding/integration/RouteDeleteIT.java @@ -1,21 +1,9 @@ /* - * Licensed to DuraSpace under one or more contributor license agreements. - * See the NOTICE file distributed with this work for additional information - * regarding copyright ownership. - * - * DuraSpace licenses this file to you 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 contents of this file are subject to the license and copyright + * detailed in the LICENSE and NOTICE files at the root of the source + * tree. */ -package org.fcrepo.camel.indexing.http.integration; +package org.fcrepo.camel.httpforwarding.integration; import com.github.tomakehurst.wiremock.WireMockServer; import com.github.tomakehurst.wiremock.client.WireMock; @@ -45,7 +33,6 @@ import static com.github.tomakehurst.wiremock.client.WireMock.postRequestedFor; import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo; import static java.lang.Integer.parseInt; -import static org.fcrepo.camel.indexing.http.integration.TestUtils.getEvent; import static org.slf4j.LoggerFactory.getLogger; /** @@ -90,7 +77,7 @@ public class RouteDeleteIT { @BeforeClass public static void beforeClass() { final String jmsPort = System.getProperty("fcrepo.dynamic.jms.port", "61616"); - System.setProperty("http.indexer.enabled", "true"); + System.setProperty("http.enabled", "true"); System.setProperty("http.baseUrl", "http://localhost:" + MOCKSERVER_PORT + MOCK_ENDPOINT); System.setProperty("http.authUsername", BASIC_AUTH_USERNAME); System.setProperty("http.authPassword", BASIC_AUTH_PASSWORD); @@ -137,7 +124,7 @@ public void testDeletedResourceWithEventBody() throws Exception { logger.info("fullPath={}", fullPath); template.sendBodyAndHeader( - "direct:start", getEvent(fullPath, AS_NS + "Delete"), "org.fcrepo.jms.eventtype", AS_NS + "Delete" + "direct:start", TestUtils.getEvent(fullPath, AS_NS + "Delete"), "org.fcrepo.jms.eventtype", AS_NS + "Delete" ); mockServer.verify(1, postRequestedFor(urlEqualTo(MOCK_ENDPOINT)) diff --git a/fcrepo-indexing-http/src/test/java/org/fcrepo/camel/indexing/http/integration/RouteUpdateIT.java b/fcrepo-http-forwarding/src/test/java/org/fcrepo/camel/httpforwarding/integration/RouteUpdateIT.java similarity index 85% rename from fcrepo-indexing-http/src/test/java/org/fcrepo/camel/indexing/http/integration/RouteUpdateIT.java rename to fcrepo-http-forwarding/src/test/java/org/fcrepo/camel/httpforwarding/integration/RouteUpdateIT.java index 4e2b07f1..9a7e178d 100644 --- a/fcrepo-indexing-http/src/test/java/org/fcrepo/camel/indexing/http/integration/RouteUpdateIT.java +++ b/fcrepo-http-forwarding/src/test/java/org/fcrepo/camel/httpforwarding/integration/RouteUpdateIT.java @@ -1,21 +1,9 @@ /* - * Licensed to DuraSpace under one or more contributor license agreements. - * See the NOTICE file distributed with this work for additional information - * regarding copyright ownership. - * - * DuraSpace licenses this file to you 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 contents of this file are subject to the license and copyright + * detailed in the LICENSE and NOTICE files at the root of the source + * tree. */ -package org.fcrepo.camel.indexing.http.integration; +package org.fcrepo.camel.httpforwarding.integration; import com.github.tomakehurst.wiremock.WireMockServer; import com.github.tomakehurst.wiremock.client.WireMock; @@ -50,7 +38,7 @@ import static com.github.tomakehurst.wiremock.client.WireMock.postRequestedFor; import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo; import static java.lang.Integer.parseInt; -import static org.fcrepo.camel.indexing.http.integration.TestUtils.getEvent; +import static org.fcrepo.camel.httpforwarding.integration.TestUtils.getEvent; import static org.slf4j.LoggerFactory.getLogger; /** @@ -94,7 +82,7 @@ public class RouteUpdateIT { @BeforeClass public static void beforeClass() { - System.setProperty("http.indexer.enabled", "true"); + System.setProperty("http.enabled", "true"); System.setProperty("http.baseUrl", "http://localhost:" + MOCKSERVER_PORT + MOCK_ENDPOINT); System.setProperty("jms.brokerUrl", "tcp://localhost:" + JMS_PORT); System.setProperty("http.input.stream", "direct:start"); diff --git a/fcrepo-indexing-http/src/test/java/org/fcrepo/camel/indexing/http/integration/TestUtils.java b/fcrepo-http-forwarding/src/test/java/org/fcrepo/camel/httpforwarding/integration/TestUtils.java similarity index 82% rename from fcrepo-indexing-http/src/test/java/org/fcrepo/camel/indexing/http/integration/TestUtils.java rename to fcrepo-http-forwarding/src/test/java/org/fcrepo/camel/httpforwarding/integration/TestUtils.java index 87c187db..ea88c324 100644 --- a/fcrepo-indexing-http/src/test/java/org/fcrepo/camel/indexing/http/integration/TestUtils.java +++ b/fcrepo-http-forwarding/src/test/java/org/fcrepo/camel/httpforwarding/integration/TestUtils.java @@ -1,21 +1,9 @@ /* - * Licensed to DuraSpace under one or more contributor license agreements. - * See the NOTICE file distributed with this work for additional information - * regarding copyright ownership. - * - * DuraSpace licenses this file to you 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 contents of this file are subject to the license and copyright + * detailed in the LICENSE and NOTICE files at the root of the source + * tree. */ -package org.fcrepo.camel.indexing.http.integration; +package org.fcrepo.camel.httpforwarding.integration; import org.apache.camel.Exchange; import org.apache.http.client.methods.HttpPost; diff --git a/fcrepo-indexing-solr/README.md b/fcrepo-indexing-solr/README.md deleted file mode 100644 index b1aeb8c6..00000000 --- a/fcrepo-indexing-solr/README.md +++ /dev/null @@ -1,100 +0,0 @@ -# Fedora Indexing Service (Solr) - -This application implements a bridge to an external, solr index -for [Fedora4](http://fcrepo.org). - -The application relies on LDPath-based transformations to convert a resource -from RDF into JSON. More information on the LDPath language is available on the -[Marmotta website](http://marmotta.apache.org/ldpath/language.html). - -Additional background information is available on the Fedora Wiki on the -[Integration Services page](https://wiki.duraspace.org/display/FEDORA4x/Integration+Services). - -Please also note that in order to push data into Solr, your Solr schema must -be configured to accept the data you intend to send. This is typically accomplished -by updating Solr's `[schema.xml](https://wiki.apache.org/solr/SchemaXml)` file, -found in `$SOLR_HOME//conf/` (for Solr 4.x). Starting with 5.2, Solr provides a -[schema API](https://cwiki.apache.org/confluence/display/solr/Schema+API), -which allows runtime (re-)configuration of Solr. Further information on using Solr -can be found at the [Solr website](http://lucene.apache.org/solr/) - -## Building - -To build this project use - - MAVEN_OPTS="-Xmx1024m" mvn install - -## Deploying in OSGi - -This project can be deployed in an OSGi container. For example using -[Apache ServiceMix](http://servicemix.apache.org/) or -[Apache Karaf](http://karaf.apache.org), you can run the following -command from its shell: - - feature:repo-add mvn:org.fcrepo.camel/toolbox-features/LATEST/xml/features - feature:install fcrepo-indexing-solr - feature:install fcrepo-service-activemq - -## Configuration - -The application can be configured by creating a file in -`$KARAF_HOME/etc/org.fcrepo.camel.indexing.solr.cfg`. The following -values are available for configuration: - -In the event of failure, the maximum number of times a redelivery will be attempted. - - error.maxRedeliveries=10 - -If you would like the `indexing:hasIndexingTransformation` property to be checked -on a per-object basis, set this to true. Otherwise, the `fcrepo.defaultTransform` -is always used as transformation URL even if an object has the -`indexing:hasIndexingTransformation` property set. - - fcrepo.checkHasIndexingTransformation=true - -The default `LDPath` transformation to use. This is overridden on a per-object -basis with the `indexing:hasIndexingTransformation` predicate. The default value is empty, -but it may be overridden with a public URL as shown below. - - fcrepo.defaultTransform=http://example.com/ldpath/program.txt - -The location of the LDPath service. - - ldpath.service.baseUrl=http://localhost:9086/ldpath - -If you would like to index only those objects with a type `indexing:Indexable`, -set this property to `true` - - indexing.predicate=false - -The camel URI for the incoming message stream. - - input.stream=broker:topic:fedora - -The camel URI for handling reindexing events. - - solr.reindex.stream=broker:queue:solr.reindex - -The baseUrl for the Solr server. If using Solr 4.x or better, the URL should include -the core name. (Use `https` scheme if your solr server requires https and/or ssl client certificate authentication.) - - solr.baseUrl=http://localhost:8983/solr/collection1 - - -The timeframe (in milliseconds) within which new items should be committed to the solr index. - - solr.commitWithin=10000 - -A comma-delimited list of URIs to filter. That is, any Fedora resource that either -matches or is contained in one of the URIs listed will not be processed by the -fcrepo-indexing-solr application. - - filter.containers=http://localhost:8080/fcrepo/rest/audit - -By editing this file, any currently running routes will be immediately redeployed -with the new values. - -For more help see the Apache Camel documentation - - http://camel.apache.org/ - diff --git a/fcrepo-indexing-solr/src/main/java/org/fcrepo/camel/indexing/solr/FcrepoSolrIndexerConfig.java b/fcrepo-indexing-solr/src/main/java/org/fcrepo/camel/indexing/solr/FcrepoSolrIndexingConfig.java similarity index 60% rename from fcrepo-indexing-solr/src/main/java/org/fcrepo/camel/indexing/solr/FcrepoSolrIndexerConfig.java rename to fcrepo-indexing-solr/src/main/java/org/fcrepo/camel/indexing/solr/FcrepoSolrIndexingConfig.java index f2903d12..dbcfd665 100644 --- a/fcrepo-indexing-solr/src/main/java/org/fcrepo/camel/indexing/solr/FcrepoSolrIndexerConfig.java +++ b/fcrepo-indexing-solr/src/main/java/org/fcrepo/camel/indexing/solr/FcrepoSolrIndexingConfig.java @@ -1,19 +1,7 @@ /* - * Licensed to DuraSpace under one or more contributor license agreements. - * See the NOTICE file distributed with this work for additional information - * regarding copyright ownership. - * - * DuraSpace licenses this file to you 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 contents of this file are subject to the license and copyright + * detailed in the LICENSE and NOTICE files at the root of the source + * tree. */ package org.fcrepo.camel.indexing.solr; @@ -34,25 +22,25 @@ * @author dbernstein */ @Configuration -@Conditional(FcrepoSolrIndexerConfig.SolrIndexerEnabled.class) -public class FcrepoSolrIndexerConfig extends BasePropsConfig { +@Conditional(FcrepoSolrIndexingConfig.SolrIndexingEnabled.class) +public class FcrepoSolrIndexingConfig extends BasePropsConfig { - private static final Logger LOGGER = LoggerFactory.getLogger(FcrepoSolrIndexerConfig.class); - static final String SOLR_INDEXER_ENABLED = "solr.indexer.enabled"; + private static final Logger LOGGER = LoggerFactory.getLogger(FcrepoSolrIndexingConfig.class); + static final String SOLR_INDEXING_ENABLED = "solr.indexing.enabled"; - static class SolrIndexerEnabled extends ConditionOnPropertyTrue { - SolrIndexerEnabled() { - super(FcrepoSolrIndexerConfig.SOLR_INDEXER_ENABLED, false); + static class SolrIndexingEnabled extends ConditionOnPropertyTrue { + SolrIndexingEnabled() { + super(FcrepoSolrIndexingConfig.SOLR_INDEXING_ENABLED, false); } } - @Value("${fcrepo.checkHasIndexingTransformation:true}") + @Value("${solr.fcrepo.checkHasIndexingTransformation:true}") private boolean checkHasIndexingTransformation; - @Value("${fcrepo.defaultTransform:}") + @Value("${solr.fcrepo.defaultTransform:}") private String defaultTransform; - @Value("${input.stream:broker:topic:fedora}") + @Value("${solr.input.stream:broker:topic:fedora}") private String inputStream; @Value("${solr.reindex.stream:broker:queue:solr.reindex}") @@ -61,13 +49,13 @@ static class SolrIndexerEnabled extends ConditionOnPropertyTrue { @Value("${solr.commitWithin:10000}") private long commitWithin; - @Value("${indexing.predicate:false}") + @Value("${solr.indexing.predicate:false}") private boolean indexingPredicate; - @Value("${ldpath.service.baseUrl:http://localhost:9085/ldpath}") + @Value("${solr.ldpath.service.baseUrl:http://localhost:9085/ldpath}") private String ldpathServiceBaseUrl; - @Value("${filter.containers:http://localhost:8080/fcrepo/rest/audit}") + @Value("${solr.filter.containers:http://localhost:8080/fcrepo/rest/audit}") private String filterContainers; @Value("${solr.baseUrl:http://localhost:8983/solr/collection1}") diff --git a/fcrepo-indexing-solr/src/main/java/org/fcrepo/camel/indexing/solr/SolrRouter.java b/fcrepo-indexing-solr/src/main/java/org/fcrepo/camel/indexing/solr/SolrRouter.java index c0fcfdb1..096acdf0 100644 --- a/fcrepo-indexing-solr/src/main/java/org/fcrepo/camel/indexing/solr/SolrRouter.java +++ b/fcrepo-indexing-solr/src/main/java/org/fcrepo/camel/indexing/solr/SolrRouter.java @@ -1,19 +1,7 @@ /* - * Licensed to DuraSpace under one or more contributor license agreements. - * See the NOTICE file distributed with this work for additional information - * regarding copyright ownership. - * - * DuraSpace licenses this file to you 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 contents of this file are subject to the license and copyright + * detailed in the LICENSE and NOTICE files at the root of the source + * tree. */ package org.fcrepo.camel.indexing.solr; @@ -59,7 +47,7 @@ public class SolrRouter extends RouteBuilder { private static final String INDEXING_URI = "CamelIndexingUri"; @Autowired - private FcrepoSolrIndexerConfig config; + private FcrepoSolrIndexingConfig config; /** * Configure the message route workflow. diff --git a/fcrepo-indexing-solr/src/test/java/org/fcrepo/camel/indexing/solr/RouteTest.java b/fcrepo-indexing-solr/src/test/java/org/fcrepo/camel/indexing/solr/RouteTest.java index b24a5e51..642250ca 100644 --- a/fcrepo-indexing-solr/src/test/java/org/fcrepo/camel/indexing/solr/RouteTest.java +++ b/fcrepo-indexing-solr/src/test/java/org/fcrepo/camel/indexing/solr/RouteTest.java @@ -1,19 +1,7 @@ /* - * Licensed to DuraSpace under one or more contributor license agreements. - * See the NOTICE file distributed with this work for additional information - * regarding copyright ownership. - * - * DuraSpace licenses this file to you 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 contents of this file are subject to the license and copyright + * detailed in the LICENSE and NOTICE files at the root of the source + * tree. */ package org.fcrepo.camel.indexing.solr; @@ -82,17 +70,17 @@ public class RouteTest { @BeforeClass public static void beforeClass() { - System.setProperty("solr.indexer.enabled", "true"); - System.setProperty("indexing.predicate", "true"); - System.setProperty("filter.containers", baseURL + auditContainer); - System.setProperty("input.stream", "seda:foo"); - System.setProperty("reindex.stream", "seda:bar"); + System.setProperty("solr.indexing.enabled", "true"); + System.setProperty("solr.indexing.predicate", "true"); + System.setProperty("solr.filter.containers", baseURL + auditContainer); + System.setProperty("solr.input.stream", "seda:foo"); + System.setProperty("solr.reindex.stream", "seda:bar"); System.setProperty("error.maxRedeliveries", "10"); System.setProperty("fcrepo.baseUrl", baseURL); - System.setProperty("fcrepo.defaultTransform", "http://localhost/ldpath/program"); + System.setProperty("solr.fcrepo.defaultTransform", "http://localhost/ldpath/program"); System.setProperty("solr.baseUrl", solrURL); System.setProperty("solr.reindex.stream", "seda:reindex"); - System.setProperty("fcrepo.checkHasIndexingTransformation", "true"); + System.setProperty("solr.fcrepo.checkHasIndexingTransformation", "true"); } diff --git a/fcrepo-indexing-triplestore/src/main/java/org/fcrepo/camel/indexing/triplestore/FcrepoTripleStoreIndexerConfig.java b/fcrepo-indexing-triplestore/src/main/java/org/fcrepo/camel/indexing/triplestore/FcrepoTripleStoreIndexingConfig.java similarity index 65% rename from fcrepo-indexing-triplestore/src/main/java/org/fcrepo/camel/indexing/triplestore/FcrepoTripleStoreIndexerConfig.java rename to fcrepo-indexing-triplestore/src/main/java/org/fcrepo/camel/indexing/triplestore/FcrepoTripleStoreIndexingConfig.java index a969de5c..ae9fd4e0 100644 --- a/fcrepo-indexing-triplestore/src/main/java/org/fcrepo/camel/indexing/triplestore/FcrepoTripleStoreIndexerConfig.java +++ b/fcrepo-indexing-triplestore/src/main/java/org/fcrepo/camel/indexing/triplestore/FcrepoTripleStoreIndexingConfig.java @@ -1,19 +1,7 @@ /* - * Licensed to DuraSpace under one or more contributor license agreements. - * See the NOTICE file distributed with this work for additional information - * regarding copyright ownership. - * - * DuraSpace licenses this file to you 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 contents of this file are subject to the license and copyright + * detailed in the LICENSE and NOTICE files at the root of the source + * tree. */ package org.fcrepo.camel.indexing.triplestore; @@ -21,28 +9,25 @@ import org.apache.camel.component.http.HttpComponent; import org.fcrepo.camel.common.config.BasePropsConfig; import org.fcrepo.camel.common.config.ConditionOnPropertyTrue; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Conditional; import org.springframework.context.annotation.Configuration; /** - * A configuration class for the triplestore Indexer service + * A configuration class for the triplestore Indexing service * * @author dbernstein */ @Configuration -@Conditional(FcrepoTripleStoreIndexerConfig.TriplestoreIndexerEnabled.class) -public class FcrepoTripleStoreIndexerConfig extends BasePropsConfig { +@Conditional(FcrepoTripleStoreIndexingConfig.TriplestoreIndexingEnabled.class) +public class FcrepoTripleStoreIndexingConfig extends BasePropsConfig { - private static final Logger LOGGER = LoggerFactory.getLogger(FcrepoTripleStoreIndexerConfig.class); - static final String TRIPLESTORE_INDEXER_ENABLED = "triplestore.indexer.enabled"; + static final String TRIPLESTORE_INDEXING_ENABLED = "triplestore.indexing.enabled"; - static class TriplestoreIndexerEnabled extends ConditionOnPropertyTrue { - TriplestoreIndexerEnabled() { - super(FcrepoTripleStoreIndexerConfig.TRIPLESTORE_INDEXER_ENABLED, false); + static class TriplestoreIndexingEnabled extends ConditionOnPropertyTrue { + TriplestoreIndexingEnabled() { + super(FcrepoTripleStoreIndexingConfig.TRIPLESTORE_INDEXING_ENABLED, false); } } diff --git a/fcrepo-indexing-triplestore/src/main/java/org/fcrepo/camel/indexing/triplestore/TriplestoreRouter.java b/fcrepo-indexing-triplestore/src/main/java/org/fcrepo/camel/indexing/triplestore/TriplestoreRouter.java index e9c1d184..8dde1dfc 100644 --- a/fcrepo-indexing-triplestore/src/main/java/org/fcrepo/camel/indexing/triplestore/TriplestoreRouter.java +++ b/fcrepo-indexing-triplestore/src/main/java/org/fcrepo/camel/indexing/triplestore/TriplestoreRouter.java @@ -1,19 +1,7 @@ /* - * Licensed to DuraSpace under one or more contributor license agreements. - * See the NOTICE file distributed with this work for additional information - * regarding copyright ownership. - * - * DuraSpace licenses this file to you 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 contents of this file are subject to the license and copyright + * detailed in the LICENSE and NOTICE files at the root of the source + * tree. */ package org.fcrepo.camel.indexing.triplestore; @@ -51,7 +39,7 @@ public class TriplestoreRouter extends RouteBuilder { private static final String DELETE = "https://www.w3.org/ns/activitystreams#Delete"; @Autowired - private FcrepoTripleStoreIndexerConfig config; + private FcrepoTripleStoreIndexingConfig config; /** * Configure the message route workflow. diff --git a/fcrepo-indexing-triplestore/src/test/java/org/fcrepo/camel/indexing/triplestore/RouteTest.java b/fcrepo-indexing-triplestore/src/test/java/org/fcrepo/camel/indexing/triplestore/RouteTest.java index 43db40cc..f06bba42 100644 --- a/fcrepo-indexing-triplestore/src/test/java/org/fcrepo/camel/indexing/triplestore/RouteTest.java +++ b/fcrepo-indexing-triplestore/src/test/java/org/fcrepo/camel/indexing/triplestore/RouteTest.java @@ -1,19 +1,7 @@ /* - * Licensed to DuraSpace under one or more contributor license agreements. - * See the NOTICE file distributed with this work for additional information - * regarding copyright ownership. - * - * DuraSpace licenses this file to you 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 contents of this file are subject to the license and copyright + * detailed in the LICENSE and NOTICE files at the root of the source + * tree. */ package org.fcrepo.camel.indexing.triplestore; @@ -90,7 +78,7 @@ public class RouteTest { @BeforeClass public static void beforeClass() { - System.setProperty("triplestore.indexer.enabled", "true"); + System.setProperty("triplestore.indexing.enabled", "true"); System.setProperty("triplestore.indexing.predicate", "true"); System.setProperty("triplestore.filter.containers", auditContainer); System.setProperty("triplestore.input.stream", "seda:foo"); diff --git a/fcrepo-indexing-triplestore/src/test/java/org/fcrepo/camel/indexing/triplestore/integration/RouteDeleteAuthIT.java b/fcrepo-indexing-triplestore/src/test/java/org/fcrepo/camel/indexing/triplestore/integration/RouteDeleteAuthIT.java index 33e1cb11..97f9d639 100644 --- a/fcrepo-indexing-triplestore/src/test/java/org/fcrepo/camel/indexing/triplestore/integration/RouteDeleteAuthIT.java +++ b/fcrepo-indexing-triplestore/src/test/java/org/fcrepo/camel/indexing/triplestore/integration/RouteDeleteAuthIT.java @@ -1,19 +1,7 @@ /* - * Licensed to DuraSpace under one or more contributor license agreements. - * See the NOTICE file distributed with this work for additional information - * regarding copyright ownership. - * - * DuraSpace licenses this file to you 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 contents of this file are subject to the license and copyright + * detailed in the LICENSE and NOTICE files at the root of the source + * tree. */ package org.fcrepo.camel.indexing.triplestore.integration; @@ -89,8 +77,8 @@ public class RouteDeleteAuthIT { public static void beforeClass() { final String jmsPort = System.getProperty("fcrepo.dynamic.jms.port", "61616"); final Properties props = new Properties(); - System.setProperty("triplestore.indexer.enabled", "true"); - System.setProperty("indexing.predicate", "true"); + System.setProperty("triplestore.indexing.enabled", "true"); + System.setProperty("triplestore.indexing.predicate", "true"); System.setProperty("triplestore.baseUrl", "http://localhost:" + FUSEKI_PORT + "/fuseki/test/update"); System.setProperty("triplestore.authUsername", "admin"); diff --git a/fcrepo-indexing-triplestore/src/test/java/org/fcrepo/camel/indexing/triplestore/integration/RouteDeleteIT.java b/fcrepo-indexing-triplestore/src/test/java/org/fcrepo/camel/indexing/triplestore/integration/RouteDeleteIT.java index 017325cd..01870b4f 100644 --- a/fcrepo-indexing-triplestore/src/test/java/org/fcrepo/camel/indexing/triplestore/integration/RouteDeleteIT.java +++ b/fcrepo-indexing-triplestore/src/test/java/org/fcrepo/camel/indexing/triplestore/integration/RouteDeleteIT.java @@ -1,19 +1,7 @@ /* - * Licensed to DuraSpace under one or more contributor license agreements. - * See the NOTICE file distributed with this work for additional information - * regarding copyright ownership. - * - * DuraSpace licenses this file to you 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 contents of this file are subject to the license and copyright + * detailed in the LICENSE and NOTICE files at the root of the source + * tree. */ package org.fcrepo.camel.indexing.triplestore.integration; @@ -89,8 +77,8 @@ public class RouteDeleteIT { public static void beforeClass() { final String jmsPort = System.getProperty("fcrepo.dynamic.jms.port", "61616"); final Properties props = new Properties(); - System.setProperty("triplestore.indexer.enabled", "true"); - System.setProperty("indexing.predicate", "true"); + System.setProperty("triplestore.indexing.enabled", "true"); + System.setProperty("triplestore.indexing.predicate", "true"); System.setProperty("triplestore.baseUrl", "http://localhost:" + FUSEKI_PORT + "/fuseki/test/update"); System.setProperty("fcrepo.baseUrl", "http://localhost:" + FCREPO_PORT + "/fcrepo/rest"); System.setProperty("jms.brokerUrl", "tcp://localhost:" + jmsPort); diff --git a/fcrepo-indexing-triplestore/src/test/java/org/fcrepo/camel/indexing/triplestore/integration/RouteUpdateAuthIT.java b/fcrepo-indexing-triplestore/src/test/java/org/fcrepo/camel/indexing/triplestore/integration/RouteUpdateAuthIT.java index 24b4e2d3..1278b9f2 100644 --- a/fcrepo-indexing-triplestore/src/test/java/org/fcrepo/camel/indexing/triplestore/integration/RouteUpdateAuthIT.java +++ b/fcrepo-indexing-triplestore/src/test/java/org/fcrepo/camel/indexing/triplestore/integration/RouteUpdateAuthIT.java @@ -1,19 +1,7 @@ /* - * Licensed to DuraSpace under one or more contributor license agreements. - * See the NOTICE file distributed with this work for additional information - * regarding copyright ownership. - * - * DuraSpace licenses this file to you 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 contents of this file are subject to the license and copyright + * detailed in the LICENSE and NOTICE files at the root of the source + * tree. */ package org.fcrepo.camel.indexing.triplestore.integration; @@ -99,7 +87,7 @@ public static void beforeClass() { System.setProperty("triplestore.authUsername", "admin"); System.setProperty("triplestore.authPassword", "password"); - System.setProperty("triplestore.indexer.enabled", "true"); + System.setProperty("triplestore.indexing.enabled", "true"); System.setProperty("triplestore.indexing.predicate", "true"); System.setProperty("triplestore.input.stream", "direct:start"); System.setProperty("triplestore.reindex.stream", "direct:reindex"); diff --git a/fcrepo-indexing-triplestore/src/test/java/org/fcrepo/camel/indexing/triplestore/integration/RouteUpdateIT.java b/fcrepo-indexing-triplestore/src/test/java/org/fcrepo/camel/indexing/triplestore/integration/RouteUpdateIT.java index c4ca82e1..d4fa971b 100644 --- a/fcrepo-indexing-triplestore/src/test/java/org/fcrepo/camel/indexing/triplestore/integration/RouteUpdateIT.java +++ b/fcrepo-indexing-triplestore/src/test/java/org/fcrepo/camel/indexing/triplestore/integration/RouteUpdateIT.java @@ -1,19 +1,7 @@ /* - * Licensed to DuraSpace under one or more contributor license agreements. - * See the NOTICE file distributed with this work for additional information - * regarding copyright ownership. - * - * DuraSpace licenses this file to you 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 contents of this file are subject to the license and copyright + * detailed in the LICENSE and NOTICE files at the root of the source + * tree. */ package org.fcrepo.camel.indexing.triplestore.integration; @@ -96,7 +84,7 @@ public class RouteUpdateIT { @BeforeClass public static void beforeClass() { - System.setProperty("triplestore.indexer.enabled", "true"); + System.setProperty("triplestore.indexing.enabled", "true"); System.setProperty("triplestore.indexing.predicate", "true"); System.setProperty("triplestore.baseUrl", "http://localhost:" + FUSEKI_PORT + "/fuseki/test/update"); System.setProperty("jms.brokerUrl", "tcp://localhost:" + JMS_PORT); diff --git a/fcrepo-indexing-triplestore/src/test/java/org/fcrepo/camel/indexing/triplestore/integration/TestUtils.java b/fcrepo-indexing-triplestore/src/test/java/org/fcrepo/camel/indexing/triplestore/integration/TestUtils.java index f409bd1e..e8b6a2f3 100644 --- a/fcrepo-indexing-triplestore/src/test/java/org/fcrepo/camel/indexing/triplestore/integration/TestUtils.java +++ b/fcrepo-indexing-triplestore/src/test/java/org/fcrepo/camel/indexing/triplestore/integration/TestUtils.java @@ -1,19 +1,7 @@ /* - * Licensed to DuraSpace under one or more contributor license agreements. - * See the NOTICE file distributed with this work for additional information - * regarding copyright ownership. - * - * DuraSpace licenses this file to you 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 contents of this file are subject to the license and copyright + * detailed in the LICENSE and NOTICE files at the root of the source + * tree. */ package org.fcrepo.camel.indexing.triplestore.integration; diff --git a/fcrepo-ldpath/README.md b/fcrepo-ldpath/README.md deleted file mode 100644 index e74f6900..00000000 --- a/fcrepo-ldpath/README.md +++ /dev/null @@ -1,98 +0,0 @@ -# Fedora LDPath Service - -This application implements an LDPath service on repository -resources. This allows users to dereference and follow URI -links to arbitrary lengths. Retrieved triples are cached locally -for a specified period of time. - -More information about LDPath can be found at the [Marmotta website](http://marmotta.apache.org/ldpath/language.html). - -Additional background information on this service is available on the Fedora Wiki on the -[Integration Services page](https://wiki.duraspace.org/display/FEDORA4x/Integration+Services). - -Note: The LDPath service requires an LDCache backend, such as `fcrepo-service-ldcache-file`. - -## Usage - -The LDPath service responds to `GET` and `POST` requests using any accessible resources as a context. - -For example, a request to -`http://localhost:9086/ldpath/?context=http://localhost/rest/path/to/fedora/object` -will apply the appropriate ldpath program to the specified resource. Note: it is possible to -identify non-Fedora resources in the context parameter. - -A `GET` request can include a `ldpath` parameter, pointing to the URL location of an LDPath program: - - `curl http://localhost:9086/ldpath/?context=http://localhost/rest/path/to/fedora/object&ldpath=http://example.org/ldpath` - -Otherwise, it will use a simple default ldpath program. - -A `POST` request can also be accepted by this endpoint. The body of a `POST` request should contain -the entire `LDPath` program. The `Content-Type` of the request should be either `text/plain` or -`application/ldpath`. - - `curl -XPOST -H"Content-Type: application/ldpath" -d @program.txt http://localhost:9086/ldpath/?context=http://localhost/rest/path/to/fedora/object - - -## Building - -To build this project use - - MAVEN_OPTS="-Xmx1024m" mvn install - -## Deploying in OSGi - -This project can be deployed in an OSGi container. For example using -[Apache ServiceMix](http://servicemix.apache.org/) or -[Apache Karaf](http://karaf.apache.org), you can run the following -command from its shell: - - feature:repo-add mvn:org.fcrepo.camel/toolbox-features/LATEST/xml/features - feature:install fcrepo-service-ldcache-file - feature:install fcrepo-ldpath - -## Configuration - -The application can be configured by creating a file in -`$KARAF_HOME/etc/org.fcrepo.camel.ldpath.cfg`. The following -values are available for configuration: - -If the fedora repository requires authentication, the following values -can be set: - - fcrepo.authUsername= - fcrepo.authPassword= - fcrepo.authHostname=localhost - fcrepo.authPort=8080 - -The baseUrl for the fedora repository. - - fcrepo.baseUrl=http://localhost:8080/fcrepo/rest - -The time Fedora triples are cached (in seconds) - - fcrepo.cache.timeout=0 - -The global timeout for cache entries (in seconds) - - cache.timeout=86400 - -The host to which to bind the HTTP endpoint - - rest.host=localhost - -The port at which ldpath requests can be sent. - - rest.port=9086 - -The URL path prefix for the ldpath service. - - rest.prefix=/ldpath - -By editing this file, any currently running routes will be immediately redeployed -with the new values. - -For more help see the Apache Camel documentation - - http://camel.apache.org/ - diff --git a/fcrepo-ldpath/src/main/java/org/fcrepo/camel/ldpath/ClientFactory.java b/fcrepo-ldpath/src/main/java/org/fcrepo/camel/ldpath/ClientFactory.java index 696b5bf5..9e9d4197 100644 --- a/fcrepo-ldpath/src/main/java/org/fcrepo/camel/ldpath/ClientFactory.java +++ b/fcrepo-ldpath/src/main/java/org/fcrepo/camel/ldpath/ClientFactory.java @@ -1,19 +1,7 @@ /* - * Licensed to DuraSpace under one or more contributor license agreements. - * See the NOTICE file distributed with this work for additional information - * regarding copyright ownership. - * - * DuraSpace licenses this file to you 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 contents of this file are subject to the license and copyright + * detailed in the LICENSE and NOTICE files at the root of the source + * tree. */ package org.fcrepo.camel.ldpath; diff --git a/fcrepo-ldpath/src/main/java/org/fcrepo/camel/ldpath/FcrepoLdPathConfig.java b/fcrepo-ldpath/src/main/java/org/fcrepo/camel/ldpath/FcrepoLdPathConfig.java index e9b8b331..68b07da6 100644 --- a/fcrepo-ldpath/src/main/java/org/fcrepo/camel/ldpath/FcrepoLdPathConfig.java +++ b/fcrepo-ldpath/src/main/java/org/fcrepo/camel/ldpath/FcrepoLdPathConfig.java @@ -1,19 +1,7 @@ /* - * Licensed to DuraSpace under one or more contributor license agreements. - * See the NOTICE file distributed with this work for additional information - * regarding copyright ownership. - * - * DuraSpace licenses this file to you 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 contents of this file are subject to the license and copyright + * detailed in the LICENSE and NOTICE files at the root of the source + * tree. */ package org.fcrepo.camel.ldpath; @@ -49,22 +37,22 @@ @Configuration public class FcrepoLdPathConfig extends BasePropsConfig { - @Value("${fcrepo.cache.timeout:0}") + @Value("${ldpath.fcrepo.cache.timeout:0}") private long fcrepoCacheTimeout; - @Value("${rest.prefix:/ldpath}") + @Value("${ldpath.rest.prefix:/ldpath}") private String restPrefix; - @Value("${rest.host:localhost}") + @Value("${ldpath.rest.host:localhost}") private String restHost; - @Value("${rest.port:9085}") + @Value("${ldpath.rest.port:9085}") private int restPort; - @Value("${cache.timeout:86400}") + @Value("${ldpath.cache.timeout:86400}") private int cacheTimeout; - @Value("${ldcache.directory:ldcache/}") + @Value("${ldpath.ldcache.directory:ldcache/}") private Path ldCacheDirectory; @Value("${ldpath.transform.path:classpath:org/fcrepo/camel/ldpath/default.ldpath}") diff --git a/fcrepo-ldpath/src/main/java/org/fcrepo/camel/ldpath/FedoraEndpoint.java b/fcrepo-ldpath/src/main/java/org/fcrepo/camel/ldpath/FedoraEndpoint.java index a9d1a3cd..e893e1dd 100644 --- a/fcrepo-ldpath/src/main/java/org/fcrepo/camel/ldpath/FedoraEndpoint.java +++ b/fcrepo-ldpath/src/main/java/org/fcrepo/camel/ldpath/FedoraEndpoint.java @@ -1,19 +1,7 @@ /* - * Licensed to DuraSpace under one or more contributor license agreements. - * See the NOTICE file distributed with this work for additional information - * regarding copyright ownership. - * - * DuraSpace licenses this file to you 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 contents of this file are subject to the license and copyright + * detailed in the LICENSE and NOTICE files at the root of the source + * tree. */ package org.fcrepo.camel.ldpath; diff --git a/fcrepo-ldpath/src/main/java/org/fcrepo/camel/ldpath/FedoraProvider.java b/fcrepo-ldpath/src/main/java/org/fcrepo/camel/ldpath/FedoraProvider.java index 43594059..bdef1e3c 100644 --- a/fcrepo-ldpath/src/main/java/org/fcrepo/camel/ldpath/FedoraProvider.java +++ b/fcrepo-ldpath/src/main/java/org/fcrepo/camel/ldpath/FedoraProvider.java @@ -1,19 +1,7 @@ /* - * Licensed to DuraSpace under one or more contributor license agreements. - * See the NOTICE file distributed with this work for additional information - * regarding copyright ownership. - * - * DuraSpace licenses this file to you 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 contents of this file are subject to the license and copyright + * detailed in the LICENSE and NOTICE files at the root of the source + * tree. */ package org.fcrepo.camel.ldpath; diff --git a/fcrepo-ldpath/src/main/java/org/fcrepo/camel/ldpath/LDPathRouter.java b/fcrepo-ldpath/src/main/java/org/fcrepo/camel/ldpath/LDPathRouter.java index 4092e9f3..9debd5a6 100644 --- a/fcrepo-ldpath/src/main/java/org/fcrepo/camel/ldpath/LDPathRouter.java +++ b/fcrepo-ldpath/src/main/java/org/fcrepo/camel/ldpath/LDPathRouter.java @@ -1,19 +1,7 @@ /* - * Licensed to DuraSpace under one or more contributor license agreements. - * See the NOTICE file distributed with this work for additional information - * regarding copyright ownership. - * - * DuraSpace licenses this file to you 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 contents of this file are subject to the license and copyright + * detailed in the LICENSE and NOTICE files at the root of the source + * tree. */ package org.fcrepo.camel.ldpath; diff --git a/fcrepo-ldpath/src/main/java/org/fcrepo/camel/ldpath/LDPathWrapper.java b/fcrepo-ldpath/src/main/java/org/fcrepo/camel/ldpath/LDPathWrapper.java index 4ea81517..21fb348d 100644 --- a/fcrepo-ldpath/src/main/java/org/fcrepo/camel/ldpath/LDPathWrapper.java +++ b/fcrepo-ldpath/src/main/java/org/fcrepo/camel/ldpath/LDPathWrapper.java @@ -1,19 +1,7 @@ /* - * Licensed to DuraSpace under one or more contributor license agreements. - * See the NOTICE file distributed with this work for additional information - * regarding copyright ownership. - * - * DuraSpace licenses this file to you 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 contents of this file are subject to the license and copyright + * detailed in the LICENSE and NOTICE files at the root of the source + * tree. */ package org.fcrepo.camel.ldpath; diff --git a/fcrepo-ldpath/src/test/java/org/fcrepo/camel/ldpath/RouteTest.java b/fcrepo-ldpath/src/test/java/org/fcrepo/camel/ldpath/RouteTest.java index d883f248..646fd1ba 100644 --- a/fcrepo-ldpath/src/test/java/org/fcrepo/camel/ldpath/RouteTest.java +++ b/fcrepo-ldpath/src/test/java/org/fcrepo/camel/ldpath/RouteTest.java @@ -1,19 +1,7 @@ /* - * Licensed to DuraSpace under one or more contributor license agreements. - * See the NOTICE file distributed with this work for additional information - * regarding copyright ownership. - * - * DuraSpace licenses this file to you 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 contents of this file are subject to the license and copyright + * detailed in the LICENSE and NOTICE files at the root of the source + * tree. */ package org.fcrepo.camel.ldpath; @@ -80,15 +68,15 @@ public static void beforeClass() { final var ldCacheDir = targetDir + File.separator + RouteTest.class.getCanonicalName() + File.separator + "ldcache"; new File(ldCacheDir).mkdirs(); - System.setProperty("ldcache.directory", ldCacheDir); + System.setProperty("ldpath.ldcache.directory", ldCacheDir); final String restPort = System.getProperty("fcrepo.dynamic.ldpath.port", "9085"); - System.setProperty("rest.port", restPort); - System.setProperty("rest.host", "0.0.0.0"); + System.setProperty("ldpath.rest.port", restPort); + System.setProperty("ldpath.rest.host", "0.0.0.0"); } @AfterClass public static void afterClass() { - FileUtils.deleteQuietly(new File(System.getProperty("ldcache.directory"))); + FileUtils.deleteQuietly(new File(System.getProperty("ldpath.ldcache.directory"))); } @Test diff --git a/fcrepo-ldpath/src/test/java/org/fcrepo/camel/ldpath/RouteWithFunctionsTest.java b/fcrepo-ldpath/src/test/java/org/fcrepo/camel/ldpath/RouteWithFunctionsTest.java index 7db02cfd..3e4df90a 100644 --- a/fcrepo-ldpath/src/test/java/org/fcrepo/camel/ldpath/RouteWithFunctionsTest.java +++ b/fcrepo-ldpath/src/test/java/org/fcrepo/camel/ldpath/RouteWithFunctionsTest.java @@ -1,19 +1,7 @@ /* - * Licensed to DuraSpace under one or more contributor license agreements. - * See the NOTICE file distributed with this work for additional information - * regarding copyright ownership. - * - * DuraSpace licenses this file to you 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 contents of this file are subject to the license and copyright + * detailed in the LICENSE and NOTICE files at the root of the source + * tree. */ package org.fcrepo.camel.ldpath; @@ -82,16 +70,16 @@ public static void beforeClass() { File.separator + "ldcache"; new File(ldCacheDir).mkdirs(); - System.setProperty("ldcache.directory", ldCacheDir); + System.setProperty("ldpath.ldcache.directory", ldCacheDir); final String restPort = System.getProperty("fcrepo.dynamic.ldpath.port", "9085"); - System.setProperty("rest.port", restPort); - System.setProperty("rest.host", "0.0.0.0"); + System.setProperty("ldpath.rest.port", restPort); + System.setProperty("ldpath.rest.host", "0.0.0.0"); } @AfterClass public static void afterClass() { - FileUtils.deleteQuietly(new File(System.getProperty("ldcache.directory"))); + FileUtils.deleteQuietly(new File(System.getProperty("ldpath.ldcache.directory"))); } @Test diff --git a/fcrepo-reindexing/README.md b/fcrepo-reindexing/README.md deleted file mode 100644 index 74e852e4..00000000 --- a/fcrepo-reindexing/README.md +++ /dev/null @@ -1,60 +0,0 @@ -# Fedora Reindexing Service - -This application implements a reindexing service so that -any node hierarchy in fedora (e.g. the entire repository -or some subset thereof) can be reindexed by a set of external -services. - -Additional background information on this service is available on the Fedora Wiki on the -[Integration Services page](https://wiki.duraspace.org/display/FEDORA4x/Integration+Services). - -## Building - -To build this project use - - MAVEN_OPTS="-Xmx1024m" mvn install - -## Deploying in OSGi - -This project can be deployed in an OSGi container. For example using -[Apache ServiceMix](http://servicemix.apache.org/) or -[Apache Karaf](http://karaf.apache.org), you can run the following -command from its shell: - - feature:repo-add mvn:org.fcrepo.camel/toolbox-features/LATEST/xml/features - feature:install fcrepo-reindexing - feature:install fcrepo-service-activemq - -## Configuration - -The application can be configured by creating a file in -`$KARAF_HOME/etc/org.fcrepo.camel.reindexing.cfg`. The following -values are available for configuration: - -In the event of failure, the maximum number of times a redelivery will be attempted. - - error.maxRedeliveries=10 - -The camel URI for the internal reindexing queue. - - reindexing.stream=broker:queue:reindexing - -The host to which to bind the HTTP endpoint - - rest.host=localhost - -The port at which reindexing requests can be sent. - - rest.port=9080 - -The URL path prefix for the reindexing service. - - rest.prefix=/reindexing - -By editing this file, any currently running routes will be immediately redeployed -with the new values. - -For more help see the Apache Camel documentation - - http://camel.apache.org/ - diff --git a/fcrepo-reindexing/src/main/java/org/fcrepo/camel/reindexing/FcrepoReindexerConfig.java b/fcrepo-reindexing/src/main/java/org/fcrepo/camel/reindexing/FcrepoReindexingConfig.java similarity index 51% rename from fcrepo-reindexing/src/main/java/org/fcrepo/camel/reindexing/FcrepoReindexerConfig.java rename to fcrepo-reindexing/src/main/java/org/fcrepo/camel/reindexing/FcrepoReindexingConfig.java index 3255aeaf..ad0114da 100644 --- a/fcrepo-reindexing/src/main/java/org/fcrepo/camel/reindexing/FcrepoReindexerConfig.java +++ b/fcrepo-reindexing/src/main/java/org/fcrepo/camel/reindexing/FcrepoReindexingConfig.java @@ -1,19 +1,7 @@ /* - * Licensed to DuraSpace under one or more contributor license agreements. - * See the NOTICE file distributed with this work for additional information - * regarding copyright ownership. - * - * DuraSpace licenses this file to you 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 contents of this file are subject to the license and copyright + * detailed in the LICENSE and NOTICE files at the root of the source + * tree. */ package org.fcrepo.camel.reindexing; @@ -34,21 +22,18 @@ */ @Configuration -@Conditional(FcrepoReindexerConfig.ReindexerEnabled.class) -public class FcrepoReindexerConfig extends BasePropsConfig { +@Conditional(FcrepoReindexingConfig.ReindexingEnabled.class) +public class FcrepoReindexingConfig extends BasePropsConfig { - private static final Logger LOGGER = LoggerFactory.getLogger(FcrepoReindexerConfig.class); - static final String REINDEXER_ENABLED = "reindexer.enabled"; + private static final Logger LOGGER = LoggerFactory.getLogger(FcrepoReindexingConfig.class); + static final String REINDEXING_ENABLED = "reindexing.enabled"; - static class ReindexerEnabled extends ConditionOnPropertyTrue { - ReindexerEnabled() { - super(FcrepoReindexerConfig.REINDEXER_ENABLED, true); + static class ReindexingEnabled extends ConditionOnPropertyTrue { + ReindexingEnabled() { + super(FcrepoReindexingConfig.REINDEXING_ENABLED, true); } } - @Value("${reindexing.error.maxRedeliveries:10}") - private int maxRedeliveries; - @Value("${reindexing.stream:broker:queue:reindexing}") private String reindexingStream; @@ -62,10 +47,6 @@ static class ReindexerEnabled extends ConditionOnPropertyTrue { private int restPort; - public int getMaxRedeliveries() { - return maxRedeliveries; - } - public String getReindexingStream() { return reindexingStream; } diff --git a/fcrepo-reindexing/src/main/java/org/fcrepo/camel/reindexing/ReindexingHeaders.java b/fcrepo-reindexing/src/main/java/org/fcrepo/camel/reindexing/ReindexingHeaders.java index 74fd2780..892ac43e 100644 --- a/fcrepo-reindexing/src/main/java/org/fcrepo/camel/reindexing/ReindexingHeaders.java +++ b/fcrepo-reindexing/src/main/java/org/fcrepo/camel/reindexing/ReindexingHeaders.java @@ -1,19 +1,7 @@ /* - * Licensed to DuraSpace under one or more contributor license agreements. - * See the NOTICE file distributed with this work for additional information - * regarding copyright ownership. - * - * DuraSpace licenses this file to you 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 contents of this file are subject to the license and copyright + * detailed in the LICENSE and NOTICE files at the root of the source + * tree. */ package org.fcrepo.camel.reindexing; diff --git a/fcrepo-reindexing/src/main/java/org/fcrepo/camel/reindexing/ReindexingRouter.java b/fcrepo-reindexing/src/main/java/org/fcrepo/camel/reindexing/ReindexingRouter.java index 7b063824..34e2d781 100644 --- a/fcrepo-reindexing/src/main/java/org/fcrepo/camel/reindexing/ReindexingRouter.java +++ b/fcrepo-reindexing/src/main/java/org/fcrepo/camel/reindexing/ReindexingRouter.java @@ -1,19 +1,7 @@ /* - * Licensed to DuraSpace under one or more contributor license agreements. - * See the NOTICE file distributed with this work for additional information - * regarding copyright ownership. - * - * DuraSpace licenses this file to you 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 contents of this file are subject to the license and copyright + * detailed in the LICENSE and NOTICE files at the root of the source + * tree. */ package org.fcrepo.camel.reindexing; @@ -50,7 +38,7 @@ public class ReindexingRouter extends RouteBuilder { private static final String LDP_CONTAINS = ""; @Autowired - private FcrepoReindexerConfig config; + private FcrepoReindexingConfig config; @Autowired private FcrepoCamelConfig fcrepoCamelConfig; diff --git a/fcrepo-reindexing/src/main/java/org/fcrepo/camel/reindexing/RestProcessor.java b/fcrepo-reindexing/src/main/java/org/fcrepo/camel/reindexing/RestProcessor.java index c211a589..1884e74d 100644 --- a/fcrepo-reindexing/src/main/java/org/fcrepo/camel/reindexing/RestProcessor.java +++ b/fcrepo-reindexing/src/main/java/org/fcrepo/camel/reindexing/RestProcessor.java @@ -1,19 +1,7 @@ /* - * Licensed to DuraSpace under one or more contributor license agreements. - * See the NOTICE file distributed with this work for additional information - * regarding copyright ownership. - * - * DuraSpace licenses this file to you 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 contents of this file are subject to the license and copyright + * detailed in the LICENSE and NOTICE files at the root of the source + * tree. */ package org.fcrepo.camel.reindexing; diff --git a/fcrepo-reindexing/src/test/java/org/fcrepo/camel/reindexing/RestProcessorTest.java b/fcrepo-reindexing/src/test/java/org/fcrepo/camel/reindexing/RestProcessorTest.java index 29395ef2..8e9dc947 100644 --- a/fcrepo-reindexing/src/test/java/org/fcrepo/camel/reindexing/RestProcessorTest.java +++ b/fcrepo-reindexing/src/test/java/org/fcrepo/camel/reindexing/RestProcessorTest.java @@ -1,19 +1,7 @@ /* - * Licensed to DuraSpace under one or more contributor license agreements. - * See the NOTICE file distributed with this work for additional information - * regarding copyright ownership. - * - * DuraSpace licenses this file to you 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 contents of this file are subject to the license and copyright + * detailed in the LICENSE and NOTICE files at the root of the source + * tree. */ package org.fcrepo.camel.reindexing; diff --git a/fcrepo-reindexing/src/test/java/org/fcrepo/camel/reindexing/RouteTest.java b/fcrepo-reindexing/src/test/java/org/fcrepo/camel/reindexing/RouteTest.java index 6f35d8d5..5e5b8870 100644 --- a/fcrepo-reindexing/src/test/java/org/fcrepo/camel/reindexing/RouteTest.java +++ b/fcrepo-reindexing/src/test/java/org/fcrepo/camel/reindexing/RouteTest.java @@ -1,19 +1,7 @@ /* - * Licensed to DuraSpace under one or more contributor license agreements. - * See the NOTICE file distributed with this work for additional information - * regarding copyright ownership. - * - * DuraSpace licenses this file to you 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 contents of this file are subject to the license and copyright + * detailed in the LICENSE and NOTICE files at the root of the source + * tree. */ package org.fcrepo.camel.reindexing; diff --git a/fcrepo-reindexing/src/test/java/org/fcrepo/camel/reindexing/integration/RouteIT.java b/fcrepo-reindexing/src/test/java/org/fcrepo/camel/reindexing/integration/RouteIT.java index 5e4fa37d..a1662c14 100644 --- a/fcrepo-reindexing/src/test/java/org/fcrepo/camel/reindexing/integration/RouteIT.java +++ b/fcrepo-reindexing/src/test/java/org/fcrepo/camel/reindexing/integration/RouteIT.java @@ -1,19 +1,7 @@ /* - * Licensed to DuraSpace under one or more contributor license agreements. - * See the NOTICE file distributed with this work for additional information - * regarding copyright ownership. - * - * DuraSpace licenses this file to you 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 contents of this file are subject to the license and copyright + * detailed in the LICENSE and NOTICE files at the root of the source + * tree. */ package org.fcrepo.camel.reindexing.integration; diff --git a/fcrepo-service-activemq/README.md b/fcrepo-service-activemq/README.md deleted file mode 100644 index 5d2af8ad..00000000 --- a/fcrepo-service-activemq/README.md +++ /dev/null @@ -1,46 +0,0 @@ -# Fedora ActiveMQ Service - -This implements a connector to an ActiveMQ broker. It may be used -with other applications in the `fcrepo-camel-toolbox`. - -Additional background information on this service is available on the Fedora Wiki on the -[Integration Services page](https://wiki.duraspace.org/display/FEDORA4x/Integration+Services). - -## Building - -To build this project use - - MAVEN_OPTS="-Xmx1024m" mvn install - -## Deploying in OSGi - -This project can be deployed in an OSGi container. For example using -[Apache ServiceMix](http://servicemix.apache.org/) or -[Apache Karaf](http://karaf.apache.org), you can run the following -command from its shell: - - feature:repo-add mvn:org.fcrepo.camel/toolbox-features/LATEST/xml/features - feature:install fcrepo-service-activemq - -## Configuration - -The application can be configured by creating a file in -`$KARAF_HOME/etc/org.fcrepo.camel.service.activemq.cfg`. The following -values are available for configuration: - -The url for connecting to the ActiveMQ broker - - jms.brokerUrl=tcp://localhost:61616 - -If the ActiveMQ broker requires authentication, these properties will be useful: - - jms.username= - jms.password= - -By editing this file, any currently running routes that rely on the activemq service -will be immediately redeployed using a connector with the new values. - -For more help see the Apache Camel documentation - - http://camel.apache.org/ - diff --git a/fcrepo-service-activemq/src/main/java/org/fcrepo/camel/activemq/ActiveMQConfig.java b/fcrepo-service-activemq/src/main/java/org/fcrepo/camel/activemq/ActiveMQConfig.java index 16207ddb..b447485e 100644 --- a/fcrepo-service-activemq/src/main/java/org/fcrepo/camel/activemq/ActiveMQConfig.java +++ b/fcrepo-service-activemq/src/main/java/org/fcrepo/camel/activemq/ActiveMQConfig.java @@ -1,19 +1,7 @@ /* - * Licensed to DuraSpace under one or more contributor license agreements. - * See the NOTICE file distributed with this work for additional information - * regarding copyright ownership. - * - * DuraSpace licenses this file to you 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 contents of this file are subject to the license and copyright + * detailed in the LICENSE and NOTICE files at the root of the source + * tree. */ package org.fcrepo.camel.activemq; diff --git a/fcrepo-service-activemq/src/test/java/org/fcrepo/camel/service/activemq/RouteIT.java b/fcrepo-service-activemq/src/test/java/org/fcrepo/camel/service/activemq/RouteIT.java index 08c78dab..57d76cd4 100644 --- a/fcrepo-service-activemq/src/test/java/org/fcrepo/camel/service/activemq/RouteIT.java +++ b/fcrepo-service-activemq/src/test/java/org/fcrepo/camel/service/activemq/RouteIT.java @@ -1,19 +1,7 @@ /* - * Licensed to DuraSpace under one or more contributor license agreements. - * See the NOTICE file distributed with this work for additional information - * regarding copyright ownership. - * - * DuraSpace licenses this file to you 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 contents of this file are subject to the license and copyright + * detailed in the LICENSE and NOTICE files at the root of the source + * tree. */ package org.fcrepo.camel.service.activemq; diff --git a/fcrepo-service-camel/README.md b/fcrepo-service-camel/README.md deleted file mode 100644 index 9d57802a..00000000 --- a/fcrepo-service-camel/README.md +++ /dev/null @@ -1,34 +0,0 @@ -# Fedora Camel Service - -This wraps fcrepo-camel in an OSGi service so that it can be shared among different components, -allowing the configuration to be significantly consolidated. - -Additional background information on this service is available on the Fedora Wiki on the -[Integration Services page](https://wiki.duraspace.org/display/FEDORA6x/Integration+Services). - -## Building - -To build this project use - - MAVEN_OPTS="-Xmx1024m" mvn install - -## Configuration - -If the fedora repository requires authentication, the following values -can be set: - - fcrepo.authUsername= - fcrepo.authPassword= - fcrepo.authHost= - -The baseUrl for the fedora repository. - - fcrepo.baseUrl=http://localhost:8080/fcrepo/rest - -By editing this file, any currently running routes that rely on the activemq service -will be immediately redeployed using a connector with the new values. - -For more help see the Apache Camel documentation - - http://camel.apache.org/ - diff --git a/fcrepo-service-camel/src/main/java/org/fcrepo/camel/service/FcrepoCamelConfig.java b/fcrepo-service-camel/src/main/java/org/fcrepo/camel/service/FcrepoCamelConfig.java index 91e8037d..8c3d885f 100644 --- a/fcrepo-service-camel/src/main/java/org/fcrepo/camel/service/FcrepoCamelConfig.java +++ b/fcrepo-service-camel/src/main/java/org/fcrepo/camel/service/FcrepoCamelConfig.java @@ -1,19 +1,7 @@ /* - * Licensed to DuraSpace under one or more contributor license agreements. - * See the NOTICE file distributed with this work for additional information - * regarding copyright ownership. - * - * DuraSpace licenses this file to you 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 contents of this file are subject to the license and copyright + * detailed in the LICENSE and NOTICE files at the root of the source + * tree. */ package org.fcrepo.camel.service; diff --git a/fcrepo-service-camel/src/test/java/org/fcrepo/camel/service/RouteIT.java b/fcrepo-service-camel/src/test/java/org/fcrepo/camel/service/RouteIT.java index 2251c7bd..0841ce3e 100644 --- a/fcrepo-service-camel/src/test/java/org/fcrepo/camel/service/RouteIT.java +++ b/fcrepo-service-camel/src/test/java/org/fcrepo/camel/service/RouteIT.java @@ -1,19 +1,7 @@ /* - * Licensed to DuraSpace under one or more contributor license agreements. - * See the NOTICE file distributed with this work for additional information - * regarding copyright ownership. - * - * DuraSpace licenses this file to you 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 contents of this file are subject to the license and copyright + * detailed in the LICENSE and NOTICE files at the root of the source + * tree. */ package org.fcrepo.camel.service; diff --git a/pom.xml b/pom.xml index 86a47f31..8236b97b 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ org.fcrepo fcrepo-parent - 6.0.0 + 6.1.0 org.fcrepo.camel @@ -38,15 +38,15 @@ 5.16.0 3.9.0 3.4 - 2.8.11.1 + 2.9.10.7 4.2.0 1.2.0 3.4.0 1.7.20 5.3.7 - 6.0.0 + 6.1.0 6.0.0 - 6.0.0-SNAPSHOT + 6.0.0 4.4.1 1.3.2 2.3.0.1 @@ -56,7 +56,7 @@ 1.7.0 1.10 - 2.4 + 2.7 1.1.3 2.3.16 1.3 @@ -65,8 +65,7 @@ 2.3.0 ${jena.version} 2.32 - 4.10.2 - 2.11.0 + 2.12.0 2.18.1 @@ -78,7 +77,7 @@ fcrepo-indexing-triplestore fcrepo-reindexing fcrepo-indexing-solr - fcrepo-indexing-http + fcrepo-http-forwarding fcrepo-service-activemq fcrepo-service-camel fcrepo-ldpath