From 16dd5853ade242874544d6aca2e4d8568611e7fd Mon Sep 17 00:00:00 2001
From: Paul Houle <paul@ontology2.com>
Date: Thu, 21 Nov 2013 14:57:32 -0500
Subject: [PATCH] #70 add a link to the Main class (yes I know we ought to use
 classpath scanning,  but...)

---
 .idea/workspace.xml                           | 59 ++++++++-----------
 .../java/com/ontology2/bakemono/Main.java     |  2 +
 2 files changed, 28 insertions(+), 33 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 0b7eeb6..2c370d5 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,19 +2,12 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="87a5655c-6aba-400c-a88c-ad04aa82a448" name="Default" comment="">
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/bakemono/src/test/java/com/ontology2/bakemono/joins/TaggedItemMatcher.java" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/bakemono/src/test/java/com/ontology2/bakemono/joins/TestAcceptWithMatchingKeyReducer.java" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/bakemono/src/test/java/com/ontology2/bakemono/joins/TestFetchTriplesWithMatchingObjectsMapper.java" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/bakemono/src/test/java/com/ontology2/bakemono/joins/TestTaggedItemMatcher.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/bakemono/src/main/java/com/ontology2/bakemono/joins/AcceptWithMatchingKeyReducer.java" afterPath="$PROJECT_DIR$/bakemono/src/main/java/com/ontology2/bakemono/joins/AcceptWithMatchingKeyReducer.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/bakemono/src/main/java/com/ontology2/bakemono/joins/FetchTriplesWithMatchingObjectsMapper.java" afterPath="$PROJECT_DIR$/bakemono/src/main/java/com/ontology2/bakemono/joins/FetchTriplesWithMatchingObjectsMapper.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/bakemono/src/main/java/com/ontology2/bakemono/joins/TaggedItem.java" afterPath="$PROJECT_DIR$/bakemono/src/main/java/com/ontology2/bakemono/joins/TaggedItem.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/bakemono/src/main/java/com/ontology2/bakemono/joins/TaggedTextItem.java" afterPath="$PROJECT_DIR$/bakemono/src/main/java/com/ontology2/bakemono/joins/TaggedTextItem.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/bakemono/src/main/java/com/ontology2/bakemono/Main.java" afterPath="$PROJECT_DIR$/bakemono/src/main/java/com/ontology2/bakemono/Main.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
     </list>
     <ignored path="infovore.iws" />
     <ignored path=".idea/workspace.xml" />
-    <file path="/Dummy.txt" changelist="87a5655c-6aba-400c-a88c-ad04aa82a448" time="1384987631442" ignored="false" />
+    <file path="/Dummy.txt" changelist="87a5655c-6aba-400c-a88c-ad04aa82a448" time="1385063362096" ignored="false" />
     <file path="$PROJECT_DIR$/../internal/adserver3/.idea/workspace.xml" changelist="87a5655c-6aba-400c-a88c-ad04aa82a448" time="1384450822972" ignored="false" />
     <file path="/MapMap.java" changelist="87a5655c-6aba-400c-a88c-ad04aa82a448" time="1384119062692" ignored="false" />
     <file path="/MapMapper.java" changelist="87a5655c-6aba-400c-a88c-ad04aa82a448" time="1384121253101" ignored="false" />
@@ -26,7 +19,7 @@
     <file path="/Uniq.java" changelist="87a5655c-6aba-400c-a88c-ad04aa82a448" time="1384209964390" ignored="false" />
     <file path="/UniqURIObjectTool.java" changelist="87a5655c-6aba-400c-a88c-ad04aa82a448" time="1384280865994" ignored="false" />
     <file path="/KeyOnlyOutputFormat.java" changelist="87a5655c-6aba-400c-a88c-ad04aa82a448" time="1384209486606" ignored="false" />
-    <file path="/Main.java" changelist="87a5655c-6aba-400c-a88c-ad04aa82a448" time="1384449834099" ignored="false" />
+    <file path="/Main.java" changelist="87a5655c-6aba-400c-a88c-ad04aa82a448" time="1385063458960" ignored="false" />
     <file path="/AmazonEMRCluster.java" changelist="87a5655c-6aba-400c-a88c-ad04aa82a448" time="1384268328334" ignored="false" />
     <file path="/TestEMRCluster.java" changelist="87a5655c-6aba-400c-a88c-ad04aa82a448" time="1384269846594" ignored="false" />
     <file path="/ExtractSubject.java" changelist="87a5655c-6aba-400c-a88c-ad04aa82a448" time="1384280252439" ignored="false" />
