Merge pull request #1 from ruebot/issue-229

Refactor Alpaca; s/ca.islandora.camel/ca.islandora/g; Address https:/…
Islandora · May 20, 2016 · 5c91462 · 5c91462
2 parents d909ace + 4cf81df
commit 5c91462
Show file tree

Hide file tree

Showing 22 changed files with 47 additions and 47 deletions.
diff --git a/component/pom.xml b/component/pom.xml
@@ -2,19 +2,19 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>ca.islandora.camel</groupId>
+    <groupId>ca.islandora</groupId>
     <artifactId>islandora-parent</artifactId>
     <version>0.0.1-SNAPSHOT</version>
   </parent>
 
-  <groupId>ca.islandora.camel.component</groupId>
+  <groupId>ca.islandora.component</groupId>
   <artifactId>islandora-camel-component</artifactId>
   <packaging>bundle</packaging>
 
   <name>Islandora Camel Component</name>
 
   <properties>
-    <islandora.osgi.export.pkg>ca.islandora.camel.component*</islandora.osgi.export.pkg>
+    <islandora.osgi.export.pkg>ca.islandora.component*</islandora.osgi.export.pkg>
   </properties>
 
   <dependencies>

diff --git a/...a/camel/component/IslandoraComponent.java → ...landora/component/IslandoraComponent.java b/...a/camel/component/IslandoraComponent.java → ...landora/component/IslandoraComponent.java
@@ -1,4 +1,4 @@
-package ca.islandora.camel.component;
+package ca.islandora.component;
 
 import java.net.URLDecoder;
 import java.util.Map;

diff --git a/...ra/camel/component/IslandoraEndpoint.java → ...slandora/component/IslandoraEndpoint.java b/...ra/camel/component/IslandoraEndpoint.java → ...slandora/component/IslandoraEndpoint.java
@@ -1,4 +1,4 @@
-package ca.islandora.camel.component;
+package ca.islandora.component;
 
 import org.apache.camel.Consumer;
 import org.apache.camel.Processor;

diff --git a/...camel/component/IslandoraExecBinding.java → ...ndora/component/IslandoraExecBinding.java b/...camel/component/IslandoraExecBinding.java → ...ndora/component/IslandoraExecBinding.java
@@ -1,4 +1,4 @@
-package ca.islandora.camel.component;
+package ca.islandora.component;
 
 import java.io.File;
 import java.io.InputStream;

diff --git a/...amel/component/IslandoraPHPException.java → ...dora/component/IslandoraPHPException.java b/...amel/component/IslandoraPHPException.java → ...dora/component/IslandoraPHPException.java
@@ -1,4 +1,4 @@
-package ca.islandora.camel.component;
+package ca.islandora.component;
 
 import org.apache.camel.RuntimeCamelException;
 

diff --git a/...ra/camel/component/IslandoraProducer.java → ...slandora/component/IslandoraProducer.java b/...ra/camel/component/IslandoraProducer.java → ...slandora/component/IslandoraProducer.java
@@ -1,4 +1,4 @@
-package ca.islandora.camel.component;
+package ca.islandora.component;
 
 import java.nio.charset.StandardCharsets;
 

diff --git a/component/src/main/resources/META-INF/services/ca/islandora/camel/component/islandora b/component/src/main/resources/META-INF/services/ca/islandora/camel/component/islandora
@@ -1 +1 @@
-class=ca.islandora.camel.component.IslandoraComponent
+class=ca.islandora.component.IslandoraComponent
diff --git a/indexing/islandora-indexing-triplestore/pom.xml b/indexing/islandora-indexing-triplestore/pom.xml
@@ -4,20 +4,20 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>ca.islandora.camel</groupId>
+    <groupId>ca.islandora</groupId>
     <artifactId>islandora-parent</artifactId>
     <version>0.0.1-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
-  <groupId>ca.islandora.camel.indexing</groupId>
+  <groupId>ca.islandora.indexing</groupId>
   <artifactId>islandora-indexing-triplestore</artifactId>
   <packaging>bundle</packaging>
 
   <name>Islandora Triplestore Indexer</name>
 
   <properties>
-    <islandora.osgi.export.pkg>ca.islandora.camel.indexing.triplestore</islandora.osgi.export.pkg>
+    <islandora.osgi.export.pkg>ca.islandora.indexing.triplestore</islandora.osgi.export.pkg>
   </properties>
 
   <dependencies>
