Fix split package introduced by @EnableSpringConfigured
Commit6263c9abf9@EnableSpringConfigured from beans.factory.aspectj => context.annotation within the spring-aspects module. This resolved a package cycle but had the side-effect of causing a "split package" [1] problem between spring-context and spring-aspects in OSGi-based classloader environments because the context.annotation package now exists in both modules. The simplest and best solution from an OSGi perspective is to relocate @EnableSpringConfigured and its supporting SpringConfiguredConfiguration class into a new package. This commit moves both these types into context.annotation.aspectj, following convention with other such "aspectj"-qualified packages in the spring-aspects module. As with the previous move, it is presumed this change will be low-impact as the "spring-configured" approach to domain object injection is a niche feature to begin with, and @EnableSpringConfigured has existed in its current location only since 3.1.2 and this change is being made in time for 3.1.3. [1]: http://wiki.osgi.org/wiki/Split_Packages Issue: SPR-9811, SPR-9441 Backport-Commit:54db7387de
This commit is contained in:
@@ -14,7 +14,7 @@
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.springframework.context.annotation;
|
||||
package org.springframework.context.annotation.aspectj;
|
||||
|
||||
import java.lang.annotation.Documented;
|
||||
import java.lang.annotation.ElementType;
|
||||
@@ -14,7 +14,7 @@
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.springframework.context.annotation;
|
||||
package org.springframework.context.annotation.aspectj;
|
||||
|
||||
import org.springframework.beans.factory.aspectj.AnnotationBeanConfigurerAspect;
|
||||
import org.springframework.beans.factory.config.BeanDefinition;
|
||||
@@ -14,10 +14,14 @@
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.springframework.context.annotation;
|
||||
package org.springframework.context.annotation.aspectj;
|
||||
|
||||
import org.springframework.beans.factory.aspectj.AbstractBeanConfigurerTests;
|
||||
import org.springframework.context.ConfigurableApplicationContext;
|
||||
import org.springframework.context.annotation.AnnotationConfigApplicationContext;
|
||||
import org.springframework.context.annotation.Configuration;
|
||||
import org.springframework.context.annotation.ImportResource;
|
||||
import org.springframework.context.annotation.aspectj.EnableSpringConfigured;
|
||||
|
||||
/**
|
||||
* Tests that @EnableSpringConfigured properly registers an
|
||||
Reference in New Issue
Block a user