diff --git a/README-FUTURE.md b/README-FUTURE.md
index edf642b..8f06b44 100644
--- a/README-FUTURE.md
+++ b/README-FUTURE.md
@@ -66,61 +66,54 @@
- Resource
- ResourceLoader
- MetadataReader
-
++ Bean的定义与注册
+ + BeanDefinition
+ + BeanDefinitionHolder
+ + BeanDefinitionRegistry
++ BeanDefinition的来源
+ - XmlBeanDefinitionReader
+ - PropertiesBeanDefinitionReader
+ - AnnotatedBeanDefinitionReader
+ - ClassPathBeanDefinitionScanner
+ - ImportBeanDefinitionRegistrar
+ - BeanDefinitionImportSelector
+ Bean的过滤
-
+
+ TypeFilter
+ ConditionEvaluator
+ Condition
+ ConditionContext
+ ConfigurationCondition
-
+ 属性编辑与类型转换
- PropertyEditor
- ConversionService
- - Converter
-
+ - Converter
+ 表达式语言(SpEL)
- Expression
- ExpressionParser
- EvaluationContext
- PropertyAccessor
- - MethodResolver
+ - MethodResolver
- TypeLocator
-
+ Bean容器与配置
- BeanFactory
- ListableBeanFactory
- - HierarchicalBeanFactory
+ - HierarchicalBeanFactory
- ConfigurableBeanFactory
-
- + Bean的定义与注册
- + BeanDefinition
- + BeanDefinitionHolder
- + BeanDefinitionRegistry
-
- + BeanDefinition的来源
- - XmlBeanDefinitionReader
- - PropertiesBeanDefinitionReader
- - AnnotatedBeanDefinitionReader
- - ClassPathBeanDefinitionScanner
- - ImportBeanDefinitionRegistrar
- - BeanDefinitionImportSelector
-
+ Bean生命周期
- Bean的定义解析
- Bean的初始化过程
- Bean的依赖解析过程
- Bean的销毁过程
-
- - Bean初始化与扩展点
+
+- Bean初始化与扩展点
+ InitializingBean
+ DisposableBean
+ BeanDefinitionRegistryPostProcessor
+ BeanFactoryPostProcessor
+ BeanPostProcessor
- + InstantiationAwareBeanPostProcessor
+ + InstantiationAwareBeanPostProcessor
+ DestructionAwareBeanPostProcessor
+ MergedBeanDefinitionPostProcessor
+ SmartInstantiationAwareBeanPostProcessor
@@ -172,7 +165,7 @@
+ FileSystemXmlApplicationContext
+ AnnotationConfigApplicationContext
+ GenericApplicationContext
-
+
2. **AOP (面向切面编程)**
- AOP 术语:Aspect、Join point、Advice、Pointcut 等
diff --git a/pom.xml b/pom.xml
index bd82e94..4006d48 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,6 +26,7 @@
spring-aop
spring-mvc
spring-resources
+ spring-metadata
diff --git a/spring-metadata/pom.xml b/spring-metadata/pom.xml
new file mode 100644
index 0000000..37f3dcf
--- /dev/null
+++ b/spring-metadata/pom.xml
@@ -0,0 +1,19 @@
+
+
+
+ spring-reading
+ com.xcs.spring
+ 0.0.1-SNAPSHOT
+
+
+ 4.0.0
+ spring-metadata
+ pom
+
+
+ spring-metadata-metadataReader
+
+
+
\ No newline at end of file
diff --git a/spring-resources/spring-resource-metadataReader/README.md b/spring-metadata/spring-metadata-metadataReader/README.md
similarity index 100%
rename from spring-resources/spring-resource-metadataReader/README.md
rename to spring-metadata/spring-metadata-metadataReader/README.md
diff --git a/spring-resources/spring-resource-metadataReader/pom.xml b/spring-metadata/spring-metadata-metadataReader/pom.xml
similarity index 69%
rename from spring-resources/spring-resource-metadataReader/pom.xml
rename to spring-metadata/spring-metadata-metadataReader/pom.xml
index e78101f..97b7f47 100644
--- a/spring-resources/spring-resource-metadataReader/pom.xml
+++ b/spring-metadata/spring-metadata-metadataReader/pom.xml
@@ -3,17 +3,12 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- spring-resources
+ spring-metadata
com.xcs.spring
0.0.1-SNAPSHOT
- 4.0.0
+ 4.0.0
spring-resource-metadataReader
-
- 11
- 11
-
-
\ No newline at end of file
diff --git a/spring-resources/spring-resource-metadataReader/src/main/java/com/xcs/spring/MetadataReaderDemo.java b/spring-metadata/spring-metadata-metadataReader/src/main/java/com/xcs/spring/MetadataReaderDemo.java
similarity index 100%
rename from spring-resources/spring-resource-metadataReader/src/main/java/com/xcs/spring/MetadataReaderDemo.java
rename to spring-metadata/spring-metadata-metadataReader/src/main/java/com/xcs/spring/MetadataReaderDemo.java
diff --git a/spring-resources/spring-resource-metadataReader/src/main/java/com/xcs/spring/annotation/MyAnnotation.java b/spring-metadata/spring-metadata-metadataReader/src/main/java/com/xcs/spring/annotation/MyAnnotation.java
similarity index 100%
rename from spring-resources/spring-resource-metadataReader/src/main/java/com/xcs/spring/annotation/MyAnnotation.java
rename to spring-metadata/spring-metadata-metadataReader/src/main/java/com/xcs/spring/annotation/MyAnnotation.java
diff --git a/spring-resources/spring-resource-metadataReader/src/main/java/com/xcs/spring/annotation/MyClassAnnotation.java b/spring-metadata/spring-metadata-metadataReader/src/main/java/com/xcs/spring/annotation/MyClassAnnotation.java
similarity index 100%
rename from spring-resources/spring-resource-metadataReader/src/main/java/com/xcs/spring/annotation/MyClassAnnotation.java
rename to spring-metadata/spring-metadata-metadataReader/src/main/java/com/xcs/spring/annotation/MyClassAnnotation.java
diff --git a/spring-resources/spring-resource-metadataReader/src/main/java/com/xcs/spring/bean/MyAbstract.java b/spring-metadata/spring-metadata-metadataReader/src/main/java/com/xcs/spring/bean/MyAbstract.java
similarity index 100%
rename from spring-resources/spring-resource-metadataReader/src/main/java/com/xcs/spring/bean/MyAbstract.java
rename to spring-metadata/spring-metadata-metadataReader/src/main/java/com/xcs/spring/bean/MyAbstract.java
diff --git a/spring-resources/spring-resource-metadataReader/src/main/java/com/xcs/spring/bean/MyBean.java b/spring-metadata/spring-metadata-metadataReader/src/main/java/com/xcs/spring/bean/MyBean.java
similarity index 100%
rename from spring-resources/spring-resource-metadataReader/src/main/java/com/xcs/spring/bean/MyBean.java
rename to spring-metadata/spring-metadata-metadataReader/src/main/java/com/xcs/spring/bean/MyBean.java