Apache
/
archiva
mirror of https://github.com/apache/archiva.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[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
This commit is contained in:
Joakim Erdfelt 2008-03-14 05:34:09 +00:00
parent 1e7c8f6da4
commit fb46349482
5 changed files with 29 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
archiva-base/archiva-transaction/src/main/java/org/apache/maven/archiva/transaction/CopyFileEvent.java
View File

@ -19,8 +19,8 @@ package org.apache.maven.archiva.transaction;
* under the License. * under the License.
*/ */
import org.apache.commons.io.FileUtils;
import org.codehaus.plexus.digest.Digester; import org.codehaus.plexus.digest.Digester;
import org.codehaus.plexus.util.FileUtils;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;

3
archiva-base/archiva-transaction/src/test/java/org/apache/maven/archiva/transaction/CopyFileEventTest.java
View File

@ -19,9 +19,8 @@ package org.apache.maven.archiva.transaction;
* under the License. * 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.PlexusTestCase;
import org.codehaus.plexus.util.FileUtils;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;

3
archiva-base/archiva-transaction/src/test/java/org/apache/maven/archiva/transaction/CreateFileEventTest.java
View File

@ -21,9 +21,8 @@ package org.apache.maven.archiva.transaction;
import java.io.File; 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.PlexusTestCase;
import org.codehaus.plexus.util.FileUtils;
/** /**
* @author Edwin Punzalan * @author Edwin Punzalan

29
archiva-reporting/archiva-metadata-reports/src/main/java/org/apache/maven/archiva/reporting/metadata/MetadataValidateConsumer.java
View File

@ -1,17 +1,24 @@
package org.apache.maven.archiva.reporting.metadata; 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 * MetadataValidateConsumer

10
archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/repository/PolicingServletRequest.java
View File

@ -19,8 +19,9 @@ package org.apache.maven.archiva.web.repository;
* under the License. * under the License.
*/ */
import org.apache.commons.io.FilenameUtils;
import org.apache.commons.lang.StringUtils; 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.HttpServletRequest;
import javax.servlet.http.HttpServletRequestWrapper; import javax.servlet.http.HttpServletRequestWrapper;
@ -50,7 +51,12 @@ public class PolicingServletRequest
/* Perform a simple security normalization of the requested pathinfo. /* Perform a simple security normalization of the requested pathinfo.
* This is to cleanup requests that use "/../" or "///" type hacks. * 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 );
}
} }
} }