@@ -34,7 +34,7 @@
       <artifactId>activemq-camel</artifactId>
     </dependency>
     <dependency>
-      <groupId>ca.islandora.camel.component</groupId>
+      <groupId>ca.islandora.component</groupId>
       <artifactId>islandora-camel-component</artifactId>
       <version>${project.version}</version>
     </dependency>
@@ -96,7 +96,7 @@
             <configuration>
               <artifacts>
                 <artifact>
-                  <file>src/main/cfg/ca.islandora.camel.indexing.triplestore.cfg</file>
+                  <file>src/main/cfg/ca.islandora.indexing.triplestore.cfg</file>
                   <type>cfg</type>
                   <classifier>configuration</classifier>
                 </artifact>

diff --git a/....islandora.camel.indexing.triplestore.cfg → ...cfg/ca.islandora.indexing.triplestore.cfg b/....islandora.camel.indexing.triplestore.cfg → ...cfg/ca.islandora.indexing.triplestore.cfg
diff --git a/...exing/triplestore/TriplestoreIndexer.java → ...exing/triplestore/TriplestoreIndexer.java b/...exing/triplestore/TriplestoreIndexer.java → ...exing/triplestore/TriplestoreIndexer.java
@@ -1,4 +1,4 @@
-package ca.islandora.camel.indexing.triplestore;
+package ca.islandora.indexing.triplestore;
 
 import org.apache.camel.LoggingLevel;
 import org.apache.camel.Predicate;

diff --git a/indexing/islandora-indexing-triplestore/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/indexing/islandora-indexing-triplestore/src/main/resources/OSGI-INF/blueprint/blueprint.xml
@@ -8,15 +8,15 @@
        http://camel.apache.org/schema/blueprint http://camel.apache.org/schema/blueprint/camel-blueprint.xsd">
 
   <!-- OSGI blueprint property placeholder -->
-  <cm:property-placeholder id="properties" persistent-id="ca.islandora.camel.indexing.triplestore" update-strategy="reload" />
+  <cm:property-placeholder id="properties" persistent-id="ca.islandora.indexing.triplestore" update-strategy="reload" />
 
   <!-- configuration of activemq component -->
   <bean id="activemq" class="org.apache.activemq.camel.component.ActiveMQComponent">
     <property name="brokerURL" value="${jms.brokerUrl}"/>
   </bean>
 
   <camelContext id="IslandoraTriplestoreIndexer" xmlns="http://camel.apache.org/schema/blueprint">
-    <package>ca.islandora.camel.indexing.triplestore</package>
+    <package>ca.islandora.indexing.triplestore</package>
   </camelContext>
 
 </blueprint>
diff --git a/indexing/pom.xml b/indexing/pom.xml
@@ -4,12 +4,12 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-      <groupId>ca.islandora.camel</groupId>
+      <groupId>ca.islandora</groupId>
       <artifactId>islandora-parent</artifactId>
       <version>0.0.1-SNAPSHOT</version>
   </parent>
 
-  <groupId>ca.islandora.camel</groupId>
+  <groupId>ca.islandora</groupId>
   <artifactId>islandora-indexing</artifactId>
   <packaging>pom</packaging>
 

diff --git a/islandora-indexing-triplestore/ReadMe.txt b/islandora-indexing-triplestore/ReadMe.txt
@@ -12,7 +12,7 @@ To run the project you can execute the following Maven goal
 To deploy the project in OSGi. For example using Apache ServiceMix
 or Apache Karaf. You can run the following command from its shell:
 
-    osgi:install -s mvn:ca.islandora.camel/islandora-indexing-triplestore/0.0.1-SNAPSHOT
+    osgi:install -s mvn:ca.islandora/islandora-indexing-triplestore/0.0.1-SNAPSHOT
 
 For more help see the Apache Camel documentation
 

diff --git a/islandora-indexing-triplestore/pom.xml b/islandora-indexing-triplestore/pom.xml
@@ -4,20 +4,20 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>ca.islandora.camel</groupId>
+    <groupId>ca.islandora</groupId>
     <artifactId>islandora-parent</artifactId>
     <version>0.0.1-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
-  <groupId>ca.islandora.camel.indexing</groupId>
+  <groupId>ca.islandora.indexing</groupId>
   <artifactId>islandora-indexing-triplestore</artifactId>
   <packaging>bundle</packaging>
 
   <name>Islandora Triplestore Indexer</name>
 
   <properties>
