diff options
| author | Henri Yandell <bayard@apache.org> | 2006-12-01 23:44:12 +0000 |
|---|---|---|
| committer | Henri Yandell <bayard@apache.org> | 2006-12-01 23:44:12 +0000 |
| commit | 8f58ff76643174be2c7db8c87a0c55e576bc5a23 (patch) | |
| tree | f2438a3a80efd309ac799c7adab17a73b620d6a3 /archiva-core | |
| parent | 9edce822a781760f898939e5b6d13e6b14d9a286 (diff) | |
| download | archiva-8f58ff76643174be2c7db8c87a0c55e576bc5a23.tar.gz archiva-8f58ff76643174be2c7db8c87a0c55e576bc5a23.zip | |
Moved from Plexus-Util StringUtils to Lang StringUtils. replace, split and join should just have had performance improvements (probably won't be noticed). isEmpty no longer trims, but usually people don't expect that so that's a semi bugfix. I've also switched a couple of \!isEmpty's to isNotEmpty.
git-svn-id: https://svn.apache.org/repos/asf/maven/archiva/trunk@481446 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'archiva-core')
3 files changed, 7 insertions, 3 deletions
diff --git a/archiva-core/pom.xml b/archiva-core/pom.xml index ef36c6fd0..59c3ee0f4 100644 --- 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 df1946ccb..51ba2d703 100644 --- 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 cf3c04c6a..cee8a56f5 100644 --- 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() ); |