Moved from Plexus-Util StringUtils to Lang StringUtils. replace, split and join shoul...

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

diff --git a/archiva-cli/pom.xml b/archiva-cli/pom.xml
index c54d07d443ce1fa8f2928feaf707d3fb8993c745..7d7a408d25cf8ad2c67566fe1555d91a1d0d4b8c 100644 (file)
--- a/archiva-cli/pom.xml
+++ b/archiva-cli/pom.xml
@@ -20,6 +20,10 @@
       <artifactId>plexus-cli</artifactId>
       <version>1.0-SNAPSHOT</version>
     </dependency>
+    <dependency>
+      <groupId>commons-lang</groupId>
+      <artifactId>commons-lang</artifactId>
+    </dependency>
   </dependencies>
   <build>
     <plugins>

diff --git a/archiva-cli/src/main/java/org/apache/maven/archiva/cli/ArchivaCli.java b/archiva-cli/src/main/java/org/apache/maven/archiva/cli/ArchivaCli.java
index 009e1878c7821e52642abf3f8c359e01118b8764..270658ed0442601f2b5cd3048cfc381e6f00deeb 100644 (file)
--- a/archiva-cli/src/main/java/org/apache/maven/archiva/cli/ArchivaCli.java
+++ b/archiva-cli/src/main/java/org/apache/maven/archiva/cli/ArchivaCli.java
@@ -8,7 +8,7 @@ import org.apache.maven.archiva.converter.RepositoryConversionException;
 import org.apache.maven.archiva.discoverer.DiscovererException;
 import org.codehaus.plexus.PlexusContainer;
 import org.codehaus.plexus.tools.cli.AbstractCli;
-import org.codehaus.plexus.util.StringUtils;
+import org.apache.commons.lang.StringUtils;
 
 import java.io.File;
 import java.io.FileInputStream;

diff --git a/archiva-configuration/pom.xml b/archiva-configuration/pom.xml
index 7725fa2eca2436e58ef3f663811fbbdbce9747f8..efa11bdffdef2e034f6c6cda7564e373d423789f 100644 (file)
--- a/archiva-configuration/pom.xml
+++ b/archiva-configuration/pom.xml
@@ -40,6 +40,10 @@
       <version>1.2_Java1.3</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>commons-lang</groupId>
+      <artifactId>commons-lang</artifactId>
+    </dependency>
   </dependencies>
   <build>
     <plugins>

diff --git a/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/DefaultConfigurationStore.java b/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/DefaultConfigurationStore.java
index 759e635e8f89717fcd08af0659177c7604718341..c185a4626c052355454853634bdeacdf810880d6 100644 (file)
--- a/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/DefaultConfigurationStore.java
+++ b/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/DefaultConfigurationStore.java
@@ -20,7 +20,7 @@ import org.apache.maven.archiva.configuration.io.xpp3.ConfigurationXpp3Reader;
 import org.apache.maven.archiva.configuration.io.xpp3.ConfigurationXpp3Writer;
 import org.codehaus.plexus.logging.AbstractLogEnabled;
 import org.codehaus.plexus.util.IOUtil;
-import org.codehaus.plexus.util.StringUtils;
+import org.apache.commons.lang.StringUtils;
 import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
 
 import java.io.File;

diff --git a/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/MavenProxyPropertyLoader.java b/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/MavenProxyPropertyLoader.java
index c8dfd29938114a996cd556a50d889aa6f9d95716..98f9ce7a012aeb2fe96431c553277d0ca5a40f7d 100644 (file)
--- a/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/MavenProxyPropertyLoader.java
+++ b/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/MavenProxyPropertyLoader.java
@@ -16,7 +16,7 @@ package org.apache.maven.archiva.configuration;
  * limitations under the License.
  */
 
-import org.codehaus.plexus.util.StringUtils;
+import org.apache.commons.lang.StringUtils;
 
 import java.io.IOException;
 import java.io.InputStream;

diff --git a/archiva-core/pom.xml b/archiva-core/pom.xml
index ef36c6fd06eca02a063f5a181da2228fb54b923f..59c3ee0f459a0854978e37682e6d77a8f2d26c21 100644 (file)
--- a/archiva-core/pom.xml
+++ b/archiva-core/pom.xml
@@ -56,6 +56,10 @@
       <artifactId>plexus-taskqueue</artifactId>
       <version>1.0-alpha-4-SNAPSHOT</version>
     </dependency>
+    <dependency>
+      <groupId>commons-lang</groupId>
+      <artifactId>commons-lang</artifactId>
+    </dependency>
   </dependencies>
   <build>
     <plugins>