-    <islandora.osgi.export.pkg>ca.islandora.camel.indexing.triplestore</islandora.osgi.export.pkg>
+    <islandora.osgi.export.pkg>ca.islandora.indexing.triplestore</islandora.osgi.export.pkg>
   </properties>
 
   <dependencies>
@@ -34,7 +34,7 @@
       <artifactId>activemq-camel</artifactId>
     </dependency>
     <dependency>
-      <groupId>ca.islandora.camel.component</groupId>
+      <groupId>ca.islandora.component</groupId>
       <artifactId>islandora-camel-component</artifactId>
       <version>${project.version}</version>
     </dependency>
@@ -96,7 +96,7 @@
             <configuration>
               <artifacts>
                 <artifact>
-                  <file>src/main/cfg/ca.islandora.camel.indexing.triplestore.cfg</file>
+                  <file>src/main/cfg/ca.islandora.indexing.triplestore.cfg</file>
                   <type>cfg</type>
                   <classifier>configuration</classifier>
                 </artifact>

diff --git a/....islandora.camel.indexing.triplestore.cfg → ...cfg/ca.islandora.indexing.triplestore.cfg b/....islandora.camel.indexing.triplestore.cfg → ...cfg/ca.islandora.indexing.triplestore.cfg
diff --git a/...exing/triplestore/TriplestoreIndexer.java → ...exing/triplestore/TriplestoreIndexer.java b/...exing/triplestore/TriplestoreIndexer.java → ...exing/triplestore/TriplestoreIndexer.java
@@ -1,4 +1,4 @@
-package ca.islandora.camel.indexing.triplestore;
+package ca.islandora.indexing.triplestore;
 
 import org.apache.camel.builder.RouteBuilder;
 

diff --git a/islandora-indexing-triplestore/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/islandora-indexing-triplestore/src/main/resources/OSGI-INF/blueprint/blueprint.xml
@@ -8,15 +8,15 @@
        http://camel.apache.org/schema/blueprint http://camel.apache.org/schema/blueprint/camel-blueprint.xsd">
 
   <!-- OSGI blueprint property placeholder -->
-  <!--<cm:property-placeholder id="properties" persistent-id="ca.islandora.camel.indexing.triplestore" update-strategy="reload" />-->
+  <!--<cm:property-placeholder id="properties" persistent-id="ca.islandora.indexing.triplestore" update-strategy="reload" />-->
 
   <!-- configuration of activemq component -->
   <!--<bean id="activemq" class="org.apache.activemq.camel.component.ActiveMQComponent">-->
     <!--<property name="brokerURL" value="${jms.brokerUrl}"/>-->
   <!--</bean>-->
 
   <camelContext id="IslandoraTriplestoreIndexer" xmlns="http://camel.apache.org/schema/blueprint">
-    <package>ca.islandora.camel.indexing.triplestore</package>
+    <package>ca.islandora.indexing.triplestore</package>
   </camelContext>
 
 </blueprint>
diff --git a/karaf/pom.xml b/karaf/pom.xml
@@ -4,12 +4,12 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>ca.islandora.camel</groupId>
+    <groupId>ca.islandora</groupId>
     <artifactId>islandora-parent</artifactId>
     <version>0.0.1-SNAPSHOT</version>
   </parent>
 
-  <groupId>ca.islandora.camel</groupId>
+  <groupId>ca.islandora</groupId>
   <artifactId>islandora-karaf</artifactId>
   <packaging>pom</packaging>
 

diff --git a/karaf/src/main/resources/features.xml b/karaf/src/main/resources/features.xml
@@ -15,7 +15,7 @@
     <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>
+    <bundle>mvn:ca.islandora.component/islandora-camel-component/${project.version}</bundle>
 
   </feature>
 
@@ -39,9 +39,9 @@
     <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>
+    <bundle>mvn:ca.islandora.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>
+    <configfile finalname="/etc/ca.islandora.sync.cfg">mvn:ca.islandora.sync/islandora-sync-gateway/${project.version}/cfg/configuration</configfile>
   </feature>
 
   <feature name="islandora-basic-image-service" version="${project.version}" start-level="80">
@@ -61,10 +61,10 @@
     <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>mvn:ca.islandora.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>
+    <configfile finalname="/etc/ca.islandora.services.basic.image.cfg">mvn:ca.islandora.services/islandora-basic-image-service/${project.version}/cfg/configuration</configfile>
   </feature>
 
   <feature name="islandora-collection-service" version="${project.version}" start-level="80">
