You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by dk...@apache.org on 2013/12/13 19:23:43 UTC
svn commit: r1550790 - in /aries/trunk/blueprint/blueprint-core/src/main:
java/org/apache/aries/blueprint/ext/impl/ExtNamespaceHandler.java
resources/OSGI-INF/blueprint/blueprint-ext.xml
resources/org/apache/aries/blueprint/ext/impl/blueprint-ext-1.4.xsd
Author: dkulp
Date: Fri Dec 13 18:23:43 2013
New Revision: 1550790
URL: http://svn.apache.org/r1550790
Log:
[ARIES-1141] Update to use the blueprint Tinterfaces type, register the namespace handler
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
aries/trunk/blueprint/blueprint-core/src/main/resources/org/apache/aries/blueprint/ext/impl/blueprint-ext-1.4.xsd
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=1550790&r1=1550789&r2=1550790&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 Fri Dec 13 18:23:43 2013
@@ -109,7 +109,7 @@ public class ExtNamespaceHandler impleme
public static final String FILTER_ATTRIBUTE = "filter";
public static final String ADDITIONAL_INTERFACES = "additional-interfaces";
- public static final String INTERFACE = "interface";
+ public static final String INTERFACE_VALUE = "value";
private static final Logger LOGGER = LoggerFactory.getLogger(ExtNamespaceHandler.class);
@@ -187,7 +187,7 @@ public class ExtNamespaceHandler impleme
List<String> list = new ArrayList<String>();
Node nd = node.getFirstChild();
while (nd != null) {
- if (node instanceof Element && nodeNameEquals(node, INTERFACE)) {
+ if (node instanceof Element && nodeNameEquals(node, INTERFACE_VALUE)) {
list.add(((Element)nd).getNodeValue());
}
nd = nd.getNextSibling();
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=1550790&r1=1550789&r2=1550790&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 Fri Dec 13 18:23:43 2013
@@ -42,6 +42,11 @@
<entry key="osgi.service.blueprint.namespace" value="http://aries.apache.org/blueprint/xmlns/blueprint-ext/v1.3.0"/>
</service-properties>
</service>
+ <service ref="ExtNamespaceHandler" interface="org.apache.aries.blueprint.NamespaceHandler">
+ <service-properties>
+ <entry key="osgi.service.blueprint.namespace" value="http://aries.apache.org/blueprint/xmlns/blueprint-ext/v1.4.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">
Modified: aries/trunk/blueprint/blueprint-core/src/main/resources/org/apache/aries/blueprint/ext/impl/blueprint-ext-1.4.xsd
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-core/src/main/resources/org/apache/aries/blueprint/ext/impl/blueprint-ext-1.4.xsd?rev=1550790&r1=1550789&r2=1550790&view=diff
==============================================================================
Binary files - no diff available.