You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by gn...@apache.org on 2018/01/30 22:05:00 UTC
svn commit: r1822705 - in /aries/trunk/blueprint/blueprint-core/src:
main/java/org/apache/aries/blueprint/ext/impl/
main/resources/org/apache/aries/blueprint/ext/impl/
test/java/org/apache/aries/blueprint/
Author: gnodet
Date: Tue Jan 30 22:05:00 2018
New Revision: 1822705
URL: http://svn.apache.org/viewvc?rev=1822705&view=rev
Log:
Simplify ExtNamespaceHandler
Added:
aries/trunk/blueprint/blueprint-core/src/main/resources/org/apache/aries/blueprint/ext/impl/blueprint-ext-1.0.0.xsd
- copied, changed from r1822200, aries/trunk/blueprint/blueprint-core/src/main/resources/org/apache/aries/blueprint/ext/impl/blueprint-ext.xsd
aries/trunk/blueprint/blueprint-core/src/main/resources/org/apache/aries/blueprint/ext/impl/blueprint-ext-1.1.0.xsd
- copied, changed from r1822200, aries/trunk/blueprint/blueprint-core/src/main/resources/org/apache/aries/blueprint/ext/impl/blueprint-ext-1.1.xsd
aries/trunk/blueprint/blueprint-core/src/main/resources/org/apache/aries/blueprint/ext/impl/blueprint-ext-1.2.0.xsd
- copied, changed from r1822200, aries/trunk/blueprint/blueprint-core/src/main/resources/org/apache/aries/blueprint/ext/impl/blueprint-ext-1.2.xsd
aries/trunk/blueprint/blueprint-core/src/main/resources/org/apache/aries/blueprint/ext/impl/blueprint-ext-1.3.0.xsd
- copied, changed from r1822200, aries/trunk/blueprint/blueprint-core/src/main/resources/org/apache/aries/blueprint/ext/impl/blueprint-ext-1.3.xsd
aries/trunk/blueprint/blueprint-core/src/main/resources/org/apache/aries/blueprint/ext/impl/blueprint-ext-1.4.0.xsd
- copied, changed from r1822200, aries/trunk/blueprint/blueprint-core/src/main/resources/org/apache/aries/blueprint/ext/impl/blueprint-ext-1.4.xsd
aries/trunk/blueprint/blueprint-core/src/main/resources/org/apache/aries/blueprint/ext/impl/blueprint-ext-1.5.0.xsd
- copied, changed from r1822200, aries/trunk/blueprint/blueprint-core/src/main/resources/org/apache/aries/blueprint/ext/impl/blueprint-ext-1.5.xsd
aries/trunk/blueprint/blueprint-core/src/main/resources/org/apache/aries/blueprint/ext/impl/blueprint-ext-1.6.0.xsd
- copied, changed from r1822200, aries/trunk/blueprint/blueprint-core/src/main/resources/org/apache/aries/blueprint/ext/impl/blueprint-ext-1.6.xsd
Removed:
aries/trunk/blueprint/blueprint-core/src/main/resources/org/apache/aries/blueprint/ext/impl/blueprint-ext-1.1.xsd
aries/trunk/blueprint/blueprint-core/src/main/resources/org/apache/aries/blueprint/ext/impl/blueprint-ext-1.2.xsd
aries/trunk/blueprint/blueprint-core/src/main/resources/org/apache/aries/blueprint/ext/impl/blueprint-ext-1.3.xsd
aries/trunk/blueprint/blueprint-core/src/main/resources/org/apache/aries/blueprint/ext/impl/blueprint-ext-1.4.xsd
aries/trunk/blueprint/blueprint-core/src/main/resources/org/apache/aries/blueprint/ext/impl/blueprint-ext-1.5.xsd
aries/trunk/blueprint/blueprint-core/src/main/resources/org/apache/aries/blueprint/ext/impl/blueprint-ext-1.6.xsd
aries/trunk/blueprint/blueprint-core/src/main/resources/org/apache/aries/blueprint/ext/impl/blueprint-ext.xsd
Modified:
aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/ext/impl/ExtNamespaceHandler.java
aries/trunk/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/AbstractBlueprintTest.java
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=1822705&r1=1822704&r2=1822705&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 Tue Jan 30 22:05:00 2018
@@ -19,11 +19,7 @@
package org.apache.aries.blueprint.ext.impl;
import java.net.URL;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
import org.apache.aries.blueprint.ExtendedReferenceListMetadata;
import org.apache.aries.blueprint.ExtendedReferenceMetadata;
@@ -128,6 +124,15 @@ public class ExtNamespaceHandler impleme
public static final String LIFECYCLE_DYNAMIC = "dynamic";
public static final String LIFECYCLE_STATIC = "static";
+ private static final Set<String> EXT_URIS = Collections.unmodifiableSet(new LinkedHashSet<String>(Arrays.asList(
+ BLUEPRINT_EXT_NAMESPACE_V1_0,
+ BLUEPRINT_EXT_NAMESPACE_V1_1,
+ BLUEPRINT_EXT_NAMESPACE_V1_2,
+ BLUEPRINT_EXT_NAMESPACE_V1_3,
+ BLUEPRINT_EXT_NAMESPACE_V1_4,
+ BLUEPRINT_EXT_NAMESPACE_V1_5,
+ BLUEPRINT_EXT_NAMESPACE_V1_6)));
+
private static final Logger LOGGER = LoggerFactory.getLogger(ExtNamespaceHandler.class);
private int idCounter;
@@ -139,33 +144,17 @@ public class ExtNamespaceHandler impleme
}
public URL getSchemaLocation(String namespace) {
- if (BLUEPRINT_EXT_NAMESPACE_V1_0.equals(namespace)) {
- return getClass().getResource("blueprint-ext.xsd");
- } else if (BLUEPRINT_EXT_NAMESPACE_V1_1.equals(namespace)) {
- return getClass().getResource("blueprint-ext-1.1.xsd");
- } else if (BLUEPRINT_EXT_NAMESPACE_V1_2.equals(namespace)) {
- 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 if (BLUEPRINT_EXT_NAMESPACE_V1_4.equals(namespace)) {
- return getClass().getResource("blueprint-ext-1.4.xsd");
- } else if (BLUEPRINT_EXT_NAMESPACE_V1_5.equals(namespace)) {
- return getClass().getResource("blueprint-ext-1.5.xsd");
- } else if (BLUEPRINT_EXT_NAMESPACE_V1_6.equals(namespace)) {
- return getClass().getResource("blueprint-ext-1.6.xsd");
+ if (isExtNamespace(namespace)) {
+ String v = namespace.substring("http://aries.apache.org/blueprint/xmlns/blueprint-ext/v".length());
+ return getClass().getResource("blueprint-ext-" + v + ".xsd");
} else if ("http://www.w3.org/XML/1998/namespace".equals(namespace)) {
return getClass().getResource("xml.xsd");
}
return null;
}
- public boolean isExtNamespace(String e) {
- return BLUEPRINT_EXT_NAMESPACE_V1_0.equals(e)
- || BLUEPRINT_EXT_NAMESPACE_V1_1.equals(e)
- || BLUEPRINT_EXT_NAMESPACE_V1_2.equals(e)
- || BLUEPRINT_EXT_NAMESPACE_V1_3.equals(e)
- || BLUEPRINT_EXT_NAMESPACE_V1_4.equals(e)
- || BLUEPRINT_EXT_NAMESPACE_V1_5.equals(e)
- || BLUEPRINT_EXT_NAMESPACE_V1_6.equals(e);
+
+ public static boolean isExtNamespace(String e) {
+ return EXT_URIS.contains(e);
}
public Set<Class> getManagedClasses() {
Copied: aries/trunk/blueprint/blueprint-core/src/main/resources/org/apache/aries/blueprint/ext/impl/blueprint-ext-1.0.0.xsd (from r1822200, aries/trunk/blueprint/blueprint-core/src/main/resources/org/apache/aries/blueprint/ext/impl/blueprint-ext.xsd)
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-core/src/main/resources/org/apache/aries/blueprint/ext/impl/blueprint-ext-1.0.0.xsd?p2=aries/trunk/blueprint/blueprint-core/src/main/resources/org/apache/aries/blueprint/ext/impl/blueprint-ext-1.0.0.xsd&p1=aries/trunk/blueprint/blueprint-core/src/main/resources/org/apache/aries/blueprint/ext/impl/blueprint-ext.xsd&r1=1822200&r2=1822705&rev=1822705&view=diff
==============================================================================
(empty)
Copied: aries/trunk/blueprint/blueprint-core/src/main/resources/org/apache/aries/blueprint/ext/impl/blueprint-ext-1.1.0.xsd (from r1822200, aries/trunk/blueprint/blueprint-core/src/main/resources/org/apache/aries/blueprint/ext/impl/blueprint-ext-1.1.xsd)
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-core/src/main/resources/org/apache/aries/blueprint/ext/impl/blueprint-ext-1.1.0.xsd?p2=aries/trunk/blueprint/blueprint-core/src/main/resources/org/apache/aries/blueprint/ext/impl/blueprint-ext-1.1.0.xsd&p1=aries/trunk/blueprint/blueprint-core/src/main/resources/org/apache/aries/blueprint/ext/impl/blueprint-ext-1.1.xsd&r1=1822200&r2=1822705&rev=1822705&view=diff
==============================================================================
(empty)
Copied: aries/trunk/blueprint/blueprint-core/src/main/resources/org/apache/aries/blueprint/ext/impl/blueprint-ext-1.2.0.xsd (from r1822200, aries/trunk/blueprint/blueprint-core/src/main/resources/org/apache/aries/blueprint/ext/impl/blueprint-ext-1.2.xsd)
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-core/src/main/resources/org/apache/aries/blueprint/ext/impl/blueprint-ext-1.2.0.xsd?p2=aries/trunk/blueprint/blueprint-core/src/main/resources/org/apache/aries/blueprint/ext/impl/blueprint-ext-1.2.0.xsd&p1=aries/trunk/blueprint/blueprint-core/src/main/resources/org/apache/aries/blueprint/ext/impl/blueprint-ext-1.2.xsd&r1=1822200&r2=1822705&rev=1822705&view=diff
==============================================================================
(empty)
Copied: aries/trunk/blueprint/blueprint-core/src/main/resources/org/apache/aries/blueprint/ext/impl/blueprint-ext-1.3.0.xsd (from r1822200, aries/trunk/blueprint/blueprint-core/src/main/resources/org/apache/aries/blueprint/ext/impl/blueprint-ext-1.3.xsd)
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-core/src/main/resources/org/apache/aries/blueprint/ext/impl/blueprint-ext-1.3.0.xsd?p2=aries/trunk/blueprint/blueprint-core/src/main/resources/org/apache/aries/blueprint/ext/impl/blueprint-ext-1.3.0.xsd&p1=aries/trunk/blueprint/blueprint-core/src/main/resources/org/apache/aries/blueprint/ext/impl/blueprint-ext-1.3.xsd&r1=1822200&r2=1822705&rev=1822705&view=diff
==============================================================================
(empty)
Copied: aries/trunk/blueprint/blueprint-core/src/main/resources/org/apache/aries/blueprint/ext/impl/blueprint-ext-1.4.0.xsd (from r1822200, 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.0.xsd?p2=aries/trunk/blueprint/blueprint-core/src/main/resources/org/apache/aries/blueprint/ext/impl/blueprint-ext-1.4.0.xsd&p1=aries/trunk/blueprint/blueprint-core/src/main/resources/org/apache/aries/blueprint/ext/impl/blueprint-ext-1.4.xsd&r1=1822200&r2=1822705&rev=1822705&view=diff
==============================================================================
Binary files - no diff available.
Copied: aries/trunk/blueprint/blueprint-core/src/main/resources/org/apache/aries/blueprint/ext/impl/blueprint-ext-1.5.0.xsd (from r1822200, aries/trunk/blueprint/blueprint-core/src/main/resources/org/apache/aries/blueprint/ext/impl/blueprint-ext-1.5.xsd)
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-core/src/main/resources/org/apache/aries/blueprint/ext/impl/blueprint-ext-1.5.0.xsd?p2=aries/trunk/blueprint/blueprint-core/src/main/resources/org/apache/aries/blueprint/ext/impl/blueprint-ext-1.5.0.xsd&p1=aries/trunk/blueprint/blueprint-core/src/main/resources/org/apache/aries/blueprint/ext/impl/blueprint-ext-1.5.xsd&r1=1822200&r2=1822705&rev=1822705&view=diff
==============================================================================
(empty)
Copied: aries/trunk/blueprint/blueprint-core/src/main/resources/org/apache/aries/blueprint/ext/impl/blueprint-ext-1.6.0.xsd (from r1822200, aries/trunk/blueprint/blueprint-core/src/main/resources/org/apache/aries/blueprint/ext/impl/blueprint-ext-1.6.xsd)
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-core/src/main/resources/org/apache/aries/blueprint/ext/impl/blueprint-ext-1.6.0.xsd?p2=aries/trunk/blueprint/blueprint-core/src/main/resources/org/apache/aries/blueprint/ext/impl/blueprint-ext-1.6.0.xsd&p1=aries/trunk/blueprint/blueprint-core/src/main/resources/org/apache/aries/blueprint/ext/impl/blueprint-ext-1.6.xsd&r1=1822200&r2=1822705&rev=1822705&view=diff
==============================================================================
(empty)
Modified: aries/trunk/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/AbstractBlueprintTest.java
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/AbstractBlueprintTest.java?rev=1822705&r1=1822704&r2=1822705&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/AbstractBlueprintTest.java (original)
+++ aries/trunk/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/AbstractBlueprintTest.java Tue Jan 30 22:05:00 2018
@@ -37,13 +37,12 @@ import org.xml.sax.SAXException;
public abstract class AbstractBlueprintTest extends TestCase {
protected ComponentDefinitionRegistryImpl parse(String name) throws Exception {
- final URI extensionHandler = new URI("http://aries.apache.org/blueprint/xmlns/blueprint-ext/v1.0.0");
NamespaceHandlerSet handlers = new NamespaceHandlerSet() {
public Set<URI> getNamespaces() {
return null;
}
public NamespaceHandler getNamespaceHandler(URI namespace) {
- if (namespace.equals(extensionHandler)) {
+ if (ExtNamespaceHandler.isExtNamespace(namespace.toString())) {
return new ExtNamespaceHandler();
} else {
return null;