You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2023/06/06 00:59:14 UTC
[commons-fileupload] 04/08: Rename package
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-fileupload.git
commit f84da16635405d81bbd2514b191aca6ea5e556c0
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Mon Jun 5 20:47:46 2023 -0400
Rename package
---
.../commons/fileupload2/ParameterParser.java | 4 ++--
.../fileupload2/{util => }/mime/MimeUtility.java | 2 +-
.../{util => }/mime/ParseException.java | 2 +-
.../{util => }/mime/QuotedPrintableDecoder.java | 2 +-
.../{util => }/mime/RFC2231Utility.java | 2 +-
.../fileupload2/{util => }/mime/package-info.java | 2 +-
.../commons/fileupload2/util/package-info.java | 22 ----------------------
.../{util => }/mime/MimeUtilityTestCase.java | 3 ++-
.../mime/QuotedPrintableDecoderTestCase.java | 3 ++-
.../{util => }/mime/RFC2231UtilityTestCase.java | 3 ++-
10 files changed, 13 insertions(+), 32 deletions(-)
diff --git a/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/ParameterParser.java b/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/ParameterParser.java
index 9a266b1..e1a80ca 100644
--- a/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/ParameterParser.java
+++ b/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/ParameterParser.java
@@ -21,8 +21,8 @@ import java.util.HashMap;
import java.util.Locale;
import java.util.Map;
-import org.apache.commons.fileupload2.util.mime.MimeUtility;
-import org.apache.commons.fileupload2.util.mime.RFC2231Utility;
+import org.apache.commons.fileupload2.mime.MimeUtility;
+import org.apache.commons.fileupload2.mime.RFC2231Utility;
/**
* A simple parser intended to parse sequences of name/value pairs.
diff --git a/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/util/mime/MimeUtility.java b/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/mime/MimeUtility.java
similarity index 99%
rename from commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/util/mime/MimeUtility.java
rename to commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/mime/MimeUtility.java
index 18fd9d8..2d7c3ab 100644
--- a/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/util/mime/MimeUtility.java
+++ b/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/mime/MimeUtility.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.fileupload2.util.mime;
+package org.apache.commons.fileupload2.mime;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
diff --git a/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/util/mime/ParseException.java b/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/mime/ParseException.java
similarity index 95%
rename from commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/util/mime/ParseException.java
rename to commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/mime/ParseException.java
index 6ea1efc..d8e3aa1 100644
--- a/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/util/mime/ParseException.java
+++ b/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/mime/ParseException.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.fileupload2.util.mime;
+package org.apache.commons.fileupload2.mime;
/**
*/
diff --git a/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/util/mime/QuotedPrintableDecoder.java b/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/mime/QuotedPrintableDecoder.java
similarity index 98%
rename from commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/util/mime/QuotedPrintableDecoder.java
rename to commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/mime/QuotedPrintableDecoder.java
index 9ca256f..2335fe5 100644
--- a/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/util/mime/QuotedPrintableDecoder.java
+++ b/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/mime/QuotedPrintableDecoder.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.fileupload2.util.mime;
+package org.apache.commons.fileupload2.mime;
import java.io.IOException;
import java.io.OutputStream;
diff --git a/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/util/mime/RFC2231Utility.java b/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/mime/RFC2231Utility.java
similarity index 99%
rename from commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/util/mime/RFC2231Utility.java
rename to commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/mime/RFC2231Utility.java
index e94d007..9289fba 100644
--- a/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/util/mime/RFC2231Utility.java
+++ b/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/mime/RFC2231Utility.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.fileupload2.util.mime;
+package org.apache.commons.fileupload2.mime;
import java.io.ByteArrayOutputStream;
import java.io.UnsupportedEncodingException;
diff --git a/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/util/mime/package-info.java b/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/mime/package-info.java
similarity index 95%
rename from commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/util/mime/package-info.java
rename to commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/mime/package-info.java
index 8fffd8e..ca9c417 100644
--- a/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/util/mime/package-info.java
+++ b/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/mime/package-info.java
@@ -19,4 +19,4 @@
* MIME decoder implementation, imported and retailed from <a href="http://svn.apache.org/repos/asf/geronimo/specs/tags/geronimo-javamail_1.4_spec-1.4/">Apache
* Geronimo</a>.
*/
-package org.apache.commons.fileupload2.util.mime;
+package org.apache.commons.fileupload2.mime;
diff --git a/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/util/package-info.java b/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/util/package-info.java
deleted file mode 100644
index b988928..0000000
--- a/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/util/package-info.java
+++ /dev/null
@@ -1,22 +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.
- */
-
-/**
- * This package contains various IO related utility classes or methods, which are basically reusable and not necessarily restricted to the scope of a file
- * upload.
- */
-package org.apache.commons.fileupload2.util;
diff --git a/commons-fileupload2-core/src/test/java/org/apache/commons/fileupload2/util/mime/MimeUtilityTestCase.java b/commons-fileupload2-core/src/test/java/org/apache/commons/fileupload2/mime/MimeUtilityTestCase.java
similarity index 96%
rename from commons-fileupload2-core/src/test/java/org/apache/commons/fileupload2/util/mime/MimeUtilityTestCase.java
rename to commons-fileupload2-core/src/test/java/org/apache/commons/fileupload2/mime/MimeUtilityTestCase.java
index b20ca36..d23bda0 100644
--- a/commons-fileupload2-core/src/test/java/org/apache/commons/fileupload2/util/mime/MimeUtilityTestCase.java
+++ b/commons-fileupload2-core/src/test/java/org/apache/commons/fileupload2/mime/MimeUtilityTestCase.java
@@ -14,13 +14,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.fileupload2.util.mime;
+package org.apache.commons.fileupload2.mime;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertThrows;
import java.io.UnsupportedEncodingException;
+import org.apache.commons.fileupload2.mime.MimeUtility;
import org.junit.jupiter.api.Test;
/**
diff --git a/commons-fileupload2-core/src/test/java/org/apache/commons/fileupload2/util/mime/QuotedPrintableDecoderTestCase.java b/commons-fileupload2-core/src/test/java/org/apache/commons/fileupload2/mime/QuotedPrintableDecoderTestCase.java
similarity index 97%
rename from commons-fileupload2-core/src/test/java/org/apache/commons/fileupload2/util/mime/QuotedPrintableDecoderTestCase.java
rename to commons-fileupload2-core/src/test/java/org/apache/commons/fileupload2/mime/QuotedPrintableDecoderTestCase.java
index 7ff7014..2c1ac33 100644
--- a/commons-fileupload2-core/src/test/java/org/apache/commons/fileupload2/util/mime/QuotedPrintableDecoderTestCase.java
+++ b/commons-fileupload2-core/src/test/java/org/apache/commons/fileupload2/mime/QuotedPrintableDecoderTestCase.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.fileupload2.util.mime;
+package org.apache.commons.fileupload2.mime;
import static org.junit.jupiter.api.Assertions.assertArrayEquals;
import static org.junit.jupiter.api.Assertions.assertThrows;
@@ -25,6 +25,7 @@ import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.nio.charset.StandardCharsets;
+import org.apache.commons.fileupload2.mime.QuotedPrintableDecoder;
import org.junit.jupiter.api.Test;
/**
diff --git a/commons-fileupload2-core/src/test/java/org/apache/commons/fileupload2/util/mime/RFC2231UtilityTestCase.java b/commons-fileupload2-core/src/test/java/org/apache/commons/fileupload2/mime/RFC2231UtilityTestCase.java
similarity index 97%
rename from commons-fileupload2-core/src/test/java/org/apache/commons/fileupload2/util/mime/RFC2231UtilityTestCase.java
rename to commons-fileupload2-core/src/test/java/org/apache/commons/fileupload2/mime/RFC2231UtilityTestCase.java
index bc999cc..5933ab1 100644
--- a/commons-fileupload2-core/src/test/java/org/apache/commons/fileupload2/util/mime/RFC2231UtilityTestCase.java
+++ b/commons-fileupload2-core/src/test/java/org/apache/commons/fileupload2/mime/RFC2231UtilityTestCase.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.fileupload2.util.mime;
+package org.apache.commons.fileupload2.mime;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
@@ -23,6 +23,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
import java.io.UnsupportedEncodingException;
+import org.apache.commons.fileupload2.mime.RFC2231Utility;
import org.junit.jupiter.api.Test;
/**