Apache
/
archiva-redback-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

package move to o.a.a.r module redback-common-integrations 

git-svn-id: https://svn.apache.org/repos/asf/archiva/redback/redback-core/trunk@1311034 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Olivier Lamy 2012-04-08 16:19:46 +00:00
parent 5064bb1760
commit 78766bc7ee
117 changed files with 214 additions and 214 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/HttpUtils.java → redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/HttpUtils.java
View File

@ -1,4 +1,4 @@
package org.codehaus.redback.integration; package org.apache.archiva.redback.integration;
/* /*
* Licensed to the Apache Software Foundation (ASF) under one * Licensed to the Apache Software Foundation (ASF) under one

2
redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/checks/ExpectedJsps.java → redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/checks/ExpectedJsps.java
View File

@ -1,4 +1,4 @@
package org.codehaus.redback.integration.checks; package org.apache.archiva.redback.integration.checks;
/* /*
* Licensed to the Apache Software Foundation (ASF) under one * Licensed to the Apache Software Foundation (ASF) under one

2
redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/checks/security/AdminAutoCreateCheck.java → redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/checks/security/AdminAutoCreateCheck.java
View File

@ -1,4 +1,4 @@
package org.codehaus.redback.integration.checks.security; package org.apache.archiva.redback.integration.checks.security;
/* /*
* Licensed to the Apache Software Foundation (ASF) under one * Licensed to the Apache Software Foundation (ASF) under one

2
redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/checks/security/GuestUserEnvironmentCheck.java → redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/checks/security/GuestUserEnvironmentCheck.java
View File

@ -1,4 +1,4 @@
package org.codehaus.redback.integration.checks.security; package org.apache.archiva.redback.integration.checks.security;
/* /*
* Licensed to the Apache Software Foundation (ASF) under one * Licensed to the Apache Software Foundation (ASF) under one

4
redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/checks/security/LockedAdminEnvironmentCheck.java → redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/checks/security/LockedAdminEnvironmentCheck.java
View File

@ -1,4 +1,4 @@
package org.codehaus.redback.integration.checks.security; package org.apache.archiva.redback.integration.checks.security;
/* /*
* Licensed to the Apache Software Foundation (ASF) under one * Licensed to the Apache Software Foundation (ASF) under one
@ -26,7 +26,7 @@ import org.apache.archiva.redback.rbac.RBACManager;
import org.apache.archiva.redback.rbac.UserAssignment; import org.apache.archiva.redback.rbac.UserAssignment;
import org.apache.archiva.redback.users.User; import org.apache.archiva.redback.users.User;
import org.apache.archiva.redback.users.UserManager; import org.apache.archiva.redback.users.UserManager;
import org.codehaus.redback.integration.role.RoleConstants; import org.apache.archiva.redback.integration.role.RoleConstants;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;

2
redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/checks/security/RequiredRolesEnvironmentCheck.java → redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/checks/security/RequiredRolesEnvironmentCheck.java
View File

@ -1,4 +1,4 @@
package org.codehaus.redback.integration.checks.security; package org.apache.archiva.redback.integration.checks.security;
/* /*
* Licensed to the Apache Software Foundation (ASF) under one * Licensed to the Apache Software Foundation (ASF) under one

2
redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/checks/xwork/XworkActionConfig.java → redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/checks/xwork/XworkActionConfig.java
View File

@ -1,4 +1,4 @@
package org.codehaus.redback.integration.checks.xwork; package org.apache.archiva.redback.integration.checks.xwork;
/* /*
* Licensed to the Apache Software Foundation (ASF) under one * Licensed to the Apache Software Foundation (ASF) under one

2
redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/checks/xwork/XworkPackageConfig.java → redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/checks/xwork/XworkPackageConfig.java
View File

@ -1,4 +1,4 @@
package org.codehaus.redback.integration.checks.xwork; package org.apache.archiva.redback.integration.checks.xwork;
/* /*
* Licensed to the Apache Software Foundation (ASF) under one * Licensed to the Apache Software Foundation (ASF) under one

2
redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/eXc/CheckboxImageCell.java → redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/eXc/CheckboxImageCell.java
View File

@ -1,4 +1,4 @@
package org.codehaus.redback.integration.eXc; package org.apache.archiva.redback.integration.eXc;
/* /*
* Licensed to the Apache Software Foundation (ASF) under one * Licensed to the Apache Software Foundation (ASF) under one

2
redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/eXc/MailtoCell.java → redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/eXc/MailtoCell.java
View File

@ -1,4 +1,4 @@
package org.codehaus.redback.integration.eXc; package org.apache.archiva.redback.integration.eXc;
/* /*
* Licensed to the Apache Software Foundation (ASF) under one * Licensed to the Apache Software Foundation (ASF) under one

4
redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/eXc/ProcessUserRowsCallback.java → redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/eXc/ProcessUserRowsCallback.java
View File

@ -1,4 +1,4 @@
package org.codehaus.redback.integration.eXc; package org.apache.archiva.redback.integration.eXc;
/* /*
* Licensed to the Apache Software Foundation (ASF) under one * Licensed to the Apache Software Foundation (ASF) under one
@ -23,7 +23,7 @@ import java.util.Collection;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
import org.codehaus.redback.integration.util.UserComparator; import org.apache.archiva.redback.integration.util.UserComparator;
import org.extremecomponents.table.callback.ProcessRowsCallback; import org.extremecomponents.table.callback.ProcessRowsCallback;
import org.extremecomponents.table.core.TableConstants; import org.extremecomponents.table.core.TableConstants;
import org.extremecomponents.table.core.TableModel; import org.extremecomponents.table.core.TableModel;

2
redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/eXc/SecurityFilterCell.java → redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/eXc/SecurityFilterCell.java
View File

@ -1,4 +1,4 @@
package org.codehaus.redback.integration.eXc; package org.apache.archiva.redback.integration.eXc;
/* /*
* Licensed to the Apache Software Foundation (ASF) under one * Licensed to the Apache Software Foundation (ASF) under one

2
redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/eXc/views/SecurityToolbar.java → redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/eXc/views/SecurityToolbar.java
View File

@ -1,4 +1,4 @@
package org.codehaus.redback.integration.eXc.views; package org.apache.archiva.redback.integration.eXc.views;
/* /*
* Licensed to the Apache Software Foundation (ASF) under one * Licensed to the Apache Software Foundation (ASF) under one

2
redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/eXc/views/SecurityView.java → redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/eXc/views/SecurityView.java
View File

@ -1,4 +1,4 @@
package org.codehaus.redback.integration.eXc.views; package org.apache.archiva.redback.integration.eXc.views;
/* /*
* Licensed to the Apache Software Foundation (ASF) under one * Licensed to the Apache Software Foundation (ASF) under one

2
redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/filter/SpringServletFilter.java → redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/filter/SpringServletFilter.java
View File

@ -1,4 +1,4 @@
package org.codehaus.redback.integration.filter; package org.apache.archiva.redback.integration.filter;
/* /*
* Licensed to the Apache Software Foundation (ASF) under one * Licensed to the Apache Software Foundation (ASF) under one

4
redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/filter/authentication/AbstractHttpAuthenticationFilter.java → redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/filter/authentication/AbstractHttpAuthenticationFilter.java
View File

@ -1,4 +1,4 @@
package org.codehaus.redback.integration.filter.authentication; package org.apache.archiva.redback.integration.filter.authentication;
/* /*
* Licensed to the Apache Software Foundation (ASF) under one * Licensed to the Apache Software Foundation (ASF) under one
@ -22,7 +22,7 @@ package org.codehaus.redback.integration.filter.authentication;
import javax.servlet.FilterConfig; import javax.servlet.FilterConfig;
import javax.servlet.ServletException; import javax.servlet.ServletException;
import org.codehaus.redback.integration.filter.SpringServletFilter; import org.apache.archiva.redback.integration.filter.SpringServletFilter;
/** /**
* AbstractHttpAuthenticationFilter * AbstractHttpAuthenticationFilter

2
redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/filter/authentication/HttpAuthenticationException.java → redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/filter/authentication/HttpAuthenticationException.java
View File

@ -1,4 +1,4 @@
package org.codehaus.redback.integration.filter.authentication; package org.apache.archiva.redback.integration.filter.authentication;
/* /*
* Licensed to the Apache Software Foundation (ASF) under one * Licensed to the Apache Software Foundation (ASF) under one

2
redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/filter/authentication/HttpAuthenticator.java → redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/filter/authentication/HttpAuthenticator.java
View File

@ -1,4 +1,4 @@
package org.codehaus.redback.integration.filter.authentication; package org.apache.archiva.redback.integration.filter.authentication;
/* /*
* Licensed to the Apache Software Foundation (ASF) under one * Licensed to the Apache Software Foundation (ASF) under one

4
redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/filter/authentication/basic/HttpBasicAuthentication.java → redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/filter/authentication/basic/HttpBasicAuthentication.java
View File

@ -1,4 +1,4 @@
package org.codehaus.redback.integration.filter.authentication.basic; package org.apache.archiva.redback.integration.filter.authentication.basic;
/* /*
* Licensed to the Apache Software Foundation (ASF) under one * Licensed to the Apache Software Foundation (ASF) under one
@ -33,7 +33,7 @@ import org.apache.archiva.redback.authentication.AuthenticationResult;
import org.apache.archiva.redback.authentication.PasswordBasedAuthenticationDataSource; import org.apache.archiva.redback.authentication.PasswordBasedAuthenticationDataSource;
import org.apache.archiva.redback.system.SecuritySession; import org.apache.archiva.redback.system.SecuritySession;
import org.codehaus.plexus.util.StringUtils; import org.codehaus.plexus.util.StringUtils;
import org.codehaus.redback.integration.filter.authentication.HttpAuthenticator; import org.apache.archiva.redback.integration.filter.authentication.HttpAuthenticator;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
/** /**

6
redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/filter/authentication/basic/HttpBasicAuthenticationFilter.java → redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/filter/authentication/basic/HttpBasicAuthenticationFilter.java
View File

@ -1,4 +1,4 @@
package org.codehaus.redback.integration.filter.authentication.basic; package org.apache.archiva.redback.integration.filter.authentication.basic;
/* /*
* Licensed to the Apache Software Foundation (ASF) under one * Licensed to the Apache Software Foundation (ASF) under one
@ -20,8 +20,8 @@ package org.codehaus.redback.integration.filter.authentication.basic;
*/ */
import org.apache.archiva.redback.authentication.AuthenticationException; import org.apache.archiva.redback.authentication.AuthenticationException;
import org.codehaus.redback.integration.filter.authentication.AbstractHttpAuthenticationFilter; import org.apache.archiva.redback.integration.filter.authentication.AbstractHttpAuthenticationFilter;
import org.codehaus.redback.integration.filter.authentication.HttpAuthenticator; import org.apache.archiva.redback.integration.filter.authentication.HttpAuthenticator;
import javax.servlet.FilterChain; import javax.servlet.FilterChain;
import javax.servlet.FilterConfig; import javax.servlet.FilterConfig;

2
redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/filter/authentication/digest/Digest.java → redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/filter/authentication/digest/Digest.java
View File

@ -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 * Licensed to the Apache Software Foundation (ASF) under one

2
redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/filter/authentication/digest/Hex.java → redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/filter/authentication/digest/Hex.java
View File

@ -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 * Licensed to the Apache Software Foundation (ASF) under one

6
redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/filter/authentication/digest/HttpDigestAuthentication.java → redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/filter/authentication/digest/HttpDigestAuthentication.java
View File

@ -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 * Licensed to the Apache Software Foundation (ASF) under one
@ -29,8 +29,8 @@ import org.apache.archiva.redback.policy.AccountLockedException;
import org.apache.archiva.redback.users.UserManager; import org.apache.archiva.redback.users.UserManager;
import org.apache.archiva.redback.users.UserNotFoundException; import org.apache.archiva.redback.users.UserNotFoundException;
import org.codehaus.plexus.util.StringUtils; import org.codehaus.plexus.util.StringUtils;
import org.codehaus.redback.integration.filter.authentication.HttpAuthenticationException; import org.apache.archiva.redback.integration.filter.authentication.HttpAuthenticationException;
import org.codehaus.redback.integration.filter.authentication.HttpAuthenticator; import org.apache.archiva.redback.integration.filter.authentication.HttpAuthenticator;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import javax.inject.Inject; import javax.inject.Inject;

8
redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/filter/authentication/digest/HttpDigestAuthenticationFilter.java → redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/filter/authentication/digest/HttpDigestAuthenticationFilter.java
View File

@ -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 * Licensed to the Apache Software Foundation (ASF) under one
@ -20,9 +20,9 @@ package org.codehaus.redback.integration.filter.authentication.digest;
*/ */
import org.apache.archiva.redback.authentication.AuthenticationException; import org.apache.archiva.redback.authentication.AuthenticationException;
import org.codehaus.redback.integration.filter.authentication.AbstractHttpAuthenticationFilter; import org.apache.archiva.redback.integration.filter.authentication.AbstractHttpAuthenticationFilter;
import org.codehaus.redback.integration.filter.authentication.HttpAuthenticator; import org.apache.archiva.redback.integration.filter.authentication.HttpAuthenticator;
import org.codehaus.redback.integration.filter.authentication.basic.HttpBasicAuthentication; import org.apache.archiva.redback.integration.filter.authentication.basic.HttpBasicAuthentication;
import javax.servlet.FilterChain; import javax.servlet.FilterChain;
import javax.servlet.FilterConfig; import javax.servlet.FilterConfig;

6
redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/filter/authentication/digest/HttpDigestHeader.java → redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/filter/authentication/digest/HttpDigestHeader.java
View File

@ -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 * Licensed to the Apache Software Foundation (ASF) under one
@ -22,8 +22,8 @@ package org.codehaus.redback.integration.filter.authentication.digest;
import org.apache.commons.codec.binary.Base64; import org.apache.commons.codec.binary.Base64;
import org.codehaus.plexus.util.StringUtils; import org.codehaus.plexus.util.StringUtils;
import org.codehaus.redback.integration.HttpUtils; import org.apache.archiva.redback.integration.HttpUtils;
import org.codehaus.redback.integration.filter.authentication.HttpAuthenticationException; import org.apache.archiva.redback.integration.filter.authentication.HttpAuthenticationException;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.context.annotation.Scope; import org.springframework.context.annotation.Scope;

4
redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/filter/authentication/digest/NonceExpirationException.java → redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/filter/authentication/digest/NonceExpirationException.java
View File

@ -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 * Licensed to the Apache Software Foundation (ASF) under one
@ -19,7 +19,7 @@ package org.codehaus.redback.integration.filter.authentication.digest;
* under the License. * under the License.
*/ */
import org.codehaus.redback.integration.filter.authentication.HttpAuthenticationException; import org.apache.archiva.redback.integration.filter.authentication.HttpAuthenticationException;
/** /**
* NonceExpirationException * NonceExpirationException

4
redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/filter/authorization/SimpleAuthorizationFilter.java → redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/filter/authorization/SimpleAuthorizationFilter.java
View File

@ -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 * Licensed to the Apache Software Foundation (ASF) under one
@ -23,7 +23,7 @@ import org.apache.archiva.redback.authorization.AuthorizationException;
import org.apache.archiva.redback.system.SecuritySession; import org.apache.archiva.redback.system.SecuritySession;
import org.apache.archiva.redback.system.SecuritySystem; import org.apache.archiva.redback.system.SecuritySystem;
import org.codehaus.plexus.util.StringUtils; 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.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;

2
redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/interceptor/SecureAction.java → redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/interceptor/SecureAction.java
View File

@ -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 * Licensed to the Apache Software Foundation (ASF) under one

2
redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/interceptor/SecureActionBundle.java → redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/interceptor/SecureActionBundle.java
View File

@ -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 * Licensed to the Apache Software Foundation (ASF) under one

2
redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/interceptor/SecureActionException.java → redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/interceptor/SecureActionException.java
View File

@ -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 * Licensed to the Apache Software Foundation (ASF) under one

2
redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/mail/MailGenerator.java → redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/mail/MailGenerator.java
View File

@ -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 * Licensed to the Apache Software Foundation (ASF) under one

2
redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/mail/Mailer.java → redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/mail/Mailer.java
View File

@ -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 * Licensed to the Apache Software Foundation (ASF) under one

2
redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/mail/MailerImpl.java → redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/mail/MailerImpl.java
View File

@ -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 * Licensed to the Apache Software Foundation (ASF) under one

2
redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/mail/VelocityMailGenerator.java → redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/mail/VelocityMailGenerator.java
View File

@ -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 * Licensed to the Apache Software Foundation (ASF) under one

2
redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/model/AdminEditUserCredentials.java → redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/model/AdminEditUserCredentials.java
View File

@ -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 * Licensed to the Apache Software Foundation (ASF) under one

2
redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/model/CreateRoleDetails.java → redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/model/CreateRoleDetails.java
View File

@ -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 * Licensed to the Apache Software Foundation (ASF) under one

2
redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/model/CreateUserCredentials.java → redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/model/CreateUserCredentials.java
View File

@ -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 * Licensed to the Apache Software Foundation (ASF) under one

2
redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/model/EditRoleDetails.java → redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/model/EditRoleDetails.java
View File

@ -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 * Licensed to the Apache Software Foundation (ASF) under one

4
redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/model/EditUserCredentials.java → redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/model/EditUserCredentials.java
View File

@ -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 * Licensed to the Apache Software Foundation (ASF) under one
@ -20,7 +20,7 @@ package org.codehaus.redback.integration.model;
*/ */
import org.apache.archiva.redback.users.User; import org.apache.archiva.redback.users.User;
import org.codehaus.redback.integration.util.DateUtils; import org.apache.archiva.redback.integration.util.DateUtils;
/** /**
* EditUserCredentials * EditUserCredentials

2
redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/model/RoleDetails.java → redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/model/RoleDetails.java
View File

@ -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 * Licensed to the Apache Software Foundation (ASF) under one

2
redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/model/SimplePermission.java → redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/model/SimplePermission.java
View File

@ -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 * Licensed to the Apache Software Foundation (ASF) under one

2
redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/model/UserCredentials.java → redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/model/UserCredentials.java
View File

@ -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 * Licensed to the Apache Software Foundation (ASF) under one

6
redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/reports/CsvRolesMatrix.java → redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/reports/CsvRolesMatrix.java
View File

@ -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 * Licensed to the Apache Software Foundation (ASF) under one
@ -26,8 +26,8 @@ import org.apache.archiva.redback.users.UserManager;
import org.apache.commons.lang.StringEscapeUtils; import org.apache.commons.lang.StringEscapeUtils;
import org.apache.archiva.redback.system.SecuritySystem; import org.apache.archiva.redback.system.SecuritySystem;
import org.apache.archiva.redback.users.User; import org.apache.archiva.redback.users.User;
import org.codehaus.redback.integration.util.RoleSorter; import org.apache.archiva.redback.integration.util.RoleSorter;
import org.codehaus.redback.integration.util.UserComparator; import org.apache.archiva.redback.integration.util.UserComparator;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import javax.inject.Inject; import javax.inject.Inject;

4
redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/reports/CsvUserList.java → redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/reports/CsvUserList.java
View File

@ -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 * Licensed to the Apache Software Foundation (ASF) under one
@ -24,7 +24,7 @@ import org.apache.archiva.redback.users.UserManager;
import org.apache.commons.beanutils.PropertyUtils; import org.apache.commons.beanutils.PropertyUtils;
import org.apache.commons.lang.StringEscapeUtils; import org.apache.commons.lang.StringEscapeUtils;
import org.apache.archiva.redback.system.SecuritySystem; 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.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;

2
redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/reports/Report.java → redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/reports/Report.java
View File

@ -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 * Licensed to the Apache Software Foundation (ASF) under one

2
redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/reports/ReportException.java → redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/reports/ReportException.java
View File

@ -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 * Licensed to the Apache Software Foundation (ASF) under one

3
redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/reports/ReportManager.java → redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/reports/ReportManager.java
View File

@ -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 * Licensed to the Apache Software Foundation (ASF) under one
@ -25,7 +25,6 @@ import org.springframework.stereotype.Service;
import javax.annotation.PostConstruct; import javax.annotation.PostConstruct;
import javax.inject.Inject; import javax.inject.Inject;
import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;

2
redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/role/RoleConstants.java → redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/role/RoleConstants.java
View File

@ -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 * Licensed to the Apache Software Foundation (ASF) under one

2
redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/taglib/jsp/ElseAuthorizedTag.java → redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/taglib/jsp/ElseAuthorizedTag.java
View File

@ -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 * Licensed to the Apache Software Foundation (ASF) under one

2
redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/taglib/jsp/IfAnyAuthorizedTag.java → redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/taglib/jsp/IfAnyAuthorizedTag.java
View File

@ -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 * Licensed to the Apache Software Foundation (ASF) under one

2
redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/taglib/jsp/IfAuthorizedTag.java → redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/taglib/jsp/IfAuthorizedTag.java
View File

@ -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 * Licensed to the Apache Software Foundation (ASF) under one

2
redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/taglib/jsp/IfConfiguredTag.java → redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/taglib/jsp/IfConfiguredTag.java
View File

@ -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 * Licensed to the Apache Software Foundation (ASF) under one

2
redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/taglib/jsp/IsNotReadOnlyUserManagerTag.java → redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/taglib/jsp/IsNotReadOnlyUserManagerTag.java
View File

@ -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 * Licensed to the Apache Software Foundation (ASF) under one

2
redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/taglib/jsp/IsReadOnlyUserManagerTag.java → redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/taglib/jsp/IsReadOnlyUserManagerTag.java
View File

@ -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 * Licensed to the Apache Software Foundation (ASF) under one

2
redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/util/AutoLoginCookies.java → redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/util/AutoLoginCookies.java
View File

@ -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 * Licensed to the Apache Software Foundation (ASF) under one

2
redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/util/DateUtils.java → redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/util/DateUtils.java
View File

@ -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 * Licensed to the Apache Software Foundation (ASF) under one

2
redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/util/ModelTemplateSorter.java → redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/util/ModelTemplateSorter.java
View File

@ -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 * Licensed to the Apache Software Foundation (ASF) under one

2
redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/util/OperationSorter.java → redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/util/OperationSorter.java
View File

@ -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 * Licensed to the Apache Software Foundation (ASF) under one

2
redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/util/PermissionSorter.java → redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/util/PermissionSorter.java
View File

@ -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 * Licensed to the Apache Software Foundation (ASF) under one

2
redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/util/ResourceSorter.java → redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/util/ResourceSorter.java
View File

@ -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 * Licensed to the Apache Software Foundation (ASF) under one

2
redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/util/RoleSorter.java → redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/util/RoleSorter.java
View File

@ -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 * Licensed to the Apache Software Foundation (ASF) under one

2
redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/util/TemplatedRoleSorter.java → redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/util/TemplatedRoleSorter.java
View File

@ -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 * Licensed to the Apache Software Foundation (ASF) under one

2
redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/util/UserComparator.java → redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/util/UserComparator.java
View File

@ -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 * Licensed to the Apache Software Foundation (ASF) under one

2
redback-integrations/redback-common-integrations/src/main/resources/META-INF/spring-context.xml
View File

@ -28,7 +28,7 @@
default-lazy-init="true"> default-lazy-init="true">
<context:annotation-config /> <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"> <bean name="velocityEngine#redback" class="org.springframework.ui.velocity.VelocityEngineFactoryBean">
<property name="velocityProperties"> <property name="velocityProperties">

12
redback-integrations/redback-common-integrations/src/main/resources/META-INF/tld/plexus-security-system.tld
View File

@ -24,7 +24,7 @@
<tag> <tag>
<name>ifConfigured</name> <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> <body-content>JSP</body-content>
<attribute> <attribute>
<name>option</name> <name>option</name>
@ -40,19 +40,19 @@
<tag> <tag>
<name>isReadOnlyUserManager</name> <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> <body-content>JSP</body-content>
</tag> </tag>
<tag> <tag>
<name>isNotReadOnlyUserManager</name> <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> <body-content>JSP</body-content>
</tag> </tag>
<tag> <tag>
<name>ifAuthorized</name> <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> <body-content>JSP</body-content>
<attribute> <attribute>
<name>permission</name> <name>permission</name>
@ -68,7 +68,7 @@
<tag> <tag>
<name>ifAnyAuthorized</name> <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> <body-content>JSP</body-content>
<attribute> <attribute>
<name>permissions</name> <name>permissions</name>
@ -84,7 +84,7 @@
<tag> <tag>
<name>elseAuthorized</name> <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> <body-content>JSP</body-content>
</tag> </tag>

0
redback-integrations/redback-common-integrations/src/main/resources/org/codehaus/redback/i18n/default.properties → redback-integrations/redback-common-integrations/src/main/resources/org/apache/archiva/redback/i18n/default.properties
View File

0
redback-integrations/redback-common-integrations/src/main/resources/org/codehaus/redback/i18n/default_de.properties → redback-integrations/redback-common-integrations/src/main/resources/org/apache/archiva/redback/i18n/default_de.properties
View File

0
redback-integrations/redback-common-integrations/src/main/resources/org/codehaus/redback/i18n/default_en.properties → redback-integrations/redback-common-integrations/src/main/resources/org/apache/archiva/redback/i18n/default_en.properties
View File

0
redback-integrations/redback-common-integrations/src/main/resources/org/codehaus/redback/i18n/default_fr.properties → redback-integrations/redback-common-integrations/src/main/resources/org/apache/archiva/redback/i18n/default_fr.properties
View File

0
redback-integrations/redback-common-integrations/src/main/resources/org/codehaus/redback/integration/mail/template/newAccountValidationEmail.vm → redback-integrations/redback-common-integrations/src/main/resources/org/apache/archiva/redback/integration/mail/template/newAccountValidationEmail.vm
View File

0
redback-integrations/redback-common-integrations/src/main/resources/org/codehaus/redback/integration/mail/template/passwordResetEmail.vm → redback-integrations/redback-common-integrations/src/main/resources/org/apache/archiva/redback/integration/mail/template/passwordResetEmail.vm
View File

4
redback-integrations/redback-common-integrations/src/test/java/org/codehaus/redback/integration/HttpUtilsTest.java → redback-integrations/redback-common-integrations/src/test/java/org/apache/archiva/redback/integration/HttpUtilsTest.java
View File

@ -1,4 +1,4 @@
package org.codehaus.redback.integration; package org.apache.archiva.redback.integration;
/* /*
* Licensed to the Apache Software Foundation (ASF) under one * Licensed to the Apache Software Foundation (ASF) under one
@ -23,7 +23,7 @@ import java.util.Properties;
import junit.framework.TestCase; import junit.framework.TestCase;
import org.codehaus.redback.integration.HttpUtils; import org.apache.archiva.redback.integration.HttpUtils;
/** /**
* HttpUtilsTest * HttpUtilsTest

2
redback-integrations/redback-common-integrations/src/test/java/org/codehaus/redback/integration/filter/authentication/digest/HexTest.java → redback-integrations/redback-common-integrations/src/test/java/org/apache/archiva/redback/integration/filter/authentication/digest/HexTest.java
View File

@ -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 * Licensed to the Apache Software Foundation (ASF) under one

3
redback-integrations/redback-common-integrations/src/test/java/org/codehaus/redback/integration/mail/MailGeneratorTest.java → redback-integrations/redback-common-integrations/src/test/java/org/apache/archiva/redback/integration/mail/MailGeneratorTest.java
View File

@ -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 * Licensed to the Apache Software Foundation (ASF) under one
@ -21,6 +21,7 @@ package org.codehaus.redback.integration.mail;
import junit.framework.TestCase; import junit.framework.TestCase;
import net.sf.ehcache.CacheManager; 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.AuthenticationKey;
import org.apache.archiva.redback.keys.KeyManager; import org.apache.archiva.redback.keys.KeyManager;
import org.apache.archiva.redback.policy.UserSecurityPolicy; import org.apache.archiva.redback.policy.UserSecurityPolicy;

2
redback-integrations/redback-common-integrations/src/test/java/org/codehaus/redback/integration/mail/MockJavaMailSender.java → redback-integrations/redback-common-integrations/src/test/java/org/apache/archiva/redback/integration/mail/MockJavaMailSender.java
View File

@ -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 * Licensed to the Apache Software Foundation (ASF) under one

0
redback-integrations/redback-common-integrations/src/test/resources/org/codehaus/plexus/redback/config-defaults.properties → redback-integrations/redback-common-integrations/src/test/resources/org/apache/archiva/redback/config-defaults.properties
View File

2
redback-integrations/redback-common-integrations/src/test/resources/spring-context.xml
View File

@ -50,7 +50,7 @@
</property> </property>
</bean> </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="config" ref="userConfiguration#custom-url"/>
<property name="velocityEngine" ref="velocityEngine#redback"/> <property name="velocityEngine" ref="velocityEngine#redback"/>
</bean> </bean>

2
redback-integrations/redback-rest/redback-rest-api/src/main/java/org/codehaus/redback/rest/api/model/User.java
View File

@ -1,6 +1,6 @@
package org.codehaus.redback.rest.api.model; 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 javax.xml.bind.annotation.XmlRootElement;
import java.io.Serializable; import java.io.Serializable;

2
redback-integrations/redback-rest/redback-rest-services/src/main/java/org/codehaus/redback/rest/services/DefaultLoginService.java
View File

@ -30,7 +30,7 @@ import org.apache.archiva.redback.keys.memory.MemoryAuthenticationKey;
import org.apache.archiva.redback.keys.memory.MemoryKeyManager; import org.apache.archiva.redback.keys.memory.MemoryKeyManager;
import org.apache.archiva.redback.system.SecuritySession; import org.apache.archiva.redback.system.SecuritySession;
import org.apache.archiva.redback.system.SecuritySystem; 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.model.User;
import org.codehaus.redback.rest.api.services.LoginService; import org.codehaus.redback.rest.api.services.LoginService;
import org.codehaus.redback.rest.api.services.RedbackServiceException; import org.codehaus.redback.rest.api.services.RedbackServiceException;

2
redback-integrations/redback-rest/redback-rest-services/src/main/java/org/codehaus/redback/rest/services/DefaultPasswordService.java
View File

@ -27,7 +27,7 @@ import org.apache.archiva.redback.keys.AuthenticationKey;
import org.apache.archiva.redback.keys.KeyManagerException; import org.apache.archiva.redback.keys.KeyManagerException;
import org.apache.archiva.redback.system.SecuritySystem; import org.apache.archiva.redback.system.SecuritySystem;
import org.apache.archiva.redback.users.UserNotFoundException; 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.model.ErrorMessage;
import org.codehaus.redback.rest.api.services.PasswordService; import org.codehaus.redback.rest.api.services.PasswordService;
import org.codehaus.redback.rest.api.services.RedbackServiceException; import org.codehaus.redback.rest.api.services.RedbackServiceException;

4
redback-integrations/redback-rest/redback-rest-services/src/main/java/org/codehaus/redback/rest/services/DefaultRoleManagementService.java
View File

@ -32,9 +32,9 @@ import org.apache.commons.lang.StringUtils;
import org.codehaus.plexus.redback.role.model.ModelApplication; import org.codehaus.plexus.redback.role.model.ModelApplication;
import org.codehaus.plexus.redback.role.model.ModelRole; import org.codehaus.plexus.redback.role.model.ModelRole;
import org.codehaus.plexus.redback.role.model.ModelTemplate; 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.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.Application;
import org.codehaus.redback.rest.api.model.ApplicationRoles; import org.codehaus.redback.rest.api.model.ApplicationRoles;
import org.codehaus.redback.rest.api.model.ErrorMessage; import org.codehaus.redback.rest.api.model.ErrorMessage;

4
redback-integrations/redback-rest/redback-rest-services/src/main/java/org/codehaus/redback/rest/services/DefaultUserService.java
View File

@ -42,8 +42,8 @@ import org.apache.archiva.redback.policy.UserSecurityPolicy;
import org.apache.archiva.redback.rbac.RBACManager; import org.apache.archiva.redback.rbac.RBACManager;
import org.apache.archiva.redback.rbac.RbacObjectNotFoundException; import org.apache.archiva.redback.rbac.RbacObjectNotFoundException;
import org.apache.archiva.redback.system.SecuritySystem; 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.integration.mail.Mailer; import org.apache.archiva.redback.integration.mail.Mailer;
import org.apache.archiva.redback.integration.security.role.RedbackRoleConstants; import org.apache.archiva.redback.integration.security.role.RedbackRoleConstants;
import org.codehaus.redback.rest.api.model.ErrorMessage; import org.codehaus.redback.rest.api.model.ErrorMessage;
import org.codehaus.redback.rest.api.model.Operation; import org.codehaus.redback.rest.api.model.Operation;

4
redback-integrations/redback-rest/redback-rest-services/src/main/java/org/codehaus/redback/rest/services/interceptors/AuthenticationInterceptor.java
View File

@ -32,8 +32,8 @@ import org.apache.archiva.redback.authorization.RedbackAuthorization;
import org.apache.archiva.redback.policy.AccountLockedException; import org.apache.archiva.redback.policy.AccountLockedException;
import org.apache.archiva.redback.system.SecuritySession; import org.apache.archiva.redback.system.SecuritySession;
import org.apache.archiva.redback.users.UserNotFoundException; import org.apache.archiva.redback.users.UserNotFoundException;
import org.codehaus.redback.integration.filter.authentication.HttpAuthenticationException; import org.apache.archiva.redback.integration.filter.authentication.HttpAuthenticationException;
import org.codehaus.redback.integration.filter.authentication.basic.HttpBasicAuthentication; import org.apache.archiva.redback.integration.filter.authentication.basic.HttpBasicAuthentication;
import org.codehaus.redback.rest.services.RedbackAuthenticationThreadLocal; import org.codehaus.redback.rest.services.RedbackAuthenticationThreadLocal;
import org.codehaus.redback.rest.services.RedbackRequestInformation; import org.codehaus.redback.rest.services.RedbackRequestInformation;
import org.slf4j.Logger; import org.slf4j.Logger;

2
redback-integrations/redback-rest/redback-rest-services/src/main/java/org/codehaus/redback/rest/services/interceptors/PermissionsInterceptor.java
View File

@ -28,7 +28,7 @@ import org.apache.archiva.redback.authorization.AuthorizationException;
import org.apache.archiva.redback.authorization.RedbackAuthorization; import org.apache.archiva.redback.authorization.RedbackAuthorization;
import org.apache.archiva.redback.system.SecuritySession; import org.apache.archiva.redback.system.SecuritySession;
import org.apache.archiva.redback.system.SecuritySystem; 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.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;

18
redback-integrations/redback-struts2/redback-struts2-content/src/main/webapp/WEB-INF/jsp/redback/admin/userList.jsp
View File

@ -53,8 +53,8 @@
filterable="true" filterable="true"
showTitle="false" showTitle="false"
showExports="false" showExports="false"
view="org.codehaus.redback.integration.eXc.views.SecurityView" view="org.apache.archiva.redback.integration.eXc.views.SecurityView"
sortRowsCallback="org.codehaus.redback.integration.eXc.ProcessUserRowsCallback" sortRowsCallback="org.apache.archiva.redback.integration.eXc.ProcessUserRowsCallback"
cellspacing="2" cellspacing="2"
cellpadding="3" cellpadding="3"
> >
@ -71,7 +71,7 @@
tooltip="Export Table to Excel format."/> tooltip="Export Table to Excel format."/>
<ec:row> <ec:row>
<ec:column property="username" title="${username}" <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"/>" /> <img src="<c:url value="/images/redback/icon-user.gif"/>" />
<redback:ifAuthorized permission="user-management-user-edit" resource="${user.username}"> <redback:ifAuthorized permission="user-management-user-edit" resource="${user.username}">
<s:url id="usereditUrl" action="useredit" includeParams="none"> <s:url id="usereditUrl" action="useredit" includeParams="none">
@ -92,16 +92,16 @@
</redback:elseAuthorized> </redback:elseAuthorized>
</ec:column> </ec:column>
<ec:column property="fullName" title="${fullName}" alias="fullname" <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}" /> <c:out value="${user.fullName}" />
</ec:column> </ec:column>
<ec:column property="email" title="${email}" cell="org.codehaus.redback.integration.eXc.MailtoCell" <ec:column property="email" title="${email}" cell="org.apache.archiva.redback.integration.eXc.MailtoCell"
filterCell="org.codehaus.redback.integration.eXc.SecurityFilterCell" /> filterCell="org.apache.archiva.redback.integration.eXc.SecurityFilterCell" />
<ec:column property="permanent" cell="org.codehaus.redback.integration.eXc.CheckboxImageCell" <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 --%> 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 --%> 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 --%> 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"> <ec:column title="${tasks}" alias="tasks" sortable="false" filterable="false" styleClass="tasks">

6
redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/AbstractSecurityAction.java
View File

@ -27,9 +27,9 @@ import org.apache.archiva.redback.policy.PasswordRuleViolationException;
import org.apache.archiva.redback.policy.PasswordRuleViolations; import org.apache.archiva.redback.policy.PasswordRuleViolations;
import org.apache.archiva.redback.system.SecuritySession; import org.apache.archiva.redback.system.SecuritySession;
import org.apache.archiva.redback.system.SecuritySystemConstants; import org.apache.archiva.redback.system.SecuritySystemConstants;
import org.codehaus.redback.integration.interceptor.SecureAction; import org.apache.archiva.redback.integration.interceptor.SecureAction;
import org.codehaus.redback.integration.interceptor.SecureActionBundle; import org.apache.archiva.redback.integration.interceptor.SecureActionBundle;
import org.codehaus.redback.integration.interceptor.SecureActionException; import org.apache.archiva.redback.integration.interceptor.SecureActionException;
/** /**
* AbstractSecurityAction * AbstractSecurityAction

4
redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/AbstractUserCredentialsAction.java
View File

@ -28,9 +28,9 @@ import org.apache.archiva.redback.policy.PasswordRuleViolationException;
import org.apache.archiva.redback.rbac.RbacManagerException; import org.apache.archiva.redback.rbac.RbacManagerException;
import org.apache.archiva.redback.system.SecuritySystem; import org.apache.archiva.redback.system.SecuritySystem;
import org.codehaus.plexus.util.StringUtils; 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.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.Inject;
import javax.inject.Named; import javax.inject.Named;

6
redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/AccountAction.java
View File

@ -28,9 +28,9 @@ import org.apache.archiva.redback.system.SecuritySession;
import org.apache.archiva.redback.system.SecuritySystemConstants; import org.apache.archiva.redback.system.SecuritySystemConstants;
import org.apache.archiva.redback.users.UserManager; import org.apache.archiva.redback.users.UserManager;
import org.codehaus.plexus.util.StringUtils; import org.codehaus.plexus.util.StringUtils;
import org.codehaus.redback.integration.interceptor.SecureActionBundle; import org.apache.archiva.redback.integration.interceptor.SecureActionBundle;
import org.codehaus.redback.integration.interceptor.SecureActionException; import org.apache.archiva.redback.integration.interceptor.SecureActionException;
import org.codehaus.redback.integration.model.EditUserCredentials; import org.apache.archiva.redback.integration.model.EditUserCredentials;
import org.springframework.context.annotation.Scope; import org.springframework.context.annotation.Scope;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;

6
redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/LoginAction.java
View File

@ -37,9 +37,9 @@ import org.apache.archiva.redback.system.SecuritySession;
import org.apache.archiva.redback.system.SecuritySystem; import org.apache.archiva.redback.system.SecuritySystem;
import org.apache.archiva.redback.users.UserNotFoundException; import org.apache.archiva.redback.users.UserNotFoundException;
import org.codehaus.plexus.util.StringUtils; import org.codehaus.plexus.util.StringUtils;
import org.codehaus.redback.integration.interceptor.SecureActionBundle; import org.apache.archiva.redback.integration.interceptor.SecureActionBundle;
import org.codehaus.redback.integration.interceptor.SecureActionException; import org.apache.archiva.redback.integration.interceptor.SecureActionException;
import org.codehaus.redback.integration.util.AutoLoginCookies; import org.apache.archiva.redback.integration.util.AutoLoginCookies;
import org.springframework.context.annotation.Scope; import org.springframework.context.annotation.Scope;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;

6
redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/LogoutAction.java
View File

@ -22,9 +22,9 @@ package org.codehaus.plexus.redback.struts2.action;
import org.apache.struts2.ServletActionContext; import org.apache.struts2.ServletActionContext;
import org.apache.struts2.dispatcher.SessionMap; import org.apache.struts2.dispatcher.SessionMap;
import org.codehaus.plexus.cache.Cache; import org.codehaus.plexus.cache.Cache;
import org.codehaus.redback.integration.interceptor.SecureActionBundle; import org.apache.archiva.redback.integration.interceptor.SecureActionBundle;
import org.codehaus.redback.integration.interceptor.SecureActionException; import org.apache.archiva.redback.integration.interceptor.SecureActionException;
import org.codehaus.redback.integration.util.AutoLoginCookies; import org.apache.archiva.redback.integration.util.AutoLoginCookies;
import org.springframework.context.annotation.Scope; import org.springframework.context.annotation.Scope;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;

4
redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/PasswordAction.java
View File

@ -27,8 +27,8 @@ import org.apache.archiva.redback.system.SecuritySession;
import org.apache.archiva.redback.system.SecuritySystem; import org.apache.archiva.redback.system.SecuritySystem;
import org.apache.archiva.redback.users.UserNotFoundException; import org.apache.archiva.redback.users.UserNotFoundException;
import org.codehaus.plexus.util.StringUtils; import org.codehaus.plexus.util.StringUtils;
import org.codehaus.redback.integration.interceptor.SecureActionBundle; import org.apache.archiva.redback.integration.interceptor.SecureActionBundle;
import org.codehaus.redback.integration.interceptor.SecureActionException; import org.apache.archiva.redback.integration.interceptor.SecureActionException;
import org.springframework.context.annotation.Scope; import org.springframework.context.annotation.Scope;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;

6
redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/PasswordResetAction.java
View File

@ -28,9 +28,9 @@ import org.apache.archiva.redback.keys.KeyManagerException;
import org.apache.archiva.redback.system.SecuritySystem; import org.apache.archiva.redback.system.SecuritySystem;
import org.apache.archiva.redback.users.User; import org.apache.archiva.redback.users.User;
import org.codehaus.plexus.util.StringUtils; import org.codehaus.plexus.util.StringUtils;
import org.codehaus.redback.integration.interceptor.SecureActionBundle; import org.apache.archiva.redback.integration.interceptor.SecureActionBundle;
import org.codehaus.redback.integration.interceptor.SecureActionException; import org.apache.archiva.redback.integration.interceptor.SecureActionException;
import org.codehaus.redback.integration.mail.Mailer; import org.apache.archiva.redback.integration.mail.Mailer;
import org.springframework.context.annotation.Scope; import org.springframework.context.annotation.Scope;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;

8
redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/RegisterAction.java
View File

@ -27,10 +27,10 @@ import org.apache.archiva.redback.users.User;
import org.apache.archiva.redback.keys.KeyManagerException; import org.apache.archiva.redback.keys.KeyManagerException;
import org.apache.archiva.redback.users.UserManager; import org.apache.archiva.redback.users.UserManager;
import org.apache.archiva.redback.users.UserNotFoundException; import org.apache.archiva.redback.users.UserNotFoundException;
import org.codehaus.redback.integration.interceptor.SecureActionBundle; import org.apache.archiva.redback.integration.interceptor.SecureActionBundle;
import org.codehaus.redback.integration.interceptor.SecureActionException; import org.apache.archiva.redback.integration.interceptor.SecureActionException;
import org.codehaus.redback.integration.mail.Mailer; import org.apache.archiva.redback.integration.mail.Mailer;
import org.codehaus.redback.integration.model.CreateUserCredentials; import org.apache.archiva.redback.integration.model.CreateUserCredentials;
import org.apache.archiva.redback.integration.security.role.RedbackRoleConstants; import org.apache.archiva.redback.integration.security.role.RedbackRoleConstants;
import org.springframework.context.annotation.Scope; import org.springframework.context.annotation.Scope;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;

8
redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/AddAdminUserAction.java
View File

@ -35,10 +35,10 @@ import org.codehaus.plexus.redback.struts2.action.AuditEvent;
import org.apache.archiva.redback.system.SecuritySession; import org.apache.archiva.redback.system.SecuritySession;
import org.apache.archiva.redback.users.User; import org.apache.archiva.redback.users.User;
import org.apache.archiva.redback.users.UserNotFoundException; import org.apache.archiva.redback.users.UserNotFoundException;
import org.codehaus.redback.integration.interceptor.SecureActionBundle; import org.apache.archiva.redback.integration.interceptor.SecureActionBundle;
import org.codehaus.redback.integration.interceptor.SecureActionException; import org.apache.archiva.redback.integration.interceptor.SecureActionException;
import org.codehaus.redback.integration.model.EditUserCredentials; import org.apache.archiva.redback.integration.model.EditUserCredentials;
import org.codehaus.redback.integration.util.AutoLoginCookies; import org.apache.archiva.redback.integration.util.AutoLoginCookies;
import org.springframework.context.annotation.Scope; import org.springframework.context.annotation.Scope;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;

6
redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/AdminConsoleAction.java
View File

@ -21,9 +21,9 @@ package org.codehaus.plexus.redback.struts2.action.admin;
import org.apache.archiva.redback.rbac.Resource; import org.apache.archiva.redback.rbac.Resource;
import org.codehaus.plexus.redback.struts2.action.AbstractSecurityAction; import org.codehaus.plexus.redback.struts2.action.AbstractSecurityAction;
import org.codehaus.redback.integration.interceptor.SecureActionBundle; import org.apache.archiva.redback.integration.interceptor.SecureActionBundle;
import org.codehaus.redback.integration.interceptor.SecureActionException; import org.apache.archiva.redback.integration.interceptor.SecureActionException;
import org.codehaus.redback.integration.role.RoleConstants; import org.apache.archiva.redback.integration.role.RoleConstants;
import org.springframework.context.annotation.Scope; import org.springframework.context.annotation.Scope;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;

8
redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/AssignmentsAction.java
View File

@ -33,10 +33,10 @@ import org.codehaus.plexus.redback.struts2.model.ApplicationRoleDetails;
import org.codehaus.plexus.redback.struts2.model.ApplicationRoleDetails.RoleTableCell; import org.codehaus.plexus.redback.struts2.model.ApplicationRoleDetails.RoleTableCell;
import org.apache.archiva.redback.users.UserManager; import org.apache.archiva.redback.users.UserManager;
import org.codehaus.plexus.util.StringUtils; import org.codehaus.plexus.util.StringUtils;
import org.codehaus.redback.integration.interceptor.SecureActionBundle; import org.apache.archiva.redback.integration.interceptor.SecureActionBundle;
import org.codehaus.redback.integration.interceptor.SecureActionException; import org.apache.archiva.redback.integration.interceptor.SecureActionException;
import org.codehaus.redback.integration.model.AdminEditUserCredentials; import org.apache.archiva.redback.integration.model.AdminEditUserCredentials;
import org.codehaus.redback.integration.role.RoleConstants; import org.apache.archiva.redback.integration.role.RoleConstants;
import org.springframework.context.annotation.Scope; import org.springframework.context.annotation.Scope;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;

8
redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/BackupRestoreAction.java
View File

@ -27,10 +27,10 @@ import org.apache.archiva.redback.keys.KeyManager;
import org.apache.archiva.redback.management.DataManagementTool; import org.apache.archiva.redback.management.DataManagementTool;
import org.codehaus.plexus.redback.struts2.action.AbstractSecurityAction; import org.codehaus.plexus.redback.struts2.action.AbstractSecurityAction;
import org.apache.archiva.redback.users.UserManager; import org.apache.archiva.redback.users.UserManager;
import org.codehaus.redback.integration.interceptor.SecureAction; import org.apache.archiva.redback.integration.interceptor.SecureAction;
import org.codehaus.redback.integration.interceptor.SecureActionBundle; import org.apache.archiva.redback.integration.interceptor.SecureActionBundle;
import org.codehaus.redback.integration.interceptor.SecureActionException; import org.apache.archiva.redback.integration.interceptor.SecureActionException;
import org.codehaus.redback.integration.role.RoleConstants; import org.apache.archiva.redback.integration.role.RoleConstants;
import org.springframework.context.annotation.Scope; import org.springframework.context.annotation.Scope;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;

4
redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/EditRoleAction.java
View File

@ -31,8 +31,8 @@ import org.codehaus.plexus.redback.struts2.action.AuditEvent;
import org.apache.archiva.redback.users.UserManager; import org.apache.archiva.redback.users.UserManager;
import org.apache.archiva.redback.users.UserNotFoundException; import org.apache.archiva.redback.users.UserNotFoundException;
import org.codehaus.plexus.util.StringUtils; import org.codehaus.plexus.util.StringUtils;
import org.codehaus.redback.integration.interceptor.SecureActionBundle; import org.apache.archiva.redback.integration.interceptor.SecureActionBundle;
import org.codehaus.redback.integration.interceptor.SecureActionException; import org.apache.archiva.redback.integration.interceptor.SecureActionException;
import org.apache.archiva.redback.integration.security.role.RedbackRoleConstants; import org.apache.archiva.redback.integration.security.role.RedbackRoleConstants;
import org.springframework.context.annotation.Scope; import org.springframework.context.annotation.Scope;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;

8
redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/OperationsAction.java
View File

@ -24,10 +24,10 @@ import org.apache.archiva.redback.rbac.RBACManager;
import org.apache.archiva.redback.rbac.RbacManagerException; import org.apache.archiva.redback.rbac.RbacManagerException;
import org.apache.archiva.redback.rbac.Resource; import org.apache.archiva.redback.rbac.Resource;
import org.codehaus.plexus.redback.struts2.action.RedbackActionSupport; import org.codehaus.plexus.redback.struts2.action.RedbackActionSupport;
import org.codehaus.redback.integration.interceptor.SecureActionBundle; import org.apache.archiva.redback.integration.interceptor.SecureActionBundle;
import org.codehaus.redback.integration.interceptor.SecureActionException; import org.apache.archiva.redback.integration.interceptor.SecureActionException;
import org.codehaus.redback.integration.role.RoleConstants; import org.apache.archiva.redback.integration.role.RoleConstants;
import org.codehaus.redback.integration.util.OperationSorter; import org.apache.archiva.redback.integration.util.OperationSorter;
import org.springframework.context.annotation.Scope; import org.springframework.context.annotation.Scope;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;

8
redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/PermissionsAction.java
View File

@ -26,10 +26,10 @@ import org.apache.archiva.redback.rbac.Resource;
import org.apache.archiva.redback.rbac.RbacManagerException; import org.apache.archiva.redback.rbac.RbacManagerException;
import org.codehaus.plexus.redback.struts2.action.RedbackActionSupport; import org.codehaus.plexus.redback.struts2.action.RedbackActionSupport;
import org.codehaus.plexus.util.StringUtils; import org.codehaus.plexus.util.StringUtils;
import org.codehaus.redback.integration.interceptor.SecureActionBundle; import org.apache.archiva.redback.integration.interceptor.SecureActionBundle;
import org.codehaus.redback.integration.interceptor.SecureActionException; import org.apache.archiva.redback.integration.interceptor.SecureActionException;
import org.codehaus.redback.integration.role.RoleConstants; import org.apache.archiva.redback.integration.role.RoleConstants;
import org.codehaus.redback.integration.util.PermissionSorter; import org.apache.archiva.redback.integration.util.PermissionSorter;
import org.springframework.context.annotation.Scope; import org.springframework.context.annotation.Scope;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;

Some files were not shown because too many files have changed in this diff Show More