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-rest-api 

git-svn-id: https://svn.apache.org/repos/asf/archiva/redback/redback-core/trunk@1311083 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Olivier Lamy 2012-04-08 20:27:54 +00:00
parent f45b8da121
commit cd56d60adc
31 changed files with 87 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
redback-integrations/redback-rest/redback-rest-api/src/main/java/org/codehaus/redback/rest/api/model/Application.java → redback-integrations/redback-rest/redback-rest-api/src/main/java/org/apache/archiva/redback/rest/api/model/Application.java
View File

@ -1,4 +1,4 @@
package org.codehaus.redback.rest.api.model;
package org.apache.archiva.redback.rest.api.model;
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file

2
redback-integrations/redback-rest/redback-rest-api/src/main/java/org/codehaus/redback/rest/api/model/ApplicationRoles.java → redback-integrations/redback-rest/redback-rest-api/src/main/java/org/apache/archiva/redback/rest/api/model/ApplicationRoles.java
View File

@ -1,4 +1,4 @@
package org.codehaus.redback.rest.api.model;
package org.apache.archiva.redback.rest.api.model;
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file

2
redback-integrations/redback-rest/redback-rest-api/src/main/java/org/codehaus/redback/rest/api/model/ErrorMessage.java → redback-integrations/redback-rest/redback-rest-api/src/main/java/org/apache/archiva/redback/rest/api/model/ErrorMessage.java
View File

@ -1,4 +1,4 @@
package org.codehaus.redback.rest.api.model;
package org.apache.archiva.redback.rest.api.model;
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file

2
redback-integrations/redback-rest/redback-rest-api/src/main/java/org/codehaus/redback/rest/api/model/Operation.java → redback-integrations/redback-rest/redback-rest-api/src/main/java/org/apache/archiva/redback/rest/api/model/Operation.java
View File

@ -1,4 +1,4 @@
package org.codehaus.redback.rest.api.model;
package org.apache.archiva.redback.rest.api.model;
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file

2
redback-integrations/redback-rest/redback-rest-api/src/main/java/org/codehaus/redback/rest/api/model/Permission.java → redback-integrations/redback-rest/redback-rest-api/src/main/java/org/apache/archiva/redback/rest/api/model/Permission.java
View File

@ -1,4 +1,4 @@
package org.codehaus.redback.rest.api.model;
package org.apache.archiva.redback.rest.api.model;
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file

4
redback-integrations/redback-rest/redback-rest-api/src/main/java/org/codehaus/redback/rest/api/model/RedbackRestError.java → redback-integrations/redback-rest/redback-rest-api/src/main/java/org/apache/archiva/redback/rest/api/model/RedbackRestError.java
View File

@ -1,4 +1,4 @@
package org.codehaus.redback.rest.api.model;
package org.apache.archiva.redback.rest.api.model;
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@ -19,7 +19,7 @@ package org.codehaus.redback.rest.api.model;
*/
import org.apache.commons.lang.StringUtils;
import org.codehaus.redback.rest.api.services.RedbackServiceException;
import org.apache.archiva.redback.rest.api.services.RedbackServiceException;
import javax.xml.bind.annotation.XmlRootElement;
import java.io.Serializable;

2
redback-integrations/redback-rest/redback-rest-api/src/main/java/org/codehaus/redback/rest/api/model/RegistrationKey.java → redback-integrations/redback-rest/redback-rest-api/src/main/java/org/apache/archiva/redback/rest/api/model/RegistrationKey.java
View File

@ -1,4 +1,4 @@
package org.codehaus.redback.rest.api.model;
package org.apache.archiva.redback.rest.api.model;
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file

2
redback-integrations/redback-rest/redback-rest-api/src/main/java/org/codehaus/redback/rest/api/model/Resource.java → redback-integrations/redback-rest/redback-rest-api/src/main/java/org/apache/archiva/redback/rest/api/model/Resource.java
View File

@ -1,4 +1,4 @@
package org.codehaus.redback.rest.api.model;
package org.apache.archiva.redback.rest.api.model;
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file