diff --git a/archiva-core/src/main/java/org/apache/maven/archiva/configuration/DefaultConfiguredRepositoryFactory.java b/archiva-core/src/main/java/org/apache/maven/archiva/configuration/DefaultConfiguredRepositoryFactory.java
index df1946ccb6a0ecf7c8c84ca5d5c400aa39b69cfa..51ba2d703f6db7e7c050213996e7bdc7313bcac4 100644 (file)
--- a/archiva-core/src/main/java/org/apache/maven/archiva/configuration/DefaultConfiguredRepositoryFactory.java
+++ b/archiva-core/src/main/java/org/apache/maven/archiva/configuration/DefaultConfiguredRepositoryFactory.java
@@ -21,7 +21,7 @@ import org.apache.maven.artifact.repository.ArtifactRepository;
 import org.apache.maven.artifact.repository.ArtifactRepositoryFactory;
 import org.apache.maven.artifact.repository.ArtifactRepositoryPolicy;
 import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout;
-import org.codehaus.plexus.util.StringUtils;
+import org.apache.commons.lang.StringUtils;
 
 import java.io.File;
 import java.util.ArrayList;

diff --git a/archiva-core/src/main/java/org/apache/maven/archiva/proxy/DefaultProxyManager.java b/archiva-core/src/main/java/org/apache/maven/archiva/proxy/DefaultProxyManager.java
index cf3c04c6ac090c979b14e75000be226d78dbb07b..cee8a56f5e0ae1aae11958fbd8948262ff2e4702 100644 (file)
--- a/archiva-core/src/main/java/org/apache/maven/archiva/proxy/DefaultProxyManager.java
+++ b/archiva-core/src/main/java/org/apache/maven/archiva/proxy/DefaultProxyManager.java
@@ -30,7 +30,7 @@ import org.apache.maven.artifact.repository.ArtifactRepository;
 import org.apache.maven.wagon.ResourceDoesNotExistException;
 import org.apache.maven.wagon.proxy.ProxyInfo;
 import org.codehaus.plexus.logging.AbstractLogEnabled;
