Author: olamy
Date: Tue Dec 4 18:16:52 2012
New Revision: 1417080
URL: http://svn.apache.org/viewvc?rev=1417080&view=rev
Log:
remove plexus-utils usage to commons-*
Modified:
archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/HttpUtils.java
archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/checks/security/AdminAutoCreateCheck.java
archiva/redback/redback-core/trunk/redback-system/src/main/java/org/apache/archiva/redback/system/SecuritySystemConstants.java
Modified:
archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/HttpUtils.java
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/HttpUtils.java?rev=1417080&r1=1417079&r2=1417080&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/HttpUtils.java
(original)
+++
archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/HttpUtils.java
Tue Dec 4 18:16:52 2012
@@ -19,16 +19,15 @@ package org.apache.archiva.redback.integ
* under the License.
*/
-import java.util.Properties;
+import org.apache.commons.lang.StringUtils;
-import org.codehaus.plexus.util.StringUtils;
+import java.util.Properties;
/**
* Collection of Utility methods useful in an Http environment.
*
* @author <a href="mailto:[email protected]";>Joakim Erdfelt</a>
*
- * @todo should move this to plexus-utils or plexus-utils-web
*/
public class HttpUtils
{
Modified:
archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/checks/security/AdminAutoCreateCheck.java
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/checks/security/AdminAutoCreateCheck.java?rev=1417080&r1=1417079&r2=1417080&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/checks/security/AdminAutoCreateCheck.java
(original)
+++
archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/checks/security/AdminAutoCreateCheck.java
Tue Dec 4 18:16:52 2012
@@ -31,7 +31,6 @@ import org.apache.archiva.redback.users.
import org.apache.archiva.redback.users.UserManager;
import org.apache.archiva.redback.users.UserNotFoundException;
import org.apache.commons.lang.StringUtils;
-import org.codehaus.plexus.util.IOUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Service;
@@ -128,7 +127,7 @@ public class AdminAutoCreateCheck
}
finally
{
- IOUtil.close( fis );
+ IOUtils.close( fis );
}
// ensure we have all properties
Modified:
archiva/redback/redback-core/trunk/redback-system/src/main/java/org/apache/archiva/redback/system/SecuritySystemConstants.java
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-system/src/main/java/org/apache/archiva/redback/system/SecuritySystemConstants.java?rev=1417080&r1=1417079&r2=1417080&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-system/src/main/java/org/apache/archiva/redback/system/SecuritySystemConstants.java
(original)
+++
archiva/redback/redback-core/trunk/redback-system/src/main/java/org/apache/archiva/redback/system/SecuritySystemConstants.java
Tue Dec 4 18:16:52 2012
@@ -20,7 +20,7 @@ package org.apache.archiva.redback.syste
*/
/**
- * SecuritySystemConstants - constants for use with contexts that use
plexus-security.
+ * SecuritySystemConstants - constants for use with contexts that use redback.
*
* @author <a href="mailto:[email protected]";>Joakim Erdfelt</a>
*
