Author: joakime
Date: Thu Mar 13 22:34:09 2008
New Revision: 636996
URL: http://svn.apache.org/viewvc?rev=636996&view=rev
Log:
[MRM-709] Use commons-io instead of Plexus Utils
* Some more IOUtil and FileUtil conversions.
Modified:
maven/archiva/trunk/archiva-base/archiva-transaction/src/main/java/org/apache/maven/archiva/transaction/CopyFileEvent.java
maven/archiva/trunk/archiva-base/archiva-transaction/src/test/java/org/apache/maven/archiva/transaction/CopyFileEventTest.java
maven/archiva/trunk/archiva-base/archiva-transaction/src/test/java/org/apache/maven/archiva/transaction/CreateFileEventTest.java
maven/archiva/trunk/archiva-reporting/archiva-metadata-reports/src/main/java/org/apache/maven/archiva/reporting/metadata/MetadataValidateConsumer.java
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/repository/PolicingServletRequest.java
Modified:
maven/archiva/trunk/archiva-base/archiva-transaction/src/main/java/org/apache/maven/archiva/transaction/CopyFileEvent.java
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-transaction/src/main/java/org/apache/maven/archiva/transaction/CopyFileEvent.java?rev=636996&r1=636995&r2=636996&view=diff
==============================================================================
---
maven/archiva/trunk/archiva-base/archiva-transaction/src/main/java/org/apache/maven/archiva/transaction/CopyFileEvent.java
(original)
+++
maven/archiva/trunk/archiva-base/archiva-transaction/src/main/java/org/apache/maven/archiva/transaction/CopyFileEvent.java
Thu Mar 13 22:34:09 2008
@@ -19,8 +19,8 @@
* 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;
Modified:
maven/archiva/trunk/archiva-base/archiva-transaction/src/test/java/org/apache/maven/archiva/transaction/CopyFileEventTest.java
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-transaction/src/test/java/org/apache/maven/archiva/transaction/CopyFileEventTest.java?rev=636996&r1=636995&r2=636996&view=diff
==============================================================================
---
maven/archiva/trunk/archiva-base/archiva-transaction/src/test/java/org/apache/maven/archiva/transaction/CopyFileEventTest.java
(original)
+++
maven/archiva/trunk/archiva-base/archiva-transaction/src/test/java/org/apache/maven/archiva/transaction/CopyFileEventTest.java
Thu Mar 13 22:34:09 2008
@@ -19,9 +19,8 @@
* 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;
Modified:
maven/archiva/trunk/archiva-base/archiva-transaction/src/test/java/org/apache/maven/archiva/transaction/CreateFileEventTest.java
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-transaction/src/test/java/org/apache/maven/archiva/transaction/CreateFileEventTest.java?rev=636996&r1=636995&r2=636996&view=diff
==============================================================================
---
maven/archiva/trunk/archiva-base/archiva-transaction/src/test/java/org/apache/maven/archiva/transaction/CreateFileEventTest.java
(original)
+++
maven/archiva/trunk/archiva-base/archiva-transaction/src/test/java/org/apache/maven/archiva/transaction/CreateFileEventTest.java
Thu Mar 13 22:34:09 2008
@@ -21,9 +21,8 @@
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
Modified:
maven/archiva/trunk/archiva-reporting/archiva-metadata-reports/src/main/java/org/apache/maven/archiva/reporting/metadata/MetadataValidateConsumer.java
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-reporting/archiva-metadata-reports/src/main/java/org/apache/maven/archiva/reporting/metadata/MetadataValidateConsumer.java?rev=636996&r1=636995&r2=636996&view=diff
==============================================================================
---
maven/archiva/trunk/archiva-reporting/archiva-metadata-reports/src/main/java/org/apache/maven/archiva/reporting/metadata/MetadataValidateConsumer.java
(original)
+++
maven/archiva/trunk/archiva-reporting/archiva-metadata-reports/src/main/java/org/apache/maven/archiva/reporting/metadata/MetadataValidateConsumer.java
Thu Mar 13 22:34:09 2008
@@ -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
Modified:
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/repository/PolicingServletRequest.java
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/repository/PolicingServletRequest.java?rev=636996&r1=636995&r2=636996&view=diff
==============================================================================
---
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/repository/PolicingServletRequest.java
(original)
+++
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/repository/PolicingServletRequest.java
Thu Mar 13 22:34:09 2008
@@ -19,8 +19,9 @@
* 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 @@
/* 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
);
+ }
}
}