2
redback-integrations/redback-rest/redback-rest-api/src/main/java/org/codehaus/redback/rest/api/model/Role.java → redback-integrations/redback-rest/redback-rest-api/src/main/java/org/apache/archiva/redback/rest/api/model/Role.java
View File

@ -1,4 +1,4 @@
package org.codehaus.redback.rest.api.model;
package org.apache.archiva.redback.rest.api.model;
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file

2
redback-integrations/redback-rest/redback-rest-api/src/main/java/org/codehaus/redback/rest/api/model/RoleTemplate.java → redback-integrations/redback-rest/redback-rest-api/src/main/java/org/apache/archiva/redback/rest/api/model/RoleTemplate.java
View File

@ -1,4 +1,4 @@
package org.codehaus.redback.rest.api.model;
package org.apache.archiva.redback.rest.api.model;
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file

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

@ -1,4 +1,4 @@
package org.codehaus.redback.rest.api.model;
package org.apache.archiva.redback.rest.api.model;
import org.apache.archiva.redback.integration.util.DateUtils;

4
redback-integrations/redback-rest/redback-rest-api/src/main/java/org/codehaus/redback/rest/api/services/LoginService.java → redback-integrations/redback-rest/redback-rest-api/src/main/java/org/apache/archiva/redback/rest/api/services/LoginService.java
View File

@ -1,4 +1,4 @@
package org.codehaus.redback.rest.api.services;
package org.apache.archiva.redback.rest.api.services;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@ -20,7 +20,7 @@ package org.codehaus.redback.rest.api.services;
*/
import org.apache.archiva.redback.authorization.RedbackAuthorization;
import org.codehaus.redback.rest.api.model.User;
import org.apache.archiva.redback.rest.api.model.User;
import javax.ws.rs.GET;
import javax.ws.rs.Path;

4
redback-integrations/redback-rest/redback-rest-api/src/main/java/org/codehaus/redback/rest/api/services/PasswordService.java → redback-integrations/redback-rest/redback-rest-api/src/main/java/org/apache/archiva/redback/rest/api/services/PasswordService.java
View File

@ -1,4 +1,4 @@
package org.codehaus.redback.rest.api.services;
package org.apache.archiva.redback.rest.api.services;
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@ -19,7 +19,7 @@ package org.codehaus.redback.rest.api.services;
*/
import org.apache.archiva.redback.authorization.RedbackAuthorization;
import org.codehaus.redback.rest.api.model.User;
import org.apache.archiva.redback.rest.api.model.User;
import javax.ws.rs.GET;
import javax.ws.rs.Path;

4
redback-integrations/redback-rest/redback-rest-api/src/main/java/org/codehaus/redback/rest/api/services/RedbackServiceException.java → redback-integrations/redback-rest/redback-rest-api/src/main/java/org/apache/archiva/redback/rest/api/services/RedbackServiceException.java
View File

@ -1,4 +1,4 @@
package org.codehaus.redback.rest.api.services;
package org.apache.archiva.redback.rest.api.services;
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@ -18,7 +18,7 @@ package org.codehaus.redback.rest.api.services;
* under the License.
*/
import org.codehaus.redback.rest.api.model.ErrorMessage;
import org.apache.archiva.redback.rest.api.model.ErrorMessage;
import java.util.ArrayList;
import java.util.List;

10
redback-integrations/redback-rest/redback-rest-api/src/main/java/org/codehaus/redback/rest/api/services/RoleManagementService.java → redback-integrations/redback-rest/redback-rest-api/src/main/java/org/apache/archiva/redback/rest/api/services/RoleManagementService.java
View File

