From 3c88b2cad95a365473266bd258ae2f7053a46792 Mon Sep 17 00:00:00 2001 From: Sebastian Sdorra Date: Sun, 26 Feb 2012 11:24:36 +0100 Subject: [PATCH] use ExternallyManagedLifecycle instead of deprecated SpringManagedLifecycle --- .../scm/api/rest/resources/AuthenticationResource.java | 4 ++-- .../scm/api/rest/resources/ChangePasswordResource.java | 4 ++-- .../sonia/scm/api/rest/resources/ConfigurationResource.java | 4 ++-- .../java/sonia/scm/api/rest/resources/GroupResource.java | 4 ++-- .../java/sonia/scm/api/rest/resources/PluginResource.java | 4 ++-- .../scm/api/rest/resources/RepositoryImportResource.java | 4 ++-- .../sonia/scm/api/rest/resources/RepositoryResource.java | 4 ++-- .../java/sonia/scm/api/rest/resources/SearchResource.java | 4 ++-- .../java/sonia/scm/api/rest/resources/UserResource.java | 6 +++--- 9 files changed, 19 insertions(+), 19 deletions(-) diff --git a/scm-webapp/src/main/java/sonia/scm/api/rest/resources/AuthenticationResource.java b/scm-webapp/src/main/java/sonia/scm/api/rest/resources/AuthenticationResource.java index 531228a87b..2edf625886 100644 --- a/scm-webapp/src/main/java/sonia/scm/api/rest/resources/AuthenticationResource.java +++ b/scm-webapp/src/main/java/sonia/scm/api/rest/resources/AuthenticationResource.java @@ -40,7 +40,7 @@ import com.google.inject.Provider; import com.google.inject.Singleton; 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.LoggerFactory; @@ -75,7 +75,7 @@ import javax.ws.rs.core.Response; */ @Singleton @Path("authentication") -@SpringManagedLifecycle +@ExternallyManagedLifecycle @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON }) public class AuthenticationResource { diff --git a/scm-webapp/src/main/java/sonia/scm/api/rest/resources/ChangePasswordResource.java b/scm-webapp/src/main/java/sonia/scm/api/rest/resources/ChangePasswordResource.java index 5cdffa08de..471deceac9 100644 --- a/scm-webapp/src/main/java/sonia/scm/api/rest/resources/ChangePasswordResource.java +++ b/scm-webapp/src/main/java/sonia/scm/api/rest/resources/ChangePasswordResource.java @@ -39,7 +39,7 @@ import com.google.inject.Inject; import com.google.inject.Provider; 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.LoggerFactory; @@ -69,7 +69,7 @@ import javax.ws.rs.core.Response; * * @author Sebastian Sdorra */ -@SpringManagedLifecycle +@ExternallyManagedLifecycle @Path("action/change-password") public class ChangePasswordResource { diff --git a/scm-webapp/src/main/java/sonia/scm/api/rest/resources/ConfigurationResource.java b/scm-webapp/src/main/java/sonia/scm/api/rest/resources/ConfigurationResource.java index e1be94159a..36cd0d149a 100644 --- a/scm-webapp/src/main/java/sonia/scm/api/rest/resources/ConfigurationResource.java +++ b/scm-webapp/src/main/java/sonia/scm/api/rest/resources/ConfigurationResource.java @@ -39,7 +39,7 @@ import com.google.inject.Inject; import com.google.inject.Provider; 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.util.ScmConfigurationUtil; @@ -64,7 +64,7 @@ import javax.ws.rs.core.UriInfo; */ @Singleton @Path("config") -@SpringManagedLifecycle +@ExternallyManagedLifecycle public class ConfigurationResource { diff --git a/scm-webapp/src/main/java/sonia/scm/api/rest/resources/GroupResource.java b/scm-webapp/src/main/java/sonia/scm/api/rest/resources/GroupResource.java index 1a1e3ac35c..f542195bf4 100644 --- a/scm-webapp/src/main/java/sonia/scm/api/rest/resources/GroupResource.java +++ b/scm-webapp/src/main/java/sonia/scm/api/rest/resources/GroupResource.java @@ -40,7 +40,7 @@ import com.google.inject.Provider; import com.google.inject.Singleton; 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.GroupException; @@ -75,7 +75,7 @@ import javax.ws.rs.core.UriInfo; */ @Path("groups") @Singleton -@SpringManagedLifecycle +@ExternallyManagedLifecycle public class GroupResource extends AbstractManagerResource { diff --git a/scm-webapp/src/main/java/sonia/scm/api/rest/resources/PluginResource.java b/scm-webapp/src/main/java/sonia/scm/api/rest/resources/PluginResource.java index 628824c4fb..a54e45e50c 100644 --- a/scm-webapp/src/main/java/sonia/scm/api/rest/resources/PluginResource.java +++ b/scm-webapp/src/main/java/sonia/scm/api/rest/resources/PluginResource.java @@ -38,7 +38,7 @@ package sonia.scm.api.rest.resources; import com.google.inject.Inject; 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.OverviewPluginFilter; @@ -67,7 +67,7 @@ import javax.ws.rs.core.Response; */ @Singleton @Path("plugins") -@SpringManagedLifecycle +@ExternallyManagedLifecycle public class PluginResource { diff --git a/scm-webapp/src/main/java/sonia/scm/api/rest/resources/RepositoryImportResource.java b/scm-webapp/src/main/java/sonia/scm/api/rest/resources/RepositoryImportResource.java index bc787f84cc..992463ab72 100644 --- a/scm-webapp/src/main/java/sonia/scm/api/rest/resources/RepositoryImportResource.java +++ b/scm-webapp/src/main/java/sonia/scm/api/rest/resources/RepositoryImportResource.java @@ -38,7 +38,7 @@ import com.google.inject.Provider; import com.google.inject.Singleton; 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.LoggerFactory; @@ -72,7 +72,7 @@ import javax.ws.rs.core.MediaType; */ @Singleton @Path("import/repositories") -@SpringManagedLifecycle +@ExternallyManagedLifecycle public class RepositoryImportResource { diff --git a/scm-webapp/src/main/java/sonia/scm/api/rest/resources/RepositoryResource.java b/scm-webapp/src/main/java/sonia/scm/api/rest/resources/RepositoryResource.java index 7cadf9724e..b6286a8652 100644 --- a/scm-webapp/src/main/java/sonia/scm/api/rest/resources/RepositoryResource.java +++ b/scm-webapp/src/main/java/sonia/scm/api/rest/resources/RepositoryResource.java @@ -40,7 +40,7 @@ import com.google.inject.Provider; import com.google.inject.Singleton; 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.LoggerFactory; @@ -101,7 +101,7 @@ import javax.ws.rs.core.UriInfo; */ @Singleton @Path("repositories") -@SpringManagedLifecycle +@ExternallyManagedLifecycle public class RepositoryResource extends AbstractManagerResource { diff --git a/scm-webapp/src/main/java/sonia/scm/api/rest/resources/SearchResource.java b/scm-webapp/src/main/java/sonia/scm/api/rest/resources/SearchResource.java index a00ee6344b..e636b60852 100644 --- a/scm-webapp/src/main/java/sonia/scm/api/rest/resources/SearchResource.java +++ b/scm-webapp/src/main/java/sonia/scm/api/rest/resources/SearchResource.java @@ -40,7 +40,7 @@ import com.google.inject.Inject; import com.google.inject.Provider; 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.cache.Cache; @@ -70,7 +70,7 @@ import javax.ws.rs.core.MediaType; */ @Singleton @Path("search") -@SpringManagedLifecycle +@ExternallyManagedLifecycle public class SearchResource implements UserListener, GroupListener { diff --git a/scm-webapp/src/main/java/sonia/scm/api/rest/resources/UserResource.java b/scm-webapp/src/main/java/sonia/scm/api/rest/resources/UserResource.java index 5fa88f12f9..62deb10607 100644 --- a/scm-webapp/src/main/java/sonia/scm/api/rest/resources/UserResource.java +++ b/scm-webapp/src/main/java/sonia/scm/api/rest/resources/UserResource.java @@ -40,7 +40,7 @@ import com.google.inject.Provider; import com.google.inject.Singleton; 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.user.User; @@ -78,7 +78,7 @@ import javax.ws.rs.core.UriInfo; */ @Singleton @Path("users") -@SpringManagedLifecycle +@ExternallyManagedLifecycle public class UserResource extends AbstractManagerResource { @@ -234,7 +234,7 @@ public class UserResource extends AbstractManagerResource *
  • 403 forbidden, the current user has no admin privileges
    • *
  • 500 internal server error
    • * - * + * * @param request the current request * @param start the start value for paging * @param limit the limit value for paging