diff --git a/org.springframework.config.java/src/main/java/org/springframework/config/java/ext/AbstractMethodInterceptor.java b/org.springframework.config.java/src/main/java/org/springframework/config/java/internal/enhancement/AbstractMethodInterceptor.java similarity index 91% rename from org.springframework.config.java/src/main/java/org/springframework/config/java/ext/AbstractMethodInterceptor.java rename to org.springframework.config.java/src/main/java/org/springframework/config/java/internal/enhancement/AbstractMethodInterceptor.java index 698c5b8545..cde89a4aef 100644 --- a/org.springframework.config.java/src/main/java/org/springframework/config/java/ext/AbstractMethodInterceptor.java +++ b/org.springframework.config.java/src/main/java/org/springframework/config/java/internal/enhancement/AbstractMethodInterceptor.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.config.java.ext; +package org.springframework.config.java.internal.enhancement; import java.lang.reflect.Method; @@ -33,7 +33,7 @@ import org.springframework.util.Assert; * * @author Chris Beams */ -public abstract class AbstractMethodInterceptor implements BeanFactoryAware, MethodInterceptor { +abstract class AbstractMethodInterceptor implements BeanFactoryAware, MethodInterceptor { protected final Log log = LogFactory.getLog(this.getClass()); protected DefaultListableBeanFactory beanFactory; diff --git a/org.springframework.config.java/src/main/java/org/springframework/config/java/ext/BeanMethodInterceptor.java b/org.springframework.config.java/src/main/java/org/springframework/config/java/internal/enhancement/BeanMethodInterceptor.java similarity index 94% rename from org.springframework.config.java/src/main/java/org/springframework/config/java/ext/BeanMethodInterceptor.java rename to org.springframework.config.java/src/main/java/org/springframework/config/java/internal/enhancement/BeanMethodInterceptor.java index d8f1829670..0fce6cb2d4 100644 --- a/org.springframework.config.java/src/main/java/org/springframework/config/java/ext/BeanMethodInterceptor.java +++ b/org.springframework.config.java/src/main/java/org/springframework/config/java/internal/enhancement/BeanMethodInterceptor.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.config.java.ext; +package org.springframework.config.java.internal.enhancement; import static java.lang.String.*; @@ -22,6 +22,8 @@ import java.lang.reflect.Method; import net.sf.cglib.proxy.MethodProxy; import org.springframework.beans.factory.config.ConfigurableBeanFactory; +import org.springframework.config.java.ext.Bean; +import org.springframework.config.java.ext.BeanRegistrar; /** diff --git a/org.springframework.config.java/src/main/java/org/springframework/config/java/internal/enhancement/ConfigurationEnhancer.java b/org.springframework.config.java/src/main/java/org/springframework/config/java/internal/enhancement/ConfigurationEnhancer.java index e74e4d3e2b..769e384da9 100644 --- a/org.springframework.config.java/src/main/java/org/springframework/config/java/internal/enhancement/ConfigurationEnhancer.java +++ b/org.springframework.config.java/src/main/java/org/springframework/config/java/internal/enhancement/ConfigurationEnhancer.java @@ -42,7 +42,6 @@ import org.springframework.beans.factory.support.DefaultListableBeanFactory; import org.springframework.config.java.BeanDefinitionRegistrar; import org.springframework.config.java.BeanMethod; import org.springframework.config.java.Configuration; -import org.springframework.config.java.ext.BeanMethodInterceptor; import org.springframework.config.java.ext.BeanRegistrar;