[MRM-709] Use commons-io instead of Plexus Utils

* Some more IOUtil and FileUtil conversions.

git-svn-id: https://svn.apache.org/repos/asf/maven/archiva/trunk@636996 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/archiva-base/archiva-transaction/src/main/java/org/apache/maven/archiva/transaction/CopyFileEvent.java b/archiva-base/archiva-transaction/src/main/java/org/apache/maven/archiva/transaction/CopyFileEvent.java
index 52b72f0ed486488a38a553420e65104c27c4c852..6261e8d8d575b8f59b61f16f10220bcf8b3c74d6 100644 (file)
--- a/archiva-base/archiva-transaction/src/main/java/org/apache/maven/archiva/transaction/CopyFileEvent.java
+++ b/archiva-base/archiva-transaction/src/main/java/org/apache/maven/archiva/transaction/CopyFileEvent.java
@@ -19,8 +19,8 @@ package org.apache.maven.archiva.transaction;
  * under the License.
  */
 
+import org.apache.commons.io.FileUtils;
 import org.codehaus.plexus.digest.Digester;
-import org.codehaus.plexus.util.FileUtils;
 
 import java.io.File;
 import java.io.IOException;

diff --git a/archiva-base/archiva-transaction/src/test/java/org/apache/maven/archiva/transaction/CopyFileEventTest.java b/archiva-base/archiva-transaction/src/test/java/org/apache/maven/archiva/transaction/CopyFileEventTest.java
index ac30a3514659f4ebfa0d410c673cf116664fb2a4..847c85178d61e2b58d96bed51fb408a602f18e53 100644 (file)
--- a/archiva-base/archiva-transaction/src/test/java/org/apache/maven/archiva/transaction/CopyFileEventTest.java
+++ b/archiva-base/archiva-transaction/src/test/java/org/apache/maven/archiva/transaction/CopyFileEventTest.java
@@ -19,9 +19,8 @@ package org.apache.maven.archiva.transaction;
  * under the License.
  */
 
-import org.apache.maven.archiva.transaction.CopyFileEvent;
+import org.apache.commons.io.FileUtils;
 import org.codehaus.plexus.PlexusTestCase;
-import org.codehaus.plexus.util.FileUtils;
 
 import java.io.File;
 import java.io.IOException;

diff --git a/archiva-base/archiva-transaction/src/test/java/org/apache/maven/archiva/transaction/CreateFileEventTest.java b/archiva-base/archiva-transaction/src/test/java/org/apache/maven/archiva/transaction/CreateFileEventTest.java
index 14a1df4cb8e26b759ba00121b916f8ce6fd5871b..f5dcf0a1c2a7f1906cd9c9d4177cddd7dcbb5cd3 100644 (file)
--- a/archiva-base/archiva-transaction/src/test/java/org/apache/maven/archiva/transaction/CreateFileEventTest.java
+++ b/archiva-base/archiva-transaction/src/test/java/org/apache/maven/archiva/transaction/CreateFileEventTest.java
@@ -21,9 +21,8 @@ package org.apache.maven.archiva.transaction;
 
 import java.io.File;
 
-import org.apache.maven.archiva.transaction.CreateFileEvent;
+import org.apache.commons.io.FileUtils;
 import org.codehaus.plexus.PlexusTestCase;
-import org.codehaus.plexus.util.FileUtils;
 
 /**
  * @author Edwin Punzalan

diff --git a/archiva-reporting/archiva-metadata-reports/src/main/java/org/apache/maven/archiva/reporting/metadata/MetadataValidateConsumer.java b/archiva-reporting/archiva-metadata-reports/src/main/java/org/apache/maven/archiva/reporting/metadata/MetadataValidateConsumer.java
index c9559025bf095a9f7fea6cb226fd2d5b1e34041f..578e0460394707ad2a6973e801c7c012ff78fd40 100644 (file)
--- a/archiva-reporting/archiva-metadata-reports/src/main/java/org/apache/maven/archiva/reporting/metadata/MetadataValidateConsumer.java
+++ b/archiva-reporting/archiva-metadata-reports/src/main/java/org/apache/maven/archiva/reporting/metadata/MetadataValidateConsumer.java
@@ -1,17 +1,24 @@
 package org.apache.maven.archiva.reporting.metadata;
 
-import org.apache.commons.lang.StringUtils;
-import org.codehaus.plexus.util.FileUtils;
+/*
+ * 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.
+ */
 
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
 
 /**
  * MetadataValidateConsumer 

diff --git a/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/repository/PolicingServletRequest.java b/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/repository/PolicingServletRequest.java
index 0076988ae1ed0d7e5cea1971260b3166468e7a0a..085b3dcdde50f253c452ac63e0bc849bcbfb3d51 100644 (file)
--- a/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/repository/PolicingServletRequest.java
+++ b/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/repository/PolicingServletRequest.java
@@ -19,8 +19,9 @@ package org.apache.maven.archiva.web.repository;
  * under the License.
  */
 
+import org.apache.commons.io.FilenameUtils;
 import org.apache.commons.lang.StringUtils;
-import org.codehaus.plexus.util.FileUtils;
+import org.apache.commons.lang.SystemUtils;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletRequestWrapper;
@@ -50,7 +51,12 @@ public class PolicingServletRequest
             /* Perform a simple security normalization of the requested pathinfo.
              * This is to cleanup requests that use "/../" or "///" type hacks.
              */
-            fixedPathInfo = FileUtils.normalize( fixedPathInfo );
+            fixedPathInfo = FilenameUtils.normalize( fixedPathInfo );
+            if ( SystemUtils.IS_OS_WINDOWS )
+            {
+                // Adjust paths back to unix & url format expectations (when on windows)
+                fixedPathInfo = FilenameUtils.separatorsToUnix( fixedPathInfo );
+            }
         }
     }