From fb46349482ae5249bf1bfce05fec9ab0d32ecebc Mon Sep 17 00:00:00 2001 From: Joakim Erdfelt Date: Fri, 14 Mar 2008 05:34:09 +0000 Subject: [PATCH] [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 --- .../archiva/transaction/CopyFileEvent.java | 2 +- .../transaction/CopyFileEventTest.java | 3 +- .../transaction/CreateFileEventTest.java | 3 +- .../metadata/MetadataValidateConsumer.java | 29 ++++++++++++------- .../repository/PolicingServletRequest.java | 10 +++++-- 5 files changed, 29 insertions(+), 18 deletions(-) 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 52b72f0ed..6261e8d8d 100644 --- 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 ac30a3514..847c85178 100644 --- 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 14a1df4cb..f5dcf0a1c 100644 --- 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 c9559025b..578e04603 100644 --- 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 0076988ae..085b3dcdd 100644 --- 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 ); + } } } -- 2.39.5