@@ -84,10 +84,10 @@
     <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>mvn:ca.islandora.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>
+    <configfile finalname="/etc/ca.islandora.services.collection.cfg">mvn:ca.islandora.services/islandora-collection-service/${project.version}/cfg/configuration</configfile>
   </feature>
 
   <feature name="islandora-indexing-triplestore" version="${project.version}" start-level="80">
@@ -97,9 +97,9 @@
     <feature version="${activemq.version}">activemq-camel</feature>
     <feature version="${project.version}">islandora-camel-component</feature>
 
-    <bundle>mvn:ca.islandora.camel.indexing/islandora-indexing-triplestore/${project.version}</bundle>
+    <bundle>mvn:ca.islandora.indexing/islandora-indexing-triplestore/${project.version}</bundle>
 
-    <configfile finalname="/etc/ca.islandora.camel.indexing.triplestore.cfg">mvn:ca.islandora.camel.indexing/islandora-indexing-triplestore/${project.version}/cfg/configuration</configfile>
+    <configfile finalname="/etc/ca.islandora.indexing.triplestore.cfg">mvn:ca.islandora.indexing/islandora-indexing-triplestore/${project.version}/cfg/configuration</configfile>
 
   </feature>
 </features>
diff --git a/pom.xml b/pom.xml
@@ -10,7 +10,7 @@
     <relativePath />
   </parent>
 
-  <groupId>ca.islandora.camel</groupId>
+  <groupId>ca.islandora</groupId>
   <artifactId>islandora-parent</artifactId>
   <packaging>pom</packaging>
   <version>0.0.1-SNAPSHOT</version>
@@ -55,7 +55,7 @@
     <bundle.plugin.version>2.3.7</bundle.plugin.version>
     <build.helper.plugin.version>1.9.1</build.helper.plugin.version>
     <!-- OSGi -->
-    <islandora.osgi.export.pkg>ca.islandora.camel.component;version="${project.version}"</islandora.osgi.export.pkg>
+    <islandora.osgi.export.pkg>ca.islandora.component;version="${project.version}"</islandora.osgi.export.pkg>
     <islandora.osgi.import.pkg/>
     <islandora.osgi.private.pkg/>
   </properties>
@@ -171,7 +171,7 @@
       </dependency>
 
       <dependency>
-        <groupId>ca.islandora.camel.component</groupId>
+        <groupId>ca.islandora.component</groupId>
         <artifactId>islandora-camel-component</artifactId>
         <version>${project.version}</version>
       </dependency>

diff --git a/sync/pom.xml b/sync/pom.xml
@@ -4,19 +4,19 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>ca.islandora.camel</groupId>
+    <groupId>ca.islandora</groupId>
     <artifactId>islandora-parent</artifactId>
     <version>0.0.1-SNAPSHOT</version>
   </parent>
 
-  <groupId>ca.islandora.camel.sync</groupId>
+  <groupId>ca.islandora.sync</groupId>
   <artifactId>islandora-sync-gateway</artifactId>
   <packaging>bundle</packaging>
 
   <name>Islandora Sync Gateway</name>
 
   <properties>
-    <islandora.osgi.export.pkg>ca.islandora.camel.sync.islandora-sync-gateway</islandora.osgi.export.pkg>
+    <islandora.osgi.export.pkg>ca.islandora.sync.islandora-sync-gateway</islandora.osgi.export.pkg>
   </properties>
 
   <dependencies>
@@ -41,7 +41,7 @@
       <artifactId>fcrepo-camel</artifactId>
     </dependency>
     <dependency>
-      <groupId>ca.islandora.camel.component</groupId>
+      <groupId>ca.islandora.component</groupId>
       <artifactId>islandora-camel-component</artifactId>
       <version>${project.version}</version>
     </dependency>

diff --git a/sync/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/sync/src/main/resources/OSGI-INF/blueprint/blueprint.xml
@@ -23,7 +23,7 @@
   <bean id="http" class="org.apache.camel.component.http.HttpComponent"/>
 
   <!-- Islandora Component Configuration -->
-  <bean id="islandora" class="ca.islandora.camel.component.IslandoraComponent">
+  <bean id="islandora" class="ca.islandora.component.IslandoraComponent">
     <argument value="${islandora.php.workingDir}"/>
   </bean>