Index: CHANGES.txt
===================================================================
--- CHANGES.txt	(revision 1380211)
+++ CHANGES.txt	(working copy)
@@ -11,6 +11,9 @@
   * PKCS7: Detached signatures no longer through NullPointerException
     (TIKA-986).
 
+  * CLI: TikaCLI -m now handles multi-valued metadata keys correctly
+    (previously it only printed the first value).  (TIKA-920)
+
 Release 1.2 - 07/10/2012
 ---------------------------------
 
Index: tika-app/src/test/java/org/apache/tika/cli/TikaCLITest.java
===================================================================
--- tika-app/src/test/java/org/apache/tika/cli/TikaCLITest.java	(revision 1380211)
+++ tika-app/src/test/java/org/apache/tika/cli/TikaCLITest.java	(working copy)
@@ -35,7 +35,7 @@
     private ByteArrayOutputStream outContent = null;
     private PrintStream stdout = null;
     private URI testDataURI = new File("src/test/resources/test-data/").toURI();
-    private String resorcePrefix = testDataURI.toString();
+    private String resourcePrefix = testDataURI.toString();
 
     public void setUp() throws Exception {
         profile = new File("welsh.ngp");
@@ -50,7 +50,7 @@
      * @throws Exception
      */
     public void testCreateProfile() throws Exception {
-        String[] params = {"--create-profile=welsh", "-eUTF-8", resorcePrefix + "welsh_corpus.txt"};
+        String[] params = {"--create-profile=welsh", "-eUTF-8", resourcePrefix + "welsh_corpus.txt"};
         TikaCLI.main(params);
         Assert.assertTrue(profile.exists());
     }
@@ -84,7 +84,7 @@
      * @throws Exception
      */
     public void testXMLOutput() throws Exception{
-        String[] params = {"-x", resorcePrefix + "alice.cli.test"};
+        String[] params = {"-x", resourcePrefix + "alice.cli.test"};
         TikaCLI.main(params);
         Assert.assertTrue(outContent.toString().contains("?xml version=\"1.0\" encoding=\"UTF-8\"?"));
     }
@@ -95,7 +95,7 @@
      * @throws Exception
      */
     public void testHTMLOutput() throws Exception{
-        String[] params = {"-h", resorcePrefix + "alice.cli.test"};
+        String[] params = {"-h", resourcePrefix + "alice.cli.test"};
         TikaCLI.main(params);
         Assert.assertTrue(outContent.toString().contains("html xmlns=\"http://www.w3.org/1999/xhtml"));
     }
@@ -106,7 +106,7 @@
      * @throws Exception
      */
     public void testTextOutput() throws Exception{
-        String[] params = {"-t", resorcePrefix + "alice.cli.test"};
+        String[] params = {"-t", resourcePrefix + "alice.cli.test"};
         TikaCLI.main(params);
         Assert.assertTrue(outContent.toString().contains("finished off the cake"));
     }
@@ -116,7 +116,7 @@
      * @throws Exception
      */
     public void testMetadataOutput() throws Exception{
-        String[] params = {"-m", resorcePrefix + "alice.cli.test"};
+        String[] params = {"-m", resourcePrefix + "alice.cli.test"};
         TikaCLI.main(params);
         Assert.assertTrue(outContent.toString().contains("text/plain"));
     }
@@ -127,7 +127,7 @@
      * @throws Exception
      */
     public void testLanguageOutput() throws Exception{
-        String[] params = {"-l", resorcePrefix + "alice.cli.test"};
+        String[] params = {"-l", resourcePrefix + "alice.cli.test"};
         TikaCLI.main(params);
         Assert.assertTrue(outContent.toString().contains("en"));
     }
@@ -138,7 +138,7 @@
      * @throws Exception
      */
     public void testDetectOutput() throws Exception{
-        String[] params = {"-d", resorcePrefix + "alice.cli.test"};
+        String[] params = {"-d", resourcePrefix + "alice.cli.test"};
         TikaCLI.main(params);
         Assert.assertTrue(outContent.toString().contains("text/plain"));
     }
@@ -149,7 +149,7 @@
      * @throws Exception
      */
     public void testListMetModels() throws Exception{
-        String[] params = {"--list-met-models", resorcePrefix + "alice.cli.test"};
+        String[] params = {"--list-met-models", resourcePrefix + "alice.cli.test"};
         TikaCLI.main(params);
         Assert.assertTrue(outContent.toString().contains("text/plain"));
     }
@@ -160,7 +160,7 @@
      * @throws Exception
      */
     public void testListSupportedTypes() throws Exception{
-        String[] params = {"--list-supported-types", resorcePrefix + "alice.cli.test"};
+        String[] params = {"--list-supported-types", resourcePrefix + "alice.cli.test"};
         TikaCLI.main(params);
         Assert.assertTrue(outContent.toString().contains("supertype: application/octet-stream"));
     }
@@ -181,7 +181,7 @@
                           // google guava library has better solution
 
         try {
-            String[] params = {"--extract-dir="+tempFile.getAbsolutePath(),"-z", resorcePrefix + "/coffee.xls"};
+            String[] params = {"--extract-dir="+tempFile.getAbsolutePath(),"-z", resourcePrefix + "/coffee.xls"};
             
             TikaCLI.main(params);
             
@@ -204,4 +204,15 @@
         }
 
     }
+
+    // TIKA-920
+    public void testMultiValuedMetadata() throws Exception {
+        String[] params = {"-m", resourcePrefix + "testMultipleSheets.numbers"};
+        TikaCLI.main(params);
+        String content = outContent.toString();
+        assertTrue(content.contains("sheetNames: Checking"));
+        assertTrue(content.contains("sheetNames: Secon sheet"));
+        assertTrue(content.contains("sheetNames: Logical Sheet 3"));
+        assertTrue(content.contains("sheetNames: Sheet 4"));
+    }
 }
Index: tika-app/src/test/resources/test-data/testMultipleSheets.numbers
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tika-app/src/test/resources/test-data/testMultipleSheets.numbers
===================================================================
--- tika-app/src/test/resources/test-data/testMultipleSheets.numbers	(revision 1380211)
+++ tika-app/src/test/resources/test-data/testMultipleSheets.numbers	(working copy)

Property changes on: tika-app/src/test/resources/test-data/testMultipleSheets.numbers
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tika-app/src/main/java/org/apache/tika/cli/TikaCLI.java
===================================================================
--- tika-app/src/main/java/org/apache/tika/cli/TikaCLI.java	(revision 1380211)
+++ tika-app/src/main/java/org/apache/tika/cli/TikaCLI.java	(working copy)
@@ -824,8 +824,10 @@
         
         public void outputMetadata(String[] names) {
            for (String name : names) {
-              writer.println(name + ": " + metadata.get(name));
-          }
+              for(String value : metadata.getValues(name)) {
+                 writer.println(name + ": " + value);
+              }
+           }
         }
         
         public boolean metOutput(){