SAK-29137 - Move message search impl from mail archive into message tool

bot2012 · Mar 6, 2015 · 4db5540 · 4db5540
1 parent 0c09295
commit 4db5540
Show file tree

Hide file tree

Showing 25 changed files with 12 additions and 12 deletions.
diff --git a/mailarchive/pom.xml b/mailarchive/pom.xml
@@ -21,8 +21,6 @@
         <module>mailarchive-impl/pack</module>
         <module>mailarchive-james/james</module>
         <module>mailarchive-tool/tool</module>
-        <module>search-adapters/impl</module>
-        <module>search-adapters/pack</module>
     </modules>
 
     <scm>

diff --git a/message/pom.xml b/message/pom.xml
@@ -19,6 +19,8 @@
         <module>message-api/api</module>
         <module>message-util/util</module>
         <module>message-tool/tool</module>
+        <module>search-adapters/impl</module>
+        <module>search-adapters/pack</module>
     </modules>
 
     <scm>

diff --git a/mailarchive/search-adapters/impl/derby.log → message/search-adapters/impl/derby.log b/mailarchive/search-adapters/impl/derby.log → message/search-adapters/impl/derby.log
diff --git a/mailarchive/search-adapters/impl/pom.xml → message/search-adapters/impl/pom.xml b/mailarchive/search-adapters/impl/pom.xml → message/search-adapters/impl/pom.xml
@@ -3,15 +3,15 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.sakaiproject.mailarchive</groupId>
-        <artifactId>mailarchive</artifactId>
+        <groupId>org.sakaiproject.message</groupId>
+        <artifactId>message</artifactId>
         <version>11-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
-    <name>sakai-search-adapters-impl</name>
-    <groupId>org.sakaiproject.mailarchive</groupId>
-    <artifactId>sakai-search-adapters-impl</artifactId>
+    <name>message-search-adapters-impl</name>
+    <groupId>org.sakaiproject.message</groupId>
+    <artifactId>message-search-adapters-impl</artifactId>
     <packaging>jar</packaging>
 
     <properties>

diff --git a/...dapter/message/bundle/Messages.properties → ...dapter/message/bundle/Messages.properties b/...dapter/message/bundle/Messages.properties → ...dapter/message/bundle/Messages.properties
diff --git a/...ter/message/bundle/Messages_ca.properties → ...ter/message/bundle/Messages_ca.properties b/...ter/message/bundle/Messages_ca.properties → ...ter/message/bundle/Messages_ca.properties
diff --git a/...ter/message/bundle/Messages_es.properties → ...ter/message/bundle/Messages_es.properties b/...ter/message/bundle/Messages_es.properties → ...ter/message/bundle/Messages_es.properties
diff --git a/...ter/message/bundle/Messages_eu.properties → ...ter/message/bundle/Messages_eu.properties b/...ter/message/bundle/Messages_eu.properties → ...ter/message/bundle/Messages_eu.properties
diff --git a/.../message/bundle/Messages_fr_CA.properties → .../message/bundle/Messages_fr_CA.properties b/.../message/bundle/Messages_fr_CA.properties → .../message/bundle/Messages_fr_CA.properties
diff --git a/.../message/bundle/Messages_fr_FR.properties → .../message/bundle/Messages_fr_FR.properties b/.../message/bundle/Messages_fr_FR.properties → .../message/bundle/Messages_fr_FR.properties
diff --git a/.../message/bundle/Messages_hi_IN.properties → .../message/bundle/Messages_hi_IN.properties b/.../message/bundle/Messages_hi_IN.properties → .../message/bundle/Messages_hi_IN.properties
diff --git a/...ter/message/bundle/Messages_ja.properties → ...ter/message/bundle/Messages_ja.properties b/...ter/message/bundle/Messages_ja.properties → ...ter/message/bundle/Messages_ja.properties
diff --git a/...ter/message/bundle/Messages_mn.properties → ...ter/message/bundle/Messages_mn.properties b/...ter/message/bundle/Messages_mn.properties → ...ter/message/bundle/Messages_mn.properties
diff --git a/...ter/message/bundle/Messages_nl.properties → ...ter/message/bundle/Messages_nl.properties b/...ter/message/bundle/Messages_nl.properties → ...ter/message/bundle/Messages_nl.properties
diff --git a/.../message/bundle/Messages_pt_PT.properties → .../message/bundle/Messages_pt_PT.properties b/.../message/bundle/Messages_pt_PT.properties → .../message/bundle/Messages_pt_PT.properties
diff --git a/...ter/message/bundle/Messages_ru.properties → ...ter/message/bundle/Messages_ru.properties b/...ter/message/bundle/Messages_ru.properties → ...ter/message/bundle/Messages_ru.properties
diff --git a/...ter/message/bundle/Messages_sv.properties → ...ter/message/bundle/Messages_sv.properties b/...ter/message/bundle/Messages_sv.properties → ...ter/message/bundle/Messages_sv.properties
diff --git a/.../message/bundle/Messages_tr_TR.properties → .../message/bundle/Messages_tr_TR.properties b/.../message/bundle/Messages_tr_TR.properties → .../message/bundle/Messages_tr_TR.properties
diff --git a/...ter/message/bundle/Messages_vi.properties → ...ter/message/bundle/Messages_vi.properties b/...ter/message/bundle/Messages_vi.properties → ...ter/message/bundle/Messages_vi.properties
diff --git a/.../message/bundle/Messages_zh_CN.properties → .../message/bundle/Messages_zh_CN.properties b/.../message/bundle/Messages_zh_CN.properties → .../message/bundle/Messages_zh_CN.properties
diff --git a/...apter/message/MessageContentProducer.java → ...apter/message/MessageContentProducer.java b/...apter/message/MessageContentProducer.java → ...apter/message/MessageContentProducer.java
diff --git a/...h-adapters/impl/src/test/log4j.properties → ...h-adapters/impl/src/test/log4j.properties b/...h-adapters/impl/src/test/log4j.properties → ...h-adapters/impl/src/test/log4j.properties
diff --git a/mailarchive/search-adapters/pack/pom.xml → message/search-adapters/pack/pom.xml b/mailarchive/search-adapters/pack/pom.xml → message/search-adapters/pack/pom.xml
@@ -3,15 +3,15 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.sakaiproject.mailarchive</groupId>
-        <artifactId>mailarchive</artifactId>
+        <groupId>org.sakaiproject.message</groupId>
+        <artifactId>message</artifactId>
         <version>11-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
-    <name>sakai-search-adapters-pack</name>
-    <groupId>org.sakaiproject.mailarchive</groupId>
-    <artifactId>sakai-search-adapters-pack</artifactId>
+    <name>message-search-adapters-pack</name>
+    <groupId>org.sakaiproject.message</groupId>
+    <artifactId>message-search-adapters-pack</artifactId>
     <packaging>sakai-component</packaging>
 
     <properties>

diff --git a/...rs/pack/src/webapp/WEB-INF/components.xml → ...rs/pack/src/webapp/WEB-INF/components.xml b/...rs/pack/src/webapp/WEB-INF/components.xml → ...rs/pack/src/webapp/WEB-INF/components.xml
diff --git a/...bapp/WEB-INF/messageAdapterComponents.xml → ...bapp/WEB-INF/messageAdapterComponents.xml b/...bapp/WEB-INF/messageAdapterComponents.xml → ...bapp/WEB-INF/messageAdapterComponents.xml