aries-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gno...@apache.org
Subject svn commit: r1690284 - in /aries/trunk/blueprint/blueprint-cm/src/main: java/org/apache/aries/blueprint/compendium/cm/CmNamespaceHandler.java resources/org/apache/aries/blueprint/compendium/cm/blueprint-cm-1.3.0.xsd
Date Fri, 10 Jul 2015 16:28:19 GMT
Author: gnodet
Date: Fri Jul 10 16:28:19 2015
New Revision: 1690284

URL: http://svn.apache.org/r1690284
Log:
[ARIES-1290] Include ext-v1.5.0 support in CmNamespaceHandler

Modified:
    aries/trunk/blueprint/blueprint-cm/src/main/java/org/apache/aries/blueprint/compendium/cm/CmNamespaceHandler.java
    aries/trunk/blueprint/blueprint-cm/src/main/resources/org/apache/aries/blueprint/compendium/cm/blueprint-cm-1.3.0.xsd

Modified: aries/trunk/blueprint/blueprint-cm/src/main/java/org/apache/aries/blueprint/compendium/cm/CmNamespaceHandler.java
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-cm/src/main/java/org/apache/aries/blueprint/compendium/cm/CmNamespaceHandler.java?rev=1690284&r1=1690283&r2=1690284&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-cm/src/main/java/org/apache/aries/blueprint/compendium/cm/CmNamespaceHandler.java
(original)
+++ aries/trunk/blueprint/blueprint-cm/src/main/java/org/apache/aries/blueprint/compendium/cm/CmNamespaceHandler.java
Fri Jul 10 16:28:19 2015
@@ -87,6 +87,7 @@ public class CmNamespaceHandler implemen
     public static final String BLUEPRINT_EXT_NAMESPACE_V1_2 = "http://aries.apache.org/blueprint/xmlns/blueprint-ext/v1.2.0";
     public static final String BLUEPRINT_EXT_NAMESPACE_V1_3 = "http://aries.apache.org/blueprint/xmlns/blueprint-ext/v1.3.0";
     public static final String BLUEPRINT_EXT_NAMESPACE_V1_4 = "http://aries.apache.org/blueprint/xmlns/blueprint-ext/v1.4.0";
+    public static final String BLUEPRINT_EXT_NAMESPACE_V1_5 = "http://aries.apache.org/blueprint/xmlns/blueprint-ext/v1.5.0";
 
     public static final String PROPERTY_PLACEHOLDER_ELEMENT = "property-placeholder";
     public static final String MANAGED_PROPERTIES_ELEMENT = "managed-properties";
@@ -315,6 +316,8 @@ public class CmNamespaceHandler implemen
         systemProperties =  element.getAttributeNS(BLUEPRINT_EXT_NAMESPACE_V1_3, SYSTEM_PROPERTIES_ATTRIBUTE);
       } else if (element.hasAttributeNS(BLUEPRINT_EXT_NAMESPACE_V1_4, SYSTEM_PROPERTIES_ATTRIBUTE))
{
         systemProperties =  element.getAttributeNS(BLUEPRINT_EXT_NAMESPACE_V1_4, SYSTEM_PROPERTIES_ATTRIBUTE);
+      } else if (element.hasAttributeNS(BLUEPRINT_EXT_NAMESPACE_V1_5, SYSTEM_PROPERTIES_ATTRIBUTE))
{
+        systemProperties =  element.getAttributeNS(BLUEPRINT_EXT_NAMESPACE_V1_5, SYSTEM_PROPERTIES_ATTRIBUTE);
       }
       return systemProperties;
     }