-import org.codehaus.plexus.util.StringUtils;
+import org.apache.commons.lang.StringUtils;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -230,7 +230,7 @@ public class DefaultProxyManager
     private static ProxyInfo createWagonProxy( Proxy proxy )
     {
         ProxyInfo proxyInfo = null;
-        if ( proxy != null && !StringUtils.isEmpty( proxy.getHost() ) )
+        if ( proxy != null && StringUtils.isNotEmpty( proxy.getHost() ) )
         {
             proxyInfo = new ProxyInfo();
             proxyInfo.setHost( proxy.getHost() );

diff --git a/archiva-discoverer/pom.xml b/archiva-discoverer/pom.xml
index 15eca39ce245a316a92cc413621ea7d07ee15b39..15e6837f19357db5f474ec80681c3d987923af6c 100755 (executable)
--- a/archiva-discoverer/pom.xml
+++ b/archiva-discoverer/pom.xml
@@ -50,5 +50,9 @@
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-model</artifactId>
     </dependency>
+    <dependency>
+      <groupId>commons-lang</groupId>
+      <artifactId>commons-lang</artifactId>
+    </dependency>
   </dependencies>
 </project>

diff --git a/archiva-discoverer/src/main/java/org/apache/maven/archiva/discoverer/DefaultArtifactDiscoverer.java b/archiva-discoverer/src/main/java/org/apache/maven/archiva/discoverer/DefaultArtifactDiscoverer.java
index 86dbc9f620b103cdca198ec5952b4def8b87d8e5..204d900feec454106869a825147263f7f1ad00e6 100644 (file)
--- a/archiva-discoverer/src/main/java/org/apache/maven/archiva/discoverer/DefaultArtifactDiscoverer.java
+++ b/archiva-discoverer/src/main/java/org/apache/maven/archiva/discoverer/DefaultArtifactDiscoverer.java
@@ -17,7 +17,7 @@ package org.apache.maven.archiva.discoverer;
  */
 
 import org.apache.maven.artifact.Artifact;
-import org.codehaus.plexus.util.StringUtils;
+import org.apache.commons.lang.StringUtils;
 
 import java.util.ArrayList;
 import java.util.Collections;

diff --git a/archiva-discoverer/src/main/java/org/apache/maven/archiva/discoverer/DefaultMetadataDiscoverer.java b/archiva-discoverer/src/main/java/org/apache/maven/archiva/discoverer/DefaultMetadataDiscoverer.java
index 87a0bea2788bea43a4e94e32f4a7c1a4bad5c217..5b6db703a1c1052b72869443a3018b0870a11c87 100644 (file)
--- a/archiva-discoverer/src/main/java/org/apache/maven/archiva/discoverer/DefaultMetadataDiscoverer.java
+++ b/archiva-discoverer/src/main/java/org/apache/maven/archiva/discoverer/DefaultMetadataDiscoverer.java
@@ -26,7 +26,7 @@ import org.apache.maven.artifact.repository.metadata.Metadata;
 import org.apache.maven.artifact.repository.metadata.RepositoryMetadata;
 import org.apache.maven.artifact.repository.metadata.SnapshotArtifactRepositoryMetadata;
 import org.apache.maven.artifact.repository.metadata.io.xpp3.MetadataXpp3Reader;
-import org.codehaus.plexus.util.StringUtils;
+import org.apache.commons.lang.StringUtils;
 import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
 
 import java.io.File;
@@ -162,7 +162,7 @@ public class DefaultMetadataDiscoverer
         String tmpDir = (String) it.next();
 
         Artifact artifact = null;
-        if ( !StringUtils.isEmpty( metaVersion ) )
+        if ( StringUtils.isNotEmpty( metaVersion ) )
         {
             artifact = artifactFactory.createProjectArtifact( metaGroupId, metaArtifactId, metaVersion );
         }

diff --git a/archiva-indexer/pom.xml b/archiva-indexer/pom.xml
index 718397e9992d4187ae5f682ded070d0a35351c7f..7221fc7f73370a752164950d39cd9f693c55531e 100644 (file)
--- a/archiva-indexer/pom.xml
+++ b/archiva-indexer/pom.xml
@@ -63,6 +63,10 @@
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-repository-metadata</artifactId>
     </dependency>
+    <dependency>
+      <groupId>commons-lang</groupId>
+      <artifactId>commons-lang</artifactId>
+    </dependency>
   </dependencies>
   <build>
     <plugins>

diff --git a/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/lucene/LuceneMinimalIndexRecordConverter.java b/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/lucene/LuceneMinimalIndexRecordConverter.java
index 0e29e2ca389aebc9f44a279ddd543368981ac6c2..ffcc69b90e2c1a471cfc98551199797a45a7bc53 100644 (file)
--- a/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/lucene/LuceneMinimalIndexRecordConverter.java
+++ b/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/lucene/LuceneMinimalIndexRecordConverter.java
@@ -23,7 +23,7 @@ import org.apache.lucene.document.NumberTools;
 import org.apache.maven.archiva.indexer.record.MinimalArtifactIndexRecord;
 import org.apache.maven.archiva.indexer.record.MinimalIndexRecordFields;
 import org.apache.maven.archiva.indexer.record.RepositoryIndexRecord;
-import org.codehaus.plexus.util.StringUtils;
+import org.apache.commons.lang.StringUtils;
 
 import java.text.ParseException;
 import java.util.Arrays;

diff --git a/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/lucene/LuceneStandardIndexRecordConverter.java b/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/lucene/LuceneStandardIndexRecordConverter.java
index f97275c983b5a3b1c73445cb15f810034bb8a3e4..6189ee56fe7f5fc633d7b443de2339a0643a6f63 100644 (file)
--- a/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/lucene/LuceneStandardIndexRecordConverter.java
+++ b/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/lucene/LuceneStandardIndexRecordConverter.java
@@ -23,7 +23,7 @@ import org.apache.lucene.document.NumberTools;
 import org.apache.maven.archiva.indexer.record.RepositoryIndexRecord;
 import org.apache.maven.archiva.indexer.record.StandardArtifactIndexRecord;
 import org.apache.maven.archiva.indexer.record.StandardIndexRecordFields;
-import org.codehaus.plexus.util.StringUtils;
+import org.apache.commons.lang.StringUtils;
 
 import java.text.ParseException;
 import java.util.Arrays;

diff --git a/archiva-reports-standard/pom.xml b/archiva-reports-standard/pom.xml
index 74c1c1c7350e446eb0c9725d7c367a2d4da977bf..ba86342df5b46c122c919ca8cff268a48f3cd8e6 100755 (executable)
--- a/archiva-reports-standard/pom.xml
+++ b/archiva-reports-standard/pom.xml
@@ -66,6 +66,10 @@
       <groupId>org.apache.maven.archiva</groupId>
       <artifactId>archiva-discoverer</artifactId>
     </dependency>
+    <dependency>
+      <groupId>commons-lang</groupId>
+      <artifactId>commons-lang</artifactId>
+    </dependency>
   </dependencies>
   <build>
     <plugins>

diff --git a/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/BadMetadataReportProcessor.java b/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/BadMetadataReportProcessor.java
index d493158b8cafc953e51d1db9844759d00cd2f753..dfc5190cf0d4ec00b054f4f0904857e221570d0d 100644 (file)
--- a/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/BadMetadataReportProcessor.java
+++ b/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/BadMetadataReportProcessor.java
@@ -26,7 +26,7 @@ import org.apache.maven.artifact.repository.metadata.RepositoryMetadata;
 import org.apache.maven.artifact.repository.metadata.Snapshot;
 import org.apache.maven.artifact.repository.metadata.Versioning;
 import org.codehaus.plexus.util.FileUtils;
-import org.codehaus.plexus.util.StringUtils;
+import org.apache.commons.lang.StringUtils;
 
 import java.io.File;
 import java.io.IOException;

diff --git a/archiva-webapp/pom.xml b/archiva-webapp/pom.xml
index 087373fadce04169fedd55f251eb893493b689e9..5f5c566951618d4a603f044a953eb908d4e4c2a9 100644 (file)
--- a/archiva-webapp/pom.xml
+++ b/archiva-webapp/pom.xml
@@ -219,6 +219,10 @@
       <artifactId>webdav</artifactId>
       <version>0.4</version>
     </dependency>
+    <dependency>
+      <groupId>commons-lang</groupId>
+      <artifactId>commons-lang</artifactId>
+    </dependency>
   </dependencies>
   <build>
     <plugins>

diff --git a/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/BrowseAction.java b/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/BrowseAction.java
index 189407c6d4aefdbf31e89d66c85bd46779849b6d..2d982b790f1ec88e9b21c86321cb743f77d0f47f 100644 (file)
--- a/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/BrowseAction.java
+++ b/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/BrowseAction.java
@@ -24,7 +24,7 @@ import org.apache.maven.archiva.indexer.RepositoryArtifactIndex;
 import org.apache.maven.archiva.indexer.RepositoryArtifactIndexFactory;
 import org.apache.maven.archiva.indexer.RepositoryIndexException;
 import org.apache.maven.archiva.indexer.RepositoryIndexSearchException;
-import org.codehaus.plexus.util.StringUtils;
+import org.apache.commons.lang.StringUtils;
 import org.codehaus.plexus.xwork.action.PlexusActionSupport;
 
 import java.io.File;

diff --git a/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/ShowArtifactAction.java b/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/ShowArtifactAction.java
index 2913056ecc29bea0f050c9f76feec2eb347fce94..42adbb776b1ec4e690a005f2242a40e37bd4a335 100644 (file)
--- a/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/ShowArtifactAction.java
+++ b/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/ShowArtifactAction.java
@@ -46,7 +46,7 @@ import org.apache.maven.shared.dependency.tree.DependencyNode;
 import org.apache.maven.shared.dependency.tree.DependencyTree;
 import org.apache.maven.shared.dependency.tree.DependencyTreeBuilder;
 import org.apache.maven.shared.dependency.tree.DependencyTreeBuilderException;
-import org.codehaus.plexus.util.StringUtils;
+import org.apache.commons.lang.StringUtils;
 import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
 import org.codehaus.plexus.xwork.action.PlexusActionSupport;
 

diff --git a/archiva-webapp/src/main/java/org/apache/maven/archiva/web/servlet/repository/RepositoryAccess.java b/archiva-webapp/src/main/java/org/apache/maven/archiva/web/servlet/repository/RepositoryAccess.java
index b2f564b5f4a5380be937a97eadcd189f3f5944b5..9bf770c76aa62345736b2039d39964d37474031f 100644 (file)
--- a/archiva-webapp/src/main/java/org/apache/maven/archiva/web/servlet/repository/RepositoryAccess.java
+++ b/archiva-webapp/src/main/java/org/apache/maven/archiva/web/servlet/repository/RepositoryAccess.java
@@ -34,7 +34,7 @@ import org.codehaus.plexus.security.system.SecuritySession;
 import org.codehaus.plexus.security.system.SecuritySystem;
 import org.codehaus.plexus.security.ui.web.filter.authentication.HttpAuthenticator;
 import org.codehaus.plexus.util.FileUtils;
-import org.codehaus.plexus.util.StringUtils;
+import org.apache.commons.lang.StringUtils;
 
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;

diff --git a/pom.xml b/pom.xml
index c2e0f22c29ffa41f569c3bd01d3d9d2108cb5222..6025dcb2649f4f34abafae789f0d11459ddf100e 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -341,6 +341,11 @@
         <artifactId>plexus-security-keys-jdo</artifactId>
         <version>${plexus-security.version}</version>
       </dependency>
+      <dependency>
+        <groupId>commons-lang</groupId>
+        <artifactId>commons-lang</artifactId>
+        <version>2.2</version>
+      </dependency>
     </dependencies>
   </dependencyManagement>
   <reporting>