Move PasswordRequiredException
git-svn-id: https://svn.apache.org/repos/asf/commons/proper/compress/trunk@1654720 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/src/main/java/org/apache/commons/compress/exceptions/PasswordRequiredException.java b/src/main/java/org/apache/commons/compress/PasswordRequiredException.java
similarity index 96%
rename from src/main/java/org/apache/commons/compress/exceptions/PasswordRequiredException.java
rename to src/main/java/org/apache/commons/compress/PasswordRequiredException.java
index 8198b0b..6532a3a 100644
--- a/src/main/java/org/apache/commons/compress/exceptions/PasswordRequiredException.java
+++ b/src/main/java/org/apache/commons/compress/PasswordRequiredException.java
@@ -15,7 +15,7 @@
* limitations under the License.
*
*/
-package org.apache.commons.compress.exceptions;
+package org.apache.commons.compress;
import java.io.IOException;
diff --git a/src/main/java/org/apache/commons/compress/archivers/sevenz/AES256SHA256Decoder.java b/src/main/java/org/apache/commons/compress/archivers/sevenz/AES256SHA256Decoder.java
index ba8e9a6..e2ed5c2 100644
--- a/src/main/java/org/apache/commons/compress/archivers/sevenz/AES256SHA256Decoder.java
+++ b/src/main/java/org/apache/commons/compress/archivers/sevenz/AES256SHA256Decoder.java
@@ -27,7 +27,7 @@
import javax.crypto.SecretKey;
import javax.crypto.spec.IvParameterSpec;
import javax.crypto.spec.SecretKeySpec;
-import org.apache.commons.compress.exceptions.PasswordRequiredException;
+import org.apache.commons.compress.PasswordRequiredException;
class AES256SHA256Decoder extends CoderBase {
@Override
diff --git a/src/main/java/org/apache/commons/compress/exceptions/package-info.java b/src/main/java/org/apache/commons/compress/exceptions/package-info.java
deleted file mode 100644
index ccdcae1..0000000
--- a/src/main/java/org/apache/commons/compress/exceptions/package-info.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-/**
- * Contains specialized exceptions that might be thrown by Commons Compress.
- * @since 1.10
- */
-package org.apache.commons.compress.exceptions;
diff --git a/src/test/java/org/apache/commons/compress/archivers/sevenz/SevenZFileTest.java b/src/test/java/org/apache/commons/compress/archivers/sevenz/SevenZFileTest.java
index 5af1d86..6fbb3e3 100644
--- a/src/test/java/org/apache/commons/compress/archivers/sevenz/SevenZFileTest.java
+++ b/src/test/java/org/apache/commons/compress/archivers/sevenz/SevenZFileTest.java
@@ -23,7 +23,7 @@
import java.util.Arrays;
import javax.crypto.Cipher;
import org.apache.commons.compress.AbstractTestCase;
-import org.apache.commons.compress.exceptions.PasswordRequiredException;
+import org.apache.commons.compress.PasswordRequiredException;
public class SevenZFileTest extends AbstractTestCase {
private static final String TEST2_CONTENT = "<?xml version = '1.0'?>\r\n<!DOCTYPE"