svn commit: r1654501 - in /commons/proper/compress/trunk/src: main/java/org/apache/commons/compress/archivers/sevenz/ main/java/org/apache/commons/compress/exceptions/ test/java/org/apache/commons/compress/archivers/sevenz/

[bodewig]

Author: bodewig
Date: Sat Jan 24 12:16:38 2015
New Revision: 1654501

URL: http://svn.apache.org/r1654501
Log:
move PasswordRequiredException

Added:
    
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/exceptions/
    
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/exceptions/PasswordRequiredException.java
      - copied, changed from r1654500, 
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/sevenz/PasswordRequiredException.java
Removed:
    
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/sevenz/PasswordRequiredException.java
Modified:
    
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/sevenz/AES256SHA256Decoder.java
    
commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/sevenz/SevenZFileTest.java

Modified: 
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/sevenz/AES256SHA256Decoder.java
URL: 
http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/sevenz/AES256SHA256Decoder.java?rev=1654501&r1=1654500&r2=1654501&view=diff
==============================================================================
--- 
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/sevenz/AES256SHA256Decoder.java
 (original)
+++ 
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/sevenz/AES256SHA256Decoder.java
 Sat Jan 24 12:16:38 2015
@@ -27,6 +27,7 @@ import javax.crypto.CipherInputStream;
 import javax.crypto.SecretKey;
 import javax.crypto.spec.IvParameterSpec;
 import javax.crypto.spec.SecretKeySpec;
+import org.apache.commons.compress.exceptions.PasswordRequiredException;
 
 class AES256SHA256Decoder extends CoderBase {
     @Override

Copied: 
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/exceptions/PasswordRequiredException.java
 (from r1654500, 
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/sevenz/PasswordRequiredException.java)
URL: 
http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/exceptions/PasswordRequiredException.java?p2=commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/exceptions/PasswordRequiredException.java&p1=commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/sevenz/PasswordRequiredException.java&r1=1654500&r2=1654501&rev=1654501&view=diff
==============================================================================
--- 
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/sevenz/PasswordRequiredException.java
 (original)
+++ 
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/exceptions/PasswordRequiredException.java
 Sat Jan 24 12:16:38 2015
@@ -15,12 +15,12 @@
  *  limitations under the License.
  *
  */
-package org.apache.commons.compress.archivers.sevenz;
+package org.apache.commons.compress.exceptions;
 
 import java.io.IOException;
 
 /**
- * Exception thrown when trying to read an encrypted entry without
+ * Exception thrown when trying to read an encrypted entry or file without
  * configuring a password.
  * @since 1.10
  */
@@ -29,9 +29,10 @@ public class PasswordRequiredException e
     /**
      * Create a new exception.
      *
-     * @param archiveName name of the archive containing encrypted streams.
+     * @param name name of the archive containing encrypted streams or
+     * the encrypted file.
      */
-    public PasswordRequiredException(String archiveName) {
-        super("Cannot read encrypted archive " + archiveName + " without a 
password.");
+    public PasswordRequiredException(String name) {
+        super("Cannot read encrypted content from " + name + " without a 
password.");
     }
 }

Modified: 
commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/sevenz/SevenZFileTest.java
URL: 
http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/sevenz/SevenZFileTest.java?rev=1654501&r1=1654500&r2=1654501&view=diff
==============================================================================
--- 
commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/sevenz/SevenZFileTest.java
 (original)
+++ 
commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/sevenz/SevenZFileTest.java
 Sat Jan 24 12:16:38 2015
@@ -23,6 +23,7 @@ import java.security.NoSuchAlgorithmExce
 import java.util.Arrays;
 import javax.crypto.Cipher;
 import org.apache.commons.compress.AbstractTestCase;
+import org.apache.commons.compress.exceptions.PasswordRequiredException;
 
 public class SevenZFileTest extends AbstractTestCase {
     private static final String TEST2_CONTENT = "<?xml version = 
'1.0'?>\r\n<!DOCTYPE"
@@ -71,7 +72,7 @@ public class SevenZFileTest extends Abst
         } catch (PasswordRequiredException ex) {
             String msg = ex.getMessage();
             assertTrue("Should start with whining about being unable to 
decrypt",
-                       msg.startsWith("Cannot read encrypted archive "));
+                       msg.startsWith("Cannot read encrypted content from "));
             assertTrue("Should finish the sentence properly",
                        msg.endsWith(" without a password."));
             assertTrue("Should contain archive's name",