From 7994b63c13f7e1f54b444d8314c93e6e9cdf2b6b Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Thu, 26 Sep 2013 21:38:54 +0200 Subject: [PATCH] Polishing --- .../context/annotation/ComponentScan.java | 22 ++--- .../context/annotation/FilterType.java | 9 +- .../context/config/spring-context-3.1.xsd | 82 +++++++++---------- .../context/config/spring-context-3.2.xsd | 82 +++++++++---------- 4 files changed, 85 insertions(+), 110 deletions(-) diff --git a/spring-context/src/main/java/org/springframework/context/annotation/ComponentScan.java b/spring-context/src/main/java/org/springframework/context/annotation/ComponentScan.java index eaab654ec7..f90f4d9858 100644 --- a/spring-context/src/main/java/org/springframework/context/annotation/ComponentScan.java +++ b/spring-context/src/main/java/org/springframework/context/annotation/ComponentScan.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2012 the original author or authors. + * Copyright 2002-2013 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. @@ -42,7 +42,7 @@ import org.springframework.core.type.filter.TypeFilter; * always registered, meaning that any attempt to disable them at the * {@code @ComponentScan} level would be ignored. * - *

See @{@link Configuration} Javadoc for usage examples. + *

See @{@link Configuration}'s javadoc for usage examples. * * @author Chris Beams * @since 3.1 @@ -139,24 +139,18 @@ public @interface ComponentScan { @Retention(RetentionPolicy.RUNTIME) @Target({}) @interface Filter { + /** - * The type of filter to use. - *

Note that the filter types available are limited to those that may - * be expressed as a {@code Class} in the {@link #value()} attribute. This is - * in contrast to {@code }, which allows for - * expression-based (i.e., string-based) filters such as AspectJ pointcuts. - * These filter types are intentionally not supported here, and not available - * in the {@link FilterType} enum. - * @see FilterType + * The type of filter to use. Default is {@link FilterType#ANNOTATION}. */ FilterType type() default FilterType.ANNOTATION; /** * The class or classes to use as the filter. In the case of - * {@link FilterType#ANNOTATION}, the class will be the annotation itself. In the - * case of {@link FilterType#ASSIGNABLE_TYPE}, the class will be the type that - * detected components should be assignable to. And in the case of - * {@link FilterType#CUSTOM}, the class will be an implementation of + * {@link FilterType#ANNOTATION}, the class will be the annotation itself. + * In the case of {@link FilterType#ASSIGNABLE_TYPE}, the class will be the + * type that detected components should be assignable to. And in the case + * of {@link FilterType#CUSTOM}, the class will be an implementation of * {@link TypeFilter}. *

When multiple classes are specified, OR logic is applied, e.g. "include * types annotated with {@code @Foo} OR {@code @Bar}". diff --git a/spring-context/src/main/java/org/springframework/context/annotation/FilterType.java b/spring-context/src/main/java/org/springframework/context/annotation/FilterType.java index 26bd302d8e..746424007d 100644 --- a/spring-context/src/main/java/org/springframework/context/annotation/FilterType.java +++ b/spring-context/src/main/java/org/springframework/context/annotation/FilterType.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2013 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. @@ -16,9 +16,6 @@ package org.springframework.context.annotation; -import org.springframework.core.type.filter.AssignableTypeFilter; - - /** * Enumeration of the type filters that may be used in conjunction with * {@link ComponentScan @ComponentScan}. @@ -42,12 +39,12 @@ public enum FilterType { /** * Filter candidates assignable to a given type. - * @see AssignableTypeFilter + * @see org.springframework.core.type.filter.AssignableTypeFilter */ ASSIGNABLE_TYPE, /** Filter candidates using a given custom - * {@link org.springframework.core.type.filter.TypeFilter} implementation + * {@link org.springframework.core.type.filter.TypeFilter} implementation. */ CUSTOM diff --git a/spring-context/src/main/resources/org/springframework/context/config/spring-context-3.1.xsd b/spring-context/src/main/resources/org/springframework/context/config/spring-context-3.1.xsd index b2132e4e1c..34dca16031 100644 --- a/spring-context/src/main/resources/org/springframework/context/config/spring-context-3.1.xsd +++ b/spring-context/src/main/resources/org/springframework/context/config/spring-context-3.1.xsd @@ -1,13 +1,15 @@ + xmlns:xsd="http://www.w3.org/2001/XMLSchema" + xmlns:beans="http://www.springframework.org/schema/beans" + xmlns:tool="http://www.springframework.org/schema/tool" + targetNamespace="http://www.springframework.org/schema/context" + elementFormDefault="qualified" + attributeFormDefault="unqualified"> - - + + + type="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/> @@ -158,14 +160,13 @@ ]]> - + - + @@ -273,9 +274,8 @@ ]]> - - + + @@ -288,9 +288,8 @@ ]]> - - + + @@ -304,9 +303,9 @@ - - - + + + @@ -342,8 +341,7 @@ ]]> - + @@ -355,9 +353,8 @@ ]]> - - + + @@ -396,23 +393,20 @@ - - - + - - + @@ -455,9 +448,9 @@ - - - + + + @@ -466,8 +459,7 @@ - - + @@ -503,8 +495,8 @@ "annotation" indicates an annotation to be present at the type level in target components; "assignable" indicates a class (or interface) that the target components are assignable to (extend/implement); - "aspectj" indicates an AspectJ type expression to be matched by the target components; - "regex" indicates a regex expression to be matched by the target components' class names; + "aspectj" indicates an AspectJ type pattern expression to be matched by the target components; + "regex" indicates a regex pattern to be matched by the target components' class names; "custom" indicates a custom implementation of the org.springframework.core.type.TypeFilter interface. Note: This attribute will not be inherited by child bean definitions. @@ -513,11 +505,11 @@ - - - - - + + + + + diff --git a/spring-context/src/main/resources/org/springframework/context/config/spring-context-3.2.xsd b/spring-context/src/main/resources/org/springframework/context/config/spring-context-3.2.xsd index f63ecc1aaf..d650f07135 100644 --- a/spring-context/src/main/resources/org/springframework/context/config/spring-context-3.2.xsd +++ b/spring-context/src/main/resources/org/springframework/context/config/spring-context-3.2.xsd @@ -1,13 +1,15 @@ + xmlns:xsd="http://www.w3.org/2001/XMLSchema" + xmlns:beans="http://www.springframework.org/schema/beans" + xmlns:tool="http://www.springframework.org/schema/tool" + targetNamespace="http://www.springframework.org/schema/context" + elementFormDefault="qualified" + attributeFormDefault="unqualified"> - - + + + type="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/> @@ -158,14 +160,13 @@ ]]> - + - + @@ -273,9 +274,8 @@ ]]> - - + + @@ -288,9 +288,8 @@ ]]> - - + + @@ -304,9 +303,9 @@ - - - + + + @@ -342,8 +341,7 @@ ]]> - + @@ -355,9 +353,8 @@ ]]> - - + + @@ -396,23 +393,20 @@ - - - + - - + @@ -455,9 +448,9 @@ - - - + + + @@ -466,8 +459,7 @@ - - + @@ -503,8 +495,8 @@ "annotation" indicates an annotation to be present at the type level in target components; "assignable" indicates a class (or interface) that the target components are assignable to (extend/implement); - "aspectj" indicates an AspectJ type expression to be matched by the target components; - "regex" indicates a regex expression to be matched by the target components' class names; + "aspectj" indicates an AspectJ type pattern expression to be matched by the target components; + "regex" indicates a regex pattern to be matched by the target components' class names; "custom" indicates a custom implementation of the org.springframework.core.type.TypeFilter interface. Note: This attribute will not be inherited by child bean definitions. @@ -513,11 +505,11 @@ - - - - - + + + + +