diff --git a/org.springframework.aop/src/main/resources/META-INF/spring.handlers b/org.springframework.aop/src/main/resources/META-INF/spring.handlers
new file mode 100644
index 00000000000..0c1d1b525e3
--- /dev/null
+++ b/org.springframework.aop/src/main/resources/META-INF/spring.handlers
@@ -0,0 +1 @@
+http\://www.springframework.org/schema/aop=org.springframework.aop.config.AopNamespaceHandler
diff --git a/org.springframework.aop/src/main/resources/META-INF/spring.schemas b/org.springframework.aop/src/main/resources/META-INF/spring.schemas
new file mode 100644
index 00000000000..000bbdc0979
--- /dev/null
+++ b/org.springframework.aop/src/main/resources/META-INF/spring.schemas
@@ -0,0 +1,3 @@
+http\://www.springframework.org/schema/aop/spring-aop-2.0.xsd=org/springframework/aop/config/spring-aop-2.0.xsd
+http\://www.springframework.org/schema/aop/spring-aop-2.5.xsd=org/springframework/aop/config/spring-aop-2.5.xsd
+http\://www.springframework.org/schema/aop/spring-aop.xsd=org/springframework/aop/config/spring-aop-2.5.xsd
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/config/spring-aop-2.0.xsd b/org.springframework.aop/src/main/resources/org/springframework/aop/config/spring-aop-2.0.xsd
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/config/spring-aop-2.0.xsd
rename to org.springframework.aop/src/main/resources/org/springframework/aop/config/spring-aop-2.0.xsd
diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/config/spring-aop-2.5.xsd b/org.springframework.aop/src/main/resources/org/springframework/aop/config/spring-aop-2.5.xsd
similarity index 100%
rename from org.springframework.aop/src/main/java/org/springframework/aop/config/spring-aop-2.5.xsd
rename to org.springframework.aop/src/main/resources/org/springframework/aop/config/spring-aop-2.5.xsd
diff --git a/org.springframework.beans/src/main/resources/META-INF/spring.handlers b/org.springframework.beans/src/main/resources/META-INF/spring.handlers
new file mode 100644
index 00000000000..8fda43f0c74
--- /dev/null
+++ b/org.springframework.beans/src/main/resources/META-INF/spring.handlers
@@ -0,0 +1,2 @@
+http\://www.springframework.org/schema/p=org.springframework.beans.factory.xml.SimplePropertyNamespaceHandler
+http\://www.springframework.org/schema/util=org.springframework.beans.factory.xml.UtilNamespaceHandler
diff --git a/org.springframework.beans/src/main/resources/META-INF/spring.schemas b/org.springframework.beans/src/main/resources/META-INF/spring.schemas
new file mode 100644
index 00000000000..e17a59aec63
--- /dev/null
+++ b/org.springframework.beans/src/main/resources/META-INF/spring.schemas
@@ -0,0 +1,9 @@
+http\://www.springframework.org/schema/beans/spring-beans-2.0.xsd=org/springframework/beans/factory/xml/spring-beans-2.0.xsd
+http\://www.springframework.org/schema/beans/spring-beans-2.5.xsd=org/springframework/beans/factory/xml/spring-beans-2.5.xsd
+http\://www.springframework.org/schema/beans/spring-beans.xsd=org/springframework/beans/factory/xml/spring-beans-2.5.xsd
+http\://www.springframework.org/schema/tool/spring-tool-2.0.xsd=org/springframework/beans/factory/xml/spring-tool-2.0.xsd
+http\://www.springframework.org/schema/tool/spring-tool-2.5.xsd=org/springframework/beans/factory/xml/spring-tool-2.5.xsd
+http\://www.springframework.org/schema/tool/spring-tool.xsd=org/springframework/beans/factory/xml/spring-tool-2.5.xsd
+http\://www.springframework.org/schema/util/spring-util-2.0.xsd=org/springframework/beans/factory/xml/spring-util-2.0.xsd
+http\://www.springframework.org/schema/util/spring-util-2.5.xsd=org/springframework/beans/factory/xml/spring-util-2.5.xsd
+http\://www.springframework.org/schema/util/spring-util.xsd=org/springframework/beans/factory/xml/spring-util-2.5.xsd
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/xml/spring-beans-2.0.dtd b/org.springframework.beans/src/main/resources/org/springframework/beans/factory/xml/spring-beans-2.0.dtd
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/xml/spring-beans-2.0.dtd
rename to org.springframework.beans/src/main/resources/org/springframework/beans/factory/xml/spring-beans-2.0.dtd
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/xml/spring-beans-2.0.xsd b/org.springframework.beans/src/main/resources/org/springframework/beans/factory/xml/spring-beans-2.0.xsd
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/xml/spring-beans-2.0.xsd
rename to org.springframework.beans/src/main/resources/org/springframework/beans/factory/xml/spring-beans-2.0.xsd
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/xml/spring-beans-2.5.xsd b/org.springframework.beans/src/main/resources/org/springframework/beans/factory/xml/spring-beans-2.5.xsd
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/xml/spring-beans-2.5.xsd
rename to org.springframework.beans/src/main/resources/org/springframework/beans/factory/xml/spring-beans-2.5.xsd
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/xml/spring-beans.dtd b/org.springframework.beans/src/main/resources/org/springframework/beans/factory/xml/spring-beans.dtd
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/xml/spring-beans.dtd
rename to org.springframework.beans/src/main/resources/org/springframework/beans/factory/xml/spring-beans.dtd
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/xml/spring-tool-2.0.xsd b/org.springframework.beans/src/main/resources/org/springframework/beans/factory/xml/spring-tool-2.0.xsd
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/xml/spring-tool-2.0.xsd
rename to org.springframework.beans/src/main/resources/org/springframework/beans/factory/xml/spring-tool-2.0.xsd
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/xml/spring-tool-2.5.xsd b/org.springframework.beans/src/main/resources/org/springframework/beans/factory/xml/spring-tool-2.5.xsd
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/xml/spring-tool-2.5.xsd
rename to org.springframework.beans/src/main/resources/org/springframework/beans/factory/xml/spring-tool-2.5.xsd
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/xml/spring-util-2.0.xsd b/org.springframework.beans/src/main/resources/org/springframework/beans/factory/xml/spring-util-2.0.xsd
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/xml/spring-util-2.0.xsd
rename to org.springframework.beans/src/main/resources/org/springframework/beans/factory/xml/spring-util-2.0.xsd
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/xml/spring-util-2.5.xsd b/org.springframework.beans/src/main/resources/org/springframework/beans/factory/xml/spring-util-2.5.xsd
similarity index 100%
rename from org.springframework.beans/src/main/java/org/springframework/beans/factory/xml/spring-util-2.5.xsd
rename to org.springframework.beans/src/main/resources/org/springframework/beans/factory/xml/spring-util-2.5.xsd
diff --git a/org.springframework.context/src/main/resources/META-INF/spring.handlers b/org.springframework.context/src/main/resources/META-INF/spring.handlers
new file mode 100644
index 00000000000..0d98a114a78
--- /dev/null
+++ b/org.springframework.context/src/main/resources/META-INF/spring.handlers
@@ -0,0 +1,3 @@
+http\://www.springframework.org/schema/context=org.springframework.context.config.ContextNamespaceHandler
+http\://www.springframework.org/schema/jee=org.springframework.ejb.config.JeeNamespaceHandler
+http\://www.springframework.org/schema/lang=org.springframework.scripting.config.LangNamespaceHandler
diff --git a/org.springframework.context/src/main/resources/META-INF/spring.schemas b/org.springframework.context/src/main/resources/META-INF/spring.schemas
new file mode 100644
index 00000000000..4b32bfb8485
--- /dev/null
+++ b/org.springframework.context/src/main/resources/META-INF/spring.schemas
@@ -0,0 +1,8 @@
+http\://www.springframework.org/schema/context/spring-context-2.5.xsd=org/springframework/context/config/spring-context-2.5.xsd
+http\://www.springframework.org/schema/context/spring-context.xsd=org/springframework/context/config/spring-context-2.5.xsd
+http\://www.springframework.org/schema/jee/spring-jee-2.0.xsd=org/springframework/ejb/config/spring-jee-2.0.xsd
+http\://www.springframework.org/schema/jee/spring-jee-2.5.xsd=org/springframework/ejb/config/spring-jee-2.5.xsd
+http\://www.springframework.org/schema/jee/spring-jee.xsd=org/springframework/ejb/config/spring-jee-2.5.xsd
+http\://www.springframework.org/schema/lang/spring-lang-2.0.xsd=org/springframework/scripting/config/spring-lang-2.0.xsd
+http\://www.springframework.org/schema/lang/spring-lang-2.5.xsd=org/springframework/scripting/config/spring-lang-2.5.xsd
+http\://www.springframework.org/schema/lang/spring-lang.xsd=org/springframework/scripting/config/spring-lang-2.5.xsd
diff --git a/org.springframework.context/src/main/java/org/springframework/context/config/spring-context-2.5.xsd b/org.springframework.context/src/main/resources/org/springframework/context/config/spring-context-2.5.xsd
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/context/config/spring-context-2.5.xsd
rename to org.springframework.context/src/main/resources/org/springframework/context/config/spring-context-2.5.xsd
diff --git a/org.springframework.context/src/main/java/org/springframework/ejb/config/spring-jee-2.0.xsd b/org.springframework.context/src/main/resources/org/springframework/ejb/config/spring-jee-2.0.xsd
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/ejb/config/spring-jee-2.0.xsd
rename to org.springframework.context/src/main/resources/org/springframework/ejb/config/spring-jee-2.0.xsd
diff --git a/org.springframework.context/src/main/java/org/springframework/ejb/config/spring-jee-2.5.xsd b/org.springframework.context/src/main/resources/org/springframework/ejb/config/spring-jee-2.5.xsd
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/ejb/config/spring-jee-2.5.xsd
rename to org.springframework.context/src/main/resources/org/springframework/ejb/config/spring-jee-2.5.xsd
diff --git a/org.springframework.context/src/main/java/org/springframework/scripting/config/spring-lang-2.0.xsd b/org.springframework.context/src/main/resources/org/springframework/scripting/config/spring-lang-2.0.xsd
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/scripting/config/spring-lang-2.0.xsd
rename to org.springframework.context/src/main/resources/org/springframework/scripting/config/spring-lang-2.0.xsd
diff --git a/org.springframework.context/src/main/java/org/springframework/scripting/config/spring-lang-2.5.xsd b/org.springframework.context/src/main/resources/org/springframework/scripting/config/spring-lang-2.5.xsd
similarity index 100%
rename from org.springframework.context/src/main/java/org/springframework/scripting/config/spring-lang-2.5.xsd
rename to org.springframework.context/src/main/resources/org/springframework/scripting/config/spring-lang-2.5.xsd
diff --git a/org.springframework.jms/src/main/resources/META-INF/spring.handlers b/org.springframework.jms/src/main/resources/META-INF/spring.handlers
new file mode 100644
index 00000000000..02cedcc67c5
--- /dev/null
+++ b/org.springframework.jms/src/main/resources/META-INF/spring.handlers
@@ -0,0 +1 @@
+http\://www.springframework.org/schema/jms=org.springframework.jms.config.JmsNamespaceHandler
diff --git a/org.springframework.jms/src/main/resources/META-INF/spring.schemas b/org.springframework.jms/src/main/resources/META-INF/spring.schemas
new file mode 100644
index 00000000000..42fc5f5be5f
--- /dev/null
+++ b/org.springframework.jms/src/main/resources/META-INF/spring.schemas
@@ -0,0 +1,2 @@
+http\://www.springframework.org/schema/jms/spring-jms-2.5.xsd=org/springframework/jms/config/spring-jms-2.5.xsd
+http\://www.springframework.org/schema/jms/spring-jms.xsd=org/springframework/jms/config/spring-jms-2.5.xsd
diff --git a/org.springframework.jms/src/main/java/org/springframework/jms/config/spring-jms-2.5.xsd b/org.springframework.jms/src/main/resources/org/springframework/jms/config/spring-jms-2.5.xsd
similarity index 100%
rename from org.springframework.jms/src/main/java/org/springframework/jms/config/spring-jms-2.5.xsd
rename to org.springframework.jms/src/main/resources/org/springframework/jms/config/spring-jms-2.5.xsd
diff --git a/org.springframework.transaction/src/main/resources/META-INF/spring.handlers b/org.springframework.transaction/src/main/resources/META-INF/spring.handlers
new file mode 100644
index 00000000000..4c07197ea4e
--- /dev/null
+++ b/org.springframework.transaction/src/main/resources/META-INF/spring.handlers
@@ -0,0 +1 @@
+http\://www.springframework.org/schema/tx=org.springframework.transaction.config.TxNamespaceHandler
diff --git a/org.springframework.transaction/src/main/resources/META-INF/spring.schemas b/org.springframework.transaction/src/main/resources/META-INF/spring.schemas
new file mode 100644
index 00000000000..d1399eb05c6
--- /dev/null
+++ b/org.springframework.transaction/src/main/resources/META-INF/spring.schemas
@@ -0,0 +1,3 @@
+http\://www.springframework.org/schema/tx/spring-tx-2.0.xsd=org/springframework/transaction/config/spring-tx-2.0.xsd
+http\://www.springframework.org/schema/tx/spring-tx-2.5.xsd=org/springframework/transaction/config/spring-tx-2.5.xsd
+http\://www.springframework.org/schema/tx/spring-tx.xsd=org/springframework/transaction/config/spring-tx-2.5.xsd
diff --git a/org.springframework.transaction/src/main/java/org/springframework/transaction/config/spring-tx-2.0.xsd b/org.springframework.transaction/src/main/resources/org/springframework/transaction/config/spring-tx-2.0.xsd
similarity index 100%
rename from org.springframework.transaction/src/main/java/org/springframework/transaction/config/spring-tx-2.0.xsd
rename to org.springframework.transaction/src/main/resources/org/springframework/transaction/config/spring-tx-2.0.xsd
diff --git a/org.springframework.transaction/src/main/java/org/springframework/transaction/config/spring-tx-2.5.xsd b/org.springframework.transaction/src/main/resources/org/springframework/transaction/config/spring-tx-2.5.xsd
similarity index 100%
rename from org.springframework.transaction/src/main/java/org/springframework/transaction/config/spring-tx-2.5.xsd
rename to org.springframework.transaction/src/main/resources/org/springframework/transaction/config/spring-tx-2.5.xsd