mirror of
https://github.com/scm-manager/scm-manager.git
synced 2025-11-15 09:46:16 +01:00
use ExternallyManagedLifecycle instead of deprecated SpringManagedLifecycle
This commit is contained in:
@@ -40,7 +40,7 @@ import com.google.inject.Provider;
|
|||||||
import com.google.inject.Singleton;
|
import com.google.inject.Singleton;
|
||||||
|
|
||||||
import org.codehaus.enunciate.jaxrs.TypeHint;
|
import org.codehaus.enunciate.jaxrs.TypeHint;
|
||||||
import org.codehaus.enunciate.modules.jersey.SpringManagedLifecycle;
|
import org.codehaus.enunciate.modules.jersey.ExternallyManagedLifecycle;
|
||||||
|
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
@@ -75,7 +75,7 @@ import javax.ws.rs.core.Response;
|
|||||||
*/
|
*/
|
||||||
@Singleton
|
@Singleton
|
||||||
@Path("authentication")
|
@Path("authentication")
|
||||||
@SpringManagedLifecycle
|
@ExternallyManagedLifecycle
|
||||||
@Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
|
@Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
|
||||||
public class AuthenticationResource
|
public class AuthenticationResource
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -39,7 +39,7 @@ import com.google.inject.Inject;
|
|||||||
import com.google.inject.Provider;
|
import com.google.inject.Provider;
|
||||||
|
|
||||||
import org.codehaus.enunciate.jaxrs.TypeHint;
|
import org.codehaus.enunciate.jaxrs.TypeHint;
|
||||||
import org.codehaus.enunciate.modules.jersey.SpringManagedLifecycle;
|
import org.codehaus.enunciate.modules.jersey.ExternallyManagedLifecycle;
|
||||||
|
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
@@ -69,7 +69,7 @@ import javax.ws.rs.core.Response;
|
|||||||
*
|
*
|
||||||
* @author Sebastian Sdorra
|
* @author Sebastian Sdorra
|
||||||
*/
|
*/
|
||||||
@SpringManagedLifecycle
|
@ExternallyManagedLifecycle
|
||||||
@Path("action/change-password")
|
@Path("action/change-password")
|
||||||
public class ChangePasswordResource
|
public class ChangePasswordResource
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -39,7 +39,7 @@ import com.google.inject.Inject;
|
|||||||
import com.google.inject.Provider;
|
import com.google.inject.Provider;
|
||||||
import com.google.inject.Singleton;
|
import com.google.inject.Singleton;
|
||||||
|
|
||||||
import org.codehaus.enunciate.modules.jersey.SpringManagedLifecycle;
|
import org.codehaus.enunciate.modules.jersey.ExternallyManagedLifecycle;
|
||||||
|
|
||||||
import sonia.scm.config.ScmConfiguration;
|
import sonia.scm.config.ScmConfiguration;
|
||||||
import sonia.scm.util.ScmConfigurationUtil;
|
import sonia.scm.util.ScmConfigurationUtil;
|
||||||
@@ -64,7 +64,7 @@ import javax.ws.rs.core.UriInfo;
|
|||||||
*/
|
*/
|
||||||
@Singleton
|
@Singleton
|
||||||
@Path("config")
|
@Path("config")
|
||||||
@SpringManagedLifecycle
|
@ExternallyManagedLifecycle
|
||||||
public class ConfigurationResource
|
public class ConfigurationResource
|
||||||
{
|
{
|
||||||
|
|
||||||
|
|||||||
@@ -40,7 +40,7 @@ import com.google.inject.Provider;
|
|||||||
import com.google.inject.Singleton;
|
import com.google.inject.Singleton;
|
||||||
|
|
||||||
import org.codehaus.enunciate.jaxrs.TypeHint;
|
import org.codehaus.enunciate.jaxrs.TypeHint;
|
||||||
import org.codehaus.enunciate.modules.jersey.SpringManagedLifecycle;
|
import org.codehaus.enunciate.modules.jersey.ExternallyManagedLifecycle;
|
||||||
|
|
||||||
import sonia.scm.group.Group;
|
import sonia.scm.group.Group;
|
||||||
import sonia.scm.group.GroupException;
|
import sonia.scm.group.GroupException;
|
||||||
@@ -75,7 +75,7 @@ import javax.ws.rs.core.UriInfo;
|
|||||||
*/
|
*/
|
||||||
@Path("groups")
|
@Path("groups")
|
||||||
@Singleton
|
@Singleton
|
||||||
@SpringManagedLifecycle
|
@ExternallyManagedLifecycle
|
||||||
public class GroupResource
|
public class GroupResource
|
||||||
extends AbstractManagerResource<Group, GroupException>
|
extends AbstractManagerResource<Group, GroupException>
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -38,7 +38,7 @@ package sonia.scm.api.rest.resources;
|
|||||||
import com.google.inject.Inject;
|
import com.google.inject.Inject;
|
||||||
import com.google.inject.Singleton;
|
import com.google.inject.Singleton;
|
||||||
|
|
||||||
import org.codehaus.enunciate.modules.jersey.SpringManagedLifecycle;
|
import org.codehaus.enunciate.modules.jersey.ExternallyManagedLifecycle;
|
||||||
|
|
||||||
import sonia.scm.plugin.DefaultPluginManager;
|
import sonia.scm.plugin.DefaultPluginManager;
|
||||||
import sonia.scm.plugin.OverviewPluginFilter;
|
import sonia.scm.plugin.OverviewPluginFilter;
|
||||||
@@ -67,7 +67,7 @@ import javax.ws.rs.core.Response;
|
|||||||
*/
|
*/
|
||||||
@Singleton
|
@Singleton
|
||||||
@Path("plugins")
|
@Path("plugins")
|
||||||
@SpringManagedLifecycle
|
@ExternallyManagedLifecycle
|
||||||
public class PluginResource
|
public class PluginResource
|
||||||
{
|
{
|
||||||
|
|
||||||
|
|||||||
@@ -38,7 +38,7 @@ import com.google.inject.Provider;
|
|||||||
import com.google.inject.Singleton;
|
import com.google.inject.Singleton;
|
||||||
|
|
||||||
import org.codehaus.enunciate.jaxrs.TypeHint;
|
import org.codehaus.enunciate.jaxrs.TypeHint;
|
||||||
import org.codehaus.enunciate.modules.jersey.SpringManagedLifecycle;
|
import org.codehaus.enunciate.modules.jersey.ExternallyManagedLifecycle;
|
||||||
|
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
@@ -72,7 +72,7 @@ import javax.ws.rs.core.MediaType;
|
|||||||
*/
|
*/
|
||||||
@Singleton
|
@Singleton
|
||||||
@Path("import/repositories")
|
@Path("import/repositories")
|
||||||
@SpringManagedLifecycle
|
@ExternallyManagedLifecycle
|
||||||
public class RepositoryImportResource
|
public class RepositoryImportResource
|
||||||
{
|
{
|
||||||
|
|
||||||
|
|||||||
@@ -40,7 +40,7 @@ import com.google.inject.Provider;
|
|||||||
import com.google.inject.Singleton;
|
import com.google.inject.Singleton;
|
||||||
|
|
||||||
import org.codehaus.enunciate.jaxrs.TypeHint;
|
import org.codehaus.enunciate.jaxrs.TypeHint;
|
||||||
import org.codehaus.enunciate.modules.jersey.SpringManagedLifecycle;
|
import org.codehaus.enunciate.modules.jersey.ExternallyManagedLifecycle;
|
||||||
|
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
@@ -101,7 +101,7 @@ import javax.ws.rs.core.UriInfo;
|
|||||||
*/
|
*/
|
||||||
@Singleton
|
@Singleton
|
||||||
@Path("repositories")
|
@Path("repositories")
|
||||||
@SpringManagedLifecycle
|
@ExternallyManagedLifecycle
|
||||||
public class RepositoryResource
|
public class RepositoryResource
|
||||||
extends AbstractManagerResource<Repository, RepositoryException>
|
extends AbstractManagerResource<Repository, RepositoryException>
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -40,7 +40,7 @@ import com.google.inject.Inject;
|
|||||||
import com.google.inject.Provider;
|
import com.google.inject.Provider;
|
||||||
import com.google.inject.Singleton;
|
import com.google.inject.Singleton;
|
||||||
|
|
||||||
import org.codehaus.enunciate.modules.jersey.SpringManagedLifecycle;
|
import org.codehaus.enunciate.modules.jersey.ExternallyManagedLifecycle;
|
||||||
|
|
||||||
import sonia.scm.HandlerEvent;
|
import sonia.scm.HandlerEvent;
|
||||||
import sonia.scm.cache.Cache;
|
import sonia.scm.cache.Cache;
|
||||||
@@ -70,7 +70,7 @@ import javax.ws.rs.core.MediaType;
|
|||||||
*/
|
*/
|
||||||
@Singleton
|
@Singleton
|
||||||
@Path("search")
|
@Path("search")
|
||||||
@SpringManagedLifecycle
|
@ExternallyManagedLifecycle
|
||||||
public class SearchResource implements UserListener, GroupListener
|
public class SearchResource implements UserListener, GroupListener
|
||||||
{
|
{
|
||||||
|
|
||||||
|
|||||||
@@ -40,7 +40,7 @@ import com.google.inject.Provider;
|
|||||||
import com.google.inject.Singleton;
|
import com.google.inject.Singleton;
|
||||||
|
|
||||||
import org.codehaus.enunciate.jaxrs.TypeHint;
|
import org.codehaus.enunciate.jaxrs.TypeHint;
|
||||||
import org.codehaus.enunciate.modules.jersey.SpringManagedLifecycle;
|
import org.codehaus.enunciate.modules.jersey.ExternallyManagedLifecycle;
|
||||||
|
|
||||||
import sonia.scm.security.EncryptionHandler;
|
import sonia.scm.security.EncryptionHandler;
|
||||||
import sonia.scm.user.User;
|
import sonia.scm.user.User;
|
||||||
@@ -78,7 +78,7 @@ import javax.ws.rs.core.UriInfo;
|
|||||||
*/
|
*/
|
||||||
@Singleton
|
@Singleton
|
||||||
@Path("users")
|
@Path("users")
|
||||||
@SpringManagedLifecycle
|
@ExternallyManagedLifecycle
|
||||||
public class UserResource extends AbstractManagerResource<User, UserException>
|
public class UserResource extends AbstractManagerResource<User, UserException>
|
||||||
{
|
{
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user