felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject svn commit: r1775478 - in /felix/trunk/scr/src/main/java/org/apache/felix/scr/impl: metadata/DSVersion.java xml/XmlHandler.java
Date Wed, 21 Dec 2016 15:52:52 GMT
Author: cziegeler
Date: Wed Dec 21 15:52:52 2016
New Revision: 1775478

URL: http://svn.apache.org/viewvc?rev=1775478&view=rev
Log:
FELIX-5354 : Implement Declarative Service Updates for R7 (RFC 222). Add new namespace

Modified:
    felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/metadata/DSVersion.java
    felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/xml/XmlHandler.java

Modified: felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/metadata/DSVersion.java
URL: http://svn.apache.org/viewvc/felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/metadata/DSVersion.java?rev=1775478&r1=1775477&r2=1775478&view=diff
==============================================================================
--- felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/metadata/DSVersion.java (original)
+++ felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/metadata/DSVersion.java Wed Dec
21 15:52:52 2016
@@ -26,15 +26,16 @@ public enum DSVersion
     DS11Felix(2),
     DS12(3),
     DS12Felix(4),
-    DS13(5);
-    
+    DS13(5),
+    DS14(6);
+
     private final int version;
-    
-    DSVersion(int version) 
+
+    DSVersion(int version)
     {
         this.version = version;
     }
-    
+
     public boolean isDS10()
     {
         return version >=DS10.version;
@@ -55,4 +56,8 @@ public enum DSVersion
         return version >=DS13.version;
     }
 
+    public boolean isDS14()
+    {
+        return version >=DS14.version;
+    }
 }

Modified: felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/xml/XmlHandler.java
URL: http://svn.apache.org/viewvc/felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/xml/XmlHandler.java?rev=1775478&r1=1775477&r2=1775478&view=diff
==============================================================================
--- felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/xml/XmlHandler.java (original)
+++ felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/xml/XmlHandler.java Wed Dec 21
15:52:52 2016
@@ -72,6 +72,9 @@ public class XmlHandler implements KXml2
     // Namespace URI of Felix DS extensions 1.0
     public static final String NAMESPACE_URI_1_0_FELIX_EXTENSIONS = "http://felix.apache.org/xmlns/scr/extensions/v1.0.0";
 
+    // Namespace URI of DS 1.4
+    public static final String NAMESPACE_URI_1_4 = "http://www.osgi.org/xmlns/scr/v1.4.0";
+
     //extension features
     public static final String CONFIGURABLE_SERVICE_PROPERTIES = "configurableServiceProperties";
 
@@ -150,6 +153,7 @@ public class XmlHandler implements KXml2
         NAMESPACE_CODE_MAP.put( NAMESPACE_URI_1_2, DSVersion.DS12 );
         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 );
     }
 
 



Mime
View raw message