@@ -331,6 +334,8 @@ public class CmNamespaceHandler implemen
         ignoreMissingLocations = element.getAttributeNS(BLUEPRINT_EXT_NAMESPACE_V1_3, IGNORE_MISSING_LOCATIONS_ATTRIBUTE);
       } else if (element.hasAttributeNS(BLUEPRINT_EXT_NAMESPACE_V1_4, IGNORE_MISSING_LOCATIONS_ATTRIBUTE))
{
         ignoreMissingLocations = element.getAttributeNS(BLUEPRINT_EXT_NAMESPACE_V1_4, IGNORE_MISSING_LOCATIONS_ATTRIBUTE);
+      } else if (element.hasAttributeNS(BLUEPRINT_EXT_NAMESPACE_V1_5, IGNORE_MISSING_LOCATIONS_ATTRIBUTE))
{
+        ignoreMissingLocations = element.getAttributeNS(BLUEPRINT_EXT_NAMESPACE_V1_5, IGNORE_MISSING_LOCATIONS_ATTRIBUTE);
       }
       return ignoreMissingLocations;
     }

Modified: aries/trunk/blueprint/blueprint-cm/src/main/resources/org/apache/aries/blueprint/compendium/cm/blueprint-cm-1.3.0.xsd
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-cm/src/main/resources/org/apache/aries/blueprint/compendium/cm/blueprint-cm-1.3.0.xsd?rev=1690284&r1=1690283&r2=1690284&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-cm/src/main/resources/org/apache/aries/blueprint/compendium/cm/blueprint-cm-1.3.0.xsd
(original)
+++ aries/trunk/blueprint/blueprint-cm/src/main/resources/org/apache/aries/blueprint/compendium/cm/blueprint-cm-1.3.0.xsd
Fri Jul 10 16:28:19 2015
@@ -24,6 +24,7 @@
             xmlns:ext120="http://aries.apache.org/blueprint/xmlns/blueprint-ext/v1.2.0"
             xmlns:ext130="http://aries.apache.org/blueprint/xmlns/blueprint-ext/v1.3.0"
             xmlns:ext140="http://aries.apache.org/blueprint/xmlns/blueprint-ext/v1.4.0"
+            xmlns:ext150="http://aries.apache.org/blueprint/xmlns/blueprint-ext/v1.5.0"
             xmlns:xsd="http://www.w3.org/2001/XMLSchema"
             xmlns:bp="http://www.osgi.org/xmlns/blueprint/v1.0.0"
             targetNamespace="http://aries.apache.org/blueprint/xmlns/blueprint-cm/v1.3.0"
@@ -37,6 +38,7 @@
     <xsd:import namespace="http://aries.apache.org/blueprint/xmlns/blueprint-ext/v1.2.0"
/>
     <xsd:import namespace="http://aries.apache.org/blueprint/xmlns/blueprint-ext/v1.3.0"
/>
     <xsd:import namespace="http://aries.apache.org/blueprint/xmlns/blueprint-ext/v1.4.0"
/>
+    <xsd:import namespace="http://aries.apache.org/blueprint/xmlns/blueprint-ext/v1.5.0"
/>
 
     <!-- property placeholder -->
 
@@ -54,6 +56,7 @@
                         <xsd:element ref="ext120:location" />
                         <xsd:element ref="ext130:location" />
                         <xsd:element ref="ext140:location" />
+                        <xsd:element ref="ext150:location" />
                     </xsd:choice>
                 </xsd:sequence>
 
@@ -90,11 +93,13 @@
         <xsd:attribute ref="ext120:ignore-missing-locations" use="optional" />
         <xsd:attribute ref="ext130:ignore-missing-locations" use="optional" />
         <xsd:attribute ref="ext140:ignore-missing-locations" use="optional" />
+        <xsd:attribute ref="ext150:ignore-missing-locations" use="optional" />
         <xsd:attribute ref="ext100:system-properties" use="optional" />
         <xsd:attribute ref="ext110:system-properties" use="optional" />
         <xsd:attribute ref="ext120:system-properties" use="optional" />
         <xsd:attribute ref="ext130:system-properties" use="optional" />
         <xsd:attribute ref="ext140:system-properties" use="optional" />
+        <xsd:attribute ref="ext150:system-properties" use="optional" />
     </xsd:attributeGroup>
 
     <!--  managed-properties  -->



Mime
View raw message