You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by tj...@apache.org on 2020/11/05 15:56:25 UTC
[felix-dev] 02/06: Add DS namespace version 1.5.0 for OSGi R8
This is an automated email from the ASF dual-hosted git repository.
tjwatson pushed a commit to branch scrR8
in repository https://gitbox.apache.org/repos/asf/felix-dev.git
commit 7898ad92ade59707dab993a35747a45130549066
Author: Thomas Watson <tj...@us.ibm.com>
AuthorDate: Wed Oct 28 10:06:53 2020 -0500
Add DS namespace version 1.5.0 for OSGi R8
---
.../main/java/org/apache/felix/scr/impl/metadata/DSVersion.java | 8 +++++++-
scr/src/main/java/org/apache/felix/scr/impl/xml/XmlConstants.java | 4 ++++
scr/src/main/java/org/apache/felix/scr/impl/xml/XmlHandler.java | 2 --
3 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/scr/src/main/java/org/apache/felix/scr/impl/metadata/DSVersion.java b/scr/src/main/java/org/apache/felix/scr/impl/metadata/DSVersion.java
index b3a7ef8..1fc7570 100644
--- a/scr/src/main/java/org/apache/felix/scr/impl/metadata/DSVersion.java
+++ b/scr/src/main/java/org/apache/felix/scr/impl/metadata/DSVersion.java
@@ -27,7 +27,8 @@ public enum DSVersion
DS12(3),
DS12Felix(4),
DS13(5),
- DS14(6);
+ DS14(6),
+ DS15(7);
private final int version;
@@ -60,4 +61,9 @@ public enum DSVersion
{
return version >=DS14.version;
}
+
+ public boolean isDS15()
+ {
+ return version >= DS15.version;
+ }
}
diff --git a/scr/src/main/java/org/apache/felix/scr/impl/xml/XmlConstants.java b/scr/src/main/java/org/apache/felix/scr/impl/xml/XmlConstants.java
index 112d34e..42624d7 100644
--- a/scr/src/main/java/org/apache/felix/scr/impl/xml/XmlConstants.java
+++ b/scr/src/main/java/org/apache/felix/scr/impl/xml/XmlConstants.java
@@ -55,6 +55,9 @@ public abstract class XmlConstants
// Namespace URI of DS 1.4
public static final String NAMESPACE_URI_1_4 = "http://www.osgi.org/xmlns/scr/v1.4.0";
+ // Namespace URI of DS 1.5
+ public static final String NAMESPACE_URI_1_5 = "http://www.osgi.org/xmlns/scr/v1.5.0";
+
// Elements
public static final String EL_COMPONENT = "component";
public static final String EL_COMPONENTS = "components";
@@ -113,5 +116,6 @@ public abstract class XmlConstants
NAMESPACE_CODE_MAP.put( NAMESPACE_URI_1_2_FELIX, DSVersion.DS12Felix );
NAMESPACE_CODE_MAP.put( NAMESPACE_URI_1_3, DSVersion.DS13 );
NAMESPACE_CODE_MAP.put( NAMESPACE_URI_1_4, DSVersion.DS14 );
+ NAMESPACE_CODE_MAP.put( NAMESPACE_URI_1_5, DSVersion.DS15 );
}
}
diff --git a/scr/src/main/java/org/apache/felix/scr/impl/xml/XmlHandler.java b/scr/src/main/java/org/apache/felix/scr/impl/xml/XmlHandler.java
index 19c9374..e40954c 100644
--- a/scr/src/main/java/org/apache/felix/scr/impl/xml/XmlHandler.java
+++ b/scr/src/main/java/org/apache/felix/scr/impl/xml/XmlHandler.java
@@ -26,8 +26,6 @@ import java.util.List;
import java.util.Map;
import java.util.Properties;
-import javax.xml.XMLConstants;
-
import org.apache.felix.scr.impl.logger.BundleLogger;
import org.apache.felix.scr.impl.logger.InternalLogger.Level;
import org.apache.felix.scr.impl.metadata.ComponentMetadata;