@@ -71,7 +64,7 @@
     <file path="$PROJECT_DIR$/../centipede/centipede/src/test/java/util/TestVersion.java" changelist="87a5655c-6aba-400c-a88c-ad04aa82a448" time="1384809896299" ignored="false" />
     <file path="/TestVersion.java" changelist="87a5655c-6aba-400c-a88c-ad04aa82a448" time="1384809205385" ignored="false" />
     <file path="$PROJECT_DIR$/../centipede/pom.xml" changelist="87a5655c-6aba-400c-a88c-ad04aa82a448" time="1384809899180" ignored="false" />
-    <file path="$PROJECT_DIR$/../centipede/.idea/workspace.xml" changelist="87a5655c-6aba-400c-a88c-ad04aa82a448" time="1385062964581" ignored="false" />
+    <file path="$PROJECT_DIR$/../centipede/.idea/workspace.xml" changelist="87a5655c-6aba-400c-a88c-ad04aa82a448" time="1385063805120" ignored="false" />
     <file path="$PROJECT_DIR$/../centipede/centipede/src/main/java/com/ontology2/centipede/parser/Argument.java" changelist="87a5655c-6aba-400c-a88c-ad04aa82a448" time="1384886091403" ignored="false" />
     <file path="/Argument.java" changelist="87a5655c-6aba-400c-a88c-ad04aa82a448" time="1384886034422" ignored="false" />
     <file path="$PROJECT_DIR$/../centipede/centipede/src/main/java/com/ontology2/centipede/parser/Option.java" changelist="87a5655c-6aba-400c-a88c-ad04aa82a448" time="1384892244578" ignored="false" />
@@ -257,10 +250,10 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="GeneralJoinMapper.java" pinned="false" current="true" current-in-tab="true">
+      <file leaf-file-name="GeneralJoinMapper.java" pinned="false" current="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/bakemono/src/main/java/com/ontology2/bakemono/joins/GeneralJoinMapper.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state line="68" column="0" selection-start="2552" selection-end="2552" vertical-scroll-proportion="0.81722933">
+            <state line="68" column="0" selection-start="2552" selection-end="2552" vertical-scroll-proportion="0.0">
               <folding />
             </state>
           </provider>
@@ -322,13 +315,11 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="TestTaggedItemMatcher.java" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/bakemono/src/test/java/com/ontology2/bakemono/joins/TestTaggedItemMatcher.java">
+      <file leaf-file-name="Main.java" pinned="false" current="true" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/bakemono/src/main/java/com/ontology2/bakemono/Main.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state line="7" column="13" selection-start="169" selection-end="169" vertical-scroll-proportion="0.0">
-              <folding>
-                <element signature="imports" expanded="true" />
-              </folding>
+            <state line="68" column="75" selection-start="2685" selection-end="2720" vertical-scroll-proportion="0.5343422">
+              <folding />
             </state>
           </provider>
         </entry>
@@ -362,7 +353,6 @@
   <component name="IdeDocumentHistory">
     <option name="changedFiles">
       <list>
-        <option value="$PROJECT_DIR$/bakemono/src/main/java/com/ontology2/bakemono/joins/SimpleJoinMapper.java" />
         <option value="$PROJECT_DIR$/bakemono/src/main/java/com/ontology2/bakemono/joins/SetJoinMapper.java" />
         <option value="$PROJECT_DIR$/bakemono/src/main/java/com/ontology2/bakemono/joins/GeneralJoinMapper.java" />
         <option value="$PROJECT_DIR$/bakemono/src/main/java/com/ontology2/bakemono/joins/GeneralTextJoinMapper.java" />
@@ -378,6 +368,7 @@
         <option value="$PROJECT_DIR$/bakemono/src/test/java/com/ontology2/bakemono/joins/TaggedItemMatcher.java" />
         <option value="$PROJECT_DIR$/bakemono/src/test/java/com/ontology2/bakemono/joins/TestTaggedItemMatcher.java" />
         <option value="$PROJECT_DIR$/bakemono/src/test/java/com/ontology2/bakemono/joins/TestFetchTriplesWithMatchingObjectsMapper.java" />
+        <option value="$PROJECT_DIR$/bakemono/src/main/java/com/ontology2/bakemono/Main.java" />
       </list>
     </option>
   </component>
@@ -1421,7 +1412,11 @@
       <created>1384987639428</created>
       <updated>1384987639428</updated>
     </task>
-    <option name="localTasksCounter" value="29" />
+    <task id="LOCAL-00029" summary="#70 mapper and reducer pass tests">
+      <created>1385063376198</created>
+      <updated>1385063376198</updated>
+    </task>
+    <option name="localTasksCounter" value="30" />
     <servers />
   </component>
   <component name="ToolWindowManager">
@@ -1492,7 +1487,7 @@
     <option name="WRAP_WHEN_TYPING_REACHES_RIGHT_MARGIN" value="false" />
     <option name="FORCE_NON_EMPTY_COMMENT" value="false" />
     <option name="CLEAR_INITIAL_COMMIT_MESSAGE" value="false" />
-    <option name="LAST_COMMIT_MESSAGE" value="#70 initial work on FetchTriplesWithMatchingObjectsTool and the infrastructure that supports it." />
+    <option name="LAST_COMMIT_MESSAGE" value="#70 mapper and reducer pass tests" />
     <option name="MAKE_NEW_CHANGELIST_ACTIVE" value="false" />
     <option name="OPTIMIZE_IMPORTS_BEFORE_PROJECT_COMMIT" value="false" />
     <option name="CHECK_FILES_UP_TO_DATE_BEFORE_COMMIT" value="false" />
@@ -1506,7 +1501,6 @@
     <option name="UPDATE_FILTER_BY_SCOPE" value="false" />
     <option name="SHOW_FILE_HISTORY_AS_TREE" value="false" />
     <option name="FILE_HISTORY_SPLITTER_PROPORTION" value="0.6" />
-    <MESSAGE value="resolve #75 and more work towards #70,  in particular development of script to extract all unique object links" />
     <MESSAGE value="point haruhi's default at version 2.1-SNAPSHOT to resolve #76" />
     <MESSAGE value="#70 add application to application list" />
     <MESSAGE value="#77 better ergonomics for error handling and reporting" />
@@ -1531,6 +1525,7 @@
     <MESSAGE value="#78 add to application context file so by default haruhi will run the matching version of bakemono" />
     <MESSAGE value="#78 use the right propert name to unbreak the build" />
     <MESSAGE value="#70 initial work on FetchTriplesWithMatchingObjectsTool and the infrastructure that supports it." />
+    <MESSAGE value="#70 mapper and reducer pass tests" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager />
@@ -1540,15 +1535,6 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/bakemono/src/test/java/com/ontology2/bakemono/joins/SetDifferenceReducerTest.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="31" column="51" selection-start="866" selection-end="866" vertical-scroll-proportion="0.0">
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/bakemono/src/main/java/com/ontology2/bakemono/joins/GeneralTextJoinMapper.java">
       <provider selected="true" editor-type-id="text-editor">
         <state line="5" column="22" selection-start="138" selection-end="138" vertical-scroll-proportion="0.0">
@@ -1663,7 +1649,14 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/bakemono/src/main/java/com/ontology2/bakemono/joins/GeneralJoinMapper.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="68" column="0" selection-start="2552" selection-end="2552" vertical-scroll-proportion="0.81722933">
+        <state line="68" column="0" selection-start="2552" selection-end="2552" vertical-scroll-proportion="0.0">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/bakemono/src/main/java/com/ontology2/bakemono/Main.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="68" column="75" selection-start="2685" selection-end="2720" vertical-scroll-proportion="0.5343422">
           <folding />
         </state>
       </provider>
diff --git a/bakemono/src/main/java/com/ontology2/bakemono/Main.java b/bakemono/src/main/java/com/ontology2/bakemono/Main.java
index 59140eb..0adc6bf 100644
--- a/bakemono/src/main/java/com/ontology2/bakemono/Main.java
+++ b/bakemono/src/main/java/com/ontology2/bakemono/Main.java
@@ -6,6 +6,7 @@
 import java.util.Map;
 import java.util.Map.Entry;
 
+import com.ontology2.bakemono.joins.FetchTriplesWithMatchingObjectsTool;
 import com.ontology2.bakemono.joins.SetDifferenceTool;
 import com.ontology2.bakemono.mapmap.*;
 import org.apache.commons.logging.Log;
@@ -65,6 +66,7 @@ public IncorrectUsageException(String message) {
         put("uniqURISubjects", UniqueURISubjectTool.class);
         put("uniqURIPredicates", UniqueURIPredicateTool.class);
         put("setDifference", SetDifferenceTool.class);
+        put("fetchWithMatchingObjects3",FetchTriplesWithMatchingObjectsTool.class);
     }};
     
     Map<String, TopLevelCommand> myCommands=new HashMap<String,TopLevelCommand>() {{