diff --git a/.travis.yml b/.travis.yml index 7ccc60840..6b4ee277b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,7 +17,15 @@ script: - phpcpd --names *.module,*.inc,*.test sites/all/modules/islandora/drupal/islandora sites/all/modules/islandora/drupal/islandora_apachesolr sites/all/modules/islandora/drupal/islandora_basic_image sites/all/modules/islandora/drupal/islandora_collection sites/all/modules/islandora/drupal/islandora_dc sites/all/modules/islandora/drupal/islandora_mods sites/all/modules/islandora/drupal/islandora_rdf_mapping_service - drush test-run --uri=http://localhost:8081 Islandora - export JAVA_HOME=/usr/lib/jvm/java-8-oracle - - cd $TRAVIS_BUILD_DIR/camel + - cd $TRAVIS_BUILD_DIR/camel/sync + - mvn install -B -V + - mvn javadoc:jar + - mvn javadoc:test-aggregate + - cd $TRAVIS_BUILD_DIR/camel/services/collection-service + - mvn install -B -V + - mvn javadoc:jar + - mvn javadoc:test-aggregate + - cd $TRAVIS_BUILD_DIR/camel/component - mvn install -B -V - mvn javadoc:jar - mvn javadoc:test-aggregate diff --git a/camel/component/pom.xml b/camel/component/pom.xml index a42ac7c54..41a2154dc 100644 --- a/camel/component/pom.xml +++ b/camel/component/pom.xml @@ -1,12 +1,6 @@ 4.0.0 - - ca.islandora.camel - islandora-parent - 0.0.0-SNAPSHOT - - ca.islandora.camel.component islandora-camel-component bundle @@ -16,21 +10,32 @@ Islandora Camel Component + 2.15.2 + [2.15,3) + 2.4 + 2.5.1 + 1.8 + 2.6 + 2.3.7 ca.islandora.camel.component.* + org.apache.camel camel-core + ${camel.version} org.apache.camel camel-exec + ${camel.version} commons-io commons-io + ${commons-io.version} @@ -50,16 +55,50 @@ org.apache.maven.plugins maven-compiler-plugin + ${compiler.plugin.version} + + ${java.version} + ${java.version} + org.apache.maven.plugins maven-resources-plugin + ${resources.plugin.version} + + UTF-8 + + + + filter + generate-resources + + resources + + + org.apache.felix maven-bundle-plugin + ${bundle.plugin.version} + true + + + ${project.artifactId} + ${project.groupId}.${project.artifactId} + ${islandora.osgi.export.pkg};version=${project.version} + + ${islandora.osgi.import.pkg}, + org.apache.camel*;version="${camel.version.range}", + * + + ${project.name} + ${project.version} + + diff --git a/camel/component/src/main/resources/features.xml b/camel/component/src/main/resources/features.xml new file mode 100644 index 000000000..a4af93bc2 --- /dev/null +++ b/camel/component/src/main/resources/features.xml @@ -0,0 +1,10 @@ + + + +
Installs ${project.name}
+ mvn:${project.groupId}/${project.artifactId}/${project.version} + camel + camel-exec + mvn:commons-io/commons-io/${commons-io.version} +
+
diff --git a/camel/sync/src/main/cfg/ca.islandora.sync.cfg b/camel/config/islandora.cfg similarity index 100% rename from camel/sync/src/main/cfg/ca.islandora.sync.cfg rename to camel/config/islandora.cfg diff --git a/camel/karaf/pom.xml b/camel/karaf/pom.xml deleted file mode 100644 index 79c16461d..000000000 --- a/camel/karaf/pom.xml +++ /dev/null @@ -1,69 +0,0 @@ - - - - 4.0.0 - - - ca.islandora.camel - islandora-parent - 0.0.0-SNAPSHOT - - - ca.islandora.camel - islandora-karaf - pom - 0.0.0-SNAPSHOT - - Karaf Provisioning Features for Islandora - - - install - - - - src/main/resources - true - - - - - - org.codehaus.mojo - build-helper-maven-plugin - - - attach-artifacts - package - - attach-artifact - - - - - target/classes/features.xml - xml - features - - - - - - - - - org.apache.maven.plugins - maven-resources-plugin - - - filter - generate-resources - - resources - - - - - - - - diff --git a/camel/karaf/src/main/resources/features.xml b/camel/karaf/src/main/resources/features.xml deleted file mode 100644 index f6527371f..000000000 --- a/camel/karaf/src/main/resources/features.xml +++ /dev/null @@ -1,73 +0,0 @@ - - - - mvn:org.fcrepo.camel/fcrepo-camel/${fcrepo.camel.version}/xml/features - mvn:org.apache.activemq/activemq-karaf/${activemq.version}/xml/features - mvn:org.apache.camel.karaf/apache-camel/${camel.version}/xml/features - - -
Installs the Islandora synchronization gateway
- - camel - camel-http - camel-cache - camel-jsonpath - camel-script - camel-script-javascript - camel-base64 - activemq-camel - fcrepo-camel - islandora-camel-component - - mvn:ca.islandora.camel.sync/islandora-sync-gateway/${project.version} - - mvn:ca.islandora.camel.sync/islandora-sync-gateway/${project.version}/cfg/configuration -
- - -
Installs the Islandora basic image service
- - camel - camel-http - camel-jetty - camel-jsonpath - camel-script - camel-script-javascript - camel-mustache - fcrepo-camel - islandora-camel-component - - mvn:ca.islandora.camel.services/islandora-basic-image-service/${project.version} - - mvn:ca.islandora.camel.services/islandora-basic-image-service/${project.version}/cfg/configuration -
- - -
Installs the Islandora collection service
- - camel - camel-http - camel-servlet - camel-jsonpath - camel-script - camel-script-javascript - camel-mustache - fcrepo-camel - islandora-camel-component - - mvn:ca.islandora.camel.services/islandora-collection-services/${project.version} - - mvn:ca.islandora.camel.services/islandora-collection-services/cfg/configuration -
- - -
Installs the Islandora camel component
- - camel - camel-exec - - mvn:commons-io/commons-io/${commons-io.version} - - mvn:ca.islandora.camel.component/islandora-camel-component/${project.version} -
-
diff --git a/camel/pom.xml b/camel/pom.xml deleted file mode 100644 index ef9d9a1b0..000000000 --- a/camel/pom.xml +++ /dev/null @@ -1,175 +0,0 @@ - - - - 4.0.0 - - ca.islandora.camel - islandora-parent - pom - 0.0.0-SNAPSHOT - - Islandora :: Parent POM - - - UTF-8 - UTF-8 - 1.8 - 5.11.1 - 2.15.2 - [2.15, 3) - 2.4 - 4.3.0 - 1.7.12 - 1.2.17 - - 2.5.1 - 2.6 - 2.3.7 - 1.9.1 - - - - - - - - sync - services - component - karaf - - - - - - org.apache.camel - camel-core - ${camel.version} - - - org.apache.camel - camel-blueprint - ${camel.version} - - - org.apache.camel - camel-exec - ${camel.version} - - - commons-io - commons-io - ${commons-io.version} - - - - - org.slf4j - slf4j-api - ${slf4j.version} - - - org.slf4j - slf4j-log4j12 - ${slf4j.version} - - - log4j - log4j - ${log4j.version} - - - - - org.apache.camel - camel-test-blueprint - ${camel.version} - test - - - - - - install - - - - src/main/resources - true - - OSGI-INF/**/* - - - - src/main/resources - false - - OSGI-INF/**/* - - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - ${compiler.plugin.version} - - ${java.version} - ${java.version} - - - - - org.apache.maven.plugins - maven-resources-plugin - ${resources.plugin.version} - - UTF-8 - - - - filter - generate-resources - - resources - - - - - - - - org.apache.felix - maven-bundle-plugin - ${bundle.plugin.version} - true - - - ${project.artifactId} - ${project.groupId}.${project.artifactId} - ${project.version} - ${islandora.osgi.export.pkg} - - ${islandora.osgi.import.pkg}, - org.apache.camel.*;version="${camel.version.range}", - * - - ${islandora.osgi.private.pkg} - ${project.name} - ${project.version} - - - - - - org.codehaus.mojo - build-helper-maven-plugin - ${build.helper.plugin.version} - - - - - - diff --git a/camel/services/basic-image-service/pom.xml b/camel/services/basic-image-service/pom.xml index 39a38b1e2..45eb36a9d 100644 --- a/camel/services/basic-image-service/pom.xml +++ b/camel/services/basic-image-service/pom.xml @@ -3,12 +3,6 @@ 4.0.0 - - ca.islandora.camel - islandora-services - 0.0.0-SNAPSHOT - - ca.islandora.camel.services islandora-basic-image-service bundle @@ -16,14 +10,32 @@ Islandora Basic Image Service + + UTF-8 + UTF-8 + 2.15.2 + [2.15,3) + 4.3.0 + 1.7.12 + 1.2.17 + 2.5.1 + 1.8 + 2.6 + 2.3.7 + ca.islandora.camel.services.* + + + org.apache.camel camel-core + ${camel.version} org.apache.camel camel-blueprint + ${camel.version} @@ -31,20 +43,24 @@ org.slf4j slf4j-api + ${slf4j.version} org.slf4j slf4j-log4j12 + ${slf4j.version} log4j log4j + ${log4j.version} org.apache.camel camel-test-blueprint + ${camel.version} @@ -72,38 +88,50 @@ org.apache.maven.plugins maven-compiler-plugin + ${compiler.plugin.version} + + ${java.version} + ${java.version} + org.apache.maven.plugins maven-resources-plugin + ${resources.plugin.version} + + UTF-8 + + + + filter + generate-resources + + resources + + + org.apache.felix maven-bundle-plugin - - - - org.codehaus.mojo - build-helper-maven-plugin - - - package - - attach-artifact - - - - - src/main/cfg/ca.islandora.services.basic.image.cfg - cfg - configuration - - - - - + ${bundle.plugin.version} + true + + + ${project.artifactId} + ${project.groupId}.${project.artifactId} + ${islandora.osgi.export.pkg};version=${project.version} + + ${islandora.osgi.import.pkg}, + org.apache.camel*;version="${camel.version.range}", + * + + ${project.name} + ${project.version} + + diff --git a/camel/services/basic-image-service/src/main/cfg/ca.islandora.services.basic.image.cfg b/camel/services/basic-image-service/src/main/cfg/ca.islandora.services.basic.image.cfg deleted file mode 100644 index 2b1e88a10..000000000 --- a/camel/services/basic-image-service/src/main/cfg/ca.islandora.services.basic.image.cfg +++ /dev/null @@ -1,6 +0,0 @@ -islandora.drupal.baseurl = localhost/islandora -islandora.drupal.username = admin -islandora.drupal.password = islandora -islandora.fcrepo.baseurl = localhost:8080/fcrepo/rest -islandora.php.workingDir = /home/vagrant/islandora/camel/commands/bin -islandora.triplestore.baseurl = localhost:8080/bigdata/namespace/kb/sparql diff --git a/camel/services/basic-image-service/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/camel/services/basic-image-service/src/main/resources/OSGI-INF/blueprint/blueprint.xml index c485d305c..696c13a34 100644 --- a/camel/services/basic-image-service/src/main/resources/OSGI-INF/blueprint/blueprint.xml +++ b/camel/services/basic-image-service/src/main/resources/OSGI-INF/blueprint/blueprint.xml @@ -1,23 +1,13 @@ - - - - - - - - - - + diff --git a/camel/services/basic-image-service/src/main/resources/features.xml b/camel/services/basic-image-service/src/main/resources/features.xml new file mode 100644 index 000000000..831091dc3 --- /dev/null +++ b/camel/services/basic-image-service/src/main/resources/features.xml @@ -0,0 +1,16 @@ + + + +
Installs ${project.name}
+ mvn:${project.groupId}/${project.artifactId}/${project.version} + camel + fcrepo-camel + islandora-camel-component + camel-http + camel-jetty + camel-jsonpath + camel-script + camel-script-javascript + camel-mustache +
+
diff --git a/camel/services/collection-service/pom.xml b/camel/services/collection-service/pom.xml index c8feec1ba..9eb5c3a69 100644 --- a/camel/services/collection-service/pom.xml +++ b/camel/services/collection-service/pom.xml @@ -3,12 +3,6 @@ 4.0.0 - - ca.islandora.camel - islandora-services - 0.0.0-SNAPSHOT - - ca.islandora.camel.services islandora-collection-service bundle @@ -16,34 +10,56 @@ Islandora Collection Service + + UTF-8 + UTF-8 + 2.15.2 + [2.15,3) + 4.3.0 + 1.7.12 + 1.2.17 + 2.5.1 + 1.8 + 2.6 + 2.3.7 + ca.islandora.camel.services.* + + + org.apache.camel camel-core + ${camel.version} org.apache.camel camel-blueprint + ${camel.version} org.slf4j slf4j-api + ${slf4j.version} org.slf4j slf4j-log4j12 + ${slf4j.version} log4j log4j + ${log4j.version} org.apache.camel camel-test-blueprint + ${camel.version} @@ -71,38 +87,50 @@ org.apache.maven.plugins maven-compiler-plugin + ${compiler.plugin.version} + + ${java.version} + ${java.version} + org.apache.maven.plugins maven-resources-plugin + ${resources.plugin.version} + + UTF-8 + + + + filter + generate-resources + + resources + + + org.apache.felix maven-bundle-plugin - - - - org.codehaus.mojo - build-helper-maven-plugin - - - package - - attach-artifact - - - - - src/main/cfg/ca.islandora.services.collection.cfg - cfg - configuration - - - - - + ${bundle.plugin.version} + true + + + ${project.artifactId} + ${project.groupId}.${project.artifactId} + ${islandora.osgi.export.pkg};version=${project.version} + + ${islandora.osgi.import.pkg}, + org.apache.camel*;version="${camel.version.range}", + * + + ${project.name} + ${project.version} + + diff --git a/camel/services/collection-service/src/main/cfg/ca.islandora.services.collection.cfg b/camel/services/collection-service/src/main/cfg/ca.islandora.services.collection.cfg deleted file mode 100644 index 2b1e88a10..000000000 --- a/camel/services/collection-service/src/main/cfg/ca.islandora.services.collection.cfg +++ /dev/null @@ -1,6 +0,0 @@ -islandora.drupal.baseurl = localhost/islandora -islandora.drupal.username = admin -islandora.drupal.password = islandora -islandora.fcrepo.baseurl = localhost:8080/fcrepo/rest -islandora.php.workingDir = /home/vagrant/islandora/camel/commands/bin -islandora.triplestore.baseurl = localhost:8080/bigdata/namespace/kb/sparql diff --git a/camel/services/collection-service/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/camel/services/collection-service/src/main/resources/OSGI-INF/blueprint/blueprint.xml index 939a2c5c3..ca60cca9c 100644 --- a/camel/services/collection-service/src/main/resources/OSGI-INF/blueprint/blueprint.xml +++ b/camel/services/collection-service/src/main/resources/OSGI-INF/blueprint/blueprint.xml @@ -1,9 +1,8 @@ @@ -21,17 +20,7 @@ - - - - - - - - - - - + diff --git a/camel/services/collection-service/src/main/resources/features.xml b/camel/services/collection-service/src/main/resources/features.xml new file mode 100644 index 000000000..988eee2e2 --- /dev/null +++ b/camel/services/collection-service/src/main/resources/features.xml @@ -0,0 +1,16 @@ + + + +
Installs ${project.name}
+ mvn:${project.groupId}/${project.artifactId}/${project.version} + camel + fcrepo-camel + islandora-camel-component + camel-http + camel-servlet + camel-jsonpath + camel-script + camel-script-javascript + camel-mustache +
+
diff --git a/camel/services/pom.xml b/camel/services/pom.xml deleted file mode 100644 index 6df2c4a96..000000000 --- a/camel/services/pom.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - 4.0.0 - - - ca.islandora.camel - islandora-parent - 0.0.0-SNAPSHOT - - - ca.islandora.camel - islandora-services - pom - 0.0.0-SNAPSHOT - - Islandora :: Services - - - basic-image-service - collection-service - - - diff --git a/camel/sync/pom.xml b/camel/sync/pom.xml index 181150b1f..64891c486 100644 --- a/camel/sync/pom.xml +++ b/camel/sync/pom.xml @@ -3,12 +3,6 @@ 4.0.0 - - ca.islandora.camel - islandora-parent - 0.0.0-SNAPSHOT - - ca.islandora.camel.sync islandora-sync-gateway bundle @@ -16,34 +10,57 @@ Islandora Sync Gateway + + UTF-8 + UTF-8 + 2.15.2 + [2.15, 3) + 4.3.0 + 5.11.1 + 1.7.12 + 1.2.17 + 2.5.1 + 1.8 + 2.6 + 2.3.7 + ca.islandora.camel.sync.* + + + org.apache.camel camel-core + ${camel.version} org.apache.camel camel-blueprint + ${camel.version} org.slf4j slf4j-api + ${slf4j.version} org.slf4j slf4j-log4j12 + ${slf4j.version} log4j log4j + ${log4j.version} org.apache.camel camel-test-blueprint + ${camel.version} @@ -51,43 +68,72 @@ install + + + src/main/resources + true + + OSGI-INF/**/* + + + + src/main/resources + false + + OSGI-INF/**/* + + + + org.apache.maven.plugins maven-compiler-plugin + ${compiler.plugin.version} + + ${java.version} + ${java.version} + org.apache.maven.plugins maven-resources-plugin + ${resources.plugin.version} + + UTF-8 + + + + filter + generate-resources + + resources + + + org.apache.felix maven-bundle-plugin - - - - org.codehaus.mojo - build-helper-maven-plugin - - - package - - attach-artifact - - - - - src/main/cfg/ca.islandora.sync.cfg - cfg - configuration - - - - - + ${bundle.plugin.version} + true + + + ${project.artifactId} + ${project.groupId}.${project.artifactId} + ${islandora.osgi.export.pkg};version=${project.version} + + ${islandora.osgi.import.pkg}, + org.apache.camel*;version="${camel.version.range}", + * + + ${project.name} + ${project.version} + + diff --git a/camel/sync/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/camel/sync/src/main/resources/OSGI-INF/blueprint/blueprint.xml index 6a07c96d7..ae1e1cec0 100644 --- a/camel/sync/src/main/resources/OSGI-INF/blueprint/blueprint.xml +++ b/camel/sync/src/main/resources/OSGI-INF/blueprint/blueprint.xml @@ -1,22 +1,13 @@ - - - - - - - - - + @@ -29,7 +20,7 @@ - + diff --git a/camel/sync/src/main/resources/features.xml b/camel/sync/src/main/resources/features.xml new file mode 100644 index 000000000..99a4e9c90 --- /dev/null +++ b/camel/sync/src/main/resources/features.xml @@ -0,0 +1,17 @@ + + + +
Installs ${project.name}
+ mvn:${project.groupId}/${project.artifactId}/${project.version} + camel + activemq-camel + fcrepo-camel + islandora-camel-component + camel-http + camel-cache + camel-jsonpath + camel-script + camel-script-javascript + camel-base64 +
+
diff --git a/install/scripts/config.sh b/install/scripts/config.sh index 996c86658..3b115b230 100644 --- a/install/scripts/config.sh +++ b/install/scripts/config.sh @@ -6,4 +6,4 @@ if [ -f "$HOME_DIR/islandora/install/configs/variables" ]; then . "$HOME_DIR"/islandora/install/configs/variables fi -cp "$HOME_DIR"/islandora/camel/sync/src/main/cfg/ca.islandora.sync.cfg /opt/karaf/etc +cp "$HOME_DIR"/islandora/camel/config/islandora.cfg /opt/karaf/etc