Author: olamy
Date: Tue Dec 4 18:19:03 2012
New Revision: 1417083
URL: http://svn.apache.org/viewvc?rev=1417083&view=rev
Log:
rid of plexus utils usage
Modified:
archiva/redback/redback-core/trunk/redback-configuration/src/main/java/org/apache/archiva/redback/configuration/DefaultUserConfiguration.java
archiva/redback/redback-core/trunk/redback-configuration/src/test/java/org/apache/archiva/redback/configuration/DefaultUserConfigurationTest.java
archiva/redback/redback-core/trunk/redback-data-management/pom.xml
archiva/redback/redback-core/trunk/redback-data-management/src/main/java/org/apache/archiva/redback/management/JdoDataManagementTool.java
archiva/redback/redback-core/trunk/redback-data-management/src/test/java/org/apache/archiva/redback/management/DataManagementTest.java
archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/pom.xml
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-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/filter/authentication/HttpAuthenticator.java
archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/filter/authentication/basic/HttpBasicAuthentication.java
archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/filter/authentication/digest/Digest.java
archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/filter/authentication/digest/Hex.java
archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/filter/authentication/digest/HttpDigestAuthentication.java
archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/filter/authentication/digest/HttpDigestHeader.java
archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/filter/authorization/SimpleAuthorizationFilter.java
archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/mail/MailerImpl.java
archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/model/UserCredentials.java
archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/util/AutoLoginCookies.java
archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/test/java/org/apache/archiva/redback/integration/filter/authentication/digest/HexTest.java
archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-api/src/main/java/org/apache/archiva/redback/rest/api/services/UtilServices.java
archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/DefaultUserService.java
archiva/redback/redback-core/trunk/redback-keys/redback-keys-providers/redback-keys-jdo/src/main/mdo/keys.mdo
archiva/redback/redback-core/trunk/redback-keys/redback-keys-providers/redback-keys-memory/pom.xml
archiva/redback/redback-core/trunk/redback-keys/redback-keys-providers/redback-keys-memory/src/main/java/org/apache/archiva/redback/keys/memory/MemoryKeyManager.java
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-model/pom.xml
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-model/src/main/java/org/apache/archiva/redback/rbac/AbstractRBACManager.java
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-model/src/main/java/org/apache/archiva/redback/rbac/RBACObjectAssertions.java
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-jdo/src/main/java/org/apache/archiva/redback/rbac/jdo/JdoTool.java
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-memory/src/main/java/org/apache/archiva/redback/rbac/memory/MemoryRbacManager.java
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-role-manager/pom.xml
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/DefaultRoleManager.java
Modified:
archiva/redback/redback-core/trunk/redback-configuration/src/main/java/org/apache/archiva/redback/configuration/DefaultUserConfiguration.java
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-configuration/src/main/java/org/apache/archiva/redback/configuration/DefaultUserConfiguration.java?rev=1417083&r1=1417082&r2=1417083&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-configuration/src/main/java/org/apache/archiva/redback/configuration/DefaultUserConfiguration.java
(original)
+++
archiva/redback/redback-core/trunk/redback-configuration/src/main/java/org/apache/archiva/redback/configuration/DefaultUserConfiguration.java
Tue Dec 4 18:19:03 2012
@@ -52,7 +52,7 @@ public class DefaultUserConfiguration
/**
*
*
- * @deprecated Please configure the Plexus registry instead
+ * @deprecated Please configure the Redback registry instead
*/
private List<String> configs;
@@ -111,7 +111,7 @@ public class DefaultUserConfiguration
{
// TODO: plexus should be able to do this on it's own.
log.warn(
- "DEPRECATED: the <configs> elements is deprecated. Please
configure the Plexus registry instead" );
+ "DEPRECATED: the <configs> elements is deprecated. Please
configure the Redback registry instead" );
}
for ( String configName : configs )
Modified:
archiva/redback/redback-core/trunk/redback-configuration/src/test/java/org/apache/archiva/redback/configuration/DefaultUserConfigurationTest.java
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-configuration/src/test/java/org/apache/archiva/redback/configuration/DefaultUserConfigurationTest.java?rev=1417083&r1=1417082&r2=1417083&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-configuration/src/test/java/org/apache/archiva/redback/configuration/DefaultUserConfigurationTest.java
(original)
+++
archiva/redback/redback-core/trunk/redback-configuration/src/test/java/org/apache/archiva/redback/configuration/DefaultUserConfigurationTest.java
Tue Dec 4 18:19:03 2012
@@ -20,7 +20,7 @@ package org.apache.archiva.redback.confi
*/
import junit.framework.TestCase;
-import org.codehaus.plexus.util.StringUtils;
+import org.apache.commons.lang.StringUtils;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.test.context.ContextConfiguration;
Modified: archiva/redback/redback-core/trunk/redback-data-management/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-data-management/pom.xml?rev=1417083&r1=1417082&r2=1417083&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-data-management/pom.xml
(original)
+++ archiva/redback/redback-core/trunk/redback-data-management/pom.xml Tue Dec
4 18:19:03 2012
@@ -52,7 +52,11 @@
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>jsr250-api</artifactId>
- </dependency>
+ </dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.archiva.redback</groupId>
<artifactId>redback-rbac-tests</artifactId>
Modified:
archiva/redback/redback-core/trunk/redback-data-management/src/main/java/org/apache/archiva/redback/management/JdoDataManagementTool.java
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-data-management/src/main/java/org/apache/archiva/redback/management/JdoDataManagementTool.java?rev=1417083&r1=1417082&r2=1417083&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-data-management/src/main/java/org/apache/archiva/redback/management/JdoDataManagementTool.java
(original)
+++
archiva/redback/redback-core/trunk/redback-data-management/src/main/java/org/apache/archiva/redback/management/JdoDataManagementTool.java
Tue Dec 4 18:19:03 2012
@@ -55,7 +55,7 @@ import org.apache.archiva.redback.users.
import org.apache.archiva.redback.users.jdo.UserDatabase;
import org.apache.archiva.redback.users.jdo.io.stax.UsersManagementStaxReader;
import org.apache.archiva.redback.users.jdo.io.stax.UsersManagementStaxWriter;
-import org.codehaus.plexus.util.IOUtil;
+import org.apache.commons.io.IOUtils;
import org.springframework.stereotype.Service;
/**
@@ -92,7 +92,7 @@ public class JdoDataManagementTool
}
finally
{
- IOUtil.close( fileWriter );
+ IOUtils.closeQuietly( fileWriter );
}
}
@@ -110,7 +110,7 @@ public class JdoDataManagementTool
}
finally
{
- IOUtil.close( fileWriter );
+ IOUtils.closeQuietly( fileWriter );
}
}
@@ -137,7 +137,7 @@ public class JdoDataManagementTool
}
finally
{
- IOUtil.close( fileWriter );
+ IOUtils.closeQuietly( fileWriter );
}
}
@@ -156,7 +156,7 @@ public class JdoDataManagementTool
}
finally
{
- IOUtil.close( fileReader );
+ IOUtils.closeQuietly( fileReader );
}
Map<String, Permission> permissionMap = new HashMap<String,
Permission>();
@@ -245,7 +245,7 @@ public class JdoDataManagementTool
}
finally
{
- IOUtil.close( fileReader );
+ IOUtils.closeQuietly( fileReader );
}
for ( User user : (List<User>) database.getUsers() )
@@ -269,7 +269,7 @@ public class JdoDataManagementTool
}
finally
{
- IOUtil.close( fileReader );
+ IOUtils.closeQuietly( fileReader );
}
for ( AuthenticationKey key : (List<AuthenticationKey>)
database.getKeys() )
Modified:
archiva/redback/redback-core/trunk/redback-data-management/src/test/java/org/apache/archiva/redback/management/DataManagementTest.java
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-data-management/src/test/java/org/apache/archiva/redback/management/DataManagementTest.java?rev=1417083&r1=1417082&r2=1417083&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-data-management/src/test/java/org/apache/archiva/redback/management/DataManagementTest.java
(original)
+++
archiva/redback/redback-core/trunk/redback-data-management/src/test/java/org/apache/archiva/redback/management/DataManagementTest.java
Tue Dec 4 18:19:03 2012
@@ -28,13 +28,13 @@ import org.apache.archiva.redback.rbac.R
import org.apache.archiva.redback.rbac.Role;
import org.apache.archiva.redback.rbac.UserAssignment;
import org.apache.archiva.redback.users.UserManager;
+import org.apache.commons.io.FileUtils;
+import org.apache.commons.io.IOUtils;
import org.apache.commons.lang.SystemUtils;
import org.apache.archiva.redback.keys.KeyManagerException;
import org.apache.archiva.redback.rbac.RbacManagerException;
import org.apache.archiva.redback.tests.utils.RBACDefaults;
import org.apache.archiva.redback.users.User;
-import org.codehaus.plexus.util.FileUtils;
-import org.codehaus.plexus.util.IOUtil;
import org.custommonkey.xmlunit.XMLAssert;
import org.junit.Before;
import org.junit.Test;
@@ -134,10 +134,10 @@ public class DataManagementTest
StringWriter sw = new StringWriter();
- IOUtil.copy( getClass().getResourceAsStream( "/expected-rbac.xml" ),
sw );
+ IOUtils.copy( getClass().getResourceAsStream( "/expected-rbac.xml" ),
sw );
XMLAssert.assertXMLEqual( new StringReader( sw.toString() ),
- new StringReader( FileUtils.fileRead(
backupFile ) ) );
+ new StringReader(
FileUtils.readFileToString( backupFile ) ) );
}
@@ -173,9 +173,9 @@ public class DataManagementTest
StringWriter sw = new StringWriter();
- IOUtil.copy( getClass().getResourceAsStream( "/expected-users.xml" ),
sw );
+ IOUtils.copy( getClass().getResourceAsStream( "/expected-users.xml" ),
sw );
- String actual = FileUtils.fileRead( backupFile ).trim();
+ String actual = FileUtils.readFileToString( backupFile ).trim();
String expected = sw.toString().trim();
XMLAssert.assertXMLEqual( removeTimestampVariance( expected ),
removeTimestampVariance( actual ) );
@@ -215,9 +215,9 @@ public class DataManagementTest
StringWriter sw = new StringWriter();
- IOUtil.copy( getClass().getResourceAsStream( "/expected-keys.xml" ),
sw );
+ IOUtils.copy( getClass().getResourceAsStream( "/expected-keys.xml" ),
sw );
- String actual = FileUtils.fileRead( backupFile ).trim();
+ String actual = FileUtils.readFileToString( backupFile ).trim();
String expected = sw.toString().trim();
XMLAssert.assertXMLEqual( removeKeyAndTimestampVariance( expected ),
removeKeyAndTimestampVariance( actual ) );
@@ -245,7 +245,7 @@ public class DataManagementTest
File backupFile = new File( targetDirectory, "rbac.xml" );
- IOUtil.copy( getClass().getResourceAsStream( "/expected-rbac.xml" ),
new FileWriter( backupFile ) );
+ IOUtils.copy( getClass().getResourceAsStream( "/expected-rbac.xml" ),
new FileWriter( backupFile ) );
dataManagementTool.restoreRBACDatabase( manager, targetDirectory );
@@ -324,7 +324,7 @@ public class DataManagementTest
File backupFile = new File( targetDirectory, "users.xml" );
- IOUtil.copy( getClass().getResourceAsStream( "/expected-users.xml" ),
new FileWriter( backupFile ) );
+ IOUtils.copy( getClass().getResourceAsStream( "/expected-users.xml" ),
new FileWriter( backupFile ) );
dataManagementTool.restoreUsersDatabase( manager, targetDirectory );
@@ -377,7 +377,7 @@ public class DataManagementTest
File backupFile = new File( targetDirectory, "keys.xml" );
- IOUtil.copy( getClass().getResourceAsStream( "/expected-keys.xml" ),
new FileWriter( backupFile ) );
+ IOUtils.copy( getClass().getResourceAsStream( "/expected-keys.xml" ),
new FileWriter( backupFile ) );
dataManagementTool.restoreKeysDatabase( manager, targetDirectory );
Modified:
archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/pom.xml?rev=1417083&r1=1417082&r2=1417083&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/pom.xml
(original)
+++
archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/pom.xml
Tue Dec 4 18:19:03 2012
@@ -148,6 +148,10 @@
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
</dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ </dependency>
<!-- === Test Dependencies ======================= -->
<dependency>
<groupId>org.hsqldb</groupId>
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=1417083&r1=1417082&r2=1417083&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:19:03 2012
@@ -30,6 +30,7 @@ import org.apache.archiva.redback.system
import org.apache.archiva.redback.users.User;
import org.apache.archiva.redback.users.UserManager;
import org.apache.archiva.redback.users.UserNotFoundException;
+import org.apache.commons.io.IOUtils;
import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -127,7 +128,7 @@ public class AdminAutoCreateCheck
}
finally
{
- IOUtils.close( fis );
+ IOUtils.closeQuietly( fis );
}
// ensure we have all properties
Modified:
archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/filter/authentication/HttpAuthenticator.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/filter/authentication/HttpAuthenticator.java?rev=1417083&r1=1417082&r2=1417083&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/filter/authentication/HttpAuthenticator.java
(original)
+++
archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/filter/authentication/HttpAuthenticator.java
Tue Dec 4 18:19:03 2012
@@ -29,7 +29,7 @@ import org.apache.archiva.redback.policy
import org.apache.archiva.redback.system.SecuritySession;
import org.apache.archiva.redback.system.SecuritySystem;
import org.apache.archiva.redback.system.SecuritySystemConstants;
-import org.codehaus.plexus.util.StringUtils;
+import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified:
archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/filter/authentication/basic/HttpBasicAuthentication.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/filter/authentication/basic/HttpBasicAuthentication.java?rev=1417083&r1=1417082&r2=1417083&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/filter/authentication/basic/HttpBasicAuthentication.java
(original)
+++
archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/filter/authentication/basic/HttpBasicAuthentication.java
Tue Dec 4 18:19:03 2012
@@ -32,8 +32,8 @@ import org.apache.commons.codec.binary.B
import org.apache.archiva.redback.authentication.AuthenticationResult;
import
org.apache.archiva.redback.authentication.PasswordBasedAuthenticationDataSource;
import org.apache.archiva.redback.system.SecuritySession;
-import org.codehaus.plexus.util.StringUtils;
import
org.apache.archiva.redback.integration.filter.authentication.HttpAuthenticator;
+import org.apache.commons.lang.StringUtils;
import org.springframework.stereotype.Service;
/**
Modified:
archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/filter/authentication/digest/Digest.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/filter/authentication/digest/Digest.java?rev=1417083&r1=1417082&r2=1417083&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/filter/authentication/digest/Digest.java
(original)
+++
archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/filter/authentication/digest/Digest.java
Tue Dec 4 18:19:03 2012
@@ -27,7 +27,6 @@ import java.security.NoSuchAlgorithmExce
*
* @author <a href="mailto:[email protected]";>Joakim Erdfelt</a>
*
- * @todo move to plexus-utils in future
*/
public class Digest
{
Modified:
archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/filter/authentication/digest/Hex.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/filter/authentication/digest/Hex.java?rev=1417083&r1=1417082&r2=1417083&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/filter/authentication/digest/Hex.java
(original)
+++
archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/filter/authentication/digest/Hex.java
Tue Dec 4 18:19:03 2012
@@ -24,7 +24,6 @@ package org.apache.archiva.redback.integ
*
* @author <a href="mailto:[email protected]";>Joakim Erdfelt</a>
*
- * @todo should probably move this to plexus-utils or plexus-security-common
*/
public class Hex
{
Modified:
archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/filter/authentication/digest/HttpDigestAuthentication.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/filter/authentication/digest/HttpDigestAuthentication.java?rev=1417083&r1=1417082&r2=1417083&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/filter/authentication/digest/HttpDigestAuthentication.java
(original)
+++
archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/filter/authentication/digest/HttpDigestAuthentication.java
Tue Dec 4 18:19:03 2012
@@ -28,9 +28,9 @@ import org.apache.archiva.redback.authen
import org.apache.archiva.redback.policy.AccountLockedException;
import org.apache.archiva.redback.users.UserManager;
import org.apache.archiva.redback.users.UserNotFoundException;
-import org.codehaus.plexus.util.StringUtils;
import
org.apache.archiva.redback.integration.filter.authentication.HttpAuthenticationException;
import
org.apache.archiva.redback.integration.filter.authentication.HttpAuthenticator;
+import org.apache.commons.lang.StringUtils;
import org.springframework.stereotype.Service;
import javax.inject.Inject;
Modified:
archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/filter/authentication/digest/HttpDigestHeader.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/filter/authentication/digest/HttpDigestHeader.java?rev=1417083&r1=1417082&r2=1417083&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/filter/authentication/digest/HttpDigestHeader.java
(original)
+++
archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/filter/authentication/digest/HttpDigestHeader.java
Tue Dec 4 18:19:03 2012
@@ -21,9 +21,9 @@ package org.apache.archiva.redback.integ
import org.apache.commons.codec.binary.Base64;
-import org.codehaus.plexus.util.StringUtils;
import org.apache.archiva.redback.integration.HttpUtils;
import
org.apache.archiva.redback.integration.filter.authentication.HttpAuthenticationException;
+import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.context.annotation.Scope;
Modified:
archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/filter/authorization/SimpleAuthorizationFilter.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/filter/authorization/SimpleAuthorizationFilter.java?rev=1417083&r1=1417082&r2=1417083&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/filter/authorization/SimpleAuthorizationFilter.java
(original)
+++
archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/filter/authorization/SimpleAuthorizationFilter.java
Tue Dec 4 18:19:03 2012
@@ -22,8 +22,8 @@ package org.apache.archiva.redback.integ
import org.apache.archiva.redback.authorization.AuthorizationException;
import org.apache.archiva.redback.system.SecuritySession;
import org.apache.archiva.redback.system.SecuritySystem;
-import org.codehaus.plexus.util.StringUtils;
import org.apache.archiva.redback.integration.filter.SpringServletFilter;
+import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified:
archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/mail/MailerImpl.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/mail/MailerImpl.java?rev=1417083&r1=1417082&r2=1417083&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/mail/MailerImpl.java
(original)
+++
archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/mail/MailerImpl.java
Tue Dec 4 18:19:03 2012
@@ -38,7 +38,7 @@ import org.apache.archiva.redback.keys.A
import org.apache.archiva.redback.policy.UserSecurityPolicy;
import org.apache.archiva.redback.policy.UserValidationSettings;
import org.apache.archiva.redback.system.SecuritySystem;
-import org.codehaus.plexus.util.StringUtils;
+import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.mail.javamail.JavaMailSender;
Modified:
archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/model/UserCredentials.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/model/UserCredentials.java?rev=1417083&r1=1417082&r2=1417083&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/model/UserCredentials.java
(original)
+++
archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/model/UserCredentials.java
Tue Dec 4 18:19:03 2012
@@ -21,7 +21,8 @@ package org.apache.archiva.redback.integ
import org.apache.archiva.redback.users.User;
import org.apache.archiva.redback.users.UserManager;
-import org.codehaus.plexus.util.StringUtils;
+import org.apache.commons.lang.StringUtils;
+
import java.io.Serializable;
@@ -29,7 +30,6 @@ import java.io.Serializable;
* UserCredentials
*
* @author <a href="mailto:[email protected]";>Joakim Erdfelt</a>
- *
*/
public abstract class UserCredentials
implements Serializable
Modified:
archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/util/AutoLoginCookies.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/util/AutoLoginCookies.java?rev=1417083&r1=1417082&r2=1417083&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/util/AutoLoginCookies.java
(original)
+++
archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/util/AutoLoginCookies.java
Tue Dec 4 18:19:03 2012
@@ -30,7 +30,7 @@ import org.apache.archiva.redback.keys.K
import org.apache.archiva.redback.keys.KeyNotFoundException;
import org.apache.archiva.redback.policy.CookieSettings;
import org.apache.archiva.redback.system.SecuritySystem;
-import org.codehaus.plexus.util.StringUtils;
+import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Service;
Modified:
archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/test/java/org/apache/archiva/redback/integration/filter/authentication/digest/HexTest.java
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/test/java/org/apache/archiva/redback/integration/filter/authentication/digest/HexTest.java?rev=1417083&r1=1417082&r2=1417083&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/test/java/org/apache/archiva/redback/integration/filter/authentication/digest/HexTest.java
(original)
+++
archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/test/java/org/apache/archiva/redback/integration/filter/authentication/digest/HexTest.java
Tue Dec 4 18:19:03 2012
@@ -21,8 +21,6 @@ package org.apache.archiva.redback.integ
import junit.framework.TestCase;
-import org.codehaus.plexus.digest.Hex;
-
public class HexTest
extends TestCase
{
Modified:
archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-api/src/main/java/org/apache/archiva/redback/rest/api/services/UtilServices.java
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-api/src/main/java/org/apache/archiva/redback/rest/api/services/UtilServices.java?rev=1417083&r1=1417082&r2=1417083&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-api/src/main/java/org/apache/archiva/redback/rest/api/services/UtilServices.java
(original)
+++
archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-api/src/main/java/org/apache/archiva/redback/rest/api/services/UtilServices.java
Tue Dec 4 18:19:03 2012
@@ -44,7 +44,7 @@ public interface UtilServices
/**
* <b>not intended to be exposed as a REST service.</b>
- * will load i18N resource org/codehaus/plexus/redback/users/messages in
default en then in the asked locale.
+ * will load i18N resource org/apache/archiva/redback/users/messages in
default en then in the asked locale.
* @param locale
* @return
* @throws RedbackServiceException
Modified:
archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/DefaultUserService.java
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/DefaultUserService.java?rev=1417083&r1=1417082&r2=1417083&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/DefaultUserService.java
(original)
+++
archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/DefaultUserService.java
Tue Dec 4 18:19:03 2012
@@ -796,7 +796,7 @@ public class DefaultUserService
{
RedbackServiceException redbackServiceException =
new RedbackServiceException( "issues during validating user" );
- if ( org.codehaus.plexus.util.StringUtils.isEmpty( user.getUsername()
) )
+ if ( StringUtils.isEmpty( user.getUsername() ) )
{
redbackServiceException.addErrorMessage( new ErrorMessage(
"username.required", null ) );
}
@@ -808,17 +808,17 @@ public class DefaultUserService
}
}
- if ( org.codehaus.plexus.util.StringUtils.isEmpty( user.getFullName()
) )
+ if ( StringUtils.isEmpty( user.getFullName() ) )
{
redbackServiceException.addErrorMessage( new ErrorMessage(
"fullName.required", null ) );
}
- if ( org.codehaus.plexus.util.StringUtils.isEmpty( user.getEmail() ) )
+ if ( StringUtils.isEmpty( user.getEmail() ) )
{
redbackServiceException.addErrorMessage( new ErrorMessage(
"email.required", null ) );
}
- if ( !org.codehaus.plexus.util.StringUtils.equals( user.getPassword(),
user.getConfirmPassword() ) )
+ if ( !StringUtils.equals( user.getPassword(),
user.getConfirmPassword() ) )
{
redbackServiceException.addErrorMessage( new ErrorMessage(
"passwords.does.not.match", null ) );
}
Modified:
archiva/redback/redback-core/trunk/redback-keys/redback-keys-providers/redback-keys-jdo/src/main/mdo/keys.mdo
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-keys/redback-keys-providers/redback-keys-jdo/src/main/mdo/keys.mdo?rev=1417083&r1=1417082&r2=1417083&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-keys/redback-keys-providers/redback-keys-jdo/src/main/mdo/keys.mdo
(original)
+++
archiva/redback/redback-core/trunk/redback-keys/redback-keys-providers/redback-keys-jdo/src/main/mdo/keys.mdo
Tue Dec 4 18:19:03 2012
@@ -52,10 +52,6 @@
<interfaces>
<interface>org.apache.archiva.redback.keys.AuthenticationKey</interface>
</interfaces>
- <description>
- @plexus.component
role="org.apache.archiva.redback.keys.AuthenticationKey"
- role-hint="jdo"
- </description>
<fields>
<field jpox.primary-key="true"
jpox.value-strategy="off"
Modified:
archiva/redback/redback-core/trunk/redback-keys/redback-keys-providers/redback-keys-memory/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-keys/redback-keys-providers/redback-keys-memory/pom.xml?rev=1417083&r1=1417082&r2=1417083&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-keys/redback-keys-providers/redback-keys-memory/pom.xml
(original)
+++
archiva/redback/redback-core/trunk/redback-keys/redback-keys-providers/redback-keys-memory/pom.xml
Tue Dec 4 18:19:03 2012
@@ -41,6 +41,10 @@
<artifactId>spring-context-support</artifactId>
</dependency>
<dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ </dependency>
+ <dependency>
<groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId>
</dependency>
Modified:
archiva/redback/redback-core/trunk/redback-keys/redback-keys-providers/redback-keys-memory/src/main/java/org/apache/archiva/redback/keys/memory/MemoryKeyManager.java
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-keys/redback-keys-providers/redback-keys-memory/src/main/java/org/apache/archiva/redback/keys/memory/MemoryKeyManager.java?rev=1417083&r1=1417082&r2=1417083&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-keys/redback-keys-providers/redback-keys-memory/src/main/java/org/apache/archiva/redback/keys/memory/MemoryKeyManager.java
(original)
+++
archiva/redback/redback-core/trunk/redback-keys/redback-keys-providers/redback-keys-memory/src/main/java/org/apache/archiva/redback/keys/memory/MemoryKeyManager.java
Tue Dec 4 18:19:03 2012
@@ -23,8 +23,7 @@ import org.apache.archiva.redback.keys.A
import org.apache.archiva.redback.keys.AuthenticationKey;
import org.apache.archiva.redback.keys.KeyManagerException;
import org.apache.archiva.redback.keys.KeyNotFoundException;
-import org.apache.archiva.redback.keys.memory.MemoryAuthenticationKey;
-import org.codehaus.plexus.util.StringUtils;
+import org.apache.commons.lang.StringUtils;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
Modified:
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-model/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-model/pom.xml?rev=1417083&r1=1417082&r2=1417083&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-model/pom.xml
(original)
+++ archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-model/pom.xml
Tue Dec 4 18:19:03 2012
@@ -33,6 +33,14 @@
<dependencies>
<dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
</dependency>
@@ -49,6 +57,7 @@
<groupId>javax.annotation</groupId>
<artifactId>jsr250-api</artifactId>
</dependency>
+
</dependencies>
<build>
Modified:
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-model/src/main/java/org/apache/archiva/redback/rbac/AbstractRBACManager.java
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-model/src/main/java/org/apache/archiva/redback/rbac/AbstractRBACManager.java?rev=1417083&r1=1417082&r2=1417083&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-model/src/main/java/org/apache/archiva/redback/rbac/AbstractRBACManager.java
(original)
+++
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-model/src/main/java/org/apache/archiva/redback/rbac/AbstractRBACManager.java
Tue Dec 4 18:19:03 2012
@@ -16,8 +16,8 @@ package org.apache.archiva.redback.rbac;
* limitations under the License.
*/
-import org.codehaus.plexus.util.CollectionUtils;
-import org.codehaus.plexus.util.StringUtils;
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified:
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-model/src/main/java/org/apache/archiva/redback/rbac/RBACObjectAssertions.java
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-model/src/main/java/org/apache/archiva/redback/rbac/RBACObjectAssertions.java?rev=1417083&r1=1417082&r2=1417083&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-model/src/main/java/org/apache/archiva/redback/rbac/RBACObjectAssertions.java
(original)
+++
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-model/src/main/java/org/apache/archiva/redback/rbac/RBACObjectAssertions.java
Tue Dec 4 18:19:03 2012
@@ -16,7 +16,8 @@ package org.apache.archiva.redback.rbac;
* limitations under the License.
*/
-import org.codehaus.plexus.util.StringUtils;
+
+import org.apache.commons.lang.StringUtils;
/**
* RBACObjectAssertions
Modified:
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-jdo/src/main/java/org/apache/archiva/redback/rbac/jdo/JdoTool.java
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-jdo/src/main/java/org/apache/archiva/redback/rbac/jdo/JdoTool.java?rev=1417083&r1=1417082&r2=1417083&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-jdo/src/main/java/org/apache/archiva/redback/rbac/jdo/JdoTool.java
(original)
+++
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-jdo/src/main/java/org/apache/archiva/redback/rbac/jdo/JdoTool.java
Tue Dec 4 18:19:03 2012
@@ -25,7 +25,7 @@ import org.apache.archiva.redback.rbac.R
import org.apache.archiva.redback.rbac.RbacObjectNotFoundException;
import org.apache.archiva.redback.rbac.Role;
import org.apache.archiva.redback.components.jdo.JdoFactory;
-import org.codehaus.plexus.util.StringUtils;
+import org.apache.commons.lang.StringUtils;
import org.springframework.stereotype.Service;
import javax.annotation.PostConstruct;
Modified:
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-memory/src/main/java/org/apache/archiva/redback/rbac/memory/MemoryRbacManager.java
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-memory/src/main/java/org/apache/archiva/redback/rbac/memory/MemoryRbacManager.java?rev=1417083&r1=1417082&r2=1417083&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-memory/src/main/java/org/apache/archiva/redback/rbac/memory/MemoryRbacManager.java
(original)
+++
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-memory/src/main/java/org/apache/archiva/redback/rbac/memory/MemoryRbacManager.java
Tue Dec 4 18:19:03 2012
@@ -31,7 +31,7 @@ import org.apache.archiva.redback.rbac.R
import org.apache.archiva.redback.rbac.Role;
import org.apache.archiva.redback.rbac.UserAssignment;
import org.apache.archiva.redback.rbac.RbacPermanentException;
-import org.codehaus.plexus.util.StringUtils;
+import org.apache.commons.lang.StringUtils;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
Modified:
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-role-manager/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-role-manager/pom.xml?rev=1417083&r1=1417082&r2=1417083&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-role-manager/pom.xml
(original)
+++
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-role-manager/pom.xml
Tue Dec 4 18:19:03 2012
@@ -52,7 +52,11 @@
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>jsr250-api</artifactId>
- </dependency>
+ </dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ </dependency>
<dependency>
<artifactId>redback-rbac-memory</artifactId>
<groupId>org.apache.archiva.redback</groupId>
Modified:
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/DefaultRoleManager.java
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/DefaultRoleManager.java?rev=1417083&r1=1417082&r2=1417083&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/DefaultRoleManager.java
(original)
+++
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/DefaultRoleManager.java
Tue Dec 4 18:19:03 2012
@@ -29,12 +29,12 @@ import org.apache.archiva.redback.role.m
import org.apache.archiva.redback.role.model.RedbackRoleModel;
import
org.apache.archiva.redback.role.model.io.stax.RedbackRoleModelStaxReader;
import org.apache.archiva.redback.role.processor.RoleModelProcessor;
+import org.apache.commons.io.IOUtils;
import org.apache.commons.lang.SystemUtils;
import org.apache.archiva.redback.rbac.Resource;
import org.apache.archiva.redback.role.template.RoleTemplateProcessor;
import org.apache.archiva.redback.role.util.RoleModelUtils;
import org.apache.archiva.redback.role.validator.RoleModelValidator;
-import org.codehaus.plexus.util.IOUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Service;
@@ -135,7 +135,7 @@ public class DefaultRoleManager
}
finally
{
- IOUtil.close( inputStreamReader );
+ IOUtils.closeQuietly( inputStreamReader );
}
}
