diff --git a/org.springframework.context/src/main/java/org/springframework/context/annotation/Scope.java b/org.springframework.context/src/main/java/org/springframework/context/annotation/Scope.java index 9bc14970ce8..50f78e72360 100644 --- a/org.springframework.context/src/main/java/org/springframework/context/annotation/Scope.java +++ b/org.springframework.context/src/main/java/org/springframework/context/annotation/Scope.java @@ -42,7 +42,6 @@ import org.springframework.stereotype.Component; * @since 2.5 * @see Component * @see Bean - * @see StandardScopes */ @Target({ElementType.TYPE, ElementType.METHOD}) @Retention(RetentionPolicy.RUNTIME) @@ -52,7 +51,6 @@ public @interface Scope { /** * Specifies the scope to use for the annotated component/bean. * @return the specified scope - * @see StandardScopes */ String value() default BeanDefinition.SCOPE_SINGLETON; diff --git a/org.springframework.context/src/main/java/org/springframework/context/annotation/StandardScopes.java b/org.springframework.context/src/main/java/org/springframework/context/annotation/StandardScopes.java deleted file mode 100644 index 732eb8eb5b8..00000000000 --- a/org.springframework.context/src/main/java/org/springframework/context/annotation/StandardScopes.java +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright 2002-2009 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.springframework.context.annotation; - -/** - * Enumerates the names of the scopes supported out of the box in Spring. - * - *
Not modeled as an actual java enum because annotations that accept a scope attribute - * must allow for user-defined scope names. Given that java enums are not extensible, these - * must remain simple string constants. - * - * @author Chris Beams - * @since 3.0 - * @see org.springframework.context.annotation.Scope - */ -public class StandardScopes { - - private StandardScopes() { } - - public static final String SINGLETON = "singleton"; - - public static final String PROTOTYPE = "prototype"; - - public static final String REQUEST = "request"; - - public static final String SESSION = "session"; - -}