@ -1,4 +1,4 @@
package org.codehaus.redback.rest.api.services;
package org.apache.archiva.redback.rest.api.services;
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@ -20,10 +20,10 @@ package org.codehaus.redback.rest.api.services;
import org.apache.archiva.redback.authorization.RedbackAuthorization;
import org.apache.archiva.redback.integration.security.role.RedbackRoleConstants;
import org.codehaus.redback.rest.api.model.Application;
import org.codehaus.redback.rest.api.model.ApplicationRoles;
import org.codehaus.redback.rest.api.model.Role;
import org.codehaus.redback.rest.api.model.User;
import org.apache.archiva.redback.rest.api.model.Application;
import org.apache.archiva.redback.rest.api.model.ApplicationRoles;
import org.apache.archiva.redback.rest.api.model.Role;
import org.apache.archiva.redback.rest.api.model.User;
import javax.ws.rs.Consumes;
import javax.ws.rs.GET;

10
redback-integrations/redback-rest/redback-rest-api/src/main/java/org/codehaus/redback/rest/api/services/UserService.java → redback-integrations/redback-rest/redback-rest-api/src/main/java/org/apache/archiva/redback/rest/api/services/UserService.java
View File

@ -1,4 +1,4 @@
package org.codehaus.redback.rest.api.services;
package org.apache.archiva.redback.rest.api.services;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@ -21,10 +21,10 @@ package org.codehaus.redback.rest.api.services;
import org.apache.archiva.redback.authorization.RedbackAuthorization;
import org.apache.archiva.redback.integration.security.role.RedbackRoleConstants;
import org.codehaus.redback.rest.api.model.Operation;
import org.codehaus.redback.rest.api.model.Permission;
import org.codehaus.redback.rest.api.model.RegistrationKey;
import org.codehaus.redback.rest.api.model.User;
import org.apache.archiva.redback.rest.api.model.Operation;
import org.apache.archiva.redback.rest.api.model.Permission;
import org.apache.archiva.redback.rest.api.model.RegistrationKey;
import org.apache.archiva.redback.rest.api.model.User;
import javax.ws.rs.Consumes;
import javax.ws.rs.GET;

2
redback-integrations/redback-rest/redback-rest-api/src/main/java/org/codehaus/redback/rest/api/services/UtilServices.java → redback-integrations/redback-rest/redback-rest-api/src/main/java/org/apache/archiva/redback/rest/api/services/UtilServices.java
View File

@ -1,4 +1,4 @@
package org.codehaus.redback.rest.api.services;
package org.apache.archiva.redback.rest.api.services;
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file

0
redback-integrations/redback-rest/redback-rest-api/src/main/resources/org/codehaus/redback/rest/api/RedbackRestModel.gwt.xml → redback-integrations/redback-rest/redback-rest-api/src/main/resources/org/apache/archiva/redback/rest/api/RedbackRestModel.gwt.xml
View File

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

@ -31,9 +31,9 @@ import org.apache.archiva.redback.keys.memory.MemoryKeyManager;
import org.apache.archiva.redback.system.SecuritySession;
import org.apache.archiva.redback.system.SecuritySystem;
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;
import org.apache.archiva.redback.rest.api.model.User;
import org.apache.archiva.redback.rest.api.services.LoginService;
import org.apache.archiva.redback.rest.api.services.RedbackServiceException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Service;

14
redback-integrations/redback-rest/redback-rest-services/src/main/java/org/codehaus/redback/rest/services/DefaultPasswordService.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.users.UserNotFoundException;
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;
import org.apache.archiva.redback.rest.api.model.ErrorMessage;
import org.apache.archiva.redback.rest.api.services.PasswordService;
import org.apache.archiva.redback.rest.api.services.RedbackServiceException;
import org.codehaus.redback.rest.services.utils.PasswordValidator;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@ -74,7 +74,7 @@ public class DefaultPasswordService
this.passwordValidator = passwordValidator;
}
public org.codehaus.redback.rest.api.model.User changePasswordWithKey( String password, String passwordConfirmation,
public org.apache.archiva.redback.rest.api.model.User changePasswordWithKey( String password, String passwordConfirmation,
String key )
throws RedbackServiceException
{
@ -112,7 +112,7 @@ public class DefaultPasswordService
user.setEncodedPassword( encodedPassword );
user = securitySystem.getUserManager().updateUser( user );
return new org.codehaus.redback.rest.api.model.User( user );
return new org.apache.archiva.redback.rest.api.model.User( user );
}
catch ( KeyManagerException e )
@ -146,7 +146,7 @@ public class DefaultPasswordService
}
public org.codehaus.redback.rest.api.model.User changePassword( String userName, String previousPassword,
public org.apache.archiva.redback.rest.api.model.User changePassword( String userName, String previousPassword,
String password, String passwordConfirmation )
throws RedbackServiceException
{
@ -196,7 +196,7 @@ public class DefaultPasswordService
u.setPassword( password );
u = securitySystem.getUserManager().updateUser( u );
return new org.codehaus.redback.rest.api.model.User( u );
return new org.apache.archiva.redback.rest.api.model.User( u );
}
catch ( UserNotFoundException e )
{

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

@ -35,13 +35,13 @@ import org.codehaus.plexus.redback.role.model.ModelTemplate;
import org.apache.archiva.redback.integration.model.AdminEditUserCredentials;
import org.apache.archiva.redback.integration.security.role.RedbackRoleConstants;
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;
import org.codehaus.redback.rest.api.model.Role;
import org.codehaus.redback.rest.api.model.RoleTemplate;
import org.codehaus.redback.rest.api.services.RedbackServiceException;
import org.codehaus.redback.rest.api.services.RoleManagementService;
import org.apache.archiva.redback.rest.api.model.Application;
import org.apache.archiva.redback.rest.api.model.ApplicationRoles;
import org.apache.archiva.redback.rest.api.model.ErrorMessage;
import org.apache.archiva.redback.rest.api.model.Role;
import org.apache.archiva.redback.rest.api.model.RoleTemplate;
import org.apache.archiva.redback.rest.api.services.RedbackServiceException;
import org.apache.archiva.redback.rest.api.services.RoleManagementService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Service;
@ -384,7 +384,7 @@ public class DefaultRoleManagementService
try
{
User user = userManager.findUser( userAssignment.getPrincipal() );
role.getUsers().add( new org.codehaus.redback.rest.api.model.User( user ) );
role.getUsers().add( new org.apache.archiva.redback.rest.api.model.User( user ) );
}
catch ( UserNotFoundException e )
{
@ -404,7 +404,7 @@ public class DefaultRoleManagementService
try
{
User user = userManager.findUser( userAssignment.getPrincipal() );
role.getParentsRolesUsers().add( new org.codehaus.redback.rest.api.model.User( user ) );
role.getParentsRolesUsers().add( new org.apache.archiva.redback.rest.api.model.User( user ) );
}
catch ( UserNotFoundException e )
{
@ -414,11 +414,12 @@ public class DefaultRoleManagementService
}
}
List<org.codehaus.redback.rest.api.model.User> otherUsers =
new ArrayList<org.codehaus.redback.rest.api.model.User>();
List<org.apache.archiva.redback.rest.api.model.User> otherUsers =
new ArrayList<org.apache.archiva.redback.rest.api.model.User>();
for ( User u : userManager.getUsers() )
{
org.codehaus.redback.rest.api.model.User user = new org.codehaus.redback.rest.api.model.User( u );
org.apache.archiva.redback.rest.api.model.User
user = new org.apache.archiva.redback.rest.api.model.User( u );
if ( role.getParentsRolesUsers().contains( user ) )
{
continue;
@ -460,7 +461,7 @@ public class DefaultRoleManagementService
throws RedbackServiceException
{
for ( org.codehaus.redback.rest.api.model.User user : role.getUsers() )
for ( org.apache.archiva.redback.rest.api.model.User user : role.getUsers() )
{
String username = user.getUsername();
if ( !userManager.userExists( username ) )
@ -494,7 +495,7 @@ public class DefaultRoleManagementService
}
}
for ( org.codehaus.redback.rest.api.model.User user : role.getRemovedUsers() )
for ( org.apache.archiva.redback.rest.api.model.User user : role.getRemovedUsers() )
{
String username = user.getUsername();
if ( !userManager.userExists( username ) )
@ -623,7 +624,7 @@ public class DefaultRoleManagementService
}
}
public Boolean updateUserRoles( org.codehaus.redback.rest.api.model.User user )
public Boolean updateUserRoles( org.apache.archiva.redback.rest.api.model.User user )
throws RedbackServiceException
{

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

@ -45,14 +45,14 @@ import org.apache.archiva.redback.system.SecuritySystem;
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;
import org.codehaus.redback.rest.api.model.Permission;
import org.codehaus.redback.rest.api.model.RegistrationKey;
import org.codehaus.redback.rest.api.model.Resource;
import org.codehaus.redback.rest.api.model.User;
import org.codehaus.redback.rest.api.services.RedbackServiceException;
import org.codehaus.redback.rest.api.services.UserService;
import org.apache.archiva.redback.rest.api.model.ErrorMessage;
import org.apache.archiva.redback.rest.api.model.Operation;
import org.apache.archiva.redback.rest.api.model.Permission;
import org.apache.archiva.redback.rest.api.model.RegistrationKey;
import org.apache.archiva.redback.rest.api.model.Resource;
import org.apache.archiva.redback.rest.api.model.User;
import org.apache.archiva.redback.rest.api.services.RedbackServiceException;
import org.apache.archiva.redback.rest.api.services.UserService;
import org.codehaus.redback.rest.services.utils.PasswordValidator;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

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

@ -20,8 +20,8 @@ package org.codehaus.redback.rest.services;
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang.StringUtils;
import org.codehaus.redback.rest.api.services.RedbackServiceException;
import org.codehaus.redback.rest.api.services.UtilServices;
import org.apache.archiva.redback.rest.api.services.RedbackServiceException;
import org.apache.archiva.redback.rest.api.services.UtilServices;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Service;

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

@ -20,8 +20,8 @@ package org.codehaus.redback.rest.services.interceptors;
import org.apache.archiva.redback.policy.PasswordRuleViolationException;
import org.apache.archiva.redback.policy.PasswordRuleViolations;
import org.codehaus.redback.rest.api.model.ErrorMessage;
import org.codehaus.redback.rest.api.model.RedbackRestError;
import org.apache.archiva.redback.rest.api.model.ErrorMessage;
import org.apache.archiva.redback.rest.api.model.RedbackRestError;
import org.springframework.stereotype.Service;
import javax.ws.rs.core.Response;

5
redback-integrations/redback-rest/redback-rest-services/src/main/java/org/codehaus/redback/rest/services/interceptors/RedbackServiceExceptionMapper.java
View File

@ -18,9 +18,8 @@ package org.codehaus.redback.rest.services.interceptors;
* under the License.
*/
import org.codehaus.redback.rest.api.model.ErrorMessage;
import org.codehaus.redback.rest.api.model.RedbackRestError;
import org.codehaus.redback.rest.api.services.RedbackServiceException;
import org.apache.archiva.redback.rest.api.model.RedbackRestError;
import org.apache.archiva.redback.rest.api.services.RedbackServiceException;
import org.springframework.stereotype.Service;
import javax.ws.rs.core.Response;

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

@ -24,8 +24,8 @@ import org.apache.archiva.redback.users.UserNotFoundException;
import org.apache.archiva.redback.policy.PasswordEncoder;
import org.apache.archiva.redback.policy.PasswordRuleViolationException;
import org.apache.archiva.redback.system.SecuritySystem;
import org.codehaus.redback.rest.api.model.ErrorMessage;
import org.codehaus.redback.rest.api.services.RedbackServiceException;
import org.apache.archiva.redback.rest.api.model.ErrorMessage;
import org.apache.archiva.redback.rest.api.services.RedbackServiceException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Service;

8
redback-integrations/redback-rest/redback-rest-services/src/test/java/org/codehaus/redback/rest/services/AbstractRestServicesTest.java
View File

@ -27,10 +27,10 @@ import org.apache.cxf.jaxrs.client.WebClient;
import org.apache.cxf.transport.servlet.CXFServlet;
import org.codehaus.jackson.jaxrs.JacksonJaxbJsonProvider;
import org.apache.archiva.redback.integration.security.role.RedbackRoleConstants;
import org.codehaus.redback.rest.api.model.User;
import org.codehaus.redback.rest.api.services.LoginService;
import org.codehaus.redback.rest.api.services.RoleManagementService;
import org.codehaus.redback.rest.api.services.UserService;
import org.apache.archiva.redback.rest.api.model.User;
import org.apache.archiva.redback.rest.api.services.LoginService;
import org.apache.archiva.redback.rest.api.services.RoleManagementService;
import org.apache.archiva.redback.rest.api.services.UserService;
import org.eclipse.jetty.server.Connector;
import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.server.session.SessionHandler;

2
redback-integrations/redback-rest/redback-rest-services/src/test/java/org/codehaus/redback/rest/services/FakeCreateAdminServiceImpl.java
View File

@ -23,7 +23,7 @@ import org.apache.archiva.redback.rbac.RBACManager;
import org.apache.archiva.redback.users.UserManager;
import org.apache.archiva.redback.configuration.UserConfiguration;
import org.apache.archiva.redback.role.RoleManager;
import org.codehaus.redback.rest.api.services.UserService;
import org.apache.archiva.redback.rest.api.services.UserService;
import javax.inject.Inject;
import javax.inject.Named;

4
redback-integrations/redback-rest/redback-rest-services/src/test/java/org/codehaus/redback/rest/services/LoginServiceTest.java
View File

@ -19,8 +19,8 @@ package org.codehaus.redback.rest.services;
*/
import org.apache.archiva.redback.integration.security.role.RedbackRoleConstants;
import org.codehaus.redback.rest.api.model.User;
import org.codehaus.redback.rest.api.services.UserService;
import org.apache.archiva.redback.rest.api.model.User;
import org.apache.archiva.redback.rest.api.services.UserService;
import org.junit.Test;
/**

10
redback-integrations/redback-rest/redback-rest-services/src/test/java/org/codehaus/redback/rest/services/RoleManagementServiceTest.java
View File

@ -20,11 +20,11 @@ package org.codehaus.redback.rest.services;
import org.apache.commons.lang.StringUtils;
import org.apache.cxf.jaxrs.client.ServerWebApplicationException;
import org.codehaus.redback.rest.api.model.ApplicationRoles;
import org.codehaus.redback.rest.api.model.Role;
import org.codehaus.redback.rest.api.model.User;
import org.codehaus.redback.rest.api.services.RoleManagementService;
import org.codehaus.redback.rest.api.services.UserService;
import org.apache.archiva.redback.rest.api.model.ApplicationRoles;
import org.apache.archiva.redback.rest.api.model.Role;
import org.apache.archiva.redback.rest.api.model.User;
import org.apache.archiva.redback.rest.api.services.RoleManagementService;
import org.apache.archiva.redback.rest.api.services.UserService;
import org.junit.Test;
import java.util.Arrays;

8
redback-integrations/redback-rest/redback-rest-services/src/test/java/org/codehaus/redback/rest/services/UserServiceTest.java
View File

@ -23,10 +23,10 @@ import org.apache.cxf.jaxrs.client.JAXRSClientFactory;
import org.apache.cxf.jaxrs.client.ServerWebApplicationException;
import org.apache.cxf.jaxrs.client.WebClient;
import org.codehaus.jackson.jaxrs.JacksonJaxbJsonProvider;
import org.codehaus.redback.rest.api.model.Operation;
import org.codehaus.redback.rest.api.model.Permission;
import org.codehaus.redback.rest.api.model.User;
import org.codehaus.redback.rest.api.services.UserService;
import org.apache.archiva.redback.rest.api.model.Operation;
import org.apache.archiva.redback.rest.api.model.Permission;
import org.apache.archiva.redback.rest.api.model.User;
import org.apache.archiva.redback.rest.api.services.UserService;
import org.codehaus.redback.rest.services.mock.EmailMessage;
import org.codehaus.redback.rest.services.mock.ServicesAssert;
import org.junit.Test;