Author: dkulp
Date: Wed Oct 2 15:28:28 2013
New Revision: 1528520
URL: http://svn.apache.org/r1528520
Log:
[ARIES-1118] Add the xml namespace as a "core" namespace for BP to handle
Added:
aries/trunk/blueprint/blueprint-core/src/main/resources/org/apache/aries/blueprint/ext/impl/xml.xsd
(with props)
Modified:
aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/ext/impl/ExtNamespaceHandler.java
aries/trunk/blueprint/blueprint-core/src/main/resources/OSGI-INF/blueprint/blueprint-ext.xml
Modified:
aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/ext/impl/ExtNamespaceHandler.java
URL:
http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/ext/impl/ExtNamespaceHandler.java?rev=1528520&r1=1528519&r2=1528520&view=diff
==============================================================================
---
aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/ext/impl/ExtNamespaceHandler.java
(original)
+++
aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/ext/impl/ExtNamespaceHandler.java
Wed Oct 2 15:28:28 2013
@@ -126,9 +126,10 @@ public class ExtNamespaceHandler impleme
return getClass().getResource("blueprint-ext-1.2.xsd");
} else if (BLUEPRINT_EXT_NAMESPACE_V1_3.equals(namespace)) {
return getClass().getResource("blueprint-ext-1.3.xsd");
- } else {
- return null;
+ } else if ("http://www.w3.org/XML/1998/namespace".equals(namespace)) {
+ return getClass().getResource("xml.xsd");
}
+ return null;
}
public Set<Class> getManagedClasses() {
Modified:
aries/trunk/blueprint/blueprint-core/src/main/resources/OSGI-INF/blueprint/blueprint-ext.xml
URL:
http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-core/src/main/resources/OSGI-INF/blueprint/blueprint-ext.xml?rev=1528520&r1=1528519&r2=1528520&view=diff
==============================================================================
---
aries/trunk/blueprint/blueprint-core/src/main/resources/OSGI-INF/blueprint/blueprint-ext.xml
(original)
+++
aries/trunk/blueprint/blueprint-core/src/main/resources/OSGI-INF/blueprint/blueprint-ext.xml
Wed Oct 2 15:28:28 2013
@@ -42,4 +42,11 @@
<entry key="osgi.service.blueprint.namespace"
value="http://aries.apache.org/blueprint/xmlns/blueprint-ext/v1.3.0"/>
</service-properties>
</service>
+
+ <!-- Also provide the "xml" namespace as a core functionality to avoid
many bundles registering a handler for this -->
+ <service ref="ExtNamespaceHandler"
interface="org.apache.aries.blueprint.NamespaceHandler">
+ <service-properties>
+ <entry key="osgi.service.blueprint.namespace"
value="http://www.w3.org/XML/1998/namespace"/>
+ </service-properties>
+ </service>
</blueprint>
Added:
aries/trunk/blueprint/blueprint-core/src/main/resources/org/apache/aries/blueprint/ext/impl/xml.xsd
URL:
http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-core/src/main/resources/org/apache/aries/blueprint/ext/impl/xml.xsd?rev=1528520&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
aries/trunk/blueprint/blueprint-core/src/main/resources/org/apache/aries/blueprint/ext/impl/xml.xsd
------------------------------------------------------------------------------
svn:mime-type = application/xml
