Combine 7.x-2.x-dev and 7.x-2.x

.travis.yml

@@ -17,15 +17,7 @@ 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/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
+  - cd $TRAVIS_BUILD_DIR/camel
   - mvn install -B -V
   - mvn javadoc:jar
   - mvn javadoc:test-aggregate

camel/commands/bin/islandora.php

@@ -33,7 +33,7 @@
         $std_err->writeln("\n" . $event->getException()->getTraceAsString());
     });
 
-    $application = new Application('Islandora Command Tool', '0.0.0-SNAPSHOT');
+    $application = new Application('Islandora Command Tool', '0.0.1-SNAPSHOT');
     $application->setDispatcher($dispatcher);
 
     // A little magic to find all IslandoraCommand classes and dynamically

camel/component/pom.xml

@@ -1,41 +1,34 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
+  <parent>
+    <groupId>ca.islandora.camel</groupId>
+    <artifactId>islandora-parent</artifactId>
+    <version>0.0.1-SNAPSHOT</version>
+  </parent>
+
   <groupId>ca.islandora.camel.component</groupId>
   <artifactId>islandora-camel-component</artifactId>
   <packaging>bundle</packaging>
 
-  <version>0.0.1-SNAPSHOT</version>
-
   <name>Islandora Camel Component</name>
 
   <properties>
-    <camel.version>2.15.1</camel.version>
-    <camel.version.range>[2.15.1,3)</camel.version.range>
-    <commons-io.version>2.4</commons-io.version>
-    <compiler.plugin.version>2.5.1</compiler.plugin.version>
-    <java.version>1.8</java.version>
-    <resources.plugin.version>2.6</resources.plugin.version>
-    <bundle.plugin.version>2.3.7</bundle.plugin.version>
     <islandora.osgi.export.pkg>ca.islandora.camel.component*</islandora.osgi.export.pkg>
-    <islandora.osgi.import.pkg />
   </properties>
 
   <dependencies>
     <dependency>
       <groupId>org.apache.camel</groupId>
       <artifactId>camel-core</artifactId>
-      <version>${camel.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.camel</groupId>
       <artifactId>camel-exec</artifactId>
-      <version>${camel.version}</version>
     </dependency>
     <dependency>
       <groupId>commons-io</groupId>
       <artifactId>commons-io</artifactId>
-      <version>${commons-io.version}</version>
     </dependency>
   </dependencies>
 
@@ -55,50 +48,16 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>${compiler.plugin.version}</version>
-        <configuration>
-          <source>${java.version}</source>
-          <target>${java.version}</target>
-        </configuration>
       </plugin>
 
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-resources-plugin</artifactId>
-        <version>${resources.plugin.version}</version>
-        <configuration>
-          <encoding>UTF-8</encoding>
-        </configuration>
-       <executions>
-         <execution>
-           <id>filter</id>
-           <phase>generate-resources</phase>
-           <goals>
-             <goal>resources</goal>
-           </goals>
-         </execution>
-       </executions>
       </plugin>
 
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>${bundle.plugin.version}</version>
-        <extensions>true</extensions>
-        <configuration>
-          <instructions>
-            <Bundle-Name>${project.artifactId}</Bundle-Name>
-            <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName>
-            <Export-Package>${islandora.osgi.export.pkg};version=${project.version}</Export-Package>
-            <Import-Package>
-              ${islandora.osgi.import.pkg},
-              org.apache.camel*;version="${camel.version.range}",
-              *
-            </Import-Package>
-            <Implementation-Title>${project.name}</Implementation-Title>
-            <Implementation-Version>${project.version}</Implementation-Version>
-          </instructions>
-        </configuration>
       </plugin>
 
     </plugins>

camel/karaf/pom.xml

@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>ca.islandora.camel</groupId>
+    <artifactId>islandora-parent</artifactId>
+    <version>0.0.1-SNAPSHOT</version>
+  </parent>
+
+  <groupId>ca.islandora.camel</groupId>
+  <artifactId>islandora-karaf</artifactId>
+  <packaging>pom</packaging>
+
+  <name>Karaf Provisioning Features for Islandora</name>
+
+  <build>
+    <defaultGoal>install</defaultGoal>
+
+    <resources>
+      <resource>
+        <directory>src/main/resources</directory>
+        <filtering>true</filtering>
+      </resource>
+    </resources>
+
+    <plugins>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>build-helper-maven-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>attach-artifacts</id>
+            <phase>package</phase>
+            <goals>
+              <goal>attach-artifact</goal>
+            </goals>
+            <configuration>
+              <artifacts>
+                <artifact>
+                  <file>target/classes/features.xml</file>
+                  <type>xml</type>
+                  <classifier>features</classifier>
+                </artifact>
+              </artifacts>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-resources-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>filter</id>
+            <phase>generate-resources</phase>
+            <goals>
+              <goal>resources</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+
+</project>

camel/karaf/src/main/resources/features.xml

@@ -0,0 +1,94 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<features xmlns="http://karaf.apache.org/xmlns/features/v1.3.0" name="${project.artifactId}-${project.version}">
+
+  <repository>mvn:org.fcrepo.camel/fcrepo-camel/${fcrepo.camel.version}/xml/features</repository>
+  <repository>mvn:org.fcrepo.camel/fcrepo-camel-toolbox/${fcrepo.camel.version}/xml/features</repository>
+  <repository>mvn:org.apache.activemq/activemq-karaf/${activemq.version}/xml/features</repository>
+  <repository>mvn:org.apache.camel.karaf/apache-camel/${camel.version}/xml/features</repository>
+  <repository>mvn:org.apache.cxf.karaf/apache-cxf/${cxf.version}/xml/features</repository>
+
+  <feature name="islandora-camel-component" version="${project.version}" start-level="50">
+    <details>Installs the Islandora camel component</details>
+
+    <bundle dependency="true">mvn:commons-io/commons-io/${commons-io.version}</bundle>
+
+    <feature version="${camel.version}">camel</feature>
+    <feature version="${camel.version}">camel-exec</feature>
+
+    <bundle>mvn:ca.islandora.camel.component/islandora-camel-component/${project.version}</bundle>
+
+  </feature>
+
+
+  <feature name="islandora-sync-gateway" version="${project.version}" start-level="80">
+    <details>Installs the Islandora synchronization gateway</details>
+
+
+    <feature prerequisite="true">wrap</feature>
+    <feature version="${camel.version}">camel</feature>
+    <feature version="${camel.version}">camel-cache</feature>
+    <feature version="${camel.version}">camel-jsonpath</feature>
+    <feature version="${camel.version}">camel-http</feature>
+    <feature version="${camel.version}">camel-script</feature>
+    <feature version="${camel.version}">camel-script-javascript</feature>
+    <feature version="${camel.version}">camel-base64</feature>
+    <feature version="${camel.version}">camel-mustache</feature>
+    <feature version="${activemq.version}">activemq-camel</feature>
+    <feature version="${fcrepo.camel.version}">fcrepo-camel</feature>
+    <feature version="${fcrepo.camel.version}">fcrepo-indexing-triplestore</feature>
+    <feature version="${project.version}">islandora-camel-component</feature>
+
+    <bundle dependency="true">wrap:mvn:com.github.spullara.mustache.java/compiler/${mustache.version}</bundle>
+    <bundle>mvn:ca.islandora.camel.sync/islandora-sync-gateway/${project.version}</bundle>
+
+    <configfile finalname="/etc/ca.islandora.camel.sync.cfg">mvn:ca.islandora.camel.sync/islandora-sync-gateway/${project.version}/cfg/configuration</configfile>
+  </feature>
+
+  <feature name="islandora-basic-image-service" version="${project.version}" start-level="80">
+    <details>Installs the Islandora basic image service</details>
+
+    <feature prerequisite="true">wrap</feature>
+    <feature version="${cxf.version}">cxf</feature>
+    <feature version="${camel.version}">camel</feature>
+    <feature version="${camel.version}">camel-http</feature>
+    <feature version="${camel.version}">camel-servlet</feature>
+    <feature version="${camel.version}">camel-jsonpath</feature>
+    <feature version="${camel.version}">camel-cxf</feature>
+    <feature version="${camel.version}">camel-script</feature>
+    <feature version="${camel.version}">camel-script-javascript</feature>
+    <feature version="${camel.version}">camel-mustache</feature>
+    <feature version="${fcrepo.camel.version}">fcrepo-camel</feature>
+    <feature version="${fcrepo.camel.version}">fcrepo-indexing-triplestore</feature>
+    <feature prerequisite="true" version="${project.version}">islandora-camel-component</feature>
+
+    <bundle>mvn:ca.islandora.camel.services/islandora-basic-image-service/${project.version}</bundle>
+    <bundle dependency="true">wrap:mvn:com.github.spullara.mustache.java/compiler/${mustache.version}</bundle>
+
+    <configfile finalname="/etc/ca.islandora.camel.services.basic.image.cfg">mvn:ca.islandora.camel.services/islandora-basic-image-service/${project.version}/cfg/configuration</configfile>
+  </feature>
+
+  <feature name="islandora-collection-service" version="${project.version}" start-level="80">
+    <details>Installs the Islandora collection service</details>
+
+    <feature prerequisite="true">wrap</feature>
+    <feature version="${cxf.version}">cxf</feature>
+    <feature version="${camel.version}">camel</feature>
+    <feature version="${camel.version}">camel-http</feature>
+    <feature version="${camel.version}">camel-servlet</feature>
+    <feature version="${camel.version}">camel-jsonpath</feature>
+    <feature version="${camel.version}">camel-cxf</feature>
+    <feature version="${camel.version}">camel-script</feature>
+    <feature version="${camel.version}">camel-script-javascript</feature>
+    <feature version="${camel.version}">camel-mustache</feature>
+    <feature version="${fcrepo.camel.version}">fcrepo-camel</feature>
+    <feature version="${fcrepo.camel.version}">fcrepo-indexing-triplestore</feature>
+    <feature version="${project.version}">islandora-camel-component</feature>
+
+    <bundle>mvn:ca.islandora.camel.services/islandora-collection-service/${project.version}</bundle>
+    <bundle dependency="true">wrap:mvn:com.github.spullara.mustache.java/compiler/${mustache.version}</bundle>
+
+    <configfile finalname="/etc/ca.islandora.services.collection.cfg">mvn:ca.islandora.camel.services/islandora-collection-service/${project.version}/cfg/configuration</configfile>
+  </feature>
+
+
+</features>