archiva-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ol...@apache.org
Subject svn commit: r1311034 [2/3] - in /archiva/redback/redback-core/trunk/redback-integrations: redback-common-integrations/src/main/java/org/apache/ redback-common-integrations/src/main/java/org/apache/archiva/ redback-common-integrations/src/main/java/org/...
Date Sun, 08 Apr 2012 16:19:51 GMT
Copied: archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/filter/authorization/SimpleAuthorizationFilter.java (from r1311024, archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/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?p2=archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/filter/authorization/SimpleAuthorizationFilter.java&p1=archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/filter/authorization/SimpleAuthorizationFilter.java&r1=1311024&r2=1311034&rev=1311034&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/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 Sun Apr  8 16:19:46 2012
@@ -1,4 +1,4 @@
-package org.codehaus.redback.integration.filter.authorization;
+package org.apache.archiva.redback.integration.filter.authorization;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -23,7 +23,7 @@ import org.apache.archiva.redback.author
 import org.apache.archiva.redback.system.SecuritySession;
 import org.apache.archiva.redback.system.SecuritySystem;
 import org.codehaus.plexus.util.StringUtils;
-import org.codehaus.redback.integration.filter.SpringServletFilter;
+import org.apache.archiva.redback.integration.filter.SpringServletFilter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

Copied: archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/interceptor/SecureAction.java (from r1311024, archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/interceptor/SecureAction.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/interceptor/SecureAction.java?p2=archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/interceptor/SecureAction.java&p1=archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/interceptor/SecureAction.java&r1=1311024&r2=1311034&rev=1311034&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/interceptor/SecureAction.java (original)
+++ archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/interceptor/SecureAction.java Sun Apr  8 16:19:46 2012
@@ -1,4 +1,4 @@
-package org.codehaus.redback.integration.interceptor;
+package org.apache.archiva.redback.integration.interceptor;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

Copied: archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/interceptor/SecureActionBundle.java (from r1311024, archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/interceptor/SecureActionBundle.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/interceptor/SecureActionBundle.java?p2=archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/interceptor/SecureActionBundle.java&p1=archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/interceptor/SecureActionBundle.java&r1=1311024&r2=1311034&rev=1311034&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/interceptor/SecureActionBundle.java (original)
+++ archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/interceptor/SecureActionBundle.java Sun Apr  8 16:19:46 2012
@@ -1,4 +1,4 @@
-package org.codehaus.redback.integration.interceptor;
+package org.apache.archiva.redback.integration.interceptor;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

Copied: archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/interceptor/SecureActionException.java (from r1311024, archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/interceptor/SecureActionException.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/interceptor/SecureActionException.java?p2=archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/interceptor/SecureActionException.java&p1=archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/interceptor/SecureActionException.java&r1=1311024&r2=1311034&rev=1311034&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/interceptor/SecureActionException.java (original)
+++ archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/interceptor/SecureActionException.java Sun Apr  8 16:19:46 2012
@@ -1,4 +1,4 @@
-package org.codehaus.redback.integration.interceptor;
+package org.apache.archiva.redback.integration.interceptor;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

Copied: archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/mail/MailGenerator.java (from r1311024, archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/mail/MailGenerator.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/MailGenerator.java?p2=archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/mail/MailGenerator.java&p1=archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/mail/MailGenerator.java&r1=1311024&r2=1311034&rev=1311034&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/mail/MailGenerator.java (original)
+++ archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/mail/MailGenerator.java Sun Apr  8 16:19:46 2012
@@ -1,4 +1,4 @@
-package org.codehaus.redback.integration.mail;
+package org.apache.archiva.redback.integration.mail;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

Copied: archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/mail/Mailer.java (from r1311024, archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/mail/Mailer.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/Mailer.java?p2=archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/mail/Mailer.java&p1=archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/mail/Mailer.java&r1=1311024&r2=1311034&rev=1311034&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/mail/Mailer.java (original)
+++ archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/mail/Mailer.java Sun Apr  8 16:19:46 2012
@@ -1,4 +1,4 @@
-package org.codehaus.redback.integration.mail;
+package org.apache.archiva.redback.integration.mail;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

Copied: archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/mail/MailerImpl.java (from r1311024, archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/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?p2=archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/mail/MailerImpl.java&p1=archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/mail/MailerImpl.java&r1=1311024&r2=1311034&rev=1311034&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/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 Sun Apr  8 16:19:46 2012
@@ -1,4 +1,4 @@
-package org.codehaus.redback.integration.mail;
+package org.apache.archiva.redback.integration.mail;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

Copied: archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/mail/VelocityMailGenerator.java (from r1311024, archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/mail/VelocityMailGenerator.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/VelocityMailGenerator.java?p2=archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/mail/VelocityMailGenerator.java&p1=archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/mail/VelocityMailGenerator.java&r1=1311024&r2=1311034&rev=1311034&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/mail/VelocityMailGenerator.java (original)
+++ archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/mail/VelocityMailGenerator.java Sun Apr  8 16:19:46 2012
@@ -1,4 +1,4 @@
-package org.codehaus.redback.integration.mail;
+package org.apache.archiva.redback.integration.mail;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

Copied: archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/model/AdminEditUserCredentials.java (from r1311024, archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/model/AdminEditUserCredentials.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/AdminEditUserCredentials.java?p2=archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/model/AdminEditUserCredentials.java&p1=archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/model/AdminEditUserCredentials.java&r1=1311024&r2=1311034&rev=1311034&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/model/AdminEditUserCredentials.java (original)
+++ archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/model/AdminEditUserCredentials.java Sun Apr  8 16:19:46 2012
@@ -1,4 +1,4 @@
-package org.codehaus.redback.integration.model;
+package org.apache.archiva.redback.integration.model;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

Copied: archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/model/CreateRoleDetails.java (from r1311024, archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/model/CreateRoleDetails.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/CreateRoleDetails.java?p2=archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/model/CreateRoleDetails.java&p1=archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/model/CreateRoleDetails.java&r1=1311024&r2=1311034&rev=1311034&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/model/CreateRoleDetails.java (original)
+++ archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/model/CreateRoleDetails.java Sun Apr  8 16:19:46 2012
@@ -1,4 +1,4 @@
-package org.codehaus.redback.integration.model;
+package org.apache.archiva.redback.integration.model;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

Copied: archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/model/CreateUserCredentials.java (from r1311024, archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/model/CreateUserCredentials.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/CreateUserCredentials.java?p2=archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/model/CreateUserCredentials.java&p1=archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/model/CreateUserCredentials.java&r1=1311024&r2=1311034&rev=1311034&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/model/CreateUserCredentials.java (original)
+++ archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/model/CreateUserCredentials.java Sun Apr  8 16:19:46 2012
@@ -1,4 +1,4 @@
-package org.codehaus.redback.integration.model;
+package org.apache.archiva.redback.integration.model;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

Copied: archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/model/EditRoleDetails.java (from r1311024, archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/model/EditRoleDetails.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/EditRoleDetails.java?p2=archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/model/EditRoleDetails.java&p1=archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/model/EditRoleDetails.java&r1=1311024&r2=1311034&rev=1311034&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/model/EditRoleDetails.java (original)
+++ archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/model/EditRoleDetails.java Sun Apr  8 16:19:46 2012
@@ -1,4 +1,4 @@
-package org.codehaus.redback.integration.model;
+package org.apache.archiva.redback.integration.model;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

Copied: archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/model/EditUserCredentials.java (from r1311024, archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/model/EditUserCredentials.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/EditUserCredentials.java?p2=archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/model/EditUserCredentials.java&p1=archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/model/EditUserCredentials.java&r1=1311024&r2=1311034&rev=1311034&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/model/EditUserCredentials.java (original)
+++ archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/model/EditUserCredentials.java Sun Apr  8 16:19:46 2012
@@ -1,4 +1,4 @@
-package org.codehaus.redback.integration.model;
+package org.apache.archiva.redback.integration.model;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -20,7 +20,7 @@ package org.codehaus.redback.integration
  */
 
 import org.apache.archiva.redback.users.User;
-import org.codehaus.redback.integration.util.DateUtils;
+import org.apache.archiva.redback.integration.util.DateUtils;
 
 /**
  * EditUserCredentials

Copied: archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/model/RoleDetails.java (from r1311024, archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/model/RoleDetails.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/RoleDetails.java?p2=archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/model/RoleDetails.java&p1=archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/model/RoleDetails.java&r1=1311024&r2=1311034&rev=1311034&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/model/RoleDetails.java (original)
+++ archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/model/RoleDetails.java Sun Apr  8 16:19:46 2012
@@ -1,4 +1,4 @@
-package org.codehaus.redback.integration.model;
+package org.apache.archiva.redback.integration.model;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

Copied: archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/model/SimplePermission.java (from r1311024, archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/model/SimplePermission.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/SimplePermission.java?p2=archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/model/SimplePermission.java&p1=archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/model/SimplePermission.java&r1=1311024&r2=1311034&rev=1311034&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/model/SimplePermission.java (original)
+++ archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/model/SimplePermission.java Sun Apr  8 16:19:46 2012
@@ -1,4 +1,4 @@
-package org.codehaus.redback.integration.model;
+package org.apache.archiva.redback.integration.model;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

Copied: archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/model/UserCredentials.java (from r1311024, archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/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?p2=archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/model/UserCredentials.java&p1=archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/model/UserCredentials.java&r1=1311024&r2=1311034&rev=1311034&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/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 Sun Apr  8 16:19:46 2012
@@ -1,4 +1,4 @@
-package org.codehaus.redback.integration.model;
+package org.apache.archiva.redback.integration.model;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

Copied: archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/reports/CsvRolesMatrix.java (from r1311024, archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/reports/CsvRolesMatrix.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/reports/CsvRolesMatrix.java?p2=archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/reports/CsvRolesMatrix.java&p1=archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/reports/CsvRolesMatrix.java&r1=1311024&r2=1311034&rev=1311034&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/reports/CsvRolesMatrix.java (original)
+++ archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/reports/CsvRolesMatrix.java Sun Apr  8 16:19:46 2012
@@ -1,4 +1,4 @@
-package org.codehaus.redback.integration.reports;
+package org.apache.archiva.redback.integration.reports;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -26,8 +26,8 @@ import org.apache.archiva.redback.users.
 import org.apache.commons.lang.StringEscapeUtils;
 import org.apache.archiva.redback.system.SecuritySystem;
 import org.apache.archiva.redback.users.User;
-import org.codehaus.redback.integration.util.RoleSorter;
-import org.codehaus.redback.integration.util.UserComparator;
+import org.apache.archiva.redback.integration.util.RoleSorter;
+import org.apache.archiva.redback.integration.util.UserComparator;
 import org.springframework.stereotype.Service;
 
 import javax.inject.Inject;

Copied: archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/reports/CsvUserList.java (from r1311024, archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/reports/CsvUserList.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/reports/CsvUserList.java?p2=archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/reports/CsvUserList.java&p1=archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/reports/CsvUserList.java&r1=1311024&r2=1311034&rev=1311034&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/reports/CsvUserList.java (original)
+++ archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/reports/CsvUserList.java Sun Apr  8 16:19:46 2012
@@ -1,4 +1,4 @@
-package org.codehaus.redback.integration.reports;
+package org.apache.archiva.redback.integration.reports;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -24,7 +24,7 @@ import org.apache.archiva.redback.users.
 import org.apache.commons.beanutils.PropertyUtils;
 import org.apache.commons.lang.StringEscapeUtils;
 import org.apache.archiva.redback.system.SecuritySystem;
-import org.codehaus.redback.integration.util.UserComparator;
+import org.apache.archiva.redback.integration.util.UserComparator;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;

Copied: archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/reports/Report.java (from r1311024, archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/reports/Report.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/reports/Report.java?p2=archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/reports/Report.java&p1=archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/reports/Report.java&r1=1311024&r2=1311034&rev=1311034&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/reports/Report.java (original)
+++ archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/reports/Report.java Sun Apr  8 16:19:46 2012
@@ -1,4 +1,4 @@
-package org.codehaus.redback.integration.reports;
+package org.apache.archiva.redback.integration.reports;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

Copied: archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/reports/ReportException.java (from r1311024, archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/reports/ReportException.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/reports/ReportException.java?p2=archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/reports/ReportException.java&p1=archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/reports/ReportException.java&r1=1311024&r2=1311034&rev=1311034&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/reports/ReportException.java (original)
+++ archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/reports/ReportException.java Sun Apr  8 16:19:46 2012
@@ -1,4 +1,4 @@
-package org.codehaus.redback.integration.reports;
+package org.apache.archiva.redback.integration.reports;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

Copied: archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/reports/ReportManager.java (from r1311024, archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/reports/ReportManager.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/reports/ReportManager.java?p2=archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/reports/ReportManager.java&p1=archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/reports/ReportManager.java&r1=1311024&r2=1311034&rev=1311034&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/reports/ReportManager.java (original)
+++ archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/reports/ReportManager.java Sun Apr  8 16:19:46 2012
@@ -1,4 +1,4 @@
-package org.codehaus.redback.integration.reports;
+package org.apache.archiva.redback.integration.reports;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -25,7 +25,6 @@ import org.springframework.stereotype.Se
 
 import javax.annotation.PostConstruct;
 import javax.inject.Inject;
-import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;

Copied: archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/role/RoleConstants.java (from r1311026, archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/role/RoleConstants.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/role/RoleConstants.java?p2=archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/role/RoleConstants.java&p1=archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/role/RoleConstants.java&r1=1311026&r2=1311034&rev=1311034&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/role/RoleConstants.java (original)
+++ archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/role/RoleConstants.java Sun Apr  8 16:19:46 2012
@@ -1,4 +1,4 @@
-package org.codehaus.redback.integration.role;
+package org.apache.archiva.redback.integration.role;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

Copied: archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/taglib/jsp/ElseAuthorizedTag.java (from r1311024, archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/taglib/jsp/ElseAuthorizedTag.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/taglib/jsp/ElseAuthorizedTag.java?p2=archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/taglib/jsp/ElseAuthorizedTag.java&p1=archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/taglib/jsp/ElseAuthorizedTag.java&r1=1311024&r2=1311034&rev=1311034&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/taglib/jsp/ElseAuthorizedTag.java (original)
+++ archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/taglib/jsp/ElseAuthorizedTag.java Sun Apr  8 16:19:46 2012
@@ -1,4 +1,4 @@
-package org.codehaus.redback.integration.taglib.jsp;
+package org.apache.archiva.redback.integration.taglib.jsp;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

Copied: archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/taglib/jsp/IfAnyAuthorizedTag.java (from r1311024, archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/taglib/jsp/IfAnyAuthorizedTag.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/taglib/jsp/IfAnyAuthorizedTag.java?p2=archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/taglib/jsp/IfAnyAuthorizedTag.java&p1=archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/taglib/jsp/IfAnyAuthorizedTag.java&r1=1311024&r2=1311034&rev=1311034&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/taglib/jsp/IfAnyAuthorizedTag.java (original)
+++ archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/taglib/jsp/IfAnyAuthorizedTag.java Sun Apr  8 16:19:46 2012
@@ -1,4 +1,4 @@
-package org.codehaus.redback.integration.taglib.jsp;
+package org.apache.archiva.redback.integration.taglib.jsp;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

Copied: archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/taglib/jsp/IfAuthorizedTag.java (from r1311024, archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/taglib/jsp/IfAuthorizedTag.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/taglib/jsp/IfAuthorizedTag.java?p2=archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/taglib/jsp/IfAuthorizedTag.java&p1=archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/taglib/jsp/IfAuthorizedTag.java&r1=1311024&r2=1311034&rev=1311034&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/taglib/jsp/IfAuthorizedTag.java (original)
+++ archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/taglib/jsp/IfAuthorizedTag.java Sun Apr  8 16:19:46 2012
@@ -1,4 +1,4 @@
-package org.codehaus.redback.integration.taglib.jsp;
+package org.apache.archiva.redback.integration.taglib.jsp;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

Copied: archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/taglib/jsp/IfConfiguredTag.java (from r1311024, archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/taglib/jsp/IfConfiguredTag.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/taglib/jsp/IfConfiguredTag.java?p2=archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/taglib/jsp/IfConfiguredTag.java&p1=archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/taglib/jsp/IfConfiguredTag.java&r1=1311024&r2=1311034&rev=1311034&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/taglib/jsp/IfConfiguredTag.java (original)
+++ archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/taglib/jsp/IfConfiguredTag.java Sun Apr  8 16:19:46 2012
@@ -1,4 +1,4 @@
-package org.codehaus.redback.integration.taglib.jsp;
+package org.apache.archiva.redback.integration.taglib.jsp;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

Copied: archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/taglib/jsp/IsNotReadOnlyUserManagerTag.java (from r1311024, archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/taglib/jsp/IsNotReadOnlyUserManagerTag.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/taglib/jsp/IsNotReadOnlyUserManagerTag.java?p2=archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/taglib/jsp/IsNotReadOnlyUserManagerTag.java&p1=archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/taglib/jsp/IsNotReadOnlyUserManagerTag.java&r1=1311024&r2=1311034&rev=1311034&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/taglib/jsp/IsNotReadOnlyUserManagerTag.java (original)
+++ archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/taglib/jsp/IsNotReadOnlyUserManagerTag.java Sun Apr  8 16:19:46 2012
@@ -1,4 +1,4 @@
-package org.codehaus.redback.integration.taglib.jsp;
+package org.apache.archiva.redback.integration.taglib.jsp;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

Copied: archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/taglib/jsp/IsReadOnlyUserManagerTag.java (from r1311024, archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/taglib/jsp/IsReadOnlyUserManagerTag.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/taglib/jsp/IsReadOnlyUserManagerTag.java?p2=archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/taglib/jsp/IsReadOnlyUserManagerTag.java&p1=archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/taglib/jsp/IsReadOnlyUserManagerTag.java&r1=1311024&r2=1311034&rev=1311034&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/taglib/jsp/IsReadOnlyUserManagerTag.java (original)
+++ archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/taglib/jsp/IsReadOnlyUserManagerTag.java Sun Apr  8 16:19:46 2012
@@ -1,4 +1,4 @@
-package org.codehaus.redback.integration.taglib.jsp;
+package org.apache.archiva.redback.integration.taglib.jsp;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

Copied: archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/util/AutoLoginCookies.java (from r1311024, archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/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?p2=archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/util/AutoLoginCookies.java&p1=archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/util/AutoLoginCookies.java&r1=1311024&r2=1311034&rev=1311034&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/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 Sun Apr  8 16:19:46 2012
@@ -1,4 +1,4 @@
-package org.codehaus.redback.integration.util;
+package org.apache.archiva.redback.integration.util;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

Copied: archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/util/DateUtils.java (from r1311024, archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/util/DateUtils.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/DateUtils.java?p2=archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/util/DateUtils.java&p1=archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/util/DateUtils.java&r1=1311024&r2=1311034&rev=1311034&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/util/DateUtils.java (original)
+++ archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/util/DateUtils.java Sun Apr  8 16:19:46 2012
@@ -1,4 +1,4 @@
-package org.codehaus.redback.integration.util;
+package org.apache.archiva.redback.integration.util;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

Copied: archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/util/ModelTemplateSorter.java (from r1311024, archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/util/ModelTemplateSorter.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/ModelTemplateSorter.java?p2=archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/util/ModelTemplateSorter.java&p1=archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/util/ModelTemplateSorter.java&r1=1311024&r2=1311034&rev=1311034&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/util/ModelTemplateSorter.java (original)
+++ archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/util/ModelTemplateSorter.java Sun Apr  8 16:19:46 2012
@@ -1,4 +1,4 @@
-package org.codehaus.redback.integration.util;
+package org.apache.archiva.redback.integration.util;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

Copied: archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/util/OperationSorter.java (from r1311024, archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/util/OperationSorter.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/OperationSorter.java?p2=archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/util/OperationSorter.java&p1=archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/util/OperationSorter.java&r1=1311024&r2=1311034&rev=1311034&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/util/OperationSorter.java (original)
+++ archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/util/OperationSorter.java Sun Apr  8 16:19:46 2012
@@ -1,4 +1,4 @@
-package org.codehaus.redback.integration.util;
+package org.apache.archiva.redback.integration.util;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

Copied: archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/util/PermissionSorter.java (from r1311024, archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/util/PermissionSorter.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/PermissionSorter.java?p2=archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/util/PermissionSorter.java&p1=archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/util/PermissionSorter.java&r1=1311024&r2=1311034&rev=1311034&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/util/PermissionSorter.java (original)
+++ archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/util/PermissionSorter.java Sun Apr  8 16:19:46 2012
@@ -1,4 +1,4 @@
-package org.codehaus.redback.integration.util;
+package org.apache.archiva.redback.integration.util;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

Copied: archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/util/ResourceSorter.java (from r1311024, archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/util/ResourceSorter.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/ResourceSorter.java?p2=archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/util/ResourceSorter.java&p1=archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/util/ResourceSorter.java&r1=1311024&r2=1311034&rev=1311034&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/util/ResourceSorter.java (original)
+++ archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/util/ResourceSorter.java Sun Apr  8 16:19:46 2012
@@ -1,4 +1,4 @@
-package org.codehaus.redback.integration.util;
+package org.apache.archiva.redback.integration.util;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

Copied: archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/util/RoleSorter.java (from r1311024, archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/util/RoleSorter.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/RoleSorter.java?p2=archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/util/RoleSorter.java&p1=archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/util/RoleSorter.java&r1=1311024&r2=1311034&rev=1311034&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/util/RoleSorter.java (original)
+++ archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/util/RoleSorter.java Sun Apr  8 16:19:46 2012
@@ -1,4 +1,4 @@
-package org.codehaus.redback.integration.util;
+package org.apache.archiva.redback.integration.util;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

Copied: archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/util/TemplatedRoleSorter.java (from r1311024, archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/util/TemplatedRoleSorter.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/TemplatedRoleSorter.java?p2=archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/util/TemplatedRoleSorter.java&p1=archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/util/TemplatedRoleSorter.java&r1=1311024&r2=1311034&rev=1311034&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/util/TemplatedRoleSorter.java (original)
+++ archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/util/TemplatedRoleSorter.java Sun Apr  8 16:19:46 2012
@@ -1,4 +1,4 @@
-package org.codehaus.redback.integration.util;
+package org.apache.archiva.redback.integration.util;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

Copied: archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/util/UserComparator.java (from r1311024, archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/util/UserComparator.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/UserComparator.java?p2=archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/util/UserComparator.java&p1=archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/util/UserComparator.java&r1=1311024&r2=1311034&rev=1311034&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/util/UserComparator.java (original)
+++ archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/util/UserComparator.java Sun Apr  8 16:19:46 2012
@@ -1,4 +1,4 @@
-package org.codehaus.redback.integration.util;
+package org.apache.archiva.redback.integration.util;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

Modified: archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/resources/META-INF/spring-context.xml
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/resources/META-INF/spring-context.xml?rev=1311034&r1=1311033&r2=1311034&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/resources/META-INF/spring-context.xml (original)
+++ archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/resources/META-INF/spring-context.xml Sun Apr  8 16:19:46 2012
@@ -28,7 +28,7 @@
        default-lazy-init="true">
 
   <context:annotation-config />
-  <context:component-scan  base-package="org.codehaus.redback.integration"/>
+  <context:component-scan  base-package="org.apache.archiva.redback.integration"/>
 
   <bean name="velocityEngine#redback" class="org.springframework.ui.velocity.VelocityEngineFactoryBean">
     <property name="velocityProperties">

Modified: archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/resources/META-INF/tld/plexus-security-system.tld
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/resources/META-INF/tld/plexus-security-system.tld?rev=1311034&r1=1311033&r2=1311034&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/resources/META-INF/tld/plexus-security-system.tld (original)
+++ archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/resources/META-INF/tld/plexus-security-system.tld Sun Apr  8 16:19:46 2012
@@ -24,7 +24,7 @@
 
   <tag>
     <name>ifConfigured</name>
-    <tag-class>org.codehaus.redback.integration.taglib.jsp.IfConfiguredTag</tag-class>
+    <tag-class>org.apache.archiva.redback.integration.taglib.jsp.IfConfiguredTag</tag-class>
     <body-content>JSP</body-content>
     <attribute>
       <name>option</name>
@@ -40,19 +40,19 @@
 
   <tag>
     <name>isReadOnlyUserManager</name>
-    <tag-class>org.codehaus.redback.integration.taglib.jsp.IsReadOnlyUserManagerTag</tag-class>
+    <tag-class>org.apache.archiva.redback.integration.taglib.jsp.IsReadOnlyUserManagerTag</tag-class>
     <body-content>JSP</body-content>
   </tag>
   
   <tag>
     <name>isNotReadOnlyUserManager</name>
-    <tag-class>org.codehaus.redback.integration.taglib.jsp.IsNotReadOnlyUserManagerTag</tag-class>
+    <tag-class>org.apache.archiva.redback.integration.taglib.jsp.IsNotReadOnlyUserManagerTag</tag-class>
     <body-content>JSP</body-content>
   </tag>
 
   <tag>
     <name>ifAuthorized</name>
-    <tag-class>org.codehaus.redback.integration.taglib.jsp.IfAuthorizedTag</tag-class>
+    <tag-class>org.apache.archiva.redback.integration.taglib.jsp.IfAuthorizedTag</tag-class>
     <body-content>JSP</body-content>
     <attribute>
       <name>permission</name>
@@ -68,7 +68,7 @@
   
   <tag>
     <name>ifAnyAuthorized</name>
-    <tag-class>org.codehaus.redback.integration.taglib.jsp.IfAnyAuthorizedTag</tag-class>
+    <tag-class>org.apache.archiva.redback.integration.taglib.jsp.IfAnyAuthorizedTag</tag-class>
     <body-content>JSP</body-content>
     <attribute>
       <name>permissions</name>
@@ -84,7 +84,7 @@
 
   <tag>
     <name>elseAuthorized</name>
-    <tag-class>org.codehaus.redback.integration.taglib.jsp.ElseAuthorizedTag</tag-class>
+    <tag-class>org.apache.archiva.redback.integration.taglib.jsp.ElseAuthorizedTag</tag-class>
     <body-content>JSP</body-content>
   </tag>
 

Copied: archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/test/java/org/apache/archiva/redback/integration/HttpUtilsTest.java (from r1311024, archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/test/java/org/codehaus/redback/integration/HttpUtilsTest.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/HttpUtilsTest.java?p2=archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/test/java/org/apache/archiva/redback/integration/HttpUtilsTest.java&p1=archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/test/java/org/codehaus/redback/integration/HttpUtilsTest.java&r1=1311024&r2=1311034&rev=1311034&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/test/java/org/codehaus/redback/integration/HttpUtilsTest.java (original)
+++ archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/test/java/org/apache/archiva/redback/integration/HttpUtilsTest.java Sun Apr  8 16:19:46 2012
@@ -1,4 +1,4 @@
-package org.codehaus.redback.integration;
+package org.apache.archiva.redback.integration;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -23,7 +23,7 @@ import java.util.Properties;
 
 import junit.framework.TestCase;
 
-import org.codehaus.redback.integration.HttpUtils;
+import org.apache.archiva.redback.integration.HttpUtils;
 
 /**
  * HttpUtilsTest

Copied: archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/test/java/org/apache/archiva/redback/integration/filter/authentication/digest/HexTest.java (from r1311024, archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/test/java/org/codehaus/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?p2=archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/test/java/org/apache/archiva/redback/integration/filter/authentication/digest/HexTest.java&p1=archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/test/java/org/codehaus/redback/integration/filter/authentication/digest/HexTest.java&r1=1311024&r2=1311034&rev=1311034&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/test/java/org/codehaus/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 Sun Apr  8 16:19:46 2012
@@ -1,4 +1,4 @@
-package org.codehaus.redback.integration.filter.authentication.digest;
+package org.apache.archiva.redback.integration.filter.authentication.digest;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

Copied: archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/test/java/org/apache/archiva/redback/integration/mail/MailGeneratorTest.java (from r1311024, archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/test/java/org/codehaus/redback/integration/mail/MailGeneratorTest.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/mail/MailGeneratorTest.java?p2=archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/test/java/org/apache/archiva/redback/integration/mail/MailGeneratorTest.java&p1=archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/test/java/org/codehaus/redback/integration/mail/MailGeneratorTest.java&r1=1311024&r2=1311034&rev=1311034&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/test/java/org/codehaus/redback/integration/mail/MailGeneratorTest.java (original)
+++ archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/test/java/org/apache/archiva/redback/integration/mail/MailGeneratorTest.java Sun Apr  8 16:19:46 2012
@@ -1,4 +1,4 @@
-package org.codehaus.redback.integration.mail;
+package org.apache.archiva.redback.integration.mail;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -21,6 +21,7 @@ package org.codehaus.redback.integration
 
 import junit.framework.TestCase;
 import net.sf.ehcache.CacheManager;
+import org.apache.archiva.redback.integration.mail.MailGenerator;
 import org.apache.archiva.redback.keys.AuthenticationKey;
 import org.apache.archiva.redback.keys.KeyManager;
 import org.apache.archiva.redback.policy.UserSecurityPolicy;

Copied: archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/test/java/org/apache/archiva/redback/integration/mail/MockJavaMailSender.java (from r1311024, archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/test/java/org/codehaus/redback/integration/mail/MockJavaMailSender.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/mail/MockJavaMailSender.java?p2=archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/test/java/org/apache/archiva/redback/integration/mail/MockJavaMailSender.java&p1=archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/test/java/org/codehaus/redback/integration/mail/MockJavaMailSender.java&r1=1311024&r2=1311034&rev=1311034&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/test/java/org/codehaus/redback/integration/mail/MockJavaMailSender.java (original)
+++ archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/test/java/org/apache/archiva/redback/integration/mail/MockJavaMailSender.java Sun Apr  8 16:19:46 2012
@@ -1,4 +1,4 @@
-package org.codehaus.redback.integration.mail;
+package org.apache.archiva.redback.integration.mail;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

Modified: archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/test/resources/spring-context.xml
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/test/resources/spring-context.xml?rev=1311034&r1=1311033&r2=1311034&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/test/resources/spring-context.xml (original)
+++ archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/test/resources/spring-context.xml Sun Apr  8 16:19:46 2012
@@ -50,7 +50,7 @@
     </property>
   </bean>
 
-  <bean name="mailGenerator#custom-url" class="org.codehaus.redback.integration.mail.VelocityMailGenerator">
+  <bean name="mailGenerator#custom-url" class="org.apache.archiva.redback.integration.mail.VelocityMailGenerator">
     <property name="config" ref="userConfiguration#custom-url"/>
     <property name="velocityEngine" ref="velocityEngine#redback"/>
   </bean>

Modified: archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-api/src/main/java/org/codehaus/redback/rest/api/model/User.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-api/src/main/java/org/codehaus/redback/rest/api/model/User.java?rev=1311034&r1=1311033&r2=1311034&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-api/src/main/java/org/codehaus/redback/rest/api/model/User.java (original)
+++ archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-api/src/main/java/org/codehaus/redback/rest/api/model/User.java Sun Apr  8 16:19:46 2012
@@ -1,6 +1,6 @@
 package org.codehaus.redback.rest.api.model;
 
-import org.codehaus.redback.integration.util.DateUtils;
+import org.apache.archiva.redback.integration.util.DateUtils;
 
 import javax.xml.bind.annotation.XmlRootElement;
 import java.io.Serializable;

Modified: archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/codehaus/redback/rest/services/DefaultLoginService.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/codehaus/redback/rest/services/DefaultLoginService.java?rev=1311034&r1=1311033&r2=1311034&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/codehaus/redback/rest/services/DefaultLoginService.java (original)
+++ archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/codehaus/redback/rest/services/DefaultLoginService.java Sun Apr  8 16:19:46 2012
@@ -30,7 +30,7 @@ import org.apache.archiva.redback.keys.m
 import org.apache.archiva.redback.keys.memory.MemoryKeyManager;
 import org.apache.archiva.redback.system.SecuritySession;
 import org.apache.archiva.redback.system.SecuritySystem;
-import org.codehaus.redback.integration.filter.authentication.HttpAuthenticator;
+import org.apache.archiva.redback.integration.filter.authentication.HttpAuthenticator;
 import org.codehaus.redback.rest.api.model.User;
 import org.codehaus.redback.rest.api.services.LoginService;
 import org.codehaus.redback.rest.api.services.RedbackServiceException;

Modified: archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/codehaus/redback/rest/services/DefaultPasswordService.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/codehaus/redback/rest/services/DefaultPasswordService.java?rev=1311034&r1=1311033&r2=1311034&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/codehaus/redback/rest/services/DefaultPasswordService.java (original)
+++ archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/codehaus/redback/rest/services/DefaultPasswordService.java Sun Apr  8 16:19:46 2012
@@ -27,7 +27,7 @@ import org.apache.archiva.redback.keys.A
 import org.apache.archiva.redback.keys.KeyManagerException;
 import org.apache.archiva.redback.system.SecuritySystem;
 import org.apache.archiva.redback.users.UserNotFoundException;
-import org.codehaus.redback.integration.filter.authentication.HttpAuthenticator;
+import org.apache.archiva.redback.integration.filter.authentication.HttpAuthenticator;
 import org.codehaus.redback.rest.api.model.ErrorMessage;
 import org.codehaus.redback.rest.api.services.PasswordService;
 import org.codehaus.redback.rest.api.services.RedbackServiceException;

Modified: archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/codehaus/redback/rest/services/DefaultRoleManagementService.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/codehaus/redback/rest/services/DefaultRoleManagementService.java?rev=1311034&r1=1311033&r2=1311034&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/codehaus/redback/rest/services/DefaultRoleManagementService.java (original)
+++ archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/codehaus/redback/rest/services/DefaultRoleManagementService.java Sun Apr  8 16:19:46 2012
@@ -32,9 +32,9 @@ import org.apache.commons.lang.StringUti
 import org.codehaus.plexus.redback.role.model.ModelApplication;
 import org.codehaus.plexus.redback.role.model.ModelRole;
 import org.codehaus.plexus.redback.role.model.ModelTemplate;
-import org.codehaus.redback.integration.model.AdminEditUserCredentials;
+import org.apache.archiva.redback.integration.model.AdminEditUserCredentials;
 import org.apache.archiva.redback.integration.security.role.RedbackRoleConstants;
-import org.codehaus.redback.integration.util.RoleSorter;
+import org.apache.archiva.redback.integration.util.RoleSorter;
 import org.codehaus.redback.rest.api.model.Application;
 import org.codehaus.redback.rest.api.model.ApplicationRoles;
 import org.codehaus.redback.rest.api.model.ErrorMessage;

Modified: archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/codehaus/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/codehaus/redback/rest/services/DefaultUserService.java?rev=1311034&r1=1311033&r2=1311034&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/codehaus/redback/rest/services/DefaultUserService.java (original)
+++ archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/codehaus/redback/rest/services/DefaultUserService.java Sun Apr  8 16:19:46 2012
@@ -42,8 +42,8 @@ import org.apache.archiva.redback.policy
 import org.apache.archiva.redback.rbac.RBACManager;
 import org.apache.archiva.redback.rbac.RbacObjectNotFoundException;
 import org.apache.archiva.redback.system.SecuritySystem;
-import org.codehaus.redback.integration.filter.authentication.HttpAuthenticator;
-import org.codehaus.redback.integration.mail.Mailer;
+import org.apache.archiva.redback.integration.filter.authentication.HttpAuthenticator;
+import org.apache.archiva.redback.integration.mail.Mailer;
 import org.apache.archiva.redback.integration.security.role.RedbackRoleConstants;
 import org.codehaus.redback.rest.api.model.ErrorMessage;
 import org.codehaus.redback.rest.api.model.Operation;

Modified: archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/codehaus/redback/rest/services/interceptors/AuthenticationInterceptor.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/codehaus/redback/rest/services/interceptors/AuthenticationInterceptor.java?rev=1311034&r1=1311033&r2=1311034&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/codehaus/redback/rest/services/interceptors/AuthenticationInterceptor.java (original)
+++ archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/codehaus/redback/rest/services/interceptors/AuthenticationInterceptor.java Sun Apr  8 16:19:46 2012
@@ -32,8 +32,8 @@ import org.apache.archiva.redback.author
 import org.apache.archiva.redback.policy.AccountLockedException;
 import org.apache.archiva.redback.system.SecuritySession;
 import org.apache.archiva.redback.users.UserNotFoundException;
-import org.codehaus.redback.integration.filter.authentication.HttpAuthenticationException;
-import org.codehaus.redback.integration.filter.authentication.basic.HttpBasicAuthentication;
+import org.apache.archiva.redback.integration.filter.authentication.HttpAuthenticationException;
+import org.apache.archiva.redback.integration.filter.authentication.basic.HttpBasicAuthentication;
 import org.codehaus.redback.rest.services.RedbackAuthenticationThreadLocal;
 import org.codehaus.redback.rest.services.RedbackRequestInformation;
 import org.slf4j.Logger;

Modified: archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/codehaus/redback/rest/services/interceptors/PermissionsInterceptor.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/codehaus/redback/rest/services/interceptors/PermissionsInterceptor.java?rev=1311034&r1=1311033&r2=1311034&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/codehaus/redback/rest/services/interceptors/PermissionsInterceptor.java (original)
+++ archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/codehaus/redback/rest/services/interceptors/PermissionsInterceptor.java Sun Apr  8 16:19:46 2012
@@ -28,7 +28,7 @@ import org.apache.archiva.redback.author
 import org.apache.archiva.redback.authorization.RedbackAuthorization;
 import org.apache.archiva.redback.system.SecuritySession;
 import org.apache.archiva.redback.system.SecuritySystem;
-import org.codehaus.redback.integration.filter.authentication.basic.HttpBasicAuthentication;
+import org.apache.archiva.redback.integration.filter.authentication.basic.HttpBasicAuthentication;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;

Modified: archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-content/src/main/webapp/WEB-INF/jsp/redback/admin/userList.jsp
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-content/src/main/webapp/WEB-INF/jsp/redback/admin/userList.jsp?rev=1311034&r1=1311033&r2=1311034&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-content/src/main/webapp/WEB-INF/jsp/redback/admin/userList.jsp (original)
+++ archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-content/src/main/webapp/WEB-INF/jsp/redback/admin/userList.jsp Sun Apr  8 16:19:46 2012
@@ -53,8 +53,8 @@
     filterable="true"
     showTitle="false"
     showExports="false"
-    view="org.codehaus.redback.integration.eXc.views.SecurityView" 
-    sortRowsCallback="org.codehaus.redback.integration.eXc.ProcessUserRowsCallback"
+    view="org.apache.archiva.redback.integration.eXc.views.SecurityView"
+    sortRowsCallback="org.apache.archiva.redback.integration.eXc.ProcessUserRowsCallback"
     cellspacing="2"
     cellpadding="3"
     >
@@ -71,7 +71,7 @@
        tooltip="Export Table to Excel format."/>
     <ec:row>          
         <ec:column property="username" title="${username}" 
-        	filterCell="org.codehaus.redback.integration.eXc.SecurityFilterCell">
+        	filterCell="org.apache.archiva.redback.integration.eXc.SecurityFilterCell">
           <img src="<c:url value="/images/redback/icon-user.gif"/>" />
           <redback:ifAuthorized permission="user-management-user-edit" resource="${user.username}">
             <s:url id="usereditUrl" action="useredit" includeParams="none">
@@ -92,16 +92,16 @@
           </redback:elseAuthorized>
         </ec:column>
         <ec:column property="fullName" title="${fullName}" alias="fullname" 
-        	filterCell="org.codehaus.redback.integration.eXc.SecurityFilterCell">
+        	filterCell="org.apache.archiva.redback.integration.eXc.SecurityFilterCell">
           <c:out value="${user.fullName}" />
         </ec:column>
-        <ec:column property="email" title="${email}" cell="org.codehaus.redback.integration.eXc.MailtoCell" 
-        	filterCell="org.codehaus.redback.integration.eXc.SecurityFilterCell" />
-        <ec:column property="permanent" cell="org.codehaus.redback.integration.eXc.CheckboxImageCell" 
+        <ec:column property="email" title="${email}" cell="org.apache.archiva.redback.integration.eXc.MailtoCell"
+        	filterCell="org.apache.archiva.redback.integration.eXc.SecurityFilterCell" />
+        <ec:column property="permanent" cell="org.apache.archiva.redback.integration.eXc.CheckboxImageCell"
         	style="text-align: center" title="${permanent}" filterable="false"/> <%-- Boolean's can't be filtered --%>
-        <ec:column property="validated" cell="org.codehaus.redback.integration.eXc.CheckboxImageCell" 
+        <ec:column property="validated" cell="org.apache.archiva.redback.integration.eXc.CheckboxImageCell"
         	style="text-align: center" title="${validated}" filterable="false"/> <%-- Boolean's can't be filtered --%>
-        <ec:column property="locked" cell="org.codehaus.redback.integration.eXc.CheckboxImageCell" 
+        <ec:column property="locked" cell="org.apache.archiva.redback.integration.eXc.CheckboxImageCell"
         	style="text-align: center" title="${locked}" filterable="false"/> <%-- Boolean's can't be filtered --%>
         
         <ec:column title="${tasks}" alias="tasks" sortable="false" filterable="false" styleClass="tasks">

Modified: archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/AbstractSecurityAction.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/AbstractSecurityAction.java?rev=1311034&r1=1311033&r2=1311034&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/AbstractSecurityAction.java (original)
+++ archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/AbstractSecurityAction.java Sun Apr  8 16:19:46 2012
@@ -27,9 +27,9 @@ import org.apache.archiva.redback.policy
 import org.apache.archiva.redback.policy.PasswordRuleViolations;
 import org.apache.archiva.redback.system.SecuritySession;
 import org.apache.archiva.redback.system.SecuritySystemConstants;
-import org.codehaus.redback.integration.interceptor.SecureAction;
-import org.codehaus.redback.integration.interceptor.SecureActionBundle;
-import org.codehaus.redback.integration.interceptor.SecureActionException;
+import org.apache.archiva.redback.integration.interceptor.SecureAction;
+import org.apache.archiva.redback.integration.interceptor.SecureActionBundle;
+import org.apache.archiva.redback.integration.interceptor.SecureActionException;
 
 /**
  * AbstractSecurityAction

Modified: archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/AbstractUserCredentialsAction.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/AbstractUserCredentialsAction.java?rev=1311034&r1=1311033&r2=1311034&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/AbstractUserCredentialsAction.java (original)
+++ archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/AbstractUserCredentialsAction.java Sun Apr  8 16:19:46 2012
@@ -28,9 +28,9 @@ import org.apache.archiva.redback.policy
 import org.apache.archiva.redback.rbac.RbacManagerException;
 import org.apache.archiva.redback.system.SecuritySystem;
 import org.codehaus.plexus.util.StringUtils;
-import org.codehaus.redback.integration.model.UserCredentials;
+import org.apache.archiva.redback.integration.model.UserCredentials;
 import org.apache.archiva.redback.integration.security.role.RedbackRoleConstants;
-import org.codehaus.redback.integration.util.RoleSorter;
+import org.apache.archiva.redback.integration.util.RoleSorter;
 
 import javax.inject.Inject;
 import javax.inject.Named;



Mime